Merge m-c to inbound.

dom/base/ConsoleAPIStorage.jsm

@@ -40,14 +40,12 @@ 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;

toolkit/devtools/debugger/server/dbg-browser-actors.js

@@ -210,6 +210,7 @@ BrowserRootActor.prototype = {
   exitTabActor: function BRA_exitTabActor(aWindow) {
     let actor = this._tabActors.get(aWindow);
     if (actor) {
+      this._tabActors.delete(actor.browser);
       actor.exit();
     }
   },

toolkit/mozapps/extensions/content/newaddon.js

@@ -51,7 +51,7 @@ function initialize() {
     gAddon = aAddon;
 
     document.getElementById("addon-info").setAttribute("type", aAddon.type);
-    
+
     let icon = document.getElementById("icon");
     if (aAddon.icon64URL)
       icon.src = aAddon.icon64URL;
@@ -60,7 +60,7 @@ function initialize() {
 
     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);

toolkit/themes/linux/mozapps/extensions/newaddon.css

@@ -36,6 +36,8 @@
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 

toolkit/themes/osx/mozapps/extensions/newaddon.css

@@ -38,6 +38,8 @@
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 

toolkit/themes/windows/mozapps/extensions/newaddon.css

@@ -36,6 +36,8 @@
 
 #icon {
   -moz-margin-end: 10px;
+  max-width: 64px;
+  max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }