Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 25 Apr 2013 15:08:06 -0400
changeset 140849 f50572bf5e4931e214d8d0660bf6c83f82687d3d
parent 140848 8058ffec4f32782babd673e9e128ee7da7ac5e7e (current diff)
parent 140758 681bbf7717c16100fd7e4f3891acb3215e303c81 (diff)
child 140850 9defb9661f846ae02cfea88f0a2cec78206e00bd
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone23.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
Merge m-c to inbound.
browser/devtools/styleeditor/StyleEditor.jsm
browser/devtools/styleeditor/StyleEditorChrome.jsm
browser/devtools/styleeditor/test/browser_styleeditor_passedinsheet.js
browser/devtools/styleeditor/test/browser_styleeditor_readonly.js
browser/devtools/styleeditor/test/browser_styleeditor_reopen.js
--- a/dom/base/ConsoleAPIStorage.jsm
+++ b/dom/base/ConsoleAPIStorage.jsm
@@ -35,24 +35,22 @@ var _consoleStorage = {};
  *
  *    // Clear the events for the given inner window ID.
  *    ConsoleAPIStorage.clearEvents(innerWindowID);
  */
 this.ConsoleAPIStorage = {
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]),
 
-  /** @private */
   observe: function CS_observe(aSubject, aTopic, aData)
   {
     if (aTopic == "xpcom-shutdown") {
       Services.obs.removeObserver(this, "xpcom-shutdown");
       Services.obs.removeObserver(this, "inner-window-destroyed");
       Services.obs.removeObserver(this, "memory-pressure");
-      delete _consoleStorage;
     }
     else if (aTopic == "inner-window-destroyed") {
       let innerWindowID = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
       this.clearEvents(innerWindowID);
     }
     else if (aTopic == "memory-pressure") {
       /* Handle both low-memory and low-memory-no-forward events */
       if (aData.startsWith("low-memory")) {
--- a/toolkit/devtools/debugger/server/dbg-browser-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-browser-actors.js
@@ -205,16 +205,17 @@ BrowserRootActor.prototype = {
   },
 
   /**
    * Exit the tab actor of the specified tab.
    */
   exitTabActor: function BRA_exitTabActor(aWindow) {
     let actor = this._tabActors.get(aWindow);
     if (actor) {
+      this._tabActors.delete(actor.browser);
       actor.exit();
     }
   },
 
   // ChromeDebuggerActor hooks.
 
   /**
    * Add the specified actor to the default actor pool connection, in order to
--- a/toolkit/mozapps/extensions/content/newaddon.js
+++ b/toolkit/mozapps/extensions/content/newaddon.js
@@ -46,26 +46,26 @@ function initialize() {
         !(aAddon.permissions & AddonManager.PERM_CAN_ENABLE)) {
       window.close();
       return;
     }
 
     gAddon = aAddon;
 
     document.getElementById("addon-info").setAttribute("type", aAddon.type);
-    
+
     let icon = document.getElementById("icon");
     if (aAddon.icon64URL)
       icon.src = aAddon.icon64URL;
     else if (aAddon.iconURL)
       icon.src = aAddon.iconURL;
 
     let name = bundle.formatStringFromName("name", [aAddon.name, aAddon.version],
                                            2);
-    document.getElementById("name").value = name
+    document.getElementById("name").value = name;
 
     if (aAddon.creator) {
       let creator = bundle.formatStringFromName("author", [aAddon.creator], 1);
       document.getElementById("author").value = creator;
     } else {
       document.getElementById("author").hidden = true;
     }
 
--- a/toolkit/themes/linux/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/linux/mozapps/extensions/newaddon.css
@@ -31,16 +31,18 @@
 
 #addon-info {
   -moz-box-align: start;
   margin: 25px 10px;
 }
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon-info[type="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
 .addon-info[type="locale"] #icon {
--- a/toolkit/themes/osx/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/osx/mozapps/extensions/newaddon.css
@@ -33,16 +33,18 @@
 
 #addon-info {
   -moz-box-align: start;
   margin: 25px 10px;
 }
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon-info[type="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
 .addon-info[type="locale"] #icon {
--- a/toolkit/themes/windows/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/windows/mozapps/extensions/newaddon.css
@@ -31,16 +31,18 @@
 
 #addon-info {
   -moz-box-align: start;
   margin: 25px 10px;
 }
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon-info[type="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
 .addon-info[type="locale"] #icon {