Back out 551ad0863475 and a5a50d13cc85 for test failures
authorJoe Walker <jwalker@mozilla.com>
Tue, 26 Jun 2012 09:14:43 +0100
changeset 102952 b7bb7c7891311b76bc3912dd0882dfa281ba14a9
parent 102951 a5a50d13cc852134e23800312eac275e7719180b
child 102953 05bd5e0108359fcd9846cf1e0a5b56976e72fabb
push id191
push userlsblakk@mozilla.com
push dateFri, 05 Oct 2012 17:12:53 +0000
treeherdermozilla-release@ddb22ac6c03b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone16.0a1
backs out551ad08634751a0784a313d980345dd7aa1b3785
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
Back out 551ad0863475 and a5a50d13cc85 for test failures
browser/app/profile/firefox.js
browser/devtools/shared/DeveloperToolbar.jsm
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1018,17 +1018,17 @@ pref("services.sync.prefs.sync.signon.re
 pref("services.sync.prefs.sync.spellchecker.dictionary", true);
 pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 #endif
 
 // Disable the error console
 pref("devtools.errorconsole.enabled", false);
 
 // Developer toolbar and GCLI preferences
-pref("devtools.toolbar.enabled", true);
+pref("devtools.toolbar.enabled", false);
 pref("devtools.toolbar.visible", false);
 pref("devtools.gcli.allowSet", false);
 pref("devtools.commands.dir", "");
 
 // Enable the Inspector
 pref("devtools.inspector.enabled", true);
 pref("devtools.inspector.htmlHeight", 112);
 pref("devtools.inspector.htmlPanelOpen", false);
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ b/browser/devtools/shared/DeveloperToolbar.jsm
@@ -364,19 +364,17 @@ DeveloperToolbar.prototype.handleEvent =
       });
 
       if (aEvent.type == "TabSelect") {
         this._initErrorsCount(aEvent.target);
       }
     }
   }
   else if (aEvent.type == "resize") {
-    if (this._lastState != NOTIFICATIONS.SHOW) {
-      this.outputPanel._resize();
-    }
+    this.outputPanel._resize();
   }
   else if (aEvent.type == "TabClose") {
     this._stopErrorsCount(aEvent.target);
   }
   else if (aEvent.type == "beforeunload") {
     this._onPageBeforeUnload(aEvent);
   }
 };