From 88278f8c518477498db51eaeebef274e7ad9efca Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Fri, 23 Dec 2011 20:23:25 +0200
Subject: [PATCH 01/23] Bug 713260 - Add a Tilt test for content location
 changes. r=rcampbell

---
 browser/devtools/tilt/test/Makefile.in        |  1 +
 .../test/browser_tilt_05_destruction-url.js   | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 browser/devtools/tilt/test/browser_tilt_05_destruction-url.js

diff --git a/browser/devtools/tilt/test/Makefile.in b/browser/devtools/tilt/test/Makefile.in
index 9c3ee17eaea..795bd885466 100644
--- a/browser/devtools/tilt/test/Makefile.in
+++ b/browser/devtools/tilt/test/Makefile.in
@@ -51,6 +51,7 @@ _BROWSER_TEST_FILES = \
 	browser_tilt_03_tab_switch.js \
 	browser_tilt_04_initialization.js \
 	browser_tilt_05_destruction-esc.js \
+	browser_tilt_05_destruction-url.js \
 	browser_tilt_05_destruction.js \
 	browser_tilt_arcball.js \
 	browser_tilt_controller.js \
diff --git a/browser/devtools/tilt/test/browser_tilt_05_destruction-url.js b/browser/devtools/tilt/test/browser_tilt_05_destruction-url.js
new file mode 100644
index 00000000000..365170fa28f
--- /dev/null
+++ b/browser/devtools/tilt/test/browser_tilt_05_destruction-url.js
@@ -0,0 +1,41 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*global ok, is, info, waitForExplicitFinish, finish, gBrowser */
+/*global isTiltEnabled, isWebGLSupported, createTab, createTilt */
+/*global Services, EventUtils, Tilt, TiltUtils, InspectorUI, TILT_DESTROYED */
+"use strict";
+
+function test() {
+  if (!isTiltEnabled()) {
+    info("Skipping destruction test because Tilt isn't enabled.");
+    return;
+  }
+  if (!isWebGLSupported()) {
+    info("Skipping destruction test because WebGL isn't supported.");
+    return;
+  }
+
+  waitForExplicitFinish();
+
+  createTab(function() {
+    createTilt({
+      onTiltOpen: function()
+      {
+        Services.obs.addObserver(cleanup, TILT_DESTROYED, false);
+        window.content.location = "about:mozilla";
+      }
+    });
+  });
+}
+
+function cleanup() {
+  let id = TiltUtils.getWindowId(gBrowser.selectedBrowser.contentWindow);
+
+  is(Tilt.visualizers[id], null,
+    "The current instance of the visualizer wasn't destroyed properly.");
+
+  Services.obs.removeObserver(cleanup, TILT_DESTROYED);
+  gBrowser.removeCurrentTab();
+  finish();
+}

From 6b153a37f92038b4701b844bcb900eeac7fe04b1 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Sat, 24 Dec 2011 14:22:22 +0200
Subject: [PATCH 02/23] Bug 711966 - Change Tilt accesskey to "3" on Windows
 and "D" on OS X and Linux. r=dao,rcampbell

---
 browser/base/content/browser.xul                 | 4 ++--
 browser/locales/en-US/chrome/browser/browser.dtd | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index e5284b74f85..7119f676100 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1014,8 +1014,8 @@
             <toolbarbutton id="inspector-3D-button"
                            class="devtools-toolbarbutton"
                            hidden="true"
-                           label="&inspect3DButton.label;"
-                           accesskey="&inspect3DButton.accesskey;"
+                           label="&inspect3DViewButton.label;"
+                           accesskey="&inspect3DViewButton.accesskey;"
                            command="Inspector:Tilt"/>
             <toolbarbutton id="inspector-style-button"
                            class="devtools-toolbarbutton"
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index e71068ce6b8..a185b173f13 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -217,8 +217,13 @@ can reach it easily. -->
 <!ENTITY inspectButton.label            "Inspect">
 <!ENTITY inspectButton.accesskey        "I">
 <!ENTITY inspectCloseButton.tooltiptext "Close Inspector">
-<!ENTITY inspect3DButton.label        "3D">
-<!ENTITY inspect3DButton.accesskey    "M">
+
+<!-- LOCALIZATION NOTE (inspect3DViewButton.label): This button shows an
+  -  alternate view for the Inspector, creating a 3D visualization of the
+  -  webpage. -->
+<!ENTITY inspect3DViewButton.label     "3D View">
+<!ENTITY inspect3DViewButton.accesskey "W">
+
 <!ENTITY inspectStyleButton.label     "Style">
 <!ENTITY inspectStyleButton.accesskey "S">
 

From bcfd55212bc2bf09211bad3d8d3bbd7734b84677 Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Tue, 3 Jan 2012 17:52:57 +0100
Subject: [PATCH 03/23] Bug 712867 - Orion is white-on-white when using High
 Contrast Black color scheme; r=msucan

---
 browser/devtools/sourceeditor/orion/mozilla.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/devtools/sourceeditor/orion/mozilla.css b/browser/devtools/sourceeditor/orion/mozilla.css
index 2a3ead8f31d..009acc34bcf 100644
--- a/browser/devtools/sourceeditor/orion/mozilla.css
+++ b/browser/devtools/sourceeditor/orion/mozilla.css
@@ -8,6 +8,7 @@
 }
 
 .view {
+  color: black; /* Default text color */
   background: #f0f0ff; /* Background of the editor */
   padding-left: 0;
 }

From 8211336db57fb5c681279398da2c42b8280baa99 Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Mon, 9 Jan 2012 12:31:46 +0000
Subject: [PATCH 04/23] Bug 714027 - Devtools sidebar box has a weird
 background when opened on Windows; r=muscan, dao

---
 browser/themes/gnomestripe/browser.css | 4 ++++
 browser/themes/pinstripe/browser.css   | 4 ++++
 browser/themes/winstripe/browser.css   | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index f405f7882d0..960bf0791e3 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -2003,6 +2003,10 @@ panel[dimmed="true"] {
   position: relative;
 }
 
+#devtools-sidebar-box {
+  background-color: -moz-Field;
+}
+
 /* Highlighter - toolbar resizers */
 
 .inspector-resizer {
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index c7e83aa4f3e..07bc277af64 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -2740,6 +2740,10 @@ panel[dimmed="true"] {
   position: relative;
 }
 
+#devtools-sidebar-box {
+  background-color: -moz-Field;
+}
+
 /* Highlighter - toolbar resizers */
 
 .inspector-resizer {
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index 124cd358038..6b14ecf64ef 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -2683,6 +2683,10 @@ panel[dimmed="true"] {
   position: relative;
 }
 
+#devtools-sidebar-box {
+  background-color: -moz-Field;
+}
+
 /* Highlighter - toolbar resizers */
 
 .inspector-resizer {

From 8d98dd6119789c8b0b1e1949d991a2ee7ba9def0 Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Thu, 5 Jan 2012 12:42:30 +0100
Subject: [PATCH 05/23] Bug 704017 - [RTL] The Inspector rules view should be
 LTR; r=dao

---
 browser/devtools/styleinspector/styleinspector.css  | 4 ++++
 browser/themes/gnomestripe/devtools/csshtmltree.css | 4 ----
 browser/themes/pinstripe/devtools/csshtmltree.css   | 4 ----
 browser/themes/winstripe/devtools/csshtmltree.css   | 4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/browser/devtools/styleinspector/styleinspector.css b/browser/devtools/styleinspector/styleinspector.css
index 56f18ce9de6..c10170eafe3 100644
--- a/browser/devtools/styleinspector/styleinspector.css
+++ b/browser/devtools/styleinspector/styleinspector.css
@@ -42,3 +42,7 @@
 .ruleview-computedlist:not(.styleinspector-open) {
   display: none;
 }
+
+.ruleview-code {
+  direction: ltr;
+}
diff --git a/browser/themes/gnomestripe/devtools/csshtmltree.css b/browser/themes/gnomestripe/devtools/csshtmltree.css
index 2944e08fa72..d15f6268508 100644
--- a/browser/themes/gnomestripe/devtools/csshtmltree.css
+++ b/browser/themes/gnomestripe/devtools/csshtmltree.css
@@ -234,10 +234,6 @@
   -moz-margin-end: 5px;
 }
 
