Bug 1055333 - Prevent 'this.webconsolePanel is undefined' errors on styleeditor test shutdown in e10s. r=harth
authorBrian Grinstead <bgrinstead@mozilla.com>
Tue, 26 Aug 2014 14:07:00 -0400
changeset 223425 b7147cff7a3b694bb2df57b4b01db27850904cf2
parent 223424 333a22bc721f7037dfd1d7d4da7eed80c39d96a1
child 223426 d7a9e478db1d726bfb97ba4f8e69a4604f975cb8
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersharth
bugs1055333
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1055333 - Prevent 'this.webconsolePanel is undefined' errors on styleeditor test shutdown in e10s. r=harth
browser/devtools/framework/toolbox.js
--- a/browser/devtools/framework/toolbox.js
+++ b/browser/devtools/framework/toolbox.js
@@ -1474,19 +1474,21 @@ Toolbox.prototype = {
     this.off("host-changed", this._refreshHostTitle);
 
     gDevTools.off("tool-registered", this._toolRegistered);
     gDevTools.off("tool-unregistered", this._toolUnregistered);
 
     gDevTools.off("pref-changed", this._prefChanged);
 
     this._lastFocusedElement = null;
-    this._saveSplitConsoleHeight();
-    this.webconsolePanel.removeEventListener("resize",
-      this._saveSplitConsoleHeight);
+    if (this.webconsolePanel) {
+      this._saveSplitConsoleHeight();
+      this.webconsolePanel.removeEventListener("resize",
+        this._saveSplitConsoleHeight);
+    }
     this.closeButton.removeEventListener("command", this.destroy, true);
 
     let outstanding = [];
     for (let [id, panel] of this._toolPanels) {
       try {
         outstanding.push(panel.destroy());
       } catch (e) {
         // We don't want to stop here if any panel fail to close.