Bug 1238844 - Do not call window utils if content has been null. r?dao
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -611,16 +611,19 @@ var DOMFullscreenHandler = {
addEventListener("MozDOMFullscreen:Request", this);
addEventListener("MozDOMFullscreen:Entered", this);
addEventListener("MozDOMFullscreen:NewOrigin", this);
addEventListener("MozDOMFullscreen:Exit", this);
addEventListener("MozDOMFullscreen:Exited", this);
},
get _windowUtils() {
+ if (!content) {
+ return null;
+ }
return content.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
},
receiveMessage: function(aMessage) {
switch(aMessage.name) {
case "DOMFullscreen:Entered": {
if (!this._windowUtils.handleFullscreenRequests() &&
@@ -628,17 +631,19 @@ var DOMFullscreenHandler = {
// If we don't actually have any pending fullscreen request
// to handle, neither we have been in fullscreen, tell the
// parent to just exit.
sendAsyncMessage("DOMFullscreen:Exit");
}
break;
}
case "DOMFullscreen:CleanUp": {
- this._windowUtils.exitFullscreen();
+ if (this._windowUtils) {
+ this._windowUtils.exitFullscreen();
+ }
this._fullscreenDoc = null;
break;
}
}
},
handleEvent: function(aEvent) {
switch (aEvent.type) {