-.ruleview-expander:-moz-locale-dir(rtl) {
-  background-position: 16px 0;
-}
-
 .ruleview-expander.styleinspector-open {
   background-position: 8px 0;
 }
diff --git a/browser/themes/pinstripe/devtools/csshtmltree.css b/browser/themes/pinstripe/devtools/csshtmltree.css
index d595363ceee..d5b4c32b5ae 100644
--- a/browser/themes/pinstripe/devtools/csshtmltree.css
+++ b/browser/themes/pinstripe/devtools/csshtmltree.css
@@ -236,10 +236,6 @@
   -moz-margin-end: 5px;
 }
 
-.ruleview-expander:-moz-locale-dir(rtl) {
-  background-position: 16px 0;
-}
-
 .ruleview-expander.styleinspector-open {
   background-position: 8px 0;
 }
diff --git a/browser/themes/winstripe/devtools/csshtmltree.css b/browser/themes/winstripe/devtools/csshtmltree.css
index 91c44a97a43..1d2b8ea5dae 100644
--- a/browser/themes/winstripe/devtools/csshtmltree.css
+++ b/browser/themes/winstripe/devtools/csshtmltree.css
@@ -234,10 +234,6 @@
   -moz-margin-end: 5px;
 }
 
-.ruleview-expander:-moz-locale-dir(rtl) {
-  background-position: 16px 0;
-}
-
 .ruleview-expander.styleinspector-open {
   background-position: 8px 0;
 }

From d736c9521c85d3c2fccb3a5b4b9216740feae04a Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Mon, 9 Jan 2012 17:45:53 +0100
Subject: [PATCH 06/23] Bug 715887 - Rename Properties to Computed in the Style
 sidebar; r=rcampbell

---
 browser/devtools/styleinspector/StyleInspector.jsm       | 4 ++--
 .../chrome/browser/devtools/styleinspector.properties    | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/browser/devtools/styleinspector/StyleInspector.jsm b/browser/devtools/styleinspector/StyleInspector.jsm
index 2d59a6ec656..b45eb6a45f6 100644
--- a/browser/devtools/styleinspector/StyleInspector.jsm
+++ b/browser/devtools/styleinspector/StyleInspector.jsm
@@ -81,9 +81,9 @@ StyleInspector.prototype = {
 
       this.registrationObject = {
         id: "styleinspector",
-        label: this.l10n("style.highlighter.button.label1"),
+        label: this.l10n("style.highlighter.button.label2"),
         tooltiptext: this.l10n("style.highlighter.button.tooltip"),
-        accesskey: this.l10n("style.highlighter.accesskey1"),
+        accesskey: this.l10n("style.highlighter.accesskey2"),
         context: this,
         get isOpen() isOpen(),
         onSelect: this.selectNode,
diff --git a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
index 59a6b77f676..03f6d845d77 100644
--- a/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/styleinspector.properties
@@ -33,10 +33,11 @@ rule.sourceElement=element
 rule.inheritedSource=Inherited from %S (%S)
 
 # LOCALIZATION NOTE (style.highlighter.button): These strings are used inside
-# sidebar of the Highlighter for the style inspector button
-style.highlighter.button.label1=Properties
-style.highlighter.accesskey1=P
-style.highlighter.button.tooltip=Inspect element styles
+# sidebar of the Highlighter for the style inspector button.
+# "Computed" refers to the Computed Style of the element.
+style.highlighter.button.label2=Computed
+style.highlighter.accesskey2=C
+style.highlighter.button.tooltip=Inspect element computed styles
 
 # LOCALIZATION NOTE (helpLinkTitle): For each style property
 # the user can hover it and get a help link button which allows one to

From 0551052f33c123d4102c2059f43680c85315f11f Mon Sep 17 00:00:00 2001
From: Paul Rouget <paul@mozilla.com>
Date: Wed, 11 Jan 2012 17:54:24 +0100
Subject: [PATCH 07/23] Bug 717258 - Fix CSS typo in
 winstripe/devtools/common.css; r=jwalker,dao

---
 browser/themes/winstripe/devtools/common.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/themes/winstripe/devtools/common.css b/browser/themes/winstripe/devtools/common.css
index 2a4962a7969..85c0ba7ebf1 100644
--- a/browser/themes/winstripe/devtools/common.css
+++ b/browser/themes/winstripe/devtools/common.css
@@ -74,7 +74,7 @@
   color: hsl(200,100%,60%) !important;
 }
 
-.devtools-toolbarbutton:[checked]:hover:active {
+.devtools-toolbarbutton[checked]:hover:active {
   background-color: hsla(211,68%,6%,.2);
 }
 

From 51f8db01b886852678d538b79c21b160b1a2f5f0 Mon Sep 17 00:00:00 2001
From: Cedric Vivier <cedricv@neonux.com>
Date: Fri, 6 Jan 2012 00:35:34 +0800
Subject: [PATCH 08/23] Bug 713359 - CSS cut short in Style Editor; r=dcamp

---
 browser/devtools/styleeditor/StyleEditor.jsm | 66 ++++----------------
 1 file changed, 12 insertions(+), 54 deletions(-)

diff --git a/browser/devtools/styleeditor/StyleEditor.jsm b/browser/devtools/styleeditor/StyleEditor.jsm
index 9cab0b6ac31..5b5c4f6a564 100644
--- a/browser/devtools/styleeditor/StyleEditor.jsm
+++ b/browser/devtools/styleeditor/StyleEditor.jsm
@@ -751,70 +751,28 @@ StyleEditor.prototype = {
    */
   _loadSourceFromCache: function SE__loadSourceFromCache(aHref)
   {
-    try {
-      let cacheService = Cc["@mozilla.org/network/cache-service;1"]
-                           .getService(Ci.nsICacheService);
-      let session = cacheService.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
-      session.doomEntriesIfExpired = false;
-      session.asyncOpenCacheEntry(aHref, Ci.nsICache.ACCESS_READ, {
-        onCacheEntryAvailable: this._onCacheEntryAvailable.bind(this)
-      });
-    } catch (ex) {
-      this._signalError(LOAD_ERROR);
-    }
-  },
-
-   /**
-    * The nsICacheListener.onCacheEntryAvailable method implementation used when
-    * the style sheet source is loaded from the browser cache.
-    *
-    * @param nsICacheEntryDescriptor aEntry
-    * @param nsCacheAccessMode aMode
-    * @param integer aStatus
-    */
-  _onCacheEntryAvailable: function SE__onCacheEntryAvailable(aEntry, aMode, aStatus)
-  {
-    if (!Components.isSuccessCode(aStatus)) {
-      return this._signalError(LOAD_ERROR);
-    }
-
-    let stream = aEntry.openInputStream(0);
+    let channel = Services.io.newChannel(aHref, null, null);
     let chunks = [];
     let streamListener = { // nsIStreamListener inherits nsIRequestObserver
       onStartRequest: function (aRequest, aContext, aStatusCode) {
-      },
+        if (!Components.isSuccessCode(aStatusCode)) {
+          return this._signalError(LOAD_ERROR);
+        }
+      }.bind(this),
       onDataAvailable: function (aRequest, aContext, aStream, aOffset, aCount) {
         chunks.push(NetUtil.readInputStreamToString(aStream, aCount));
       },
       onStopRequest: function (aRequest, aContext, aStatusCode) {
+        if (!Components.isSuccessCode(aStatusCode)) {
+          return this._signalError(LOAD_ERROR);
+        }
+
         this._onSourceLoad(chunks.join(""));
-      }.bind(this),
+      }.bind(this)
     };
 
-    let head = aEntry.getMetaDataElement("response-head");
-    if (/^Content-Encoding:\s*gzip/mi.test(head)) {
-      let converter = Cc["@mozilla.org/streamconv;1?from=gzip&to=uncompressed"]
-                        .createInstance(Ci.nsIStreamConverter);
-      converter.asyncConvertData("gzip", "uncompressed", streamListener, null);
-      streamListener = converter; // proxy original listener via converter
-    }
-
-    try {
-      streamListener.onStartRequest(null, null);
-      while (stream.available()) {
-        streamListener.onDataAvailable(null, null, stream, 0, stream.available());
-      }
-      streamListener.onStopRequest(null, null, 0);
-    } catch (ex) {
-      this._signalError(LOAD_ERROR);
-    } finally {
-      try {
-        stream.close();
-      } catch (ex) {
-        // swallow (some stream implementations can auto-close at eos)
-      }
-      aEntry.close();
-    }
+    channel.loadFlags = channel.LOAD_FROM_CACHE;
+    channel.asyncOpen(streamListener, null);
   },
 
   /**

From be4511f24115b9fdb156e25a737c4761130a9881 Mon Sep 17 00:00:00 2001
From: Victor Porof <vporof@mozilla.com>
Date: Fri, 13 Jan 2012 15:27:12 +0200
Subject: [PATCH 09/23] Bug 712868 - tilt does not honour webgl.force-enabled
 preference. r=bjacob,msucan

---
 browser/app/profile/firefox.js                    |  3 ---
 browser/devtools/tilt/Tilt.jsm                    |  2 +-
 browser/devtools/tilt/TiltGL.jsm                  |  8 +++++++-
 browser/devtools/tilt/TiltVisualizer.jsm          | 15 ---------------
 .../tilt/test/browser_tilt_04_initialization.js   |  5 -----
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 98e3a5a2d54..65bc015462d 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1033,9 +1033,6 @@ pref("devtools.styleinspector.enabled", true);
 // Enable the Tilt inspector
 pref("devtools.tilt.enabled", true);
 
-// Enable the Tilt inspector even if WebGL capabilities are not detected
-pref("devtools.tilt.force-enabled", false);
-
 // Enable the rules view
 pref("devtools.ruleview.enabled", true);
 
diff --git a/browser/devtools/tilt/Tilt.jsm b/browser/devtools/tilt/Tilt.jsm
index 9e7d9b648aa..2b31ec3f13b 100644
--- a/browser/devtools/tilt/Tilt.jsm
+++ b/browser/devtools/tilt/Tilt.jsm
@@ -271,7 +271,7 @@ Tilt.prototype = {
   get enabled()
   {
     return (TiltVisualizer.Prefs.enabled &&
-           (TiltVisualizer.Prefs.forceEnabled || TiltGL.isWebGLSupported()));
+           (TiltGL.isWebGLForceEnabled() || TiltGL.isWebGLSupported()));
   },
 
   /**
diff --git a/browser/devtools/tilt/TiltGL.jsm b/browser/devtools/tilt/TiltGL.jsm
index cf5d2895fc7..084a5c33a4d 100644
--- a/browser/devtools/tilt/TiltGL.jsm
+++ b/browser/devtools/tilt/TiltGL.jsm
@@ -37,7 +37,7 @@
  *
  ***** END LICENSE BLOCK *****/
 
-/*global Components, TiltMath, TiltUtils, mat4 */
+/*global Components, Services, TiltMath, TiltUtils, mat4 */
 "use strict";
 
 const Cc = Components.classes;
@@ -46,6 +46,7 @@ const Cu = Components.utils;
 
 const WEBGL_CONTEXT_NAME = "experimental-webgl";
 
+Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/devtools/TiltMath.jsm");
 Cu.import("resource:///modules/devtools/TiltUtils.jsm");
 
@@ -1554,6 +1555,11 @@ TiltGL.ColorShader = {
   ].join("\n")
 };
 
+TiltGL.isWebGLForceEnabled = function TGL_isWebGLForceEnabled()
+{
+  return Services.prefs.getBoolPref("webgl.force-enabled");
+};
+
 /**
  * Tests if the WebGL OpenGL or Angle renderer is available using the
  * GfxInfo service.
diff --git a/browser/devtools/tilt/TiltVisualizer.jsm b/browser/devtools/tilt/TiltVisualizer.jsm
index 17f4219c586..a80287808d4 100644
--- a/browser/devtools/tilt/TiltVisualizer.jsm
+++ b/browser/devtools/tilt/TiltVisualizer.jsm
@@ -1548,20 +1548,6 @@ TiltVisualizer.Prefs = {
     this._enabled = value;
   },
 
-  /**
-   * Specifies if Tilt should be enabled even if WebGL may not be available.
-   */
-  get forceEnabled()
-  {
-    return this._forceEnabled;
-  },
-
-  set forceEnabled(value)
-  {
-    TiltUtils.Preferences.set("force-enabled", "boolean", value);
-    this._forceEnabled = value;
-  },
-
   /**
    * Loads the preferences.
    */
@@ -1570,7 +1556,6 @@ TiltVisualizer.Prefs = {
     let prefs = TiltUtils.Preferences;
 
     TiltVisualizer.Prefs._enabled = prefs.get("enabled", "boolean");
-    TiltVisualizer.Prefs._forceEnabled = prefs.get("force-enabled", "boolean");
   }
 };
 
diff --git a/browser/devtools/tilt/test/browser_tilt_04_initialization.js b/browser/devtools/tilt/test/browser_tilt_04_initialization.js
index 2b68c1db194..cb587d9669c 100644
--- a/browser/devtools/tilt/test/browser_tilt_04_initialization.js
+++ b/browser/devtools/tilt/test/browser_tilt_04_initialization.js
@@ -31,11 +31,6 @@ function test() {
 
         is(Tilt.visualizers[id], null,
           "A instance of the visualizer shouldn't be initialized yet.");
-
-        is(typeof TiltVisualizer.Prefs.enabled, "boolean",
-          "The 'enabled' pref should have been loaded by now.");
-        is(typeof TiltVisualizer.Prefs.forceEnabled, "boolean",
-          "The 'force-enabled' pref should have been loaded by now.");
       },
       onTiltOpen: function(instance)
       {

From 74450a29ff692c188588bb7231116a248be76c67 Mon Sep 17 00:00:00 2001
From: Dave Camp <dcamp@mozilla.com>
Date: Fri, 13 Jan 2012 13:05:49 -0500
Subject: [PATCH 10/23] Bug 706886 - Line-through disappears after editing
 overridden rule in style inspector; f=rcampbell; r=joewalker

---
 browser/devtools/styleinspector/CssRuleView.jsm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser/devtools/styleinspector/CssRuleView.jsm b/browser/devtools/styleinspector/CssRuleView.jsm
index a359c4b6500..9b523ee1d9d 100644
--- a/browser/devtools/styleinspector/CssRuleView.jsm
+++ b/browser/devtools/styleinspector/CssRuleView.jsm
@@ -1142,7 +1142,8 @@ TextPropertyEditor.prototype = {
  *    {function} done:
  *       Called when input is committed or blurred.  Called with
  *       current value and a boolean telling the caller whether to
- *       commit the change.
+ *       commit the change.  This function is called after the editor
+ *       has been torn down.
  *    {string} advanceChars:
  *       If any characters in advanceChars are typed, focus will advance
  *       to the next element.
@@ -1286,11 +1287,11 @@ InplaceEditor.prototype = {
    */
   _onBlur: function InplaceEditor_onBlur(aEvent)
   {
-    if (this.done) {
-      this.done(this.cancelled ? this.initial : this.input.value.trim(),
-                !this.cancelled);
-    }
+    let val = this.input.value.trim();
     this._clear();
+    if (this.done) {
+      this.done(this.cancelled ? this.initial : val, !this.cancelled);
+    }
   },
 
   _onKeyPress: function InplaceEditor_onKeyPress(aEvent)

From 3a800a6051ac168f959bf4a896547316b13ce23c Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Fri, 13 Jan 2012 16:26:34 -0800
Subject: [PATCH 11/23] Bug 198964 - Enable smooth scrolling by default.
 r=gavin

---
 browser/app/profile/firefox.js                      |  2 +-
 content/events/test/test_bug350471.xul              | 10 ++++------
 content/events/test/test_bug574663.html             | 13 +++++--------
 docshell/test/navigation/test_bug430723.html        |  3 +++
 .../base/tests/test_selection_move_commands.xul     | 10 ++++++----
 editor/libeditor/html/tests/test_bug549262.html     |  3 +++
 editor/libeditor/html/tests/test_bug620906.html     |  8 +++++---
 layout/generic/test/test_bug633762.html             |  3 +++
 toolkit/content/tests/chrome/test_mousescroll.xul   |  3 +++
 widget/tests/window_bug478536.xul                   |  4 ++++
 widget/tests/window_wheeltransaction.xul            |  6 +++++-
 11 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index defc47222f7..98e3a5a2d54 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -237,7 +237,7 @@ pref("keyword.URL", "");
 pref("general.useragent.locale", "@AB_CD@");
 pref("general.skins.selectedSkin", "classic/1.0");
 
-pref("general.smoothScroll", false);
+pref("general.smoothScroll", true);
 #ifdef UNIX_BUT_NOT_MAC
 pref("general.autoScroll", false);
 #else
diff --git a/content/events/test/test_bug350471.xul b/content/events/test/test_bug350471.xul
index 5b947073d6b..adfc0039d37 100644
--- a/content/events/test/test_bug350471.xul
+++ b/content/events/test/test_bug350471.xul
@@ -22,8 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=350471
 
 /** Test for Bug 350471 **/
 
-// This test depends on general.smoothScroll being off.
-
 const minLineHeight = 10, maxLineHeight = 20;
 
 function between(x, min, max) (min <= max) ? (min <= x && x <= max) : (max <= x && x <= min);
@@ -228,6 +226,7 @@ function initPrefs()
   // Disables the app level scroll acceleration
   prefSvc.setIntPref("mousewheel.acceleration.start", -1);
   prefSvc.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
+  prefSvc.setBoolPref("general.smoothScroll", false);
 }
 
 function clearPrefs()
@@ -236,10 +235,9 @@ function clearPrefs()
   var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
                   getService(Components.interfaces.nsIPrefBranch2);
 
-  if (prefSvc.prefHasUserValue("mousewheel.acceleration.start"))
-    prefSvc.clearUserPref("mousewheel.acceleration.start");
-  if (prefSvc.prefHasUserValue("mousewheel.system_scroll_override_on_root_content.enabled"))
-    prefSvc.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
+  prefSvc.clearUserPref("mousewheel.acceleration.start");
+  prefSvc.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
+  prefSvc.clearUserPref("general.smoothScroll");
 }
 
 window.onload = function () {
diff --git a/content/events/test/test_bug574663.html b/content/events/test/test_bug574663.html
index f201702abee..bc918d147dc 100644
--- a/content/events/test/test_bug574663.html
+++ b/content/events/test/test_bug574663.html
@@ -20,8 +20,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=574663
 
 /** Test for Bug 574663 **/
 
-// This test depends on general.smoothScroll being off.
-
 function sendTouchpadScrollMotion(scrollbox, direction, ctrl, momentum) {
   var win = scrollbox.ownerDocument.defaultView;
   let event = {
@@ -107,6 +105,7 @@ function initPrefs()
   netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
   var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
                   getService(Components.interfaces.nsIPrefBranch2);
+  prefSvc.setBoolPref("general.smoothScroll", false);
   // Disables the app level scroll acceleration
   prefSvc.setIntPref("mousewheel.acceleration.start", -1);
   prefSvc.setBoolPref("mousewheel.system_scroll_override_on_root_content.enabled", false);
@@ -120,12 +119,10 @@ function clearPrefs()
   var prefSvc = Components.classes["@mozilla.org/preferences-service;1"].
                   getService(Components.interfaces.nsIPrefBranch2);
 
-  if (prefSvc.prefHasUserValue("mousewheel.acceleration.start"))
-    prefSvc.clearUserPref("mousewheel.acceleration.start");
-  if (prefSvc.prefHasUserValue("mousewheel.system_scroll_override_on_root_content.enabled"))
-    prefSvc.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
-  if (prefSvc.prefHasUserValue("mousewheel.withcontrolkey.action"))
-    prefSvc.clearUserPref("mousewheel.withcontrolkey.action");
+  prefSvc.clearUserPref("general.smoothScroll");
+  prefSvc.clearUserPref("mousewheel.acceleration.start");
+  prefSvc.clearUserPref("mousewheel.system_scroll_override_on_root_content.enabled");
+  prefSvc.clearUserPref("mousewheel.withcontrolkey.action");
 }
 
 window.onload = function () {
diff --git a/docshell/test/navigation/test_bug430723.html b/docshell/test/navigation/test_bug430723.html
index 95d77257e02..91339926fa5 100644
--- a/docshell/test/navigation/test_bug430723.html
+++ b/docshell/test/navigation/test_bug430723.html
@@ -43,7 +43,9 @@ window.onload = runTest;
 var testWindow;
 var testNum = 0;
 
+var smoothScrollPref = "general.smoothScroll";
 function runTest() {
+  SpecialPowers.setBoolPref(smoothScrollPref, false);
   testWindow = window.open(gTallRedBoxURI, "testWindow", "width=300,height=300,location=yes,scrollbars=yes");
 }
 
@@ -122,6 +124,7 @@ var step3 =function() {
           "Page2Again: Ensure we can still scroll.");  
 
     testWindow.close();
+    SpecialPowers.clearUserPref(smoothScrollPref);
     window.SimpleTest.finish();
   }, true);
   sendKey('DOWN', testWindow);
diff --git a/editor/libeditor/base/tests/test_selection_move_commands.xul b/editor/libeditor/base/tests/test_selection_move_commands.xul
index 9bd60f467b9..c92036de025 100644
--- a/editor/libeditor/base/tests/test_selection_move_commands.xul
+++ b/editor/libeditor/base/tests/test_selection_move_commands.xul
@@ -9,6 +9,10 @@
 <script class="testbody" type="application/javascript">
 <![CDATA[
 
+var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+                      .getService(Components.interfaces.nsIPrefBranch);
+prefs.setBoolPref("general.smoothScroll", false);
+
 function runTest() {
   var tests = execTests();
   function execNext() {
@@ -182,16 +186,14 @@ function execTests() {
     is(testPageSelectCommand("cmd_selectPageUp", 0), 22 - lineNum, "cmd_selectPageUp");
   }
 
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService(Components.interfaces.nsIPrefBranch);
-  var origPrefValue = prefs.getBoolPref("layout.word_select.eat_space_to_next_word");
   try {
     prefs.setBoolPref("layout.word_select.eat_space_to_next_word", false);
     runSelectionTests(body, 1);
     prefs.setBoolPref("layout.word_select.eat_space_to_next_word", true);
     runSelectionTests(node(2), 0);
   } finally {
-    prefs.setBoolPref("layout.word_select.eat_space_to_next_word", origPrefValue);
+    prefs.clearUserPref("general.smoothScroll");
+    prefs.clearUserPref("layout.word_select.eat_space_to_next_word");
   }
 
   SimpleTest.finish();
diff --git a/editor/libeditor/html/tests/test_bug549262.html b/editor/libeditor/html/tests/test_bug549262.html
index 50a14189d33..bff267bdfd6 100644
--- a/editor/libeditor/html/tests/test_bug549262.html
+++ b/editor/libeditor/html/tests/test_bug549262.html
@@ -19,6 +19,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=549262
 
 /** Test for Bug 549262 **/
 
+var smoothScrollPref = "general.smoothScroll";
+SpecialPowers.setBoolPref(smoothScrollPref, false);
 SimpleTest.waitForExplicitFinish();
 var win = window.open("file_bug549262.html", "_blank", 
                       "width=600,height=600,scrollbars=yes");
@@ -90,6 +92,7 @@ SimpleTest.waitForFocus(function() {
                       is(win.getSelection().focusOffset, ed.textContent.length, "Selection should be moved to the end");
 
                       win.close();
+                      SpecialPowers.clearUserPref(smoothScrollPref);
                       SimpleTest.finish();
                     }, 0);
                   }, 0);
diff --git a/editor/libeditor/html/tests/test_bug620906.html b/editor/libeditor/html/tests/test_bug620906.html
index 341c6904ff1..208bdfd281c 100644
--- a/editor/libeditor/html/tests/test_bug620906.html
+++ b/editor/libeditor/html/tests/test_bug620906.html
@@ -34,11 +34,13 @@ addLoadEvent(function() {
   is(iframe.contentWindow.scrollY, 0, "Sanity check");
   var rect = iframe.getBoundingClientRect();
   setTimeout(function() {
-    synthesizeMouse(iframe, rect.width - 5, rect.height / 2, {});
-    setTimeout(function() {
+    var onscroll = function () {
+      iframe.contentWindow.removeEventListener("scroll", onscroll, false);
       isnot(iframe.contentWindow.scrollY, 0, "The scrollbar should work");
       SimpleTest.finish();
-    }, 0);
+    }
+    iframe.contentWindow.addEventListener("scroll", onscroll, false);
+    synthesizeMouse(iframe, rect.width - 5, rect.height / 2, {});
   }, 0);
 });
 
diff --git a/layout/generic/test/test_bug633762.html b/layout/generic/test/test_bug633762.html
index f31b5213849..2a635490198 100644
--- a/layout/generic/test/test_bug633762.html
+++ b/layout/generic/test/test_bug633762.html
@@ -42,9 +42,12 @@ function runTests() {
 function finish() {
   // assert that scroll top is now less than before
   ok(scrollTopBefore > doc.body.scrollTop, "pressing up arrow should scroll up");
+  SpecialPowers.clearUserPref(smoothScrollPref);
   SimpleTest.finish();
 }
 
+var smoothScrollPref = "general.smoothScroll";
+SpecialPowers.setBoolPref(smoothScrollPref, false);
 SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(runTests);
 </script>
diff --git a/toolkit/content/tests/chrome/test_mousescroll.xul b/toolkit/content/tests/chrome/test_mousescroll.xul
index 5b6707e2a66..1fe83f5af76 100644
--- a/toolkit/content/tests/chrome/test_mousescroll.xul
+++ b/toolkit/content/tests/chrome/test_mousescroll.xul
@@ -73,6 +73,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=378028
 
 /** Test for Bug 378028 **/
 /*   and for Bug 350471 **/
+var smoothScrollPref = "general.smoothScroll";
+SpecialPowers.setBoolPref(smoothScrollPref, false);
 SimpleTest.waitForExplicitFinish();
 
 /* There are three kinds of scroll events:
@@ -230,6 +232,7 @@ function runTests()
     testListbox("listbox");
     testArrowScrollbox("hscrollbox");
     testArrowScrollbox("vscrollbox");
+    SpecialPowers.clearUserPref(smoothScrollPref);
     SimpleTest.finish();
   });
 }
diff --git a/widget/tests/window_bug478536.xul b/widget/tests/window_bug478536.xul
index 5bc0b23d575..3db7d646f51 100644
--- a/widget/tests/window_bug478536.xul
+++ b/widget/tests/window_bug478536.xul
@@ -78,9 +78,12 @@ var gIgnoreScrollEvent = true;
 
 var gPrefSvc = Components.classes["@mozilla.org/preferences-service;1"].
                getService(Components.interfaces.nsIPrefBranch2);
+const kPrefSmoothScroll = "general.smoothScroll";
 const kPrefNameTimeout = "mousewheel.transaction.timeout";
 const kDefaultTimeout = gPrefSvc.getIntPref(kPrefNameTimeout);
 
+gPrefSvc.setBoolPref(kPrefSmoothScroll, false);
+
 var gTimeout = kDefaultTimeout;
 
 gBody.addEventListener("MozMouseScrollFailed", onMouseScrollFailed, false);
@@ -117,6 +120,7 @@ function onunload()
 {
   resetTimeoutPrefs();
   disableNonTestMouseEvents(false);
+  gPrefSvc.clearUserPref(kPrefSmoothScroll);
   window.opener.wrappedJSObject.SimpleTest.finish();
 }
 
diff --git a/widget/tests/window_wheeltransaction.xul b/widget/tests/window_wheeltransaction.xul
index b0946ccea09..899e6d73533 100644
--- a/widget/tests/window_wheeltransaction.xul
+++ b/widget/tests/window_wheeltransaction.xul
@@ -110,11 +110,14 @@ var gTimer;
 
 var gPrefSvc = Components.classes["@mozilla.org/preferences-service;1"].
                getService(Components.interfaces.nsIPrefBranch2);
+const kPrefSmoothScroll = "general.smoothScroll";
 const kPrefNameTimeout = "mousewheel.transaction.timeout";
 const kPrefNameIgnoreMoveDelay = "mousewheel.transaction.ignoremovedelay";
 
 const kDefaultTimeout = gPrefSvc.getIntPref(kPrefNameTimeout);
-const kDefaultIgnoreMoveDelay = gPrefSvc.getIntPref(kPrefNameIgnoreMoveDelay)
+const kDefaultIgnoreMoveDelay = gPrefSvc.getIntPref(kPrefNameIgnoreMoveDelay);
+
+gPrefSvc.setBoolPref(kPrefSmoothScroll, false);
 
 var gTimeout, gIgnoreMoveDelay;
 var gEnoughForTimeout, gEnoughForIgnoreMoveDelay;
@@ -171,6 +174,7 @@ function onload()
 function onunload()
 {
   resetTimeoutPrefs();
+  gPrefSvc.clearUserPref(kPrefSmoothScroll);
   disableNonTestMouseEvents(false);
   window.opener.wrappedJSObject.SimpleTest.finish();
 }

From 68ed30db60b5573312e55ebd8ea12ff134953315 Mon Sep 17 00:00:00 2001
From: Greg Karz <greg.karz@gmail.com>
Date: Fri, 13 Jan 2012 16:26:41 -0800
Subject: [PATCH 12/23] Bug 712347 - 'The image cannot be displayed ...' error
 message is hard to read on a dark background. r=roc

---
 layout/style/TopLevelImageDocument.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/layout/style/TopLevelImageDocument.css b/layout/style/TopLevelImageDocument.css
index 5efbd96a94c..9bb5cfa100b 100644
--- a/layout/style/TopLevelImageDocument.css
+++ b/layout/style/TopLevelImageDocument.css
@@ -49,6 +49,8 @@ This is bad during printing, it means tall image frames won't know
 the size of the paper and cannot break into continuations along
 multiple pages. */
 img {
+  color: #eee;
+  text-align: center;
   display: block;
   position: absolute;
   margin: auto;

From a2825f331be789a8528de3a9ca27bb398ecb3b36 Mon Sep 17 00:00:00 2001
From: Martijn Gerrits <mgerrits@msn.com>
Date: Fri, 13 Jan 2012 16:26:49 -0800
Subject: [PATCH 13/23] Bug 689387 - Video controls should use new
 mouseenter/mouseleave events. r=dolske

---
 toolkit/content/widgets/videocontrols.xml | 25 ++++++-----------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index 80e0a5a7f85..ea051dc38f5 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -819,21 +819,15 @@
                 },
 
                 onMouseInOut : function (event) {
+                    if (this.isTouchControl)
+                        return;
+
                     // If the controls are static, don't change anything.
                     if (!this.dynamicControls)
                         return;
 
                     clearTimeout(this._hideControlsTimeout);
-
-                    // Ignore events caused by transitions between child nodes.
-                    // Note that the videocontrols element is the same
-                    // size as the *content area* of the video element,
-                    // but this is not the same as the video element's
-                    // border area if the video has border or padding.
-                    if (this.isEventWithin(event, this.videocontrols))
-                        return;
-
-                    var isMouseOver = (event.type == "mouseover");
+                    var isMouseOver = (event.type == "mouseenter");
 
                     // Suppress fading out the controls until the video has rendered
                     // its first frame. But since autoplay videos start off with no
@@ -1280,7 +1274,8 @@
                     this.muteButton.addEventListener("command", function() { self.toggleMute(); }, false);
                     this.playButton.addEventListener("command", function() { self.togglePause(); }, false);
                     this.fullscreenButton.addEventListener("command", function() { self.toggleFullscreen(); }, false );
-
+                    this.video.addEventListener("mouseenter", function(e) { self.onMouseInOut(e) }, false, true);
+                    this.video.addEventListener("mouseleave", function(e) { self.onMouseInOut(e) }, false, true);
                     this.controlsSpacer.addEventListener("click", function spacerClickHandler(e) {
                       if (e.button != 0 || self.hasError())
                         return;
@@ -1318,14 +1313,6 @@
     </implementation>
 
     <handlers>
-        <handler event="mouseover">
-            if (!this.isTouchControl)
-                this.Utils.onMouseInOut(event);
-        </handler>
-        <handler event="mouseout">
-            if (!this.isTouchControl)
-                this.Utils.onMouseInOut(event);
-        </handler>
         <handler event="mousemove">
             if (!this.isTouchControl)
                 this.Utils.onMouseMove(event);

From e764a9e424b8825552d8187edbe932b988c2c650 Mon Sep 17 00:00:00 2001
From: Diogo Golovanevsky Monteiro <diogo.gmt@gmail.com>
Date: Sat, 14 Jan 2012 22:31:18 -0800
Subject: [PATCH 14/23] Bug 718133 - Remove keyboard shortcuts for zooming to
 1:1 scale when viewing standalone images. r=roc

---
 content/html/document/src/ImageDocument.cpp | 25 ---------------------
 1 file changed, 25 deletions(-)

diff --git a/content/html/document/src/ImageDocument.cpp b/content/html/document/src/ImageDocument.cpp
index 1d3d8d0433d..6b4a804f8e5 100644
--- a/content/html/document/src/ImageDocument.cpp
+++ b/content/html/document/src/ImageDocument.cpp
@@ -613,31 +613,6 @@ ImageDocument::HandleEvent(nsIDOMEvent* aEvent)
       ShrinkToFit();
     }
   }
-  else if (eventType.EqualsLiteral("keypress")) {
-    nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aEvent);
-    PRUint32 charCode;
-    bool ctrlKey, metaKey, altKey;
-    keyEvent->GetCharCode(&charCode);
-    keyEvent->GetCtrlKey(&ctrlKey);
-    keyEvent->GetMetaKey(&metaKey);
-    keyEvent->GetAltKey(&altKey);
-    // plus key
-    if (charCode == 0x2B && !ctrlKey && !metaKey && !altKey) {
-      mShouldResize = false;
-      if (mImageIsResized) {
-        ResetZoomLevel();
-        RestoreImage();
-      }
-    }
-    // minus key
-    else if (charCode == 0x2D && !ctrlKey && !metaKey && !altKey) {
-      mShouldResize = true;
-      if (mImageIsOverflowing) {
-        ResetZoomLevel();
-        ShrinkToFit();
-      }
-    }
-  }
 
   return NS_OK;
 }

From 369f08480ba1225f011713837954885889865d91 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 16 Jan 2012 13:08:44 +0200
Subject: [PATCH 15/23] Bug 718340 - Don't traverse black windows, r=mccr8,jst

---
 dom/base/nsGlobalWindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 66a8123be27..7a7030ec548 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1404,8 +1404,9 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGlobalWindow)
 
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow)
-  if (tmp->mDoc && nsCCUncollectableMarker::InGeneration(
-                     cb, tmp->mDoc->GetMarkedCCGeneration())) {
+  if ((tmp->mDoc && nsCCUncollectableMarker::InGeneration(
+                      cb, tmp->mDoc->GetMarkedCCGeneration())) ||
+      (nsCCUncollectableMarker::sGeneration && tmp->IsBlack())) {
     return NS_SUCCESS_INTERRUPTED_TRAVERSE;
   }
 

From 40e8207296baa6e1e2d5e29371efd5397d36b6ef Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 16 Jan 2012 15:06:19 +0200
Subject: [PATCH 16/23] Bug 718330 - Add URI of owning document to
 nsGenericElement::Traverse logging, r=mccr8

---
 content/base/src/nsGenericElement.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp
index d072f8915c1..8968756bb05 100644
--- a/content/base/src/nsGenericElement.cpp
+++ b/content/base/src/nsGenericElement.cpp
@@ -4273,15 +4273,21 @@ static const char* kNSURIs[] = {
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGenericElement)
   if (NS_UNLIKELY(cb.WantDebugInfo())) {
-    char name[72];
+    char name[512];
     PRUint32 nsid = tmp->GetNameSpaceID();
     nsAtomCString localName(tmp->NodeInfo()->NameAtom());
+    nsCAutoString uri;
+    if (tmp->OwnerDoc()->GetDocumentURI()) {
+      tmp->OwnerDoc()->GetDocumentURI()->GetSpec(uri);
+    }
+
     if (nsid < ArrayLength(kNSURIs)) {
-      PR_snprintf(name, sizeof(name), "nsGenericElement%s %s", kNSURIs[nsid],
-                  localName.get());
+      PR_snprintf(name, sizeof(name), "nsGenericElement%s %s %s", kNSURIs[nsid],
+                  localName.get(), uri.get());
     }
     else {
-      PR_snprintf(name, sizeof(name), "nsGenericElement %s", localName.get());
+      PR_snprintf(name, sizeof(name), "nsGenericElement %s %s",
+                  localName.get(), uri.get());
     }
     cb.DescribeRefCountedNode(tmp->mRefCnt.get(), sizeof(nsGenericElement),
                               name);

From b6f4c8e8b3f2cda8e1fa268f04a534a381055f56 Mon Sep 17 00:00:00 2001
From: Rail Aliiev <rail@mozilla.com>
Date: Mon, 16 Jan 2012 09:30:59 -0500
Subject: [PATCH 17/23] bug 715586: checksums.py should generate sha1 and md5
 checksums. r=catlee,ted

---
 build/checksums.py                    | 70 ++++++++++++++-------------
 toolkit/mozapps/installer/packager.mk |  4 +-
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/build/checksums.py b/build/checksums.py
index 465914e3da3..97853c9612e 100755
--- a/build/checksums.py
+++ b/build/checksums.py
@@ -36,6 +36,8 @@
 #
 # ***** END LICENSE BLOCK *****
 
+from __future__ import with_statement
+
 from optparse import OptionParser
 import logging
 import os
@@ -57,14 +59,13 @@ def digest_file(filename, digest, chunk_size=1024):
     if hashlib is not None:
         logger.debug('Creating new %s object' % digest)
         h = hashlib.new(digest)
-        f = open(filename, "rb")
-        while True:
-            data = f.read(chunk_size)
-            if not data:
-                logger.debug('Finished reading in file')
-                break
-            h.update(data)
-        f.close()
+        with open(filename, 'rb') as f:
+            while True:
+                data = f.read(chunk_size)
+                if not data:
+                    logger.debug('Finished reading in file')
+                    break
+                h.update(data)
         hash = h.hexdigest()
         logger.debug('Hash for %s is %s' % (filename, hash))
         return hash
@@ -75,15 +76,15 @@ def digest_file(filename, digest, chunk_size=1024):
         return None
 
 
-def process_files(files, output_filename, digest, strip):
+def process_files(files, output_filename, digests, strip):
     '''This function takes a list of file names, 'files'.  It will then
     compute the checksum for each of the files by opening the files.
     Once each file is read and its checksum is computed, this function
     will write the information to the file specified by 'output_filename'.
     The path written in the output file will have anything specified by 'strip'
     removed from the path.  The output file is closed before returning nothing
-    The algorithm to compute checksums with can be specified by 'digest' 
-    and needs to be a valid OpenSSL algorithm.
+    The algorithm to compute checksums with can be specified by 'digests' 
+    and needs to be a list of valid OpenSSL algorithms.
 
     The output file is written in the format:
         <hash> <algorithm> <filesize> <filepath>
@@ -97,25 +98,25 @@ def process_files(files, output_filename, digest, strip):
                      output_filename)
     else:
         logger.debug('Creating a new checksums file "%s"' % output_filename)
-    output = open(output_filename, 'w+')
-    for file in files:
-        if os.path.isdir(file):
-            logger.warn('%s is a directory, skipping' % file)
-        else:
-            hash = digest_file(file, digest)
-            if hash is None:
-                logger.warn('Unable to generate a hash for %s. ' +
-                            'Using NOHASH as fallback' % file)
-                hash = 'NOHASH'
-            if file.startswith(strip):
-                short_file = file[len(strip):]
-                short_file = short_file.lstrip('/')
+    with open(output_filename, 'w+') as output:
+        for file in files:
+            if os.path.isdir(file):
+                logger.warn('%s is a directory, skipping' % file)
             else:
-                short_file = file
-            print >>output, '%s %s %s %s' % (hash, digest,
-                                             os.path.getsize(file),
-                                             short_file)
-    output.close()
+                for digest in digests:
+                    hash = digest_file(file, digest)
+                    if hash is None:
+                        logger.warn('Unable to generate a hash for %s. ' +
+                                    'Skipping.' % file)
+                        continue
+                    if file.startswith(strip):
+                        short_file = file[len(strip):]
+                        short_file = short_file.lstrip('/')
+                    else:
+                        short_file = file
+                    print >>output, '%s %s %s %s' % (hash, digest,
+                                                     os.path.getsize(file),
+                                                     short_file)
 
 def setup_logging(level=logging.DEBUG):
     '''This function sets up the logging module using a speficiable logging
@@ -141,7 +142,7 @@ def main():
     # Parse command line arguments
     parser = OptionParser()
     parser.add_option('-d', '--digest', help='checksum algorithm to use',
-                      action='store', dest='digest', default='sha1')
+                      action='append', dest='digests')
     parser.add_option('-o', '--output', help='output file to use',
                       action='store', dest='outfile', default='checksums')
     parser.add_option('-v', '--verbose',
@@ -167,11 +168,14 @@ def main():
     logger = logging.getLogger('checksums.py')
 
     # Validate the digest type to use
+    if not options.digests:
+        options.digests = ['sha1']
     try:
-        hashlib.new(options.digest)
+        for digest in options.digests:
+            hashlib.new(digest)
     except ValueError, ve:
         logger.error('Could not create a "%s" hash object (%s)' %
-                     (options.digest, ve.args[0]))
+                     (digest, ve.args[0]))
         exit(1)
 
     # Validate the files to checksum
@@ -181,7 +185,7 @@ def main():
             files.append(i)
         else:
             logger.info('File "%s" was not found on the filesystem' % i)
-    process_files(files, options.outfile, options.digest, options.strip)
+    process_files(files, options.outfile, options.digests, options.strip)
 
 if __name__ == '__main__':
     main()
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 2a3c77abbed..a2c2e7c5b40 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -904,7 +904,7 @@ ESCAPE_SPACE = $(subst $(space),\$(space),$(1))
 
 # This variable defines which OpenSSL algorithm to use to 
 # generate checksums for files that we upload
-CHECKSUM_ALGORITHM = 'sha512'
+CHECKSUM_ALGORITHM_PARAM = -d sha512 -d md5 -d sha1
 
 # This variable defines where the checksum file will be located
 CHECKSUM_FILE = "$(DIST)/$(PKG_PATH)/$(CHECKSUMS_FILE_BASENAME).checksums"
@@ -941,7 +941,7 @@ checksum:
 	mkdir -p `dirname $(CHECKSUM_FILE)`
 	@$(PYTHON) $(MOZILLA_DIR)/build/checksums.py \
 		-o $(CHECKSUM_FILE) \
-		-d $(CHECKSUM_ALGORITHM) \
+		$(CHECKSUM_ALGORITHM_PARAM) \
 		-s $(call QUOTED_WILDCARD,$(DIST)) \
 		$(UPLOAD_FILES)
 	@echo "CHECKSUM FILE START"

From d24913d5f3881cf666da8649e338f66be6d43392 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Mon, 16 Jan 2012 18:30:06 +0200
Subject: [PATCH 18/23] Backout bug 718340 since there was unknown orange

---
 dom/base/nsGlobalWindow.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 7a7030ec548..66a8123be27 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1404,9 +1404,8 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGlobalWindow)
 
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow)
-  if ((tmp->mDoc && nsCCUncollectableMarker::InGeneration(
-                      cb, tmp->mDoc->GetMarkedCCGeneration())) ||
-      (nsCCUncollectableMarker::sGeneration && tmp->IsBlack())) {
+  if (tmp->mDoc && nsCCUncollectableMarker::InGeneration(
+                     cb, tmp->mDoc->GetMarkedCCGeneration())) {
     return NS_SUCCESS_INTERRUPTED_TRAVERSE;
   }
 

From e59df39a13ad1db2ee1cf70bf6b5684bd43280f7 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Mon, 16 Jan 2012 20:15:59 +0100
Subject: [PATCH 19/23] Bug 717868. (Bv1) bug389321-1.html: Fix "Unknown key:
 VK_VK_BACK_SPACE". r=ehsan.

---
 layout/base/tests/bug389321-1.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/base/tests/bug389321-1.html b/layout/base/tests/bug389321-1.html
index 3e0ca5ed2a7..2b0ea38e681 100644
--- a/layout/base/tests/bug389321-1.html
+++ b/layout/base/tests/bug389321-1.html
@@ -12,7 +12,7 @@
   area.focus();
 
   sendKey("W"); // enter a character
-  sendKey("VK_BACK_SPACE");
+  sendKey("BACK_SPACE");
 </script>
 </body>
 </html>

From 3397965934b3a77fb20fe6d93febafc1e4ce0932 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Mon, 16 Jan 2012 21:52:18 +0100
Subject: [PATCH 20/23] Bug 628589. (Fv2) test_acceleration.html: Add a
 workaround for SeaMonkey (tinderboxes) which don't support acceleration.
 r=joe.

---
 gfx/tests/mochitest/test_acceleration.html | 24 +++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/gfx/tests/mochitest/test_acceleration.html b/gfx/tests/mochitest/test_acceleration.html
index 47f31073aab..fc9e654f2f5 100644
--- a/gfx/tests/mochitest/test_acceleration.html
+++ b/gfx/tests/mochitest/test_acceleration.html
@@ -43,21 +43,39 @@ while (windows.hasMoreElements()) {
 var osName = sysInfo.getProperty("name");
 switch(osName)
 {
-  case "Darwin":
+  case "Darwin": // Mac OS X.
     // We only enable OpenGL layers on machines that don't support QuickDraw
     // plugins. x86-64 architecture is a good proxy for this plugin support.
     if (sysInfo.getProperty("arch") != "x86-64") {
       is(acceleratedWindows, 0, "Acceleration not supported on x86 OS X");
     } else {
+      // Workaround for SeaMonkey tinderboxes which don't support acceleration.
+      if (navigator.userAgent.match(/ SeaMonkey\//)) {
+        if (acceleratedWindows == 0) {
+          todo(false, "Acceleration not supported on x86-64 OS X" +
+                      " (This is expected on SeaMonkey (tinderboxes).)");
+          break;
+        }
+      }
+
       isnot(acceleratedWindows, 0, "Acceleration enabled on x86-64 OS X");
     }
     break;
 
-  case "Windows_NT":
+  case "Windows_NT": // Windows.
     var version = parseFloat(sysInfo.getProperty("version"));
     if (version == 5.0) {
       is(acceleratedWindows, 0, "Acceleration not supported on Windows 2000");
     } else {
+      // Workaround for SeaMonkey tinderboxes which don't support acceleration.
+      if (navigator.userAgent.match(/ SeaMonkey\//)) {
+        if (acceleratedWindows == 0) {
+          todo(false, "Acceleration not supported on Windows XP or newer" +
+                      " (This is expected on SeaMonkey (tinderboxes).)");
+          break;
+        }
+      }
+
       isnot(acceleratedWindows, 0, "Acceleration enabled on Windows XP or newer");
     }
 
@@ -71,7 +89,7 @@ switch(osName)
     }
     break;
 
-  default:
+  default: // Linux and others.
     is(acceleratedWindows, 0, "Acceleration not supported on '" + osName + "'");
 }
 

From cafbfddf581a1a23311e1a1f8af182f2bdeb2262 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Mon, 16 Jan 2012 16:29:42 -0500
Subject: [PATCH 21/23] Bug 473236 - Remove executable bits from
 ScaledFontSkia.*. r=jrmuizel DONTBUILD

---
 gfx/2d/ScaledFontSkia.cpp | 0
 gfx/2d/ScaledFontSkia.h   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 gfx/2d/ScaledFontSkia.cpp
 mode change 100755 => 100644 gfx/2d/ScaledFontSkia.h

diff --git a/gfx/2d/ScaledFontSkia.cpp b/gfx/2d/ScaledFontSkia.cpp
old mode 100755
new mode 100644
diff --git a/gfx/2d/ScaledFontSkia.h b/gfx/2d/ScaledFontSkia.h
old mode 100755
new mode 100644

From 92991cc7877244a4ca71dab38610c24c80cd4c85 Mon Sep 17 00:00:00 2001
From: Phil Ringnalda <philringnalda@gmail.com>
Date: Mon, 16 Jan 2012 18:31:02 -0800
Subject: [PATCH 22/23] Back out 4ac407704d74 (bug 689387) for causing or
 exposing or whatevering bug 718411

---
 toolkit/content/widgets/videocontrols.xml | 25 +++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/toolkit/content/widgets/videocontrols.xml b/toolkit/content/widgets/videocontrols.xml
index ea051dc38f5..80e0a5a7f85 100644
--- a/toolkit/content/widgets/videocontrols.xml
+++ b/toolkit/content/widgets/videocontrols.xml
@@ -819,15 +819,21 @@
                 },
 
                 onMouseInOut : function (event) {
-                    if (this.isTouchControl)
-                        return;
-
                     // If the controls are static, don't change anything.
                     if (!this.dynamicControls)
                         return;
 
                     clearTimeout(this._hideControlsTimeout);
-                    var isMouseOver = (event.type == "mouseenter");
+
+                    // Ignore events caused by transitions between child nodes.
+                    // Note that the videocontrols element is the same
+                    // size as the *content area* of the video element,
+                    // but this is not the same as the video element's
+                    // border area if the video has border or padding.
+                    if (this.isEventWithin(event, this.videocontrols))
+                        return;
+
+                    var isMouseOver = (event.type == "mouseover");
 
                     // Suppress fading out the controls until the video has rendered
                     // its first frame. But since autoplay videos start off with no
@@ -1274,8 +1280,7 @@
                     this.muteButton.addEventListener("command", function() { self.toggleMute(); }, false);
                     this.playButton.addEventListener("command", function() { self.togglePause(); }, false);
                     this.fullscreenButton.addEventListener("command", function() { self.toggleFullscreen(); }, false );
-                    this.video.addEventListener("mouseenter", function(e) { self.onMouseInOut(e) }, false, true);
-                    this.video.addEventListener("mouseleave", function(e) { self.onMouseInOut(e) }, false, true);
+
                     this.controlsSpacer.addEventListener("click", function spacerClickHandler(e) {
                       if (e.button != 0 || self.hasError())
                         return;
@@ -1313,6 +1318,14 @@
     </implementation>
 
     <handlers>
+        <handler event="mouseover">
+            if (!this.isTouchControl)
+                this.Utils.onMouseInOut(event);
+        </handler>
+        <handler event="mouseout">
+            if (!this.isTouchControl)
+                this.Utils.onMouseInOut(event);
+        </handler>
         <handler event="mousemove">
             if (!this.isTouchControl)
                 this.Utils.onMouseMove(event);

From 88794b244355f53a1cb64bc1fb0f0fc82fc3fd07 Mon Sep 17 00:00:00 2001
From: Olli Pettay <Olli.Pettay@helsinki.fi>
Date: Tue, 17 Jan 2012 12:20:57 +0200
Subject: [PATCH 23/23] Bug 718340 - Don't traverse black windows, r=mccr8,jst

---
 dom/base/nsGlobalWindow.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 66a8123be27..7a7030ec548 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -1404,8 +1404,9 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsGlobalWindow)
 
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsGlobalWindow)
-  if (tmp->mDoc && nsCCUncollectableMarker::InGeneration(
-                     cb, tmp->mDoc->GetMarkedCCGeneration())) {
+  if ((tmp->mDoc && nsCCUncollectableMarker::InGeneration(
+                      cb, tmp->mDoc->GetMarkedCCGeneration())) ||
+      (nsCCUncollectableMarker::sGeneration && tmp->IsBlack())) {
     return NS_SUCCESS_INTERRUPTED_TRAVERSE;
   }