diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index 34a3105fc308..730bb3d9687e 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "58d73404571f7619b478116dfec8faced97be13d", 
+    "revision": "5e60cb6fc0e09cefe242a6fb0159fbd09360cc1a", 
     "repo_path": "/integration/gaia-central"
 }
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 7aaf5eb965ec..294c4cfba1b0 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1084,6 +1084,9 @@ pref("devtools.debugger.ui.variables-searchbox-visible", false);
 // Enable the Profiler
 pref("devtools.profiler.enabled", true);
 
+// The default Profiler UI settings
+pref("devtools.profiler.ui.show-platform-data", false);
+
 // Enable the Network Monitor
 pref("devtools.netmonitor.enabled", true);
 
@@ -1123,6 +1126,7 @@ pref("devtools.gcli.eagerHelper", 2);
 // Remember the Web Console filters
 pref("devtools.webconsole.filter.network", true);
 pref("devtools.webconsole.filter.networkinfo", true);
+pref("devtools.webconsole.filter.netwarn", true);
 pref("devtools.webconsole.filter.csserror", true);
 pref("devtools.webconsole.filter.cssparser", true);
 pref("devtools.webconsole.filter.exception", true);
@@ -1138,6 +1142,7 @@ pref("devtools.webconsole.filter.secwarn", true);
 // Remember the Browser Console filters
 pref("devtools.browserconsole.filter.network", true);
 pref("devtools.browserconsole.filter.networkinfo", true);
+pref("devtools.browserconsole.filter.netwarn", true);
 pref("devtools.browserconsole.filter.csserror", true);
 pref("devtools.browserconsole.filter.cssparser", true);
 pref("devtools.browserconsole.filter.exception", true);
diff --git a/browser/config/tooltool-manifests/linux32/asan.manifest b/browser/config/tooltool-manifests/linux32/asan.manifest
new file mode 100644
index 000000000000..8ce74c6e79cb
--- /dev/null
+++ b/browser/config/tooltool-manifests/linux32/asan.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r170890"
+}, 
+{
+"filename": "setup.sh", 
+"algorithm": "sha512", 
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa", 
+"size": 47
+}, 
+{
+"filename": "clang.tar.bz2", 
+"algorithm": "sha512", 
+"digest": "0bcfc19f05cc0f042befb3823c7ecce9ba411b152921aa29e97e7adc846e0258fd7da521b1620cb1e61a19d2fcac9b60e6d613c922b6c153e01b9b0766651d09", 
+"size": 62708281
+}
+]
diff --git a/browser/config/tooltool-manifests/linux64/asan.manifest b/browser/config/tooltool-manifests/linux64/asan.manifest
new file mode 100644
index 000000000000..39ba55904656
--- /dev/null
+++ b/browser/config/tooltool-manifests/linux64/asan.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r170890"
+},
+{
+"filename": "setup.sh",
+"algorithm": "sha512",
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"size": 47
+},
+{
+"filename": "clang.tar.bz2",
+"algorithm": "sha512",
+"digest": "e14ccefd965372a57c540647b2b99e21a4aa82f81a8b9a9e18dac7cba4c3436181bef0dfab8c51bcb5c343f504a693fdcfbe7d609f10291b5dd65ab059979d29",
+"size": 63034761
+}
+]
diff --git a/browser/config/tooltool-manifests/macosx64/asan.manifest b/browser/config/tooltool-manifests/macosx64/asan.manifest
new file mode 100644
index 000000000000..ede87d30e76d
--- /dev/null
+++ b/browser/config/tooltool-manifests/macosx64/asan.manifest
@@ -0,0 +1,17 @@
+[
+{
+"clang_version": "r170890"
+},
+{
+"size": 47,
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
+"algorithm": "sha512",
+"filename": "setup.sh"
+},
+{
+"size": 56126352,
+"digest": "e156e2a39abd5bf272ee30748a6825f22ddd27565b097c66662a2a6f2e9892bc5b4bf30a3552dffbe867dbfc39e7ee086e0b2cd7935f6ea216c0cf936178a88f",
+"algorithm": "sha512",
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index a3f86c592d26..eb9cb4df119d 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -314,7 +314,8 @@ let DebuggerController = {
    * away old scripts and get sources again.
    */
   reconfigureThread: function(aUseSourceMaps) {
-    this.client.reconfigureThread(aUseSourceMaps, (aResponse) => {
+    this.client.reconfigureThread({ useSourceMaps: aUseSourceMaps },
+                                  (aResponse) => {
       if (aResponse.error) {
         let msg = "Couldn't reconfigure thread: " + aResponse.message;
         Cu.reportError(msg);
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index 27f50dedc889..000929d2f015 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -98,6 +98,7 @@ MOCHITEST_BROWSER_TESTS = \
 	browser_dbg_bug883220_raise_on_pause.js \
 	browser_dbg_displayName.js \
 	browser_dbg_pause-exceptions.js \
+	browser_dbg_pause-exceptions-reload.js \
 	browser_dbg_multiple-windows.js \
 	browser_dbg_iframes.js \
 	browser_dbg_bfcache.js \
@@ -144,6 +145,7 @@ MOCHITEST_BROWSER_PAGES = \
 	test-location-changes-bp.js \
 	test-location-changes-bp.html \
 	test-step-out.html \
+	test-pause-exceptions-reload.html \
 	$(NULL)
 
 ifneq (Linux,$(OS_ARCH))
diff --git a/browser/devtools/debugger/test/browser_dbg_bfcache.js b/browser/devtools/debugger/test/browser_dbg_bfcache.js
index 0b2b4c1ea69d..4221d74379ec 100644
--- a/browser/devtools/debugger/test/browser_dbg_bfcache.js
+++ b/browser/devtools/debugger/test/browser_dbg_bfcache.js
@@ -53,7 +53,7 @@ function testLocationChange()
         });
       });
     });
-    content.location = STACK_URL;
+    gDebugger.DebuggerController.client.activeTab.navigateTo(STACK_URL);
   });
 }
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
index ed5e9c85cb98..256e21f22528 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug740825_conditional-breakpoints-01.js
@@ -293,7 +293,7 @@ function test()
     });
 
     finalCheck();
-    gDebuggee.location.reload();
+    gDebugger.DebuggerController.client.activeTab.reload();
   }
 
   function finalCheck() {
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
index 478a7677be1b..76978f355753 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-blank.js
@@ -95,7 +95,7 @@ function testLocationChange()
         closeDebuggerAndFinish();
       });
     });
-    content.location = "about:blank";
+    gDebugger.DebuggerController.client.activeTab.navigateTo("about:blank");
   });
 }
 
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-bp.js b/browser/devtools/debugger/test/browser_dbg_location-changes-bp.js
index 569171fd7827..338f8ab39cc4 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-bp.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-bp.js
@@ -103,7 +103,7 @@ function testReloadPage()
     clickAgain();
   });
 
-  content.location.reload();
+  gDebugger.DebuggerController.client.activeTab.reload();
 }
 
 function clickAgain()
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
index e2b1d8e2cc02..594472818d68 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes-new.js
@@ -95,7 +95,8 @@ function testLocationChange()
         closeDebuggerAndFinish();
       });
     });
-    content.location = EXAMPLE_URL + "browser_dbg_iframes.html";
+    let newLocation = EXAMPLE_URL + "browser_dbg_iframes.html";
+    gDebugger.DebuggerController.client.activeTab.navigateTo(newLocation);
   });
 }
 
diff --git a/browser/devtools/debugger/test/browser_dbg_location-changes.js b/browser/devtools/debugger/test/browser_dbg_location-changes.js
index 5f1122e638ad..940e4597573f 100644
--- a/browser/devtools/debugger/test/browser_dbg_location-changes.js
+++ b/browser/devtools/debugger/test/browser_dbg_location-changes.js
@@ -56,7 +56,7 @@ function testLocationChange()
 
       closeDebuggerAndFinish();
     });
-    content.location = TAB1_URL;
+    gDebugger.DebuggerController.client.activeTab.navigateTo(TAB1_URL);
   });
 }
 
diff --git a/browser/devtools/debugger/test/browser_dbg_pause-exceptions-reload.js b/browser/devtools/debugger/test/browser_dbg_pause-exceptions-reload.js
new file mode 100644
index 000000000000..7fefa73efda7
--- /dev/null
+++ b/browser/devtools/debugger/test/browser_dbg_pause-exceptions-reload.js
@@ -0,0 +1,122 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Make sure that pausing on exceptions works after reload.
+ */
+
+const TAB_URL = EXAMPLE_URL + "test-pause-exceptions-reload.html";
+
+var gPane = null;
+var gTab = null;
+var gDebugger = null;
+var gPrevPref = null;
+
+function test()
+{
+  gPrevPref = Services.prefs.getBoolPref(
+    "devtools.debugger.pause-on-exceptions");
+  Services.prefs.setBoolPref(
+    "devtools.debugger.pause-on-exceptions", true);
+
+  debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
+    gTab = aTab;
+    gPane = aPane;
+    gDebugger = gPane.panelWin;
+
+    gDebugger.DebuggerController.StackFrames.autoScopeExpand = true;
+    gDebugger.DebuggerView.Variables.nonEnumVisible = false;
+    testWithFrame();
+  });
+}
+
+function testWithFrame()
+{
+  // Pause on exceptions should be already enabled.
+  is(gDebugger.Prefs.pauseOnExceptions, true,
+    "The pause-on-exceptions pref should be true from startup.");
+  is(gDebugger.DebuggerView.Options._pauseOnExceptionsItem.getAttribute("checked"), "true",
+    "Pause on exceptions should be enabled from startup. ")
+
+  let count = 0;
+  gPane.panelWin.gClient.addOneTimeListener("paused", function() {
+    gDebugger.addEventListener("Debugger:FetchedVariables", function testA() {
+      // We expect 2 Debugger:FetchedVariables events, one from the global object
+      // scope and the regular one.
+      if (++count < 2) {
+        is(count, 1, "A. First Debugger:FetchedVariables event received.");
+        return;
+      }
+      is(count, 2, "A. Second Debugger:FetchedVariables event received.");
+      gDebugger.removeEventListener("Debugger:FetchedVariables", testA, false);
+
+      is(gDebugger.DebuggerController.activeThread.state, "paused",
+        "Should be paused now.");
+
+      count = 0;
+      gPane.panelWin.gClient.addOneTimeListener("paused", function() {
+        gDebugger.addEventListener("Debugger:FetchedVariables", function testB() {
+          // We expect 2 Debugger:FetchedVariables events, one from the global object
+          // scope and the regular one.
+          if (++count < 2) {
+            is(count, 1, "B. First Debugger:FetchedVariables event received.");
+            return;
+          }
+          is(count, 2, "B. Second Debugger:FetchedVariables event received.");
+          gDebugger.removeEventListener("Debugger:FetchedVariables", testB, false);
+          Services.tm.currentThread.dispatch({ run: function() {
+
+            var frames = gDebugger.DebuggerView.StackFrames.widget._list,
+                scopes = gDebugger.DebuggerView.Variables._list,
+                innerScope = scopes.firstChild,
+                innerNodes = innerScope.querySelector(".variables-view-element-details").childNodes;
+
+            is(gDebugger.DebuggerController.activeThread.state, "paused",
+              "Should be paused again.");
+
+            is(frames.querySelectorAll(".dbg-stackframe").length, 2,
+              "Should have two frames.");
+
+            is(scopes.children.length, 2, "Should have 2 variable scopes.");
+
+            is(innerNodes[0].querySelector(".name").getAttribute("value"), "<exception>",
+              "Should have the right property name for the exception.");
+
+            is(innerNodes[0].querySelector(".value").getAttribute("value"), "Error",
+              "Should have the right property value for the exception.");
+
+            resumeAndFinish();
+
+          }}, 0);
+        }, false);
+      });
+
+      content.window.location.reload();
+    }, false);
+  });
+
+  content.window.location.reload();
+}
+
+function resumeAndFinish() {
+  // Disable pause on exceptions.
+  gDebugger.DebuggerView.Options._pauseOnExceptionsItem.setAttribute("checked", "false");
+  gDebugger.DebuggerView.Options._togglePauseOnExceptions();
+
+  is(gDebugger.Prefs.pauseOnExceptions, false,
+    "The pause-on-exceptions pref should have been set to false.");
+
+  gPane.panelWin.gClient.addOneTimeListener("resumed", function() {
+    Services.tm.currentThread.dispatch({ run: closeDebuggerAndFinish }, 0);
+  });
+
+  // Resume to let the exception reach it's catch clause.
+  gDebugger.DebuggerController.activeThread.resume();
+}
+
+registerCleanupFunction(function() {
+  removeTab(gTab);
+  gPane = null;
+  gTab = null;
+  gDebugger = null;
+});
diff --git a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
index bee00530f48c..1036b391da28 100644
--- a/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
+++ b/browser/devtools/debugger/test/browser_dbg_reload-same-script.js
@@ -204,7 +204,7 @@ function test()
 
   function reloadPage()
   {
-    gDebuggee.location.reload();
+    gDebugger.DebuggerController.client.activeTab.reload();
   }
 
   registerCleanupFunction(function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
index d8c33b425d08..b4b13fbbe473 100644
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
+++ b/browser/devtools/debugger/test/browser_dbg_scripts-searching-05.js
@@ -127,7 +127,7 @@ function testLocationChange()
     });
   });
 
-  content.location = TAB1_URL;
+  gDebugger.DebuggerController.client.activeTab.navigateTo(TAB1_URL);
 }
 
 function clear() {
diff --git a/browser/devtools/debugger/test/browser_dbg_sources-cache.js b/browser/devtools/debugger/test/browser_dbg_sources-cache.js
index b8533c25fc8e..1b8e4169d3d1 100644
--- a/browser/devtools/debugger/test/browser_dbg_sources-cache.js
+++ b/browser/devtools/debugger/test/browser_dbg_sources-cache.js
@@ -108,7 +108,7 @@ function performReload(callback) {
     callback();
   });
 
-  gDebuggee.location.reload();
+  gDebugger.DebuggerController.client.activeTab.reload();
 }
 
 function testStateBeforeReload() {
diff --git a/browser/devtools/debugger/test/test-pause-exceptions-reload.html b/browser/devtools/debugger/test/test-pause-exceptions-reload.html
new file mode 100644
index 000000000000..c1be2edb6c2f
--- /dev/null
+++ b/browser/devtools/debugger/test/test-pause-exceptions-reload.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <meta charset='utf-8'/>
+    <title>Debugger Pause on Exceptions After Reload Test</title>
+    <!-- Any copyright is dedicated to the Public Domain.
+         http://creativecommons.org/publicdomain/zero/1.0/ -->
+  </head>
+  <body>
+    <ul></ul>
+  </body>
+  <script type="text/javascript">
+    window.addEventListener("load", function() {
+      function load() {
+        try {
+          throw new Error("boom");
+        } catch (e) {
+          var list = document.querySelector("ul");
+          var item = document.createElement("li");
+          item.innerHTML = e.message;
+          list.appendChild(item);
+        }
+      }
+      load();
+    });
+  </script>
+</html>
diff --git a/browser/devtools/framework/toolbox-options.xul b/browser/devtools/framework/toolbox-options.xul
index 433669161782..b3a032de9b1d 100644
--- a/browser/devtools/framework/toolbox-options.xul
+++ b/browser/devtools/framework/toolbox-options.xul
@@ -37,6 +37,12 @@
                     tooltiptext="&options.enablePersistentLogging.tooltip;"
                     data-pref="devtools.webconsole.persistlog"/>
         </vbox>
+        <label value="&options.profiler.label;"/>
+        <vbox id="profiler-options" class="options-groupbox">
+          <checkbox label="&options.showPlatformData.label;"
+                    tooltiptext="&options.showPlatformData.tooltip;"
+                    data-pref="devtools.profiler.ui.show-platform-data"/>
+        </vbox>
         <label value="&options.context.advancedSettings;"/>
         <vbox id="context-options" class="options-groupbox">
           <hbox>
diff --git a/browser/devtools/markupview/markup-view.xhtml b/browser/devtools/markupview/markup-view.xhtml
index b26671ce3946..2c99862c3585 100644
--- a/browser/devtools/markupview/markup-view.xhtml
+++ b/browser/devtools/markupview/markup-view.xhtml
@@ -18,7 +18,7 @@
   <div id="root"></div>
   <div id="templates" style="display:none">
     <ul>
-      <li id="template-container" save="${elt}" class="container"><span save="${expander}" class="theme-twisty expander"></span><span save="${codeBox}" class="codebox"><ul save="${children}" class="children"></ul></span></li>
+      <li id="template-container" save="${elt}" class="container"><span save="${codeBox}" class="codebox"><span save="${expander}" class="theme-twisty expander"></span><ul save="${children}" class="children"></ul></span></li>
 
       <li id="template-more-nodes" class="more-nodes devtools-class-comment" save="${elt}"><span>${showing}</span> <button href="#" onclick="${allButtonClick}">${showAll}</button></li>
     </ul>
diff --git a/browser/devtools/netmonitor/NetMonitorPanel.jsm b/browser/devtools/netmonitor/NetMonitorPanel.jsm
index 4f778bae1b3c..0afa41e9f669 100644
--- a/browser/devtools/netmonitor/NetMonitorPanel.jsm
+++ b/browser/devtools/netmonitor/NetMonitorPanel.jsm
@@ -18,13 +18,14 @@ XPCOMUtils.defineLazyModuleGetter(this, "Promise",
 this.NetMonitorPanel = function NetMonitorPanel(iframeWindow, toolbox) {
   this.panelWin = iframeWindow;
   this._toolbox = toolbox;
+  this._destroyer = null;
 
   this._view = this.panelWin.NetMonitorView;
   this._controller = this.panelWin.NetMonitorController;
   this._controller._target = this.target;
 
   EventEmitter.decorate(this);
-}
+};
 
 NetMonitorPanel.prototype = {
   /**
@@ -53,14 +54,22 @@ NetMonitorPanel.prototype = {
       })
       .then(null, function onError(aReason) {
         Cu.reportError("NetMonitorPanel open failed. " +
-                       reason.error + ": " + reason.message);
+                       aReason.error + ": " + aReason.message);
       });
   },
 
   // DevToolPanel API
+
   get target() this._toolbox.target,
 
   destroy: function() {
-    this._controller.shutdownNetMonitor().then(() => this.emit("destroyed"));
+    // Make sure this panel is not already destroyed.
+    if (this._destroyer) {
+      return this._destroyer;
+    }
+
+    return this._destroyer = this._controller.shutdownNetMonitor().then(() => {
+      this.emit("destroyed");
+    });
   }
 };
diff --git a/browser/devtools/netmonitor/netmonitor-controller.js b/browser/devtools/netmonitor/netmonitor-controller.js
index 1da4336b5c55..bbdf7a1c24cc 100644
--- a/browser/devtools/netmonitor/netmonitor-controller.js
+++ b/browser/devtools/netmonitor/netmonitor-controller.js
@@ -37,19 +37,14 @@ let NetMonitorController = {
    *         A promise that is resolved when the monitor finishes startup.
    */
   startupNetMonitor: function() {
-    if (this._isInitialized) {
-      return this._startup.promise;
+    if (this._startup) {
+      return this._startup;
     }
-    this._isInitialized = true;
 
-    let deferred = this._startup = Promise.defer();
+    NetMonitorView.initialize();
 
-    NetMonitorView.initialize(() => {
-      NetMonitorView._isInitialized = true;
-      deferred.resolve();
-    });
-
-    return deferred.promise;
+    // Startup is synchronous, for now.
+    return this._startup = Promise.resolve();
   },
 
   /**
@@ -59,24 +54,17 @@ let NetMonitorController = {
    *         A promise that is resolved when the monitor finishes shutdown.
    */
   shutdownNetMonitor: function() {
-    if (this._isDestroyed) {
-      return this._shutdown.promise;
+    if (this._shutdown) {
+      return this._shutdown;
     }
-    this._isDestroyed = true;
-    this._startup = null;
 
-    let deferred = this._shutdown = Promise.defer();
+    NetMonitorView.destroy();
+    this.TargetEventsHandler.disconnect();
+    this.NetworkEventsHandler.disconnect();
+    this.disconnect();
 
-    NetMonitorView.destroy(() => {
-      NetMonitorView._isDestroyed = true;
-      this.TargetEventsHandler.disconnect();
-      this.NetworkEventsHandler.disconnect();
-
-      this.disconnect();
-      deferred.resolve();
-    });
-
-    return deferred.promise;
+    // Shutdown is synchronous, for now.
+    return this._shutdown = Promise.resolve();
   },
 
   /**
@@ -88,10 +76,11 @@ let NetMonitorController = {
    */
   connect: function() {
     if (this._connection) {
-      return this._connection.promise;
+      return this._connection;
     }
 
-    let deferred = this._connection = Promise.defer();
+    let deferred = Promise.defer();
+    this._connection = deferred.promise;
 
     let target = this._target;
     let { client, form } = target;
@@ -192,8 +181,6 @@ let NetMonitorController = {
     });
   },
 
-  _isInitialized: false,
-  _isDestroyed: false,
   _startup: null,
   _shutdown: null,
   _connection: null,
@@ -505,7 +492,7 @@ NetworkEventsHandler.prototype = {
     let { actor, initial, length } = aStringGrip;
     let longStringClient = this.webConsoleClient.longString(aStringGrip);
 
-    longStringClient.substring(initial.length, length, (aResponse) => {
+    longStringClient.substring(initial.length, length, aResponse => {
       if (aResponse.error) {
         Cu.reportError(aResponse.error + ": " + aResponse.message);
         deferred.reject(aResponse);
diff --git a/browser/devtools/netmonitor/netmonitor-view.js b/browser/devtools/netmonitor/netmonitor-view.js
index b05776682577..b73a5a34b6cf 100644
--- a/browser/devtools/netmonitor/netmonitor-view.js
+++ b/browser/devtools/netmonitor/netmonitor-view.js
@@ -64,38 +64,24 @@ const GENERIC_VARIABLES_VIEW_SETTINGS = {
 let NetMonitorView = {
   /**
    * Initializes the network monitor view.
-   *
-   * @param function aCallback
-   *        Called after the view finishes initializing.
    */
-  initialize: function(aCallback) {
-    dumpn("Initializing the NetMonitorView");
-
+  initialize: function() {
     this._initializePanes();
 
     this.Toolbar.initialize();
     this.RequestsMenu.initialize();
     this.NetworkDetails.initialize();
-
-    aCallback();
   },
 
   /**
    * Destroys the network monitor view.
-   *
-   * @param function aCallback
-   *        Called after the view finishes destroying.
    */
-  destroy: function(aCallback) {
-    dumpn("Destroying the NetMonitorView");
-
+  destroy: function() {
     this.Toolbar.destroy();
     this.RequestsMenu.destroy();
     this.NetworkDetails.destroy();
 
     this._destroyPanes();
-
-    aCallback();
   },
 
   /**
@@ -199,9 +185,7 @@ let NetMonitorView = {
   _detailsPaneToggleButton: null,
   _collapsePaneString: "",
   _expandPaneString: "",
-  _editorPromises: new Map(),
-  _isInitialized: false,
-  _isDestroyed: false
+  _editorPromises: new Map()
 };
 
 /**
@@ -392,8 +376,8 @@ RequestsMenuView.prototype = Heritage.extend(WidgetMethods, {
       data.body = selected.requestPostData.postData.text;
     }
 
-    NetMonitorController.webConsoleClient.sendHTTPRequest(data, (response) => {
-      let id = response.eventActor.actor;
+    NetMonitorController.webConsoleClient.sendHTTPRequest(data, aResponse => {
+      let id = aResponse.eventActor.actor;
       this._preferredItemId = id;
     });
 
@@ -1383,7 +1367,7 @@ CustomRequestView.prototype = {
     if (aData.requestPostData) {
       let body = aData.requestPostData.postData.text;
 
-      gNetwork.getString(body).then((aString) => {
+      gNetwork.getString(body).then(aString => {
         $("#custom-postdata-value").value =  aString;
       });
     }
@@ -1678,7 +1662,7 @@ NetworkDetailsView.prototype = {
 
     for (let header of aResponse.headers) {
       let headerVar = headersScope.addItem(header.name, {}, true);
-      gNetwork.getString(header.value).then((aString) => headerVar.setGrip(aString));
+      gNetwork.getString(header.value).then(aString => headerVar.setGrip(aString));
     }
   },
 
@@ -1721,7 +1705,7 @@ NetworkDetailsView.prototype = {
 
     for (let cookie of aResponse.cookies) {
       let cookieVar = cookiesScope.addItem(cookie.name, {}, true);
-      gNetwork.getString(cookie.value).then((aString) => cookieVar.setGrip(aString));
+      gNetwork.getString(cookie.value).then(aString => cookieVar.setGrip(aString));
 
       // By default the cookie name and value are shown. If this is the only
       // information available, then nothing else is to be displayed.
@@ -1733,7 +1717,7 @@ NetworkDetailsView.prototype = {
       // Display any other information other than the cookie name and value
       // which may be available.
       let rawObject = Object.create(null);
-      let otherProps = cookieProps.filter((e) => e != "name" && e != "value");
+      let otherProps = cookieProps.filter(e => e != "name" && e != "value");
       for (let prop of otherProps) {
         rawObject[prop] = cookie[prop];
       }
@@ -1768,7 +1752,7 @@ NetworkDetailsView.prototype = {
     if (!aHeadersResponse || !aPostDataResponse) {
       return;
     }
-    gNetwork.getString(aPostDataResponse.postData.text).then((aString) => {
+    gNetwork.getString(aPostDataResponse.postData.text).then(aString => {
       // Handle query strings (poor man's forms, e.g. "?foo=bar&baz=42").
       let cType = aHeadersResponse.headers.filter(({ name }) => name == "Content-Type")[0];
       let cString = cType ? cType.value : "";
@@ -1790,7 +1774,7 @@ NetworkDetailsView.prototype = {
         paramsScope.locked = true;
 
         $("#request-post-data-textarea-box").hidden = false;
-        NetMonitorView.editor("#request-post-data-textarea").then((aEditor) => {
+        NetMonitorView.editor("#request-post-data-textarea").then(aEditor => {
           aEditor.setText(aString);
         });
       }
@@ -1834,7 +1818,7 @@ NetworkDetailsView.prototype = {
     }
     let { mimeType, text, encoding } = aResponse.content;
 
-    gNetwork.getString(text).then((aString) => {
+    gNetwork.getString(text).then(aString => {
       // Handle json.
       if (mimeType.contains("/json")) {
         let jsonpRegex = /^[a-zA-Z0-9_$]+\(|\)$/g; // JSONP with callback.
@@ -1864,7 +1848,7 @@ NetworkDetailsView.prototype = {
         // Malformed JSON.
         else {
           $("#response-content-textarea-box").hidden = false;
-          NetMonitorView.editor("#response-content-textarea").then((aEditor) => {
+          NetMonitorView.editor("#response-content-textarea").then(aEditor => {
             aEditor.setMode(SourceEditor.MODES.JAVASCRIPT);
             aEditor.setText(aString);
           });
@@ -1889,7 +1873,7 @@ NetworkDetailsView.prototype = {
         $("#response-content-image-encoding-value").setAttribute("value", encoding);
 
         // Wait for the image to load in order to display the width and height.
-        $("#response-content-image").onload = (e) => {
+        $("#response-content-image").onload = e => {
           // XUL images are majestic so they don't bother storing their dimensions
           // in width and height attributes like the rest of the folk. Hack around
           // this by getting the bounding client rect and subtracting the margins.
@@ -1901,7 +1885,7 @@ NetworkDetailsView.prototype = {
       // Handle anything else.
       else {
         $("#response-content-textarea-box").hidden = false;
-        NetMonitorView.editor("#response-content-textarea").then((aEditor) => {
+        NetMonitorView.editor("#response-content-textarea").then(aEditor => {
           aEditor.setMode(SourceEditor.MODES.TEXT);
           aEditor.setText(aString);
 
@@ -2036,7 +2020,7 @@ function parseQueryString(aQueryString) {
     return;
   }
   // Turn the params string into an array containing { name: value } tuples.
-  let paramsArray = aQueryString.replace(/^[?&]/, "").split("&").map((e) =>
+  let paramsArray = aQueryString.replace(/^[?&]/, "").split("&").map(e =>
     let (param = e.split("=")) {
       name: NetworkHelper.convertToUnicode(unescape(param[0])),
       value: NetworkHelper.convertToUnicode(unescape(param[1]))
diff --git a/browser/devtools/netmonitor/test/browser_net_simple-init.js b/browser/devtools/netmonitor/test/browser_net_simple-init.js
index 9f444bb49221..c273152bd78e 100644
--- a/browser/devtools/netmonitor/test/browser_net_simple-init.js
+++ b/browser/devtools/netmonitor/test/browser_net_simple-init.js
@@ -19,12 +19,9 @@ function test() {
 
       ok(aMonitor._view,
         "The network monitor view object exists (" + aTag + ").");
-      ok(aMonitor._view._isInitialized,
-        "The network monitor view object exists and is initialized (" + aTag + ").");
-
       ok(aMonitor._controller,
         "The network monitor controller object exists (" + aTag + ").");
-      ok(aMonitor._controller._isInitialized,
+      ok(aMonitor._controller._startup,
         "The network monitor controller object exists and is initialized (" + aTag + ").");
 
       ok(aMonitor.isReady,
@@ -41,6 +38,13 @@ function test() {
     function checkIfDestroyed(aTag) {
       info("Checking if destruction is ok.");
 
+      ok(aMonitor._view,
+        "The network monitor view object still exists (" + aTag + ").");
+      ok(aMonitor._controller,
+        "The network monitor controller object still exists (" + aTag + ").");
+      ok(aMonitor._controller._shutdown,
+        "The network monitor controller object still exists and is destroyed (" + aTag + ").");
+
       ok(!aMonitor._controller.client,
         "There shouldn't be a client available after destruction (" + aTag + ").");
       ok(!aMonitor._controller.tabClient,
diff --git a/browser/devtools/profiler/cleopatra.js b/browser/devtools/profiler/cleopatra.js
index a9890440478d..42112e9f2d62 100644
--- a/browser/devtools/profiler/cleopatra.js
+++ b/browser/devtools/profiler/cleopatra.js
@@ -23,9 +23,10 @@ const { PROFILE_IDLE, PROFILE_COMPLETED, PROFILE_RUNNING } = require("devtools/p
  * @param ProfilerPanel panel
  *   A reference to the container panel.
  */
-function Cleopatra(uid, name, panel) {
+function Cleopatra(panel, opts) {
   let doc = panel.document;
   let win = panel.window;
+  let { uid, name, showPlatformData } = opts;
 
   EventEmitter.decorate(this);
 
@@ -40,7 +41,7 @@ function Cleopatra(uid, name, panel) {
   this.iframe = doc.createElement("iframe");
   this.iframe.setAttribute("flex", "1");
   this.iframe.setAttribute("id", "profiler-cleo-" + uid);
-  this.iframe.setAttribute("src", "cleopatra.html?" + uid);
+  this.iframe.setAttribute("src", "cleopatra.html?uid=" + uid + "&showPlatformData=" + showPlatformData);
   this.iframe.setAttribute("hidden", "true");
 
   // Append our iframe and subscribe to postMessage events.
diff --git a/browser/devtools/profiler/cleopatra/js/devtools.js b/browser/devtools/profiler/cleopatra/js/devtools.js
index 042d67cc44a0..fc8a001db775 100644
--- a/browser/devtools/profiler/cleopatra/js/devtools.js
+++ b/browser/devtools/profiler/cleopatra/js/devtools.js
@@ -3,6 +3,22 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 var gInstanceUID;
+var gParsedQS;
+
+function getParam(key) {
+  if (gParsedQS)
+    return gParsedQS[key];
+
+  var query = window.location.search.substring(1);
+  gParsedQS = {};
+
+  query.split("&").forEach(function (pair) {
+    pair = pair.split("=");
+    gParsedQS[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1]);
+  });
+
+  return gParsedQS[key];
+}
 
 /**
  * Sends a message to the parent window with a status
@@ -17,7 +33,7 @@ var gInstanceUID;
  */
 function notifyParent(status, data={}) {
   if (!gInstanceUID) {
-    gInstanceUID = window.location.search.substr(1);
+    gInstanceUID = getParam("uid");
   }
 
   window.parent.postMessage({
@@ -208,7 +224,8 @@ function enterFinishedProfileUI() {
     }
   }
 
-  toggleJavascriptOnly();
+  if (getParam("showPlatformData") !== "true")
+    toggleJavascriptOnly();
 }
 
 function enterProgressUI() {
diff --git a/browser/devtools/profiler/consts.js b/browser/devtools/profiler/consts.js
index 1324b06cc9e4..dd76df6a1644 100644
--- a/browser/devtools/profiler/consts.js
+++ b/browser/devtools/profiler/consts.js
@@ -5,9 +5,12 @@
 "use strict";
 
 module.exports = {
-	L10N_BUNDLE:       "chrome://browser/locale/devtools/profiler.properties",
-	PROFILER_ENABLED:  "devtools.profiler.enabled",
-	PROFILE_IDLE:      0,
-	PROFILE_RUNNING:   1,
-	PROFILE_COMPLETED: 2
+	L10N_BUNDLE:        "chrome://browser/locale/devtools/profiler.properties",
+
+	PROFILER_ENABLED:   "devtools.profiler.enabled",
+	SHOW_PLATFORM_DATA: "devtools.profiler.ui.show-platform-data",
+
+	PROFILE_IDLE:       0,
+	PROFILE_RUNNING:    1,
+	PROFILE_COMPLETED:  2
 };
\ No newline at end of file
diff --git a/browser/devtools/profiler/panel.js b/browser/devtools/profiler/panel.js
index acccf47e1b1d..51d8b7dad75c 100644
--- a/browser/devtools/profiler/panel.js
+++ b/browser/devtools/profiler/panel.js
@@ -5,7 +5,12 @@
 "use strict";
 
 const { Cu } = require("chrome");
-const { PROFILE_IDLE, PROFILE_RUNNING, PROFILE_COMPLETED } = require("devtools/profiler/consts");
+const {
+  PROFILE_IDLE,
+  PROFILE_RUNNING,
+  PROFILE_COMPLETED,
+  SHOW_PLATFORM_DATA
+} = require("devtools/profiler/consts");
 
 var EventEmitter = require("devtools/shared/event-emitter");
 var Promise      = require("sdk/core/promise");
@@ -15,7 +20,7 @@ var ProfilerController = require("devtools/profiler/controller");
 
 Cu.import("resource:///modules/devtools/gDevTools.jsm");
 Cu.import("resource://gre/modules/devtools/Console.jsm");
-Cu.import("resource://gre/modules/Services.jsm")
+Cu.import("resource://gre/modules/Services.jsm");
 
 /**
  * Profiler panel. It is responsible for creating and managing
@@ -123,6 +128,14 @@ ProfilerPanel.prototype = {
     return this._browserWin = win;
   },
 
+  get showPlatformData() {
+    return Services.prefs.getBoolPref(SHOW_PLATFORM_DATA);
+  },
+
+  set showPlatformData(enabled) {
+    Services.prefs.setBoolPref(SHOW_PLATFORM_DATA, enabled);
+  },
+
   /**
    * Open a debug connection and, on success, switch to the newly created
    * profile.
@@ -139,8 +152,8 @@ ProfilerPanel.prototype = {
         let deferred = Promise.defer();
 
         this.controller = new ProfilerController(this.target);
-        this.sidebar = new Sidebar(this.document.querySelector("#profiles-list"));
 
+        this.sidebar = new Sidebar(this.document.querySelector("#profiles-list"));
         this.sidebar.widget.addEventListener("select", (ev) => {
           if (!ev.detail)
             return;
@@ -223,7 +236,11 @@ ProfilerPanel.prototype = {
 
     let uid = ++this._uid;
     let name = name || this.controller.getProfileName();
-    let profile = new Cleopatra(uid, name, this);
+    let profile = new Cleopatra(this, {
+      uid: uid,
+      name: name,
+      showPlatformData: this.showPlatformData
+    });
 
     this.profiles.set(uid, profile);
     this.sidebar.addProfile(profile);
diff --git a/browser/devtools/profiler/test/Makefile.in b/browser/devtools/profiler/test/Makefile.in
index 5181f8c0567e..c3adbbdb0c96 100644
--- a/browser/devtools/profiler/test/Makefile.in
+++ b/browser/devtools/profiler/test/Makefile.in
@@ -22,6 +22,7 @@ MOCHITEST_BROWSER_TESTS = \
 		browser_profiler_console_api_mixed.js \
 		browser_profiler_console_api_content.js \
 		browser_profiler_escape.js \
+		browser_profiler_gecko_data.js \
 		head.js \
 		$(NULL)
 
diff --git a/browser/devtools/profiler/test/browser_profiler_gecko_data.js b/browser/devtools/profiler/test/browser_profiler_gecko_data.js
new file mode 100644
index 000000000000..870cb20185fc
--- /dev/null
+++ b/browser/devtools/profiler/test/browser_profiler_gecko_data.js
@@ -0,0 +1,52 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const URL = "data:text/html;charset=utf8,<p>JavaScript Profiler test</p>";
+
+let gTab, gPanel;
+
+function test() {
+  waitForExplicitFinish();
+
+  setUp(URL, function onSetUp(tab, browser, panel) {
+    gTab = tab;
+    gPanel = panel;
+
+    function done() {
+      tearDown(gTab, () => { gPanel = null; gTab = null; });
+    }
+
+    Services.prefs.setBoolPref(SHOW_PLATFORM_DATA, false);
+    recordProfile()
+      .then(toggleGeckoDataOption)
+      .then(recordProfile)
+      .then(done);
+  });
+}
+
+function recordProfile() {
+  let deferred = Promise.defer();
+  let record = gPanel.controls.record;
+
+  gPanel.once("started", () => {
+    gPanel.once("parsed", () => {
+      // We cannot be sure which data is returned by
+      // the profiler within a test. Until we get rid
+      // of Cleopatra, at least.
+      deferred.resolve();
+    });
+
+    record.click();
+  });
+
+  record.click();
+  return deferred.promise;
+}
+
+function toggleGeckoDataOption() {
+  ok(!gPanel.showPlatformData, "showPlatformData is not set");
+
+  Services.prefs.setBoolPref(SHOW_PLATFORM_DATA, true);
+
+  ok(gPanel.showPlatformData, "showPlatformData is set");
+}
\ No newline at end of file
diff --git a/browser/devtools/profiler/test/head.js b/browser/devtools/profiler/test/head.js
index 8833f57cf0ae..cbbce3377e75 100644
--- a/browser/devtools/profiler/test/head.js
+++ b/browser/devtools/profiler/test/head.js
@@ -5,6 +5,7 @@ let temp = {};
 
 const PROFILER_ENABLED = "devtools.profiler.enabled";
 const REMOTE_ENABLED = "devtools.debugger.remote-enabled";
+const SHOW_PLATFORM_DATA = "devtools.profiler.ui.show-platform-data";
 const PROFILE_IDLE = 0;
 const PROFILE_RUNNING = 1;
 const PROFILE_COMPLETED = 2;
@@ -29,6 +30,7 @@ registerCleanupFunction(function () {
   helpers = null;
   Services.prefs.clearUserPref(PROFILER_ENABLED);
   Services.prefs.clearUserPref(REMOTE_ENABLED);
+  Services.prefs.clearUserPref(SHOW_PLATFORM_DATA);
   DebuggerServer.destroy();
 });
 
diff --git a/browser/devtools/responsivedesign/test/browser_responsiveui.js b/browser/devtools/responsivedesign/test/browser_responsiveui.js
index 9d88fa37154c..f103ccc9426f 100644
--- a/browser/devtools/responsivedesign/test/browser_responsiveui.js
+++ b/browser/devtools/responsivedesign/test/browser_responsiveui.js
@@ -132,11 +132,17 @@ function test() {
 
   function restart() {
     info("XXX BUG 851296: restarting.");
-    mgr.once("on", function() {executeSoon(onUIOpen2)});
+    info("XXX BUG 851296: __responsiveUI: " + gBrowser.selectedTab.__responsiveUI);
+    mgr.once("on", function() {
+      info("XXX BUG 851296: 'on' received.");
+      executeSoon(onUIOpen2);
+    });
     synthesizeKeyFromKeyTag("key_responsiveUI");
+    info("XXX BUG 851296: restart() finished.");
   }
 
   function onUIOpen2() {
+    info("XXX BUG 851296: onUIOpen2.");
     let container = gBrowser.getBrowserContainer();
     is(container.getAttribute("responsivemode"), "true", "In responsive mode.");
 
@@ -183,6 +189,8 @@ function test() {
       accelKey: modifiersAttr.match("accel")
     }
 
+    info("XXX BUG 851296: key name: " + name);
+    info("XXX BUG 851296: key modifiers: " + JSON.stringify(modifiers));
     EventUtils.synthesizeKey(name, modifiers);
   }
 }
diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in
index 2d8da7514b59..088cfa596deb 100644
--- a/browser/devtools/shared/test/Makefile.in
+++ b/browser/devtools/shared/test/Makefile.in
@@ -12,25 +12,31 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_BROWSER_FILES = \
-  browser_telemetry_toolboxtabs.js \
-  browser_telemetry_buttonsandsidebar.js \
-  browser_require_basic.js \
-  browser_templater_basic.js \
-  browser_toolbar_basic.js \
-  browser_toolbar_tooltip.js \
-  browser_toolbar_webconsole_errors_count.js \
-  browser_layoutHelpers.js \
-  browser_eventemitter_basic.js \
-  head.js \
-  leakhunt.js \
-  $(NULL)
+		browser_eventemitter_basic.js \
+		browser_layoutHelpers.js \
+		browser_require_basic.js \
+		browser_telemetry_buttonsandsidebar.js \
+		browser_telemetry_toolboxtabs_inspector.js \
+		browser_telemetry_toolboxtabs_jsdebugger.js \
+		browser_telemetry_toolboxtabs_jsprofiler.js \
+		browser_telemetry_toolboxtabs_netmonitor.js \
+		browser_telemetry_toolboxtabs_options.js \
+		browser_telemetry_toolboxtabs_styleeditor.js \
+		browser_telemetry_toolboxtabs_webconsole.js \
+		browser_templater_basic.js \
+		browser_toolbar_basic.js \
+		browser_toolbar_tooltip.js \
+		browser_toolbar_webconsole_errors_count.js \
+		head.js \
+		leakhunt.js \
+	$(NULL)
 
 MOCHITEST_BROWSER_FILES += \
-  browser_templater_basic.html \
-  browser_toolbar_basic.html \
-  browser_toolbar_webconsole_errors_count.html \
-  browser_layoutHelpers.html \
-  browser_layoutHelpers_iframe.html \
-  $(NULL)
+		browser_templater_basic.html \
+		browser_toolbar_basic.html \
+		browser_toolbar_webconsole_errors_count.html \
+		browser_layoutHelpers.html \
+		browser_layoutHelpers_iframe.html \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
similarity index 86%
rename from browser/devtools/shared/test/browser_telemetry_toolboxtabs.js
rename to browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
index c9572a6dedb6..e53c1b82923d 100644
--- a/browser/devtools/shared/test/browser_telemetry_toolboxtabs.js
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_inspector.js
@@ -1,7 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs.js</p>";
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_inspector.js</p>";
 
 // Because we need to gather stats for the period of time that a tool has been
 // opened we make use of setTimeout() to create tool active times.
@@ -13,9 +13,6 @@ let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
 let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
 let Telemetry = require("devtools/shared/telemetry");
 
-let tabsToTest = ["inspector", "options", "webconsole", "jsdebugger",
-                   "styleeditor", "jsprofiler", "netmonitor"];
-
 function init() {
   Telemetry.prototype.telemetryInfo = {};
   Telemetry.prototype._oldlog = Telemetry.prototype.log;
@@ -29,15 +26,7 @@ function init() {
     }
   }
 
-  testNextTool();
-}
-
-function testNextTool() {
-  let nextTool = tabsToTest.pop();
-
-  if (nextTool) {
-    openToolboxTabTwice(nextTool);
-  }
+  openToolboxTabTwice("inspector", false);
 }
 
 function openToolboxTabTwice(id, secondPass) {
@@ -48,11 +37,7 @@ function openToolboxTabTwice(id, secondPass) {
 
     toolbox.once("destroyed", function() {
       if (secondPass) {
-        if (tabsToTest.length > 0) {
-          testNextTool();
-        } else {
-          checkResults();
-        }
+        checkResults();
       } else {
         openToolboxTabTwice(id, true);
       }
@@ -108,7 +93,7 @@ function finishUp() {
   delete Telemetry.prototype._oldlog;
   delete Telemetry.prototype.telemetryInfo;
 
-  TargetFactory = tabsToTest = Services = Promise = require = null;
+  TargetFactory = Services = Promise = require = null;
 
   finish();
 }
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
new file mode 100644
index 000000000000..1b1a6234b290
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsdebugger.js
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_jsdebugger.js</p>";
+
+// Because we need to gather stats for the period of time that a tool has been
+// opened we make use of setTimeout() to create tool active times.
+const TOOL_DELAY = 200;
+
+let {Promise} = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+let Telemetry = require("devtools/shared/telemetry");
+
+function init() {
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
+
+      this.telemetryInfo[histogramId].push(value);
+    }
+  }
+
+  openToolboxTabTwice("jsdebugger", false);
+}
+
+function openToolboxTabTwice(id, secondPass) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gDevTools.showToolbox(target, id).then(function(toolbox) {
+    info("Toolbox tab " + id + " opened");
+
+    toolbox.once("destroyed", function() {
+      if (secondPass) {
+        checkResults();
+      } else {
+        openToolboxTabTwice(id, true);
+      }
+    });
+    // We use a timeout to check the tools active time
+    setTimeout(function() {
+      gDevTools.closeToolbox(target);
+    }, TOOL_DELAY);
+  }).then(null, reportError);
+}
+
+function checkResults() {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
+
+  finishUp();
+}
+
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
+  finishUp();
+}
+
+function finishUp() {
+  gBrowser.removeCurrentTab();
+
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
+
+  TargetFactory = Services = Promise = require = null;
+
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    waitForFocus(init, content);
+  }, true);
+
+  content.location = TEST_URI;
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
new file mode 100644
index 000000000000..567219222dc7
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_jsprofiler.js
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_jsprofiler.js</p>";
+
+// Because we need to gather stats for the period of time that a tool has been
+// opened we make use of setTimeout() to create tool active times.
+const TOOL_DELAY = 200;
+
+let {Promise} = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+let Telemetry = require("devtools/shared/telemetry");
+
+function init() {
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
+
+      this.telemetryInfo[histogramId].push(value);
+    }
+  }
+
+  openToolboxTabTwice("jsprofiler", false);
+}
+
+function openToolboxTabTwice(id, secondPass) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gDevTools.showToolbox(target, id).then(function(toolbox) {
+    info("Toolbox tab " + id + " opened");
+
+    toolbox.once("destroyed", function() {
+      if (secondPass) {
+        checkResults();
+      } else {
+        openToolboxTabTwice(id, true);
+      }
+    });
+    // We use a timeout to check the tools active time
+    setTimeout(function() {
+      gDevTools.closeToolbox(target);
+    }, TOOL_DELAY);
+  }).then(null, reportError);
+}
+
+function checkResults() {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
+
+  finishUp();
+}
+
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
+  finishUp();
+}
+
+function finishUp() {
+  gBrowser.removeCurrentTab();
+
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
+
+  TargetFactory = Services = Promise = require = null;
+
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    waitForFocus(init, content);
+  }, true);
+
+  content.location = TEST_URI;
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
new file mode 100644
index 000000000000..bc139acfb4cb
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_netmonitor.js
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_netmonitor.js</p>";
+
+// Because we need to gather stats for the period of time that a tool has been
+// opened we make use of setTimeout() to create tool active times.
+const TOOL_DELAY = 200;
+
+let {Promise} = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+let Telemetry = require("devtools/shared/telemetry");
+
+function init() {
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
+
+      this.telemetryInfo[histogramId].push(value);
+    }
+  }
+
+  openToolboxTabTwice("netmonitor", false);
+}
+
+function openToolboxTabTwice(id, secondPass) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gDevTools.showToolbox(target, id).then(function(toolbox) {
+    info("Toolbox tab " + id + " opened");
+
+    toolbox.once("destroyed", function() {
+      if (secondPass) {
+        checkResults();
+      } else {
+        openToolboxTabTwice(id, true);
+      }
+    });
+    // We use a timeout to check the tools active time
+    setTimeout(function() {
+      gDevTools.closeToolbox(target);
+    }, TOOL_DELAY);
+  }).then(null, reportError);
+}
+
+function checkResults() {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
+
+  finishUp();
+}
+
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
+  finishUp();
+}
+
+function finishUp() {
+  gBrowser.removeCurrentTab();
+
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
+
+  TargetFactory = Services = Promise = require = null;
+
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    waitForFocus(init, content);
+  }, true);
+
+  content.location = TEST_URI;
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
new file mode 100644
index 000000000000..687a07c38359
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_options.js
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_options.js</p>";
+
+// Because we need to gather stats for the period of time that a tool has been
+// opened we make use of setTimeout() to create tool active times.
+const TOOL_DELAY = 200;
+
+let {Promise} = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+let Telemetry = require("devtools/shared/telemetry");
+
+function init() {
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
+
+      this.telemetryInfo[histogramId].push(value);
+    }
+  }
+
+  openToolboxTabTwice("options", false);
+}
+
+function openToolboxTabTwice(id, secondPass) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gDevTools.showToolbox(target, id).then(function(toolbox) {
+    info("Toolbox tab " + id + " opened");
+
+    toolbox.once("destroyed", function() {
+      if (secondPass) {
+        checkResults();
+      } else {
+        openToolboxTabTwice(id, true);
+      }
+    });
+    // We use a timeout to check the tools active time
+    setTimeout(function() {
+      gDevTools.closeToolbox(target);
+    }, TOOL_DELAY);
+  }).then(null, reportError);
+}
+
+function checkResults() {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
+
+  finishUp();
+}
+
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
+  finishUp();
+}
+
+function finishUp() {
+  gBrowser.removeCurrentTab();
+
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
+
+  TargetFactory = Services = Promise = require = null;
+
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    waitForFocus(init, content);
+  }, true);
+
+  content.location = TEST_URI;
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
new file mode 100644
index 000000000000..9e30c74fa03b
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_styleeditor.js
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_styleeditor.js</p>";
+
+// Because we need to gather stats for the period of time that a tool has been
+// opened we make use of setTimeout() to create tool active times.
+const TOOL_DELAY = 200;
+
+let {Promise} = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+let Telemetry = require("devtools/shared/telemetry");
+
+function init() {
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
+
+      this.telemetryInfo[histogramId].push(value);
+    }
+  }
+
+  openToolboxTabTwice("styleeditor", false);
+}
+
+function openToolboxTabTwice(id, secondPass) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gDevTools.showToolbox(target, id).then(function(toolbox) {
+    info("Toolbox tab " + id + " opened");
+
+    toolbox.once("destroyed", function() {
+      if (secondPass) {
+        checkResults();
+      } else {
+        openToolboxTabTwice(id, true);
+      }
+    });
+    // We use a timeout to check the tools active time
+    setTimeout(function() {
+      gDevTools.closeToolbox(target);
+    }, TOOL_DELAY);
+  }).then(null, reportError);
+}
+
+function checkResults() {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
+
+  finishUp();
+}
+
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
+  finishUp();
+}
+
+function finishUp() {
+  gBrowser.removeCurrentTab();
+
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
+
+  TargetFactory = Services = Promise = require = null;
+
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    waitForFocus(init, content);
+  }, true);
+
+  content.location = TEST_URI;
+}
diff --git a/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
new file mode 100644
index 000000000000..ba027e7fdcca
--- /dev/null
+++ b/browser/devtools/shared/test/browser_telemetry_toolboxtabs_webconsole.js
@@ -0,0 +1,110 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+const TEST_URI = "data:text/html;charset=utf-8,<p>browser_telemetry_toolboxtabs_styleeditor_webconsole.js</p>";
+
+// Because we need to gather stats for the period of time that a tool has been
+// opened we make use of setTimeout() to create tool active times.
+const TOOL_DELAY = 200;
+
+let {Promise} = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js", {});
+let {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
+
+let require = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools.require;
+let Telemetry = require("devtools/shared/telemetry");
+
+function init() {
+  Telemetry.prototype.telemetryInfo = {};
+  Telemetry.prototype._oldlog = Telemetry.prototype.log;
+  Telemetry.prototype.log = function(histogramId, value) {
+    if (histogramId) {
+      if (!this.telemetryInfo[histogramId]) {
+        this.telemetryInfo[histogramId] = [];
+      }
+
+      this.telemetryInfo[histogramId].push(value);
+    }
+  }
+
+  openToolboxTabTwice("webconsole", false);
+}
+
+function openToolboxTabTwice(id, secondPass) {
+  let target = TargetFactory.forTab(gBrowser.selectedTab);
+
+  gDevTools.showToolbox(target, id).then(function(toolbox) {
+    info("Toolbox tab " + id + " opened");
+
+    toolbox.once("destroyed", function() {
+      if (secondPass) {
+        checkResults();
+      } else {
+        openToolboxTabTwice(id, true);
+      }
+    });
+    // We use a timeout to check the tools active time
+    setTimeout(function() {
+      gDevTools.closeToolbox(target);
+    }, TOOL_DELAY);
+  }).then(null, reportError);
+}
+
+function checkResults() {
+  let result = Telemetry.prototype.telemetryInfo;
+
+  for (let [histId, value] of Iterator(result)) {
+    if (histId.endsWith("OPENED_PER_USER_FLAG")) {
+      ok(value.length === 1 && value[0] === true,
+         "Per user value " + histId + " has a single value of true");
+    } else if (histId.endsWith("OPENED_BOOLEAN")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element === true;
+      });
+
+      ok(okay, "All " + histId + " entries are === true");
+    } else if (histId.endsWith("TIME_ACTIVE_SECONDS")) {
+      ok(value.length > 1, histId + " has more than one entry");
+
+      let okay = value.every(function(element) {
+        return element > 0;
+      });
+
+      ok(okay, "All " + histId + " entries have time > 0");
+    }
+  }
+
+  finishUp();
+}
+
+function reportError(error) {
+  let stack = "    " + error.stack.replace(/\n?.*?@/g, "\n    JS frame :: ");
+
+  ok(false, "ERROR: " + error + " at " + error.fileName + ":" +
+            error.lineNumber + "\n\nStack trace:" + stack);
+  finishUp();
+}
+
+function finishUp() {
+  gBrowser.removeCurrentTab();
+
+  Telemetry.prototype.log = Telemetry.prototype._oldlog;
+  delete Telemetry.prototype._oldlog;
+  delete Telemetry.prototype.telemetryInfo;
+
+  TargetFactory = Services = Promise = require = null;
+
+  finish();
+}
+
+function test() {
+  waitForExplicitFinish();
+  gBrowser.selectedTab = gBrowser.addTab();
+  gBrowser.selectedBrowser.addEventListener("load", function() {
+    gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
+    waitForFocus(init, content);
+  }, true);
+
+  content.location = TEST_URI;
+}
diff --git a/browser/devtools/styleeditor/StyleEditorDebuggee.jsm b/browser/devtools/styleeditor/StyleEditorDebuggee.jsm
index 24a9afa6bfef..336e6a4c329f 100644
--- a/browser/devtools/styleeditor/StyleEditorDebuggee.jsm
+++ b/browser/devtools/styleeditor/StyleEditorDebuggee.jsm
@@ -222,13 +222,11 @@ let StyleSheet = function(form, debuggee) {
 
   this._onSourceLoad = this._onSourceLoad.bind(this);
   this._onPropertyChange = this._onPropertyChange.bind(this);
-  this._onError = this._onError.bind(this);
   this._onStyleApplied = this._onStyleApplied.bind(this);
 
-  this._client.addListener("sourceLoad-" + this._actor, this._onSourceLoad);
-  this._client.addListener("propertyChange-" + this._actor, this._onPropertyChange);
-  this._client.addListener("error-" + this._actor, this._onError);
-  this._client.addListener("styleApplied-" + this._actor, this._onStyleApplied);
+  this._client.addListener("sourceLoad", this._onSourceLoad);
+  this._client.addListener("propertyChange", this._onPropertyChange);
+  this._client.addListener("styleApplied", this._onStyleApplied);
 
   // set initial property values
   for (let attr in form) {
@@ -274,7 +272,12 @@ StyleSheet.prototype = {
    *        Event details
    */
   _onSourceLoad: function(type, request) {
-    this.emit("source-load", request.source);
+    if (request.from == this._actor) {
+      if (request.error) {
+        return this.emit("error", request.error);
+      }
+      this.emit("source-load", request.source);
+    }
   },
 
   /**
@@ -286,27 +289,19 @@ StyleSheet.prototype = {
    *        Event details
    */
   _onPropertyChange: function(type, request) {
-    this[request.property] = request.value;
-    this.emit("property-change", request.property);
-  },
-
-  /**
-   * Propogate errors from the server that relate to this stylesheet.
-   *
-   * @param {string} type
-   *        Event type
-   * @param {object} request
-   *        Event details
-   */
-  _onError: function(type, request) {
-    this.emit("error", request.errorMessage);
+    if (request.from == this._actor) {
+      this[request.property] = request.value;
+      this.emit("property-change", request.property);
+    }
   },
 
   /**
    * Handle event when update has been successfully applied and propogate it.
    */
-  _onStyleApplied: function() {
-    this.emit("style-applied");
+  _onStyleApplied: function(type, request) {
+    if (request.from == this._actor) {
+      this.emit("style-applied");
+    }
   },
 
   /**
@@ -326,9 +321,8 @@ StyleSheet.prototype = {
    * Clean up and remove event listeners
    */
   destroy: function() {
-    this._client.removeListener("sourceLoad-" + this._actor, this._onSourceLoad);
-    this._client.removeListener("propertyChange-" + this._actor, this._onPropertyChange);
-    this._client.removeListener("error-" + this._actor, this._onError);
-    this._client.removeListener("styleApplied-" + this._actor, this._onStyleApplied);
+    this._client.removeListener("sourceLoad", this._onSourceLoad);
+    this._client.removeListener("propertyChange", this._onPropertyChange);
+    this._client.removeListener("styleApplied", this._onStyleApplied);
   }
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
index 21dcc603b1d9..6e0e1cb69a26 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
@@ -279,5 +279,50 @@ function popupHideAfterReturnWithNoSelection()
   is(jsterm.history[jsterm.history.length-1], "window.testBug",
      "jsterm history is correct");
 
-  executeSoon(finishTest);
+  executeSoon(testCompletionInText);
+}
+
+function testCompletionInText()
+{
+  info("test that completion works inside text, see bug 812618");
+
+  popup._panel.addEventListener("popupshown", function onShown() {
+    popup._panel.removeEventListener("popupshown", onShown);
+
+    ok(popup.isOpen, "popup is open");
+    is(popup.itemCount, 2, "popup.itemCount is correct");
+
+    EventUtils.synthesizeKey("VK_DOWN", {});
+    EventUtils.synthesizeKey("VK_DOWN", {});
+    is(popup.selectedIndex, 0, "popup.selectedIndex is correct");
+    ok(!completeNode.value, "completeNode.value is empty");
+
+    let items = popup.getItems().reverse().map(e => e.label);
+    let sameItems = items.every((prop, index) =>
+      ["testBug873250a", "testBug873250b"][index] === prop);
+    ok(sameItems, "getItems returns the items we expect");
+
+    info("press Tab and wait for popup to hide");
+    popup._panel.addEventListener("popuphidden", popupHideAfterCompletionInText);
+    EventUtils.synthesizeKey("VK_TAB", {});
+  });
+
+  jsterm.setInputValue("dump(window.testBu)");
+  inputNode.selectionStart = inputNode.selectionEnd = 18;
+  EventUtils.synthesizeKey("g", {});
+}
+
+function popupHideAfterCompletionInText()
+{
+  // At this point the completion suggestion should be accepted.
+  popup._panel.removeEventListener("popuphidden", popupHideAfterCompletionInText);
+
+  ok(!popup.isOpen, "popup is not open");
+  is(inputNode.value, "dump(window.testBug873250b)",
+     "completion was successful after VK_TAB");
+  is(inputNode.selectionStart, 26, "cursor location is correct");
+  is(inputNode.selectionStart, inputNode.selectionEnd, "cursor location (confirmed)");
+  ok(!completeNode.value, "completeNode is empty");
+
+  finishTest();
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
index 0aa95af8465c..d34f2becb9a4 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_622303_persistent_filters.js
@@ -4,7 +4,8 @@
 let prefs = {
   "net": [
     "network",
-    "networkinfo"
+    "netwarn",
+    "networkinfo",
   ],
   "css": [
     "csserror",
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js b/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
index 14c9714f30ae..7fc7eb211482 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_737873_mixedcontent.js
@@ -12,9 +12,6 @@
 
 const TEST_HTTPS_URI = "https://example.com/browser/browser/devtools/webconsole/test/test-bug-737873-mixedcontent.html";
 
-var origBlockDisplay;
-var origBlockActive;
-
 function test() {
   addTab("data:text/html;charset=utf8,Web Console mixed content test");
   browser.addEventListener("load", onLoad, true);
@@ -22,8 +19,6 @@ function test() {
 
 function onLoad(aEvent) {
   browser.removeEventListener("load", onLoad, true);
-  origBlockDisplay = Services.prefs.getBoolPref("security.mixed_content.block_display_content");
-  origBlockActive = Services.prefs.getBoolPref("security.mixed_content.block_active_content")
   Services.prefs.setBoolPref("security.mixed_content.block_display_content", false);
   Services.prefs.setBoolPref("security.mixed_content.block_active_content", false);
   openConsole(null, testMixedContent);
@@ -31,66 +26,50 @@ function onLoad(aEvent) {
 
 function testMixedContent(hud) {
   content.location = TEST_HTTPS_URI;
-  var aOutputNode = hud.outputNode;
 
-  waitForSuccess(
-    {
-      name: "mixed content warning displayed successfully",
-      timeout: 20000,
-      validatorFn: function() {
-        return ( aOutputNode.querySelector(".webconsole-mixed-content") );
-      },
+  waitForMessages({
+    webconsole: hud,
+    messages: [{
+      text: "example.com",
+      category: CATEGORY_NETWORK,
+      severity: SEVERITY_WARNING,
+    }],
+  }).then((results) => {
+    let msg = [...results[0].matched][0];
+    ok(msg, "page load logged");
 
-      successFn: function() {
+    let mixedContent = msg.querySelector(".webconsole-mixed-content");
+    ok(mixedContent, ".webconsole-mixed-content element");
 
-        //tests on the urlnode
-        let node = aOutputNode.querySelector(".webconsole-mixed-content");
-        ok(testSeverity(node), "Severity type is SEVERITY_WARNING.");
+    let link = msg.querySelector(".webconsole-mixed-content-link");
+    ok(link, "mixed content link element");
+    is(link.value, "[Mixed Content]", "link text is accurate");
 
-        //tests on the warningNode
-        let warningNode = aOutputNode.querySelector(".webconsole-mixed-content-link");
-        is(warningNode.value, "[Mixed Content]", "Message text is accurate." );
-        testClickOpenNewTab(warningNode);
-
-        endTest();
-      },
-
-      failureFn: endTest,
-    }
-  );
-
-}
-
-function testSeverity(node) {
-  let linkNode = node.parentNode;
-  let msgNode = linkNode.parentNode;
-  let bodyNode = msgNode.parentNode;
-  let finalNode = bodyNode.parentNode;
-
-  return finalNode.classList.contains("webconsole-msg-warn");
-}
-
-function testClickOpenNewTab(warningNode) {
-  /* Invoke the click event and check if a new tab would open to the correct page */
-  let linkOpened = false;
-  let oldOpenUILinkIn = window.openUILinkIn;
-
-  window.openUILinkIn = function(aLink) {
-    if (aLink == "https://developer.mozilla.org/en/Security/MixedContent") {
+    let oldOpenLink = hud.openLink;
+    let linkOpened = false;
+    hud.openLink = (url) => {
+      is(url, "https://developer.mozilla.org/en/Security/MixedContent",
+         "url opened");
       linkOpened = true;
-    }
-  }
+    };
 
-  EventUtils.synthesizeMouse(warningNode, 2, 2, {},
-                             warningNode.ownerDocument.defaultView);
+    EventUtils.synthesizeMouse(link, 2, 2, {}, link.ownerDocument.defaultView);
 
-  ok(linkOpened, "Clicking the Mixed Content Warning node opens the desired page");
+    ok(linkOpened, "clicking the Mixed Content link opened a page");
 
-  window.openUILinkIn = oldOpenUILinkIn;
-}
-
-function endTest() {
-  Services.prefs.setBoolPref("security.mixed_content.block_display_content", origBlockDisplay);
-  Services.prefs.setBoolPref("security.mixed_content.block_active_content", origBlockActive);
-  finishTest();
+    hud.openLink = oldOpenLink;
+
+    ok(!msg.classList.contains("hud-filtered-by-type"), "message is not filtered");
+
+    hud.setFilterState("netwarn", false);
+
+    ok(msg.classList.contains("hud-filtered-by-type"), "message is filtered");
+
+    hud.setFilterState("netwarn", true);
+
+    Services.prefs.clearUserPref("security.mixed_content.block_display_content");
+    Services.prefs.clearUserPref("security.mixed_content.block_active_content");
+
+    finishTest();
+  });
 }
diff --git a/browser/devtools/webconsole/webconsole.js b/browser/devtools/webconsole/webconsole.js
index 4171f8665d51..23b91a70c008 100644
--- a/browser/devtools/webconsole/webconsole.js
+++ b/browser/devtools/webconsole/webconsole.js
@@ -119,7 +119,7 @@ const SEVERITY_CLASS_FRAGMENTS = [
 // division of message type into "category" and "severity".
 const MESSAGE_PREFERENCE_KEYS = [
 //  Error         Warning   Info    Log
-  [ "network",    null,         null,   "networkinfo", ],  // Network
+  [ "network",    "netwarn",    null,   "networkinfo", ],  // Network
   [ "csserror",   "cssparser",  null,   null,          ],  // CSS
   [ "exception",  "jswarn",     null,   "jslog",       ],  // JS
   [ "error",      "warn",       "info", "log",         ],  // Web Developer
@@ -559,7 +559,7 @@ WebConsoleFrame.prototype = {
   {
     let prefs = ["network", "networkinfo", "csserror", "cssparser", "exception",
                  "jswarn", "jslog", "error", "info", "warn", "log", "secerror",
-                 "secwarn"];
+                 "secwarn", "netwarn"];
     for (let pref of prefs) {
       this.filterPrefs[pref] = Services.prefs
                                .getBoolPref(this._filterPrefsPrefix + pref);
@@ -4077,9 +4077,8 @@ JSTerm.prototype = {
       return false;
     }
 
-    // Only complete if the selection is empty and at the end of the input.
-    if (inputNode.selectionStart == inputNode.selectionEnd &&
-        inputNode.selectionEnd != inputValue.length) {
+    // Only complete if the selection is empty.
+    if (inputNode.selectionStart != inputNode.selectionEnd) {
       this.clearCompletion();
       return false;
     }
@@ -4215,6 +4214,11 @@ JSTerm.prototype = {
 
   onAutocompleteSelect: function JSTF_onAutocompleteSelect()
   {
+    // Render the suggestion only if the cursor is at the end of the input.
+    if (this.inputNode.selectionStart != this.inputNode.value.length) {
+      return;
+    }
+
     let currentItem = this.autocompletePopup.selectedItem;
     if (currentItem && this.lastCompletion.value) {
       let suffix = currentItem.label.substring(this.lastCompletion.
@@ -4256,7 +4260,11 @@ JSTerm.prototype = {
     if (currentItem && this.lastCompletion.value) {
       let suffix = currentItem.label.substring(this.lastCompletion.
                                                matchProp.length);
-      this.setInputValue(this.inputNode.value + suffix);
+      let cursor = this.inputNode.selectionStart;
+      let value = this.inputNode.value;
+      this.setInputValue(value.substr(0, cursor) + suffix + value.substr(cursor));
+      let newCursor = cursor + suffix.length;
+      this.inputNode.selectionStart = this.inputNode.selectionEnd = newCursor;
       updated = true;
     }
 
diff --git a/browser/devtools/webconsole/webconsole.xul b/browser/devtools/webconsole/webconsole.xul
index b4e07aa49ebd..16477771f627 100644
--- a/browser/devtools/webconsole/webconsole.xul
+++ b/browser/devtools/webconsole/webconsole.xul
@@ -87,6 +87,8 @@
           <menupopup>
             <menuitem label="&btnConsoleErrors;" type="checkbox" autocheck="false"
                       prefKey="network"/>
+            <menuitem label="&btnConsoleWarnings;" type="checkbox" autocheck="false"
+                      prefKey="netwarn"/>
             <menuitem label="&btnConsoleLog;" type="checkbox" autocheck="false"
                       prefKey="networkinfo"/>
             <menuseparator id="saveBodiesSeparator" />
diff --git a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
index 8bb831721924..89b982d089a8 100644
--- a/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/toolbox.dtd
@@ -79,3 +79,16 @@
   -  in the options panel. -->
 <!ENTITY options.enablePersistentLogging.label    "Enable persistent logs">
 <!ENTITY options.enablePersistentLogging.tooltip  "If you enable this option the Web Console will not clear the output each time you navigate to a new page">
+
+<!-- LOCALIZATION NOTE (options.profiler.label): This is the label for the
+  -  heading of the group of JavaScript Profiler preferences in the options
+  -  panel. -->
+<!ENTITY options.profiler.label            "JavaScript Profiler">
+
+<!-- LOCALIZATION NOTE (options.showPlatformData.label): This is the
+  -  label for the checkbox that toggles the display of the platform data in the,
+  -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
+  -  in about:config, in the options panel. -->
+<!ENTITY options.showPlatformData.label    "Show Gecko platform data">
+<!ENTITY options.showPlatformData.tooltip  "If you enable this option the JavaScript Profiler reports will include
+Gecko platform symbols">
diff --git a/browser/themes/linux/devtools/checkbox-dark.png b/browser/themes/linux/devtools/checkbox-dark.png
deleted file mode 100644
index e937b600b7bc..000000000000
Binary files a/browser/themes/linux/devtools/checkbox-dark.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/checkbox-light.png b/browser/themes/linux/devtools/checkbox-light.png
deleted file mode 100644
index 00d6d450c13c..000000000000
Binary files a/browser/themes/linux/devtools/checkbox-light.png and /dev/null differ
diff --git a/browser/themes/linux/devtools/computedview.css b/browser/themes/linux/devtools/computedview.css
index 8995658932d2..d9a2a9948b05 100644
--- a/browser/themes/linux/devtools/computedview.css
+++ b/browser/themes/linux/devtools/computedview.css
@@ -87,10 +87,6 @@ body {
   margin-left: -12px!important;
 }
 
-.expander[open] {
-  margin-left: -17px!important;
-}
-
 .expandable {
   visibility: visible;
 }
diff --git a/browser/themes/linux/devtools/dark-theme.css b/browser/themes/linux/devtools/dark-theme.css
deleted file mode 100644
index 97189572deb3..000000000000
--- a/browser/themes/linux/devtools/dark-theme.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
- */
-.theme-body {
-  background: #131c26;
-  color: #8fa1b2
-}
-
-.theme-twisty {
-  cursor: pointer;
-  margin-right: 5px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(255,255,255,0.5);
-  margin-left: 5px;
-}
-
-.theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(255,255,255,0.5) 68%);
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") no-repeat;
-}
-
-.theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") 14px 0;
-}
-
-.theme-selected {
-  background: #26384E;
-}
-
-.theme-bg-darker {
-  background-color: rgba(0,0,0,0.1);
-}
-
-.theme-link { /* blue */
-  color: #3689b2;
-}
-
-.theme-comment { /* grey */
-  color: #5c6773;
-}
-
-.theme-gutter {
-  background-color: #0f171f;
-  color: #667380;
-  border-color: #303b47;
-}
-
-.theme-separator { /* grey */
-  border-color: #303b47;
-}
-
-.theme-fg-color1 { /* green */
-  color: #5c9966;
-}
-
-.theme-fg-color2 { /* blue */
-  color: #3689b2;
-}
-
-.theme-fg-color3 { /* pink/lavender */
-  color: #a673bf;
-}
-
-.theme-fg-color4 { /* purple/violet */
-  color: #6270b2;
-}
-
-.theme-fg-color5 { /* Yellow */
-  color: #a18650;
-}
-
-.theme-fg-color6 { /* Orange */
-  color: #b26b47;
-}
-
-.theme-fg-color7 { /* Red */
-  color: #bf5656;
-}
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index b6bd5a59e101..203aba1a8abe 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -123,8 +123,9 @@ browser.jar:
   skin/classic/browser/tabview/tabview.png            (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css            (tabview/tabview.css)
 * skin/classic/browser/devtools/common.css            (devtools/common.css)
-  skin/classic/browser/devtools/dark-theme.css        (devtools/dark-theme.css)
-  skin/classic/browser/devtools/light-theme.css       (devtools/light-theme.css)
+  skin/classic/browser/devtools/dark-theme.css        (../shared/devtools/dark-theme.css)
+  skin/classic/browser/devtools/light-theme.css       (../shared/devtools/light-theme.css)
+  skin/classic/browser/devtools/controls.png          (../shared/devtools/controls.png)
   skin/classic/browser/devtools/widgets.css           (devtools/widgets.css)
   skin/classic/browser/devtools/commandline-icon.png  (devtools/commandline-icon.png)
   skin/classic/browser/devtools/command-paintflashing.png  (devtools/command-paintflashing.png)
@@ -136,10 +137,8 @@ browser.jar:
 * skin/classic/browser/devtools/webconsole.css                  (devtools/webconsole.css)
   skin/classic/browser/devtools/webconsole_networkpanel.css     (devtools/webconsole_networkpanel.css)
   skin/classic/browser/devtools/webconsole.png                  (devtools/webconsole.png)
-  skin/classic/browser/devtools/checkbox-dark.png     (devtools/checkbox-dark.png)
-  skin/classic/browser/devtools/checkbox-light.png    (devtools/checkbox-light.png)
   skin/classic/browser/devtools/commandline.css              (devtools/commandline.css)
-  skin/classic/browser/devtools/markup-view.css      (devtools/markup-view.css)
+  skin/classic/browser/devtools/markup-view.css       (../shared/devtools/markup-view.css)
   skin/classic/browser/devtools/orion.css             (devtools/orion.css)
   skin/classic/browser/devtools/orion-container.css   (devtools/orion-container.css)
   skin/classic/browser/devtools/orion-task.png        (devtools/orion-task.png)
diff --git a/browser/themes/osx/devtools/checkbox-dark.png b/browser/themes/osx/devtools/checkbox-dark.png
deleted file mode 100644
index e937b600b7bc..000000000000
Binary files a/browser/themes/osx/devtools/checkbox-dark.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/checkbox-light.png b/browser/themes/osx/devtools/checkbox-light.png
deleted file mode 100644
index 00d6d450c13c..000000000000
Binary files a/browser/themes/osx/devtools/checkbox-light.png and /dev/null differ
diff --git a/browser/themes/osx/devtools/computedview.css b/browser/themes/osx/devtools/computedview.css
index 4f6c05b67522..227fb632b435 100644
--- a/browser/themes/osx/devtools/computedview.css
+++ b/browser/themes/osx/devtools/computedview.css
@@ -105,10 +105,6 @@ body {
   margin-left: -12px!important;
 }
 
-.expander[open] {
-  margin-left: -17px!important;
-}
-
 .expandable {
   visibility: visible;
 }
diff --git a/browser/themes/osx/devtools/dark-theme.css b/browser/themes/osx/devtools/dark-theme.css
deleted file mode 100644
index 97189572deb3..000000000000
--- a/browser/themes/osx/devtools/dark-theme.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
- */
-.theme-body {
-  background: #131c26;
-  color: #8fa1b2
-}
-
-.theme-twisty {
-  cursor: pointer;
-  margin-right: 5px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(255,255,255,0.5);
-  margin-left: 5px;
-}
-
-.theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(255,255,255,0.5) 68%);
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") no-repeat;
-}
-
-.theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") 14px 0;
-}
-
-.theme-selected {
-  background: #26384E;
-}
-
-.theme-bg-darker {
-  background-color: rgba(0,0,0,0.1);
-}
-
-.theme-link { /* blue */
-  color: #3689b2;
-}
-
-.theme-comment { /* grey */
-  color: #5c6773;
-}
-
-.theme-gutter {
-  background-color: #0f171f;
-  color: #667380;
-  border-color: #303b47;
-}
-
-.theme-separator { /* grey */
-  border-color: #303b47;
-}
-
-.theme-fg-color1 { /* green */
-  color: #5c9966;
-}
-
-.theme-fg-color2 { /* blue */
-  color: #3689b2;
-}
-
-.theme-fg-color3 { /* pink/lavender */
-  color: #a673bf;
-}
-
-.theme-fg-color4 { /* purple/violet */
-  color: #6270b2;
-}
-
-.theme-fg-color5 { /* Yellow */
-  color: #a18650;
-}
-
-.theme-fg-color6 { /* Orange */
-  color: #b26b47;
-}
-
-.theme-fg-color7 { /* Red */
-  color: #bf5656;
-}
diff --git a/browser/themes/osx/devtools/light-theme.css b/browser/themes/osx/devtools/light-theme.css
deleted file mode 100644
index a867df614e34..000000000000
--- a/browser/themes/osx/devtools/light-theme.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
- */
-.theme-body {
-  background: white;
-  color: black;
-}
-
-.theme-twisty {
-  cursor: pointer;
-  margin-right: 5px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(0,0,0,0.5);
-  margin-left: 5px;
-}
-
-.theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(0,0,0,0.5) 68%);
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") no-repeat;
-}
-
-.theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") 14px 0;
-}
-
-.theme-selected {
-  background-color: hsl(0,0%,90%);
-}
-
-.theme-bg-darker {
-  background: #F9F9F9;
-}
-
-.theme-link { /* blue */
-  color: hsl(208,56%,40%);
-}
-
-.theme-comment { /* grey */
-  color: hsl(90,2%,46%);
-}
-
-.theme-gutter {
-  background-color: hsl(0,0%,90%);
-  color: #667380;
-  border-color: hsl(0,0%,65%);
-}
-
-.theme-separator { /* grey */
-  border-color: #cddae5;
-}
-
-.theme-fg-color1 { /* green */
-  color: hsl(72,100%,27%);
-}
-
-.theme-fg-color2 { /* blue */
-  color: hsl(208,56%,40%);
-}
-
-.theme-fg-color3 { /* dark blue */
-  color: hsl(208,81%,21%)
-}
-
-.theme-fg-color4 { /* Orange */
-  color: hsl(24,85%,39%);
-}
-
-.theme-fg-color5 { /* Yellow */
-  color: #a18650;
-}
-
-.theme-fg-color6 { /* Orange */
-  color: hsl(24,85%,39%);
-}
-
-.theme-fg-color7 { /* Red */
-  color: #bf5656;
-}
diff --git a/browser/themes/osx/devtools/markup-view.css b/browser/themes/osx/devtools/markup-view.css
deleted file mode 100644
index 4651a43146c1..000000000000
--- a/browser/themes/osx/devtools/markup-view.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-* {
-  padding: 0;
-  margin: 0;
-}
-
-.newattr {
-  cursor: pointer;
-}
-
-.selected {
-  background-color: hsl(0,0%,90%);
-}
-
-/* Give some padding to focusable elements to match the editor input
- * that will replace them. */
-span[tabindex] {
-  display: inline-block;
-  padding: 1px 0;
-}
-
-li.container {
-  position: relative;
-  padding: 2px 0 0 2px;
-}
-
-.codebox {
-  padding-left: 14px;
-}
-
-.expander {
-  position: absolute;
-}
-
-.more-nodes {
-  padding-left: 16px;
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #CCC;
-}
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index dbc2c15aed88..0c59df831987 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -211,8 +211,9 @@ browser.jar:
   skin/classic/browser/tabview/tabview.png                  (tabview/tabview.png)
   skin/classic/browser/tabview/tabview.css                  (tabview/tabview.css)
 * skin/classic/browser/devtools/common.css                  (devtools/common.css)
-  skin/classic/browser/devtools/dark-theme.css              (devtools/dark-theme.css)
-  skin/classic/browser/devtools/light-theme.css             (devtools/light-theme.css)
+  skin/classic/browser/devtools/dark-theme.css              (../shared/devtools/dark-theme.css)
+  skin/classic/browser/devtools/light-theme.css             (../shared/devtools/light-theme.css)
+  skin/classic/browser/devtools/controls.png                (../shared/devtools/controls.png)
   skin/classic/browser/devtools/widgets.css                 (devtools/widgets.css)
   skin/classic/browser/devtools/commandline-icon.png        (devtools/commandline-icon.png)
   skin/classic/browser/devtools/command-paintflashing.png   (devtools/command-paintflashing.png)
@@ -222,9 +223,7 @@ browser.jar:
   skin/classic/browser/devtools/alerticon-warning.png       (devtools/alerticon-warning.png)
   skin/classic/browser/devtools/ruleview.css                (devtools/ruleview.css)
   skin/classic/browser/devtools/commandline.css             (devtools/commandline.css)
-  skin/classic/browser/devtools/checkbox-dark.png           (devtools/checkbox-dark.png)
-  skin/classic/browser/devtools/checkbox-light.png          (devtools/checkbox-light.png)
-  skin/classic/browser/devtools/markup-view.css             (devtools/markup-view.css)
+  skin/classic/browser/devtools/markup-view.css             (../shared/devtools/markup-view.css)
   skin/classic/browser/devtools/orion.css                   (devtools/orion.css)
   skin/classic/browser/devtools/orion-container.css         (devtools/orion-container.css)
   skin/classic/browser/devtools/orion-task.png              (devtools/orion-task.png)
diff --git a/browser/themes/shared/devtools/controls.png b/browser/themes/shared/devtools/controls.png
new file mode 100644
index 000000000000..ebba41cd794c
Binary files /dev/null and b/browser/themes/shared/devtools/controls.png differ
diff --git a/browser/themes/windows/devtools/dark-theme.css b/browser/themes/shared/devtools/dark-theme.css
similarity index 72%
rename from browser/themes/windows/devtools/dark-theme.css
rename to browser/themes/shared/devtools/dark-theme.css
index 97189572deb3..744a828dae90 100644
--- a/browser/themes/windows/devtools/dark-theme.css
+++ b/browser/themes/shared/devtools/dark-theme.css
@@ -13,26 +13,19 @@
 
 .theme-twisty {
   cursor: pointer;
-  margin-right: 5px;
+  width: 14px;
+  height: 14px;
+  background-repeat: no-repeat;
+  background-image: url("chrome://browser/skin/devtools/controls.png");
+  background-position: -28px -14px;
 }
 
 .theme-twisty:-moz-focusring {
   outline-style: none;
 }
 
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(255,255,255,0.5);
-  margin-left: 5px;
-}
-
 .theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(255,255,255,0.5) 68%);
+  background-position: -42px -14px;
 }
 
 .theme-checkbox {
@@ -42,11 +35,12 @@
   height: 14px;
   padding: 0;
   outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") no-repeat;
+  background-image: url("chrome://browser/skin/devtools/controls.png");
+  background-position: -28px 0;
 }
 
 .theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-dark.png") 14px 0;
+  background-position: -42px 0;
 }
 
 .theme-selected {
diff --git a/browser/themes/linux/devtools/light-theme.css b/browser/themes/shared/devtools/light-theme.css
similarity index 74%
rename from browser/themes/linux/devtools/light-theme.css
rename to browser/themes/shared/devtools/light-theme.css
index a867df614e34..dd9cf1ce2fc5 100644
--- a/browser/themes/linux/devtools/light-theme.css
+++ b/browser/themes/shared/devtools/light-theme.css
@@ -13,26 +13,19 @@
 
 .theme-twisty {
   cursor: pointer;
-  margin-right: 5px;
+  width: 14px;
+  height: 14px;
+  background-repeat: no-repeat;
+  background-image: url("chrome://browser/skin/devtools/controls.png");
+  background-position: 0 -14px;
 }
 
 .theme-twisty:-moz-focusring {
   outline-style: none;
 }
 
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(0,0,0,0.5);
-  margin-left: 5px;
-}
-
 .theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(0,0,0,0.5) 68%);
+  background-position: -14px -14px;
 }
 
 .theme-checkbox {
@@ -42,11 +35,12 @@
   height: 14px;
   padding: 0;
   outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") no-repeat;
+  background-image: url("chrome://browser/skin/devtools/controls.png");
+  background-position: 0 0;
 }
 
 .theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") 14px 0;
+  background-position: -14px 0;
 }
 
 .theme-selected {
diff --git a/browser/themes/linux/devtools/markup-view.css b/browser/themes/shared/devtools/markup-view.css
similarity index 88%
rename from browser/themes/linux/devtools/markup-view.css
rename to browser/themes/shared/devtools/markup-view.css
index 4651a43146c1..4e358e196e39 100644
--- a/browser/themes/linux/devtools/markup-view.css
+++ b/browser/themes/shared/devtools/markup-view.css
@@ -23,7 +23,6 @@ span[tabindex] {
 }
 
 li.container {
-  position: relative;
   padding: 2px 0 0 2px;
 }
 
@@ -31,8 +30,13 @@ li.container {
   padding-left: 14px;
 }
 
+.codebox > * {
+  vertical-align: middle;
+}
+
 .expander {
-  position: absolute;
+  display: inline-block;
+  margin-left: -14px;
 }
 
 .more-nodes {
diff --git a/browser/themes/windows/devtools/checkbox-dark.png b/browser/themes/windows/devtools/checkbox-dark.png
deleted file mode 100644
index e937b600b7bc..000000000000
Binary files a/browser/themes/windows/devtools/checkbox-dark.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/checkbox-light.png b/browser/themes/windows/devtools/checkbox-light.png
deleted file mode 100644
index 00d6d450c13c..000000000000
Binary files a/browser/themes/windows/devtools/checkbox-light.png and /dev/null differ
diff --git a/browser/themes/windows/devtools/computedview.css b/browser/themes/windows/devtools/computedview.css
index 4f6c05b67522..227fb632b435 100644
--- a/browser/themes/windows/devtools/computedview.css
+++ b/browser/themes/windows/devtools/computedview.css
@@ -105,10 +105,6 @@ body {
   margin-left: -12px!important;
 }
 
-.expander[open] {
-  margin-left: -17px!important;
-}
-
 .expandable {
   visibility: visible;
 }
diff --git a/browser/themes/windows/devtools/light-theme.css b/browser/themes/windows/devtools/light-theme.css
deleted file mode 100644
index a867df614e34..000000000000
--- a/browser/themes/windows/devtools/light-theme.css
+++ /dev/null
@@ -1,104 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/* According to:
- * https://bugzilla.mozilla.org/show_bug.cgi?id=715472#c17
- */
-.theme-body {
-  background: white;
-  color: black;
-}
-
-.theme-twisty {
-  cursor: pointer;
-  margin-right: 5px;
-}
-
-.theme-twisty:-moz-focusring {
-  outline-style: none;
-}
-
-.theme-twisty:not([open]) {
-  width: 0;
-  height: 0;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid rgba(0,0,0,0.5);
-  margin-left: 5px;
-}
-
-.theme-twisty[open] {
-  width: 10px;
-  height: 10px;
-  background-image: linear-gradient(to bottom right, transparent 68%,  rgba(0,0,0,0.5) 68%);
-}
-
-.theme-checkbox {
-  display: inline-block;
-  border: 0;
-  width: 14px;
-  height: 14px;
-  padding: 0;
-  outline: none;
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") no-repeat;
-}
-
-.theme-checkbox[checked] {
-  background: url("chrome://browser/skin/devtools/checkbox-light.png") 14px 0;
-}
-
-.theme-selected {
-  background-color: hsl(0,0%,90%);
-}
-
-.theme-bg-darker {
-  background: #F9F9F9;
-}
-
-.theme-link { /* blue */
-  color: hsl(208,56%,40%);
-}
-
-.theme-comment { /* grey */
-  color: hsl(90,2%,46%);
-}
-
-.theme-gutter {
-  background-color: hsl(0,0%,90%);
-  color: #667380;
-  border-color: hsl(0,0%,65%);
-}
-
-.theme-separator { /* grey */
-  border-color: #cddae5;
-}
-
-.theme-fg-color1 { /* green */
-  color: hsl(72,100%,27%);
-}
-
-.theme-fg-color2 { /* blue */
-  color: hsl(208,56%,40%);
-}
-
-.theme-fg-color3 { /* dark blue */
-  color: hsl(208,81%,21%)
-}
-
-.theme-fg-color4 { /* Orange */
-  color: hsl(24,85%,39%);
-}
-
-.theme-fg-color5 { /* Yellow */
-  color: #a18650;
-}
-
-.theme-fg-color6 { /* Orange */
-  color: hsl(24,85%,39%);
-}
-
-.theme-fg-color7 { /* Red */
-  color: #bf5656;
-}
diff --git a/browser/themes/windows/devtools/markup-view.css b/browser/themes/windows/devtools/markup-view.css
deleted file mode 100644
index 4651a43146c1..000000000000
--- a/browser/themes/windows/devtools/markup-view.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-* {
-  padding: 0;
-  margin: 0;
-}
-
-.newattr {
-  cursor: pointer;
-}
-
-.selected {
-  background-color: hsl(0,0%,90%);
-}
-
-/* Give some padding to focusable elements to match the editor input
- * that will replace them. */
-span[tabindex] {
-  display: inline-block;
-  padding: 1px 0;
-}
-
-li.container {
-  position: relative;
-  padding: 2px 0 0 2px;
-}
-
-.codebox {
-  padding-left: 14px;
-}
-
-.expander {
-  position: absolute;
-}
-
-.more-nodes {
-  padding-left: 16px;
-}
-
-.styleinspector-propertyeditor {
-  border: 1px solid #CCC;
-}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index fdd3025d2284..d9368bef2b25 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -149,8 +149,9 @@ browser.jar:
         skin/classic/browser/tabview/tabview-inverted.png           (tabview/tabview-inverted.png)
         skin/classic/browser/tabview/tabview.css                    (tabview/tabview.css)
 *       skin/classic/browser/devtools/common.css                    (devtools/common.css)
-        skin/classic/browser/devtools/dark-theme.css                (devtools/dark-theme.css)
-        skin/classic/browser/devtools/light-theme.css               (devtools/light-theme.css)
+        skin/classic/browser/devtools/dark-theme.css                (../shared/devtools/dark-theme.css)
+        skin/classic/browser/devtools/light-theme.css               (../shared/devtools/light-theme.css)
+        skin/classic/browser/devtools/controls.png                  (../shared/devtools/controls.png)
         skin/classic/browser/devtools/widgets.css                   (devtools/widgets.css)
         skin/classic/browser/devtools/commandline-icon.png          (devtools/commandline-icon.png)
         skin/classic/browser/devtools/alerticon-warning.png         (devtools/alerticon-warning.png)
@@ -160,9 +161,7 @@ browser.jar:
         skin/classic/browser/devtools/command-responsivemode.png    (devtools/command-responsivemode.png)
         skin/classic/browser/devtools/command-scratchpad.png        (devtools/command-scratchpad.png)
         skin/classic/browser/devtools/command-tilt.png              (devtools/command-tilt.png)
-        skin/classic/browser/devtools/checkbox-dark.png             (devtools/checkbox-dark.png)
-        skin/classic/browser/devtools/checkbox-light.png            (devtools/checkbox-light.png)
-        skin/classic/browser/devtools/markup-view.css               (devtools/markup-view.css)
+        skin/classic/browser/devtools/markup-view.css               (../shared/devtools/markup-view.css)
         skin/classic/browser/devtools/orion.css                     (devtools/orion.css)
         skin/classic/browser/devtools/orion-container.css           (devtools/orion-container.css)
         skin/classic/browser/devtools/orion-task.png                (devtools/orion-task.png)
@@ -404,20 +403,19 @@ browser.jar:
         skin/classic/aero/browser/tabview/tabview-inverted.png       (tabview/tabview-inverted.png)
         skin/classic/aero/browser/tabview/tabview.css                (tabview/tabview.css)
 *       skin/classic/aero/browser/devtools/common.css                (devtools/common.css)
-        skin/classic/aero/browser/devtools/dark-theme.css            (devtools/dark-theme.css)
-        skin/classic/aero/browser/devtools/light-theme.css           (devtools/light-theme.css)
+        skin/classic/aero/browser/devtools/dark-theme.css            (../shared/devtools/dark-theme.css)
+        skin/classic/aero/browser/devtools/light-theme.css           (../shared/devtools/light-theme.css)
+        skin/classic/aero/browser/devtools/controls.png              (../shared/devtools/controls.png)
         skin/classic/aero/browser/devtools/widgets.css               (devtools/widgets.css)
         skin/classic/aero/browser/devtools/commandline-icon.png      (devtools/commandline-icon.png)
         skin/classic/aero/browser/devtools/command-paintflashing.png  (devtools/command-paintflashing.png)
         skin/classic/aero/browser/devtools/command-responsivemode.png (devtools/command-responsivemode.png)
         skin/classic/aero/browser/devtools/command-scratchpad.png    (devtools/command-scratchpad.png)
         skin/classic/aero/browser/devtools/command-tilt.png          (devtools/command-tilt.png)
-        skin/classic/aero/browser/devtools/checkbox-dark.png         (devtools/checkbox-dark.png)
-        skin/classic/aero/browser/devtools/checkbox-light.png        (devtools/checkbox-light.png)
         skin/classic/aero/browser/devtools/alerticon-warning.png     (devtools/alerticon-warning.png)
         skin/classic/aero/browser/devtools/ruleview.css              (devtools/ruleview.css)
         skin/classic/aero/browser/devtools/commandline.css           (devtools/commandline.css)
-        skin/classic/aero/browser/devtools/markup-view.css           (devtools/markup-view.css)
+        skin/classic/aero/browser/devtools/markup-view.css           (../shared/devtools/markup-view.css)
         skin/classic/aero/browser/devtools/orion.css                 (devtools/orion.css)
         skin/classic/aero/browser/devtools/orion-container.css       (devtools/orion-container.css)
         skin/classic/aero/browser/devtools/orion-task.png            (devtools/orion-task.png)
diff --git a/config/config.mk b/config/config.mk
index 81bfe65240ad..389b8077809e 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -357,12 +357,10 @@ ifdef BOTH_MANIFESTS
 MAKE_JARS_FLAGS += --both-manifests
 endif
 
-TAR_CREATE_FLAGS = -cvhf
-TAR_CREATE_FLAGS_QUIET = -chf
+TAR_CREATE_FLAGS = -chf
 
 ifeq ($(OS_ARCH),OS2)
-TAR_CREATE_FLAGS = -cvf
-TAR_CREATE_FLAGS_QUIET = -cf
+TAR_CREATE_FLAGS = -cf
 endif
 
 #
diff --git a/config/makefiles/makeutils.mk b/config/makefiles/makeutils.mk
index d3de7c6d2cd3..0ae1044643c0 100644
--- a/config/makefiles/makeutils.mk
+++ b/config/makefiles/makeutils.mk
@@ -118,4 +118,4 @@ ifdef USE_RCS_MK
 endif
 
 ## copy(src, dst): recursive copy
-copy_dir = (cd $(1)/. && $(TAR) $(TAR_CREATE_FLAGS_QUIET) - .) | (cd $(2)/. && tar -xf -)
+copy_dir = (cd $(1)/. && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(2)/. && tar -xf -)
diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h
index a93c77f28ee8..4467d7edfd1c 100644
--- a/content/base/public/nsIDocument.h
+++ b/content/base/public/nsIDocument.h
@@ -32,6 +32,7 @@ class nsAString;
 class nsBindingManager;
 class nsCSSStyleSheet;
 class nsDOMNavigationTiming;
+class nsDOMTouchList;
 class nsEventStates;
 class nsFrameLoader;
 class nsHTMLCSSStyleSheet;
@@ -50,7 +51,6 @@ class nsIDOMDocumentFragment;
 class nsIDOMDocumentType;
 class nsIDOMElement;
 class nsIDOMNodeList;
-class nsIDOMTouchList;
 class nsIDOMXPathExpression;
 class nsIDOMXPathNSResolver;
 class nsILayoutHistoryState;
@@ -2099,11 +2099,11 @@ public:
                 int32_t aScreenX, int32_t aScreenY, int32_t aClientX,
                 int32_t aClientY, int32_t aRadiusX, int32_t aRadiusY,
                 float aRotationAngle, float aForce);
-  already_AddRefed<nsIDOMTouchList> CreateTouchList();
-  already_AddRefed<nsIDOMTouchList>
+  already_AddRefed<nsDOMTouchList> CreateTouchList();
+  already_AddRefed<nsDOMTouchList>
     CreateTouchList(mozilla::dom::Touch& aTouch,
                     const mozilla::dom::Sequence<mozilla::dom::OwningNonNull<mozilla::dom::Touch> >& aTouches);
-  already_AddRefed<nsIDOMTouchList>
+  already_AddRefed<nsDOMTouchList>
     CreateTouchList(const mozilla::dom::Sequence<mozilla::dom::OwningNonNull<mozilla::dom::Touch> >& aTouches);
 
   void SetStyleSheetChangeEventsEnabled(bool aValue)
diff --git a/content/base/public/nsIScriptElement.h b/content/base/public/nsIScriptElement.h
index 51c20d5ede63..bc1ca54e9c5d 100644
--- a/content/base/public/nsIScriptElement.h
+++ b/content/base/public/nsIScriptElement.h
@@ -151,7 +151,7 @@ public:
 
   void SetCreatorParser(nsIParser* aParser)
   {
-    mCreatorParser = getter_AddRefs(NS_GetWeakReference(aParser));
+    mCreatorParser = do_GetWeakReference(aParser);
   }
 
   /**
diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp
index c6471d1e7a46..21503306b7ac 100644
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -9301,7 +9301,7 @@ NS_IMETHODIMP
 nsDocument::CreateTouchList(nsIVariant* aPoints,
                             nsIDOMTouchList** aRetVal)
 {
-  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList();
+  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList(ToSupports(this));
   if (aPoints) {
     uint16_t type;
     aPoints->GetDataType(&type);
@@ -9338,18 +9338,18 @@ nsDocument::CreateTouchList(nsIVariant* aPoints,
   return NS_OK;
 }
 
-already_AddRefed<nsIDOMTouchList>
+already_AddRefed<nsDOMTouchList>
 nsIDocument::CreateTouchList()
 {
-  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList();
+  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList(ToSupports(this));
   return retval.forget();
 }
 
-already_AddRefed<nsIDOMTouchList>
+already_AddRefed<nsDOMTouchList>
 nsIDocument::CreateTouchList(Touch& aTouch,
                              const Sequence<OwningNonNull<Touch> >& aTouches)
 {
-  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList();
+  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList(ToSupports(this));
   retval->Append(&aTouch);
   for (uint32_t i = 0; i < aTouches.Length(); ++i) {
     retval->Append(aTouches[i].get());
@@ -9357,10 +9357,10 @@ nsIDocument::CreateTouchList(Touch& aTouch,
   return retval.forget();
 }
 
-already_AddRefed<nsIDOMTouchList>
+already_AddRefed<nsDOMTouchList>
 nsIDocument::CreateTouchList(const Sequence<OwningNonNull<Touch> >& aTouches)
 {
-  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList();
+  nsRefPtr<nsDOMTouchList> retval = new nsDOMTouchList(ToSupports(this));
   for (uint32_t i = 0; i < aTouches.Length(); ++i) {
     retval->Append(aTouches[i].get());
   }
diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/content/canvas/src/CanvasRenderingContext2D.cpp
index f5031e38de5e..ca43251cf5ec 100644
--- a/content/canvas/src/CanvasRenderingContext2D.cpp
+++ b/content/canvas/src/CanvasRenderingContext2D.cpp
@@ -3948,6 +3948,3 @@ CanvasRenderingContext2D::ShouldForceInactiveLayer(LayerManager *aManager)
 
 }
 }
-
-DOMCI_DATA(CanvasRenderingContext2D, mozilla::dom::CanvasRenderingContext2D)
-
diff --git a/content/events/src/Touch.h b/content/events/src/Touch.h
index e9ef741a4c0c..e0feb98268f2 100644
--- a/content/events/src/Touch.h
+++ b/content/events/src/Touch.h
@@ -13,6 +13,7 @@
 #include "nsJSEnvironment.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/EventTarget.h"
+#include "Units.h"
 
 namespace mozilla {
 namespace dom {
@@ -39,9 +40,9 @@ public:
       SetIsDOMBinding();
       mTarget = aTarget;
       mIdentifier = aIdentifier;
-      mPagePoint = nsIntPoint(aPageX, aPageY);
+      mPagePoint = CSSIntPoint(aPageX, aPageY);
       mScreenPoint = nsIntPoint(aScreenX, aScreenY);
-      mClientPoint = nsIntPoint(aClientX, aClientY);
+      mClientPoint = CSSIntPoint(aClientX, aClientY);
       mRefPoint = nsIntPoint(0, 0);
       mPointsInitialized = true;
       mRadius.x = aRadiusX;
@@ -61,9 +62,9 @@ public:
     {
       SetIsDOMBinding();
       mIdentifier = aIdentifier;
-      mPagePoint = nsIntPoint(0, 0);
+      mPagePoint = CSSIntPoint(0, 0);
       mScreenPoint = nsIntPoint(0, 0);
-      mClientPoint = nsIntPoint(0, 0);
+      mClientPoint = CSSIntPoint(0, 0);
       mRefPoint = aPoint;
       mPointsInitialized = false;
       mRadius = aRadius;
@@ -105,8 +106,8 @@ public:
   float Force() const { return mForce; }
 
   int32_t mIdentifier;
-  nsIntPoint mPagePoint;
-  nsIntPoint mClientPoint;
+  CSSIntPoint mPagePoint;
+  CSSIntPoint mClientPoint;
   nsIntPoint mScreenPoint;
   nsIntPoint mRadius;
   float mRotationAngle;
diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp
index 3339099865b2..80882fb8215c 100644
--- a/content/events/src/nsDOMEvent.cpp
+++ b/content/events/src/nsDOMEvent.cpp
@@ -1091,25 +1091,23 @@ nsDOMEvent::GetScreenCoords(nsPresContext* aPresContext,
 }
 
 //static
-nsIntPoint
+CSSIntPoint
 nsDOMEvent::GetPageCoords(nsPresContext* aPresContext,
                           nsEvent* aEvent,
                           nsIntPoint aPoint,
-                          nsIntPoint aDefaultPoint)
+                          CSSIntPoint aDefaultPoint)
 {
-  nsIntPoint pagePoint = nsDOMEvent::GetClientCoords(aPresContext,
-                                                     aEvent,
-                                                     aPoint,
-                                                     aDefaultPoint);
+  CSSIntPoint pagePoint = nsDOMEvent::GetClientCoords(aPresContext,
+                                                      aEvent,
+                                                      aPoint,
+                                                      aDefaultPoint);
 
   // If there is some scrolling, add scroll info to client point.
   if (aPresContext && aPresContext->GetPresShell()) {
     nsIPresShell* shell = aPresContext->GetPresShell();
     nsIScrollableFrame* scrollframe = shell->GetRootScrollFrameAsScrollable();
     if (scrollframe) {
-      nsPoint pt = scrollframe->GetScrollPosition();
-      pagePoint += nsIntPoint(nsPresContext::AppUnitsToIntCSSPixels(pt.x),
-                              nsPresContext::AppUnitsToIntCSSPixels(pt.y));
+      pagePoint += CSSIntPoint::FromAppUnitsRounded(scrollframe->GetScrollPosition());
     }
   }
 
@@ -1117,11 +1115,11 @@ nsDOMEvent::GetPageCoords(nsPresContext* aPresContext,
 }
 
 // static
-nsIntPoint
+CSSIntPoint
 nsDOMEvent::GetClientCoords(nsPresContext* aPresContext,
                             nsEvent* aEvent,
                             nsIntPoint aPoint,
-                            nsIntPoint aDefaultPoint)
+                            CSSIntPoint aDefaultPoint)
 {
   if (nsEventStateManager::sIsPointerLocked) {
     return nsEventStateManager::sLastClientPoint;
@@ -1135,21 +1133,23 @@ nsDOMEvent::GetClientCoords(nsPresContext* aPresContext,
        aEvent->eventStructType != NS_DRAG_EVENT &&
        aEvent->eventStructType != NS_SIMPLE_GESTURE_EVENT) ||
       !aPresContext ||
-      !((nsGUIEvent*)aEvent)->widget) {
+      !static_cast<nsGUIEvent*>(aEvent)->widget) {
     return aDefaultPoint;
   }
 
-  nsPoint pt(0, 0);
   nsIPresShell* shell = aPresContext->GetPresShell();
   if (!shell) {
-    return nsIntPoint(0, 0);
+    return CSSIntPoint(0, 0);
   }
-  nsIFrame* rootFrame = shell->GetRootFrame();
-  if (rootFrame)
-    pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, aPoint, rootFrame);
 
-  return nsIntPoint(nsPresContext::AppUnitsToIntCSSPixels(pt.x),
-                    nsPresContext::AppUnitsToIntCSSPixels(pt.y));
+  nsIFrame* rootFrame = shell->GetRootFrame();
+  if (!rootFrame) {
+    return CSSIntPoint(0, 0);
+  }
+  nsPoint pt =
+    nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, aPoint, rootFrame);
+
+  return CSSIntPoint::FromAppUnitsRounded(pt);
 }
 
 // To be called ONLY by nsDOMEvent::GetType (which has the additional
diff --git a/content/events/src/nsDOMEvent.h b/content/events/src/nsDOMEvent.h
index bc164ba9d094..31717c200198 100644
--- a/content/events/src/nsDOMEvent.h
+++ b/content/events/src/nsDOMEvent.h
@@ -19,6 +19,7 @@
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/EventBinding.h"
 #include "nsIScriptGlobalObject.h"
+#include "Units.h"
 
 class nsIContent;
 class nsPresContext;
@@ -99,14 +100,12 @@ public:
   static void Shutdown();
 
   static const char* GetEventName(uint32_t aEventType);
-  static nsIntPoint GetClientCoords(nsPresContext* aPresContext,
-                                    nsEvent* aEvent,
-                                    nsIntPoint aPoint,
-                                    nsIntPoint aDefaultPoint);
-  static nsIntPoint GetPageCoords(nsPresContext* aPresContext,
-                                  nsEvent* aEvent,
-                                  nsIntPoint aPoint,
-                                  nsIntPoint aDefaultPoint);
+  static mozilla::CSSIntPoint
+  GetClientCoords(nsPresContext* aPresContext, nsEvent* aEvent,
+                  nsIntPoint aPoint, mozilla::CSSIntPoint aDefaultPoint);
+  static mozilla::CSSIntPoint
+  GetPageCoords(nsPresContext* aPresContext, nsEvent* aEvent, nsIntPoint aPoint,
+                mozilla::CSSIntPoint aDefaultPoint);
   static nsIntPoint GetScreenCoords(nsPresContext* aPresContext,
                                     nsEvent* aEvent,
                                     nsIntPoint aPoint);
diff --git a/content/events/src/nsDOMNotifyPaintEvent.cpp b/content/events/src/nsDOMNotifyPaintEvent.cpp
index 2886af165232..97f316537c9b 100644
--- a/content/events/src/nsDOMNotifyPaintEvent.cpp
+++ b/content/events/src/nsDOMNotifyPaintEvent.cpp
@@ -92,7 +92,7 @@ nsDOMNotifyPaintEvent::ClientRects()
 }
 
 NS_IMETHODIMP
-nsDOMNotifyPaintEvent::GetPaintRequests(nsIDOMPaintRequestList** aResult)
+nsDOMNotifyPaintEvent::GetPaintRequests(nsISupports** aResult)
 {
   nsRefPtr<nsPaintRequestList> requests = PaintRequests();
   requests.forget(aResult);
diff --git a/content/events/src/nsDOMTouchEvent.cpp b/content/events/src/nsDOMTouchEvent.cpp
index 033dd72fb059..b91bf53a691c 100644
--- a/content/events/src/nsDOMTouchEvent.cpp
+++ b/content/events/src/nsDOMTouchEvent.cpp
@@ -10,58 +10,67 @@
 #include "mozilla/Preferences.h"
 #include "nsPresContext.h"
 #include "mozilla/dom/Touch.h"
+#include "mozilla/dom/TouchListBinding.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 // TouchList
-nsDOMTouchList::nsDOMTouchList(nsTArray<nsCOMPtr<nsIDOMTouch> > &aTouches)
-{
-  mPoints.AppendElements(aTouches);
-  nsJSContext::LikelyShortLivingObjectCreated();
-}
-
-DOMCI_DATA(TouchList, nsDOMTouchList)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMTouchList)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_INTERFACE_MAP_ENTRY(nsIDOMTouchList)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TouchList)
 NS_INTERFACE_MAP_END
 
-NS_IMPL_CYCLE_COLLECTION_1(nsDOMTouchList, mPoints)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_2(nsDOMTouchList, mParent, mPoints)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMTouchList)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMTouchList)
 
+/* virtual */ JSObject*
+nsDOMTouchList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
+{
+  return TouchListBinding::Wrap(aCx, aScope, this);
+}
+
+/* static */ bool
+nsDOMTouchList::PrefEnabled()
+{
+  return nsDOMTouchEvent::PrefEnabled();
+}
+
 NS_IMETHODIMP
 nsDOMTouchList::GetLength(uint32_t* aLength)
 {
-  *aLength = mPoints.Length();
+  *aLength = Length();
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTouchList::Item(uint32_t aIndex, nsIDOMTouch** aRetVal)
 {
-  NS_IF_ADDREF(*aRetVal = mPoints.SafeElementAt(aIndex, nullptr));
+  NS_IF_ADDREF(*aRetVal = Item(aIndex));
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDOMTouchList::IdentifiedTouch(int32_t aIdentifier, nsIDOMTouch** aRetVal)
 {
-  *aRetVal = nullptr;
+  NS_IF_ADDREF(*aRetVal = IdentifiedTouch(aIdentifier));
+  return NS_OK;
+}
+
+Touch*
+nsDOMTouchList::IdentifiedTouch(int32_t aIdentifier) const
+{
   for (uint32_t i = 0; i < mPoints.Length(); ++i) {
-    nsCOMPtr<nsIDOMTouch> point = mPoints[i];
-    int32_t identifier;
-    if (point && NS_SUCCEEDED(point->GetIdentifier(&identifier)) &&
-        aIdentifier == identifier) {
-      point.swap(*aRetVal);
-      break;
+    Touch* point = mPoints[i];
+    if (point && point->Identifier() == aIdentifier) {
+      return point;
     }
   }
-  return NS_OK;
+  return nullptr;
 }
 
 // TouchEvent
@@ -151,16 +160,16 @@ nsDOMTouchEvent::Touches()
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(mEvent);
     if (mEvent->message == NS_TOUCH_END || mEvent->message == NS_TOUCH_CANCEL) {
       // for touchend events, remove any changed touches from the touches array
-      nsTArray<nsCOMPtr<nsIDOMTouch> > unchangedTouches;
-      const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+      nsTArray< nsRefPtr<Touch> > unchangedTouches;
+      const nsTArray< nsRefPtr<Touch> >& touches = touchEvent->touches;
       for (uint32_t i = 0; i < touches.Length(); ++i) {
         if (!touches[i]->mChanged) {
           unchangedTouches.AppendElement(touches[i]);
         }
       }
-      mTouches = new nsDOMTouchList(unchangedTouches);
+      mTouches = new nsDOMTouchList(ToSupports(this), unchangedTouches);
     } else {
-      mTouches = new nsDOMTouchList(touchEvent->touches);
+      mTouches = new nsDOMTouchList(ToSupports(this), touchEvent->touches);
     }
   }
   return mTouches;
@@ -178,21 +187,20 @@ nsDOMTouchList*
 nsDOMTouchEvent::TargetTouches()
 {
   if (!mTargetTouches) {
-    nsTArray<nsCOMPtr<nsIDOMTouch> > targetTouches;
+    nsTArray< nsRefPtr<Touch> > targetTouches;
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(mEvent);
-    const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+    const nsTArray< nsRefPtr<Touch> >& touches = touchEvent->touches;
     for (uint32_t i = 0; i < touches.Length(); ++i) {
       // for touchend/cancel events, don't append to the target list if this is a
       // touch that is ending
       if ((mEvent->message != NS_TOUCH_END &&
            mEvent->message != NS_TOUCH_CANCEL) || !touches[i]->mChanged) {
-        EventTarget* targetPtr = touches[i]->GetTarget();
-        if (targetPtr == mEvent->originalTarget) {
+        if (touches[i]->mTarget == mEvent->originalTarget) {
           targetTouches.AppendElement(touches[i]);
         }
       }
     }
-    mTargetTouches = new nsDOMTouchList(targetTouches);
+    mTargetTouches = new nsDOMTouchList(ToSupports(this), targetTouches);
   }
   return mTargetTouches;
 }
@@ -209,15 +217,15 @@ nsDOMTouchList*
 nsDOMTouchEvent::ChangedTouches()
 {
   if (!mChangedTouches) {
-    nsTArray<nsCOMPtr<nsIDOMTouch> > changedTouches;
+    nsTArray< nsRefPtr<Touch> > changedTouches;
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(mEvent);
-    const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+    const nsTArray< nsRefPtr<Touch> >& touches = touchEvent->touches;
     for (uint32_t i = 0; i < touches.Length(); ++i) {
       if (touches[i]->mChanged) {
         changedTouches.AppendElement(touches[i]);
       }
     }
-    mChangedTouches = new nsDOMTouchList(changedTouches);
+    mChangedTouches = new nsDOMTouchList(ToSupports(this), changedTouches);
   }
   return mChangedTouches;
 }
diff --git a/content/events/src/nsDOMTouchEvent.h b/content/events/src/nsDOMTouchEvent.h
index 9fbf5699795e..5676f7a49bd4 100644
--- a/content/events/src/nsDOMTouchEvent.h
+++ b/content/events/src/nsDOMTouchEvent.h
@@ -12,32 +12,69 @@
 #include "mozilla/Attributes.h"
 #include "nsJSEnvironment.h"
 #include "mozilla/dom/TouchEventBinding.h"
+#include "nsWrapperCache.h"
 
 class nsDOMTouchList MOZ_FINAL : public nsIDOMTouchList
+                               , public nsWrapperCache
 {
+  typedef mozilla::dom::Touch Touch;
+
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMTouchList)
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMTouchList)
   NS_DECL_NSIDOMTOUCHLIST
 
-  nsDOMTouchList()
+  nsDOMTouchList(nsISupports* aParent)
+    : mParent(aParent)
   {
+    SetIsDOMBinding();
+    nsJSContext::LikelyShortLivingObjectCreated();
+  }
+  nsDOMTouchList(nsISupports* aParent,
+                 const nsTArray< nsRefPtr<Touch> >& aTouches)
+    : mParent(aParent)
+    , mPoints(aTouches)
+  {
+    SetIsDOMBinding();
     nsJSContext::LikelyShortLivingObjectCreated();
   }
-  nsDOMTouchList(nsTArray<nsCOMPtr<nsIDOMTouch> > &aTouches);
 
-  void Append(nsIDOMTouch* aPoint)
+  void Append(Touch* aPoint)
   {
     mPoints.AppendElement(aPoint);
   }
 
-  nsIDOMTouch* GetItemAt(uint32_t aIndex)
+  virtual JSObject*
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
+
+  nsISupports* GetParentObject() const
   {
-    return mPoints.SafeElementAt(aIndex, nullptr);
+    return mParent;
   }
 
+  static bool PrefEnabled();
+
+  uint32_t Length() const
+  {
+    return mPoints.Length();
+  }
+  Touch* Item(uint32_t aIndex) const
+  {
+    return mPoints.SafeElementAt(aIndex);
+  }
+  Touch* IndexedGetter(uint32_t aIndex, bool& aFound) const
+  {
+    aFound = aIndex < mPoints.Length();
+    if (!aFound) {
+      return nullptr;
+    }
+    return mPoints[aIndex];
+  }
+  Touch* IdentifiedTouch(int32_t aIdentifier) const;
+
 protected:
-  nsTArray<nsCOMPtr<nsIDOMTouch> > mPoints;
+  nsCOMPtr<nsISupports> mParent;
+  nsTArray< nsRefPtr<Touch> > mPoints;
 };
 
 class nsDOMTouchEvent : public nsDOMUIEvent,
diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp
index 2cbe4471ba07..486ab2be6bc0 100644
--- a/content/events/src/nsDOMUIEvent.cpp
+++ b/content/events/src/nsDOMUIEvent.cpp
@@ -131,16 +131,6 @@ nsDOMUIEvent::GetMovementPoint()
   return current - last;
 }
 
-nsIntPoint
-nsDOMUIEvent::GetClientPoint()
-{
-  if (mIsPointerLocked) {
-    return mLastClientPoint;
-  }
-
-  return CalculateClientPoint(mPresContext, mEvent, &mClientPoint);
-}
-
 NS_IMETHODIMP
 nsDOMUIEvent::GetView(nsIDOMWindow** aView)
 {
diff --git a/content/events/src/nsDOMUIEvent.h b/content/events/src/nsDOMUIEvent.h
index ee0467e8d85f..88697cbea27d 100644
--- a/content/events/src/nsDOMUIEvent.h
+++ b/content/events/src/nsDOMUIEvent.h
@@ -12,10 +12,12 @@
 #include "nsLayoutUtils.h"
 #include "nsEvent.h"
 #include "mozilla/dom/UIEventBinding.h"
+#include "Units.h"
 
 class nsDOMUIEvent : public nsDOMEvent,
                      public nsIDOMUIEvent
 {
+  typedef mozilla::CSSIntPoint CSSIntPoint;
 public:
   nsDOMUIEvent(mozilla::dom::EventTarget* aOwner,
                nsPresContext* aPresContext, nsGUIEvent* aEvent);
@@ -55,9 +57,9 @@ public:
                       nsPresContext::AppUnitsToIntCSSPixels(offset.y * factor));
   }
 
-  static nsIntPoint CalculateClientPoint(nsPresContext* aPresContext,
-                                         nsEvent* aEvent,
-                                         nsIntPoint* aDefaultClientPoint)
+  static CSSIntPoint CalculateClientPoint(nsPresContext* aPresContext,
+                                          nsEvent* aEvent,
+                                          CSSIntPoint* aDefaultClientPoint)
   {
     if (!aEvent ||
         (aEvent->eventStructType != NS_MOUSE_EVENT &&
@@ -66,23 +68,24 @@ public:
          aEvent->eventStructType != NS_DRAG_EVENT &&
          aEvent->eventStructType != NS_SIMPLE_GESTURE_EVENT) ||
         !aPresContext ||
-        !((nsGUIEvent*)aEvent)->widget) {
-      return (nullptr == aDefaultClientPoint ? nsIntPoint(0, 0) :
-        nsIntPoint(aDefaultClientPoint->x, aDefaultClientPoint->y));
+        !static_cast<nsGUIEvent*>(aEvent)->widget) {
+      return aDefaultClientPoint
+             ? *aDefaultClientPoint
+             : CSSIntPoint(0, 0);
     }
 
-    nsPoint pt(0, 0);
     nsIPresShell* shell = aPresContext->GetPresShell();
     if (!shell) {
-      return nsIntPoint(0, 0);
+      return CSSIntPoint(0, 0);
     }
     nsIFrame* rootFrame = shell->GetRootFrame();
-    if (rootFrame) {
-      pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, rootFrame);
+    if (!rootFrame) {
+      return CSSIntPoint(0, 0);
     }
+    nsPoint pt =
+      nsLayoutUtils::GetEventCoordinatesRelativeTo(aEvent, rootFrame);
 
-    return nsIntPoint(nsPresContext::AppUnitsToIntCSSPixels(pt.x),
-                      nsPresContext::AppUnitsToIntCSSPixels(pt.y));
+    return CSSIntPoint::FromAppUnitsRounded(pt);
   }
 
   static already_AddRefed<nsDOMUIEvent> Constructor(const mozilla::dom::GlobalObject& aGlobal,
@@ -141,19 +144,18 @@ public:
 
 protected:
   // Internal helper functions
-  nsIntPoint GetClientPoint();
   nsIntPoint GetMovementPoint();
   nsIntPoint GetLayerPoint() const;
 
   nsCOMPtr<nsIDOMWindow> mView;
   int32_t mDetail;
-  nsIntPoint mClientPoint;
+  CSSIntPoint mClientPoint;
   // Screenpoint is mEvent->refPoint.
   nsIntPoint mLayerPoint;
-  nsIntPoint mPagePoint;
+  CSSIntPoint mPagePoint;
   nsIntPoint mMovementPoint;
   bool mIsPointerLocked;
-  nsIntPoint mLastClientPoint;
+  CSSIntPoint mLastClientPoint;
 
   typedef mozilla::widget::Modifiers Modifiers;
   static Modifiers ComputeModifierState(const nsAString& aModifiersList);
diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp
index 7a23186405c6..f9f1a2e15f02 100644
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -122,7 +122,7 @@ nsWeakFrame nsEventStateManager::sLastDragOverFrame = nullptr;
 nsIntPoint nsEventStateManager::sLastRefPoint = kInvalidRefPoint;
 nsIntPoint nsEventStateManager::sLastScreenPoint = nsIntPoint(0,0);
 nsIntPoint nsEventStateManager::sSynthCenteringPoint = kInvalidRefPoint;
-nsIntPoint nsEventStateManager::sLastClientPoint = nsIntPoint(0,0);
+CSSIntPoint nsEventStateManager::sLastClientPoint = CSSIntPoint(0, 0);
 bool nsEventStateManager::sIsPointerLocked = false;
 // Reference to the pointer locked element.
 nsWeakPtr nsEventStateManager::sPointerLockedElement;
@@ -1553,7 +1553,7 @@ nsEventStateManager::MapEventCoordinatesForChildProcess(
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aEvent);
     // Then offset all the touch points by that distance, to put them
     // in the space where top-left is 0,0.
-    const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+    const nsTArray< nsRefPtr<Touch> >& touches = touchEvent->touches;
     for (uint32_t i = 0; i < touches.Length(); ++i) {
       nsIDOMTouch* touch = touches[i];
       if (touch) {
@@ -1637,7 +1637,7 @@ nsEventStateManager::HandleCrossProcessEvent(nsEvent *aEvent,
     // This loop is similar to the one used in
     // PresShell::DispatchTouchEvent().
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aEvent);
-    const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+    const nsTArray< nsRefPtr<Touch> >& touches = touchEvent->touches;
     for (uint32_t i = 0; i < touches.Length(); ++i) {
       nsIDOMTouch* touch = touches[i];
       // NB: the |mChanged| check is an optimization, subprocesses can
diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h
index 3ef3be16be49..9fc973368394 100644
--- a/content/events/src/nsEventStateManager.h
+++ b/content/events/src/nsEventStateManager.h
@@ -23,6 +23,7 @@
 #include "nsEventStates.h"
 #include "mozilla/TimeStamp.h"
 #include "nsIFrame.h"
+#include "Units.h"
 
 class nsIPresShell;
 class nsIContent;
@@ -212,7 +213,7 @@ public:
   // Holds the point in client coords of the last mouse event. Used by
   // nsDOMEvent::GetClientCoords() to make mouse events' client coords appear
   // frozen at the last mouse position while the pointer is locked.
-  static nsIntPoint sLastClientPoint;
+  static mozilla::CSSIntPoint sLastClientPoint;
 
   static bool sIsPointerLocked;
   static nsWeakPtr sPointerLockedElement;
diff --git a/content/events/src/nsPaintRequest.cpp b/content/events/src/nsPaintRequest.cpp
index 015a5d1acae6..901609631273 100644
--- a/content/events/src/nsPaintRequest.cpp
+++ b/content/events/src/nsPaintRequest.cpp
@@ -55,31 +55,16 @@ nsPaintRequest::GetXPCOMReason(nsAString& aResult)
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(nsPaintRequestList, mParent)
 
-NS_INTERFACE_TABLE_HEAD(nsPaintRequestList)
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsPaintRequestList)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
-  NS_INTERFACE_TABLE1(nsPaintRequestList, nsIDOMPaintRequestList)
-  NS_INTERFACE_TABLE_TO_MAP_SEGUE_CYCLE_COLLECTION(nsPaintRequestList)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPaintRequestList)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsPaintRequestList)
 
 JSObject*
-nsPaintRequestList::WrapObject(JSContext *cx, JS::Handle<JSObject*> scope)
+nsPaintRequestList::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
-  return mozilla::dom::PaintRequestListBinding::Wrap(cx, scope, this);
-}
-
-NS_IMETHODIMP    
-nsPaintRequestList::GetLength(uint32_t* aLength)
-{
-  *aLength = Length();
-  return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsPaintRequestList::Item(uint32_t aIndex, nsIDOMPaintRequest** aReturn)
-{
-  NS_IF_ADDREF(*aReturn = Item(aIndex));
-  return NS_OK;
+  return PaintRequestListBinding::Wrap(aCx, aScope, this);
 }
diff --git a/content/events/src/nsPaintRequest.h b/content/events/src/nsPaintRequest.h
index b3ba890d92fd..f1b8e4dfc9e8 100644
--- a/content/events/src/nsPaintRequest.h
+++ b/content/events/src/nsPaintRequest.h
@@ -7,7 +7,6 @@
 #define NSPAINTREQUEST_H_
 
 #include "nsIDOMPaintRequest.h"
-#include "nsIDOMPaintRequestList.h"
 #include "nsPresContext.h"
 #include "nsIDOMEvent.h"
 #include "mozilla/Attributes.h"
@@ -53,7 +52,7 @@ private:
   nsInvalidateRequestList::Request mRequest;
 };
 
-class nsPaintRequestList MOZ_FINAL : public nsIDOMPaintRequestList,
+class nsPaintRequestList MOZ_FINAL : public nsISupports,
                                      public nsWrapperCache
 {
 public:
@@ -64,10 +63,9 @@ public:
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsPaintRequestList)
-  NS_DECL_NSIDOMPAINTREQUESTLIST
   
-  virtual JSObject* WrapObject(JSContext *cx,
-                               JS::Handle<JSObject*> scope) MOZ_OVERRIDE;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
   nsISupports* GetParentObject()
   {
     return mParent;
@@ -78,23 +76,6 @@ public:
     mArray.AppendElement(aElement);
   }
 
-  static nsPaintRequestList* FromSupports(nsISupports* aSupports)
-  {
-#ifdef DEBUG
-    {
-      nsCOMPtr<nsIDOMPaintRequestList> list_qi = do_QueryInterface(aSupports);
-
-      // If this assertion fires the QI implementation for the object in
-      // question doesn't use the nsIDOMClientRectList pointer as the nsISupports
-      // pointer. That must be fixed, or we'll crash...
-      NS_ASSERTION(list_qi == static_cast<nsIDOMPaintRequestList*>(aSupports),
-                   "Uh, fix QI!");
-    }
-#endif
-
-    return static_cast<nsPaintRequestList*>(aSupports);
-  }
-
   uint32_t Length()
   {
     return mArray.Length();
diff --git a/content/html/content/src/HTMLAnchorElement.cpp b/content/html/content/src/HTMLAnchorElement.cpp
index e60f47b312c7..ae4e18ae211d 100644
--- a/content/html/content/src/HTMLAnchorElement.cpp
+++ b/content/html/content/src/HTMLAnchorElement.cpp
@@ -6,16 +6,15 @@
 
 #include "mozilla/dom/HTMLAnchorElement.h"
 
-#include "mozilla/MemoryReporting.h"
 #include "mozilla/dom/HTMLAnchorElementBinding.h"
-
+#include "mozilla/MemoryReporting.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsGkAtoms.h"
-#include "nsIPresShell.h"
-#include "nsIDocument.h"
-#include "nsPresContext.h"
 #include "nsHTMLDNSPrefetch.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsPresContext.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Anchor)
 
diff --git a/content/html/content/src/HTMLAnchorElement.h b/content/html/content/src/HTMLAnchorElement.h
index a88f17685b0a..f290c0b74e9a 100644
--- a/content/html/content/src/HTMLAnchorElement.h
+++ b/content/html/content/src/HTMLAnchorElement.h
@@ -8,11 +8,10 @@
 #define mozilla_dom_HTMLAnchorElement_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/Link.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLAnchorElement.h"
 #include "nsILink.h"
-#include "Link.h"
-#include "base/compiler_specific.h"
 
 namespace mozilla {
 namespace dom {
@@ -28,7 +27,7 @@ public:
 
   HTMLAnchorElement(already_AddRefed<nsINodeInfo> aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
-    , ALLOW_THIS_IN_INITIALIZER_LIST(Link(this))
+    , Link(MOZ_THIS_IN_INITIALIZER_LIST())
   {
     SetIsDOMBinding();
   }
diff --git a/content/html/content/src/HTMLAreaElement.cpp b/content/html/content/src/HTMLAreaElement.cpp
index c6530fabe8cb..3b34043d48a5 100644
--- a/content/html/content/src/HTMLAreaElement.cpp
+++ b/content/html/content/src/HTMLAreaElement.cpp
@@ -6,9 +6,9 @@
 
 #include "mozilla/dom/HTMLAreaElement.h"
 
-#include "mozilla/MemoryReporting.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/HTMLAreaElementBinding.h"
-#include "base/compiler_specific.h"
+#include "mozilla/MemoryReporting.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Area)
 
@@ -16,8 +16,8 @@ namespace mozilla {
 namespace dom {
 
 HTMLAreaElement::HTMLAreaElement(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericHTMLElement(aNodeInfo),
-    ALLOW_THIS_IN_INITIALIZER_LIST(Link(this))
+  : nsGenericHTMLElement(aNodeInfo)
+  , Link(MOZ_THIS_IN_INITIALIZER_LIST())
 {
   SetIsDOMBinding();
 }
diff --git a/content/html/content/src/HTMLAreaElement.h b/content/html/content/src/HTMLAreaElement.h
index f07ef3442d19..4a1b2928e61c 100644
--- a/content/html/content/src/HTMLAreaElement.h
+++ b/content/html/content/src/HTMLAreaElement.h
@@ -8,12 +8,12 @@
 #define mozilla_dom_HTMLAreaElement_h
 
 #include "mozilla/Attributes.h"
-#include "nsIDOMHTMLAreaElement.h"
+#include "mozilla/dom/Link.h"
 #include "nsGenericHTMLElement.h"
-#include "nsILink.h"
 #include "nsGkAtoms.h"
+#include "nsIDOMHTMLAreaElement.h"
+#include "nsILink.h"
 #include "nsIURL.h"
-#include "Link.h"
 
 class nsIDocument;
 
diff --git a/content/html/content/src/HTMLLinkElement.cpp b/content/html/content/src/HTMLLinkElement.cpp
index a5baa1c471f7..3718e9a767c2 100644
--- a/content/html/content/src/HTMLLinkElement.cpp
+++ b/content/html/content/src/HTMLLinkElement.cpp
@@ -5,25 +5,25 @@
 
 #include "mozilla/dom/HTMLLinkElement.h"
 
-#include "mozilla/MemoryReporting.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/HTMLLinkElementBinding.h"
-#include "base/compiler_specific.h"
+#include "mozilla/MemoryReporting.h"
+#include "nsAsyncDOMEvent.h"
+#include "nsContentUtils.h"
 #include "nsGenericHTMLElement.h"
-#include "nsILink.h"
 #include "nsGkAtoms.h"
-#include "nsStyleConsts.h"
-#include "nsIDOMStyleSheet.h"
-#include "nsIStyleSheet.h"
-#include "nsIStyleSheetLinkingElement.h"
-#include "nsReadableUtils.h"
-#include "nsUnicharUtils.h"
-#include "nsIURL.h"
-#include "nsNetUtil.h"
 #include "nsIDocument.h"
 #include "nsIDOMEvent.h"
-#include "nsContentUtils.h"
+#include "nsIDOMStyleSheet.h"
+#include "nsILink.h"
+#include "nsIStyleSheet.h"
+#include "nsIStyleSheetLinkingElement.h"
+#include "nsIURL.h"
+#include "nsNetUtil.h"
 #include "nsPIDOMWindow.h"
-#include "nsAsyncDOMEvent.h"
+#include "nsReadableUtils.h"
+#include "nsStyleConsts.h"
+#include "nsUnicharUtils.h"
 
 NS_IMPL_NS_NEW_HTML_ELEMENT(Link)
 
@@ -31,8 +31,8 @@ namespace mozilla {
 namespace dom {
 
 HTMLLinkElement::HTMLLinkElement(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : nsGenericHTMLElement(aNodeInfo),
-    ALLOW_THIS_IN_INITIALIZER_LIST(Link(this))
+  : nsGenericHTMLElement(aNodeInfo)
+  , Link(MOZ_THIS_IN_INITIALIZER_LIST())
 {
   SetIsDOMBinding();
 }
diff --git a/content/html/content/src/HTMLLinkElement.h b/content/html/content/src/HTMLLinkElement.h
index e70472a6fb82..295a1962d900 100644
--- a/content/html/content/src/HTMLLinkElement.h
+++ b/content/html/content/src/HTMLLinkElement.h
@@ -7,11 +7,11 @@
 #define mozilla_dom_HTMLLinkElement_h
 
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/Link.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLLinkElement.h"
 #include "nsILink.h"
 #include "nsStyleLinkElement.h"
-#include "mozilla/dom/Link.h"
 
 namespace mozilla {
 namespace dom {
diff --git a/content/html/content/src/HTMLOptionsCollection.cpp b/content/html/content/src/HTMLOptionsCollection.cpp
index 840d3c20f40a..b14bb19184db 100644
--- a/content/html/content/src/HTMLOptionsCollection.cpp
+++ b/content/html/content/src/HTMLOptionsCollection.cpp
@@ -33,8 +33,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsStyleConsts.h"
 
-DOMCI_DATA(HTMLOptionsCollection, mozilla::dom::HTMLOptionsCollection)
-
 namespace mozilla {
 namespace dom {
 
diff --git a/content/html/content/src/HTMLSelectElement.cpp b/content/html/content/src/HTMLSelectElement.cpp
index cb07d792dc50..39b515ab8732 100644
--- a/content/html/content/src/HTMLSelectElement.cpp
+++ b/content/html/content/src/HTMLSelectElement.cpp
@@ -6,12 +6,12 @@
 #include "mozilla/dom/HTMLSelectElement.h"
 
 #include "mozAutoDocUpdate.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/HTMLOptGroupElement.h"
 #include "mozilla/dom/HTMLOptionElement.h"
 #include "mozilla/dom/HTMLSelectElementBinding.h"
 #include "mozilla/Util.h"
-#include "base/compiler_specific.h"
 #include "nsContentCreatorFunctions.h"
 #include "nsError.h"
 #include "nsEventDispatcher.h"
@@ -104,7 +104,7 @@ SafeOptionListMutation::~SafeOptionListMutation()
 HTMLSelectElement::HTMLSelectElement(already_AddRefed<nsINodeInfo> aNodeInfo,
                                      FromParser aFromParser)
   : nsGenericHTMLFormElement(aNodeInfo),
-    ALLOW_THIS_IN_INITIALIZER_LIST(mOptions(new HTMLOptionsCollection(this))),
+    mOptions(new HTMLOptionsCollection(MOZ_THIS_IN_INITIALIZER_LIST())),
     mIsDoneAddingChildren(!aFromParser),
     mDisabledChanged(false),
     mMutating(false),
diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp
index 1b21a9f2fb4f..71350a9bf286 100644
--- a/content/html/content/src/HTMLTableElement.cpp
+++ b/content/html/content/src/HTMLTableElement.cpp
@@ -711,6 +711,35 @@ HTMLTableElement::DeleteCaption()
   return NS_OK;
 }
 
+already_AddRefed<nsGenericHTMLElement>
+HTMLTableElement::CreateTBody()
+{
+  nsCOMPtr<nsINodeInfo> nodeInfo =
+    OwnerDoc()->NodeInfoManager()->GetNodeInfo(nsGkAtoms::tbody, nullptr,
+                                               kNameSpaceID_XHTML,
+                                               nsIDOMNode::ELEMENT_NODE);
+  MOZ_ASSERT(nodeInfo);
+
+  nsCOMPtr<nsGenericHTMLElement> newBody =
+    NS_NewHTMLTableSectionElement(nodeInfo.forget());
+  MOZ_ASSERT(newBody);
+
+  nsIContent* referenceNode = nullptr;
+  for (nsIContent* child = nsINode::GetLastChild();
+       child;
+       child = child->GetPreviousSibling()) {
+    if (child->IsHTML(nsGkAtoms::tbody)) {
+      referenceNode = child->GetNextSibling();
+      break;
+    }
+  }
+
+  ErrorResult rv;
+  nsINode::InsertBefore(*newBody, referenceNode, rv);
+
+  return newBody.forget();
+}
+
 already_AddRefed<nsGenericHTMLElement>
 HTMLTableElement::InsertRow(int32_t aIndex, ErrorResult& aError)
 {
diff --git a/content/html/content/src/HTMLTableElement.h b/content/html/content/src/HTMLTableElement.h
index e81891549348..0ec90d127de4 100644
--- a/content/html/content/src/HTMLTableElement.h
+++ b/content/html/content/src/HTMLTableElement.h
@@ -93,6 +93,9 @@ public:
   already_AddRefed<nsGenericHTMLElement> CreateTFoot();
 
   nsIHTMLCollection* TBodies();
+
+  already_AddRefed<nsGenericHTMLElement> CreateTBody();
+
   nsIHTMLCollection* Rows();
 
   already_AddRefed<nsGenericHTMLElement> InsertRow(int32_t aIndex,
diff --git a/content/html/content/src/HTMLTextAreaElement.cpp b/content/html/content/src/HTMLTextAreaElement.cpp
index 1cdddaf6fa1f..8be5640721ba 100644
--- a/content/html/content/src/HTMLTextAreaElement.cpp
+++ b/content/html/content/src/HTMLTextAreaElement.cpp
@@ -5,39 +5,38 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/HTMLTextAreaElement.h"
+
+#include "mozAutoDocUpdate.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/HTMLTextAreaElementBinding.h"
 #include "mozilla/Util.h"
-#include "base/compiler_specific.h"
-
-#include "nsIControllers.h"
-#include "nsFocusManager.h"
-#include "nsPIDOMWindow.h"
+#include "nsAttrValueInlines.h"
 #include "nsContentCID.h"
+#include "nsContentCreatorFunctions.h"
+#include "nsError.h"
+#include "nsEventDispatcher.h"
+#include "nsFocusManager.h"
+#include "nsFormSubmission.h"
+#include "nsGUIEvent.h"
 #include "nsIComponentManager.h"
+#include "nsIConstraintValidation.h"
+#include "nsIControllers.h"
+#include "nsIDocument.h"
 #include "nsIDOMHTMLFormElement.h"
+#include "nsIFormControlFrame.h"
 #include "nsIFormControl.h"
 #include "nsIForm.h"
-#include "nsFormSubmission.h"
-#include "nsAttrValueInlines.h"
-#include "nsStyleConsts.h"
-#include "nsPresContext.h"
-#include "nsMappedAttributes.h"
-#include "nsIFormControlFrame.h"
-#include "nsITextControlFrame.h"
-#include "nsLinebreakConverter.h"
-#include "nsIDocument.h"
 #include "nsIFrame.h"
-#include "nsGUIEvent.h"
+#include "nsISupportsPrimitives.h"
+#include "nsITextControlFrame.h"
+#include "nsLayoutUtils.h"
+#include "nsLinebreakConverter.h"
+#include "nsMappedAttributes.h"
+#include "nsPIDOMWindow.h"
+#include "nsPresContext.h"
 #include "nsPresState.h"
 #include "nsReadableUtils.h"
-#include "nsEventDispatcher.h"
-#include "nsLayoutUtils.h"
-#include "nsError.h"
-#include "mozAutoDocUpdate.h"
-#include "nsISupportsPrimitives.h"
-#include "nsContentCreatorFunctions.h"
-#include "nsIConstraintValidation.h"
-
+#include "nsStyleConsts.h"
 #include "nsTextEditorState.h"
 
 static NS_DEFINE_CID(kXULControllersCID,  NS_XULCONTROLLERS_CID);
@@ -59,7 +58,7 @@ HTMLTextAreaElement::HTMLTextAreaElement(already_AddRefed<nsINodeInfo> aNodeInfo
     mDisabledChanged(false),
     mCanShowInvalidUI(true),
     mCanShowValidUI(true),
-    ALLOW_THIS_IN_INITIALIZER_LIST(mState(this))
+    mState(MOZ_THIS_IN_INITIALIZER_LIST())
 {
   AddMutationObserver(this);
 
diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index 3299b66daf43..b40b84f5cfcf 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -1072,20 +1072,20 @@ nsHTMLDocument::SetDomain(const nsAString& aDomain, ErrorResult& rv)
 nsGenericHTMLElement*
 nsHTMLDocument::GetBody()
 {
-  Element* body = GetBodyElement();
-
-  if (body) {
-    // There is a body element, return that as the body.
-    return static_cast<nsGenericHTMLElement*>(body);
+  Element* html = GetHtmlElement();
+  if (!html) {
+    return nullptr;
   }
 
-  // The document is most likely a frameset document so look for the
-  // outer most frameset element
-  nsRefPtr<nsContentList> nodeList =
-    NS_GetContentList(this, kNameSpaceID_XHTML, NS_LITERAL_STRING("frameset"));
-  Element* frameset = nodeList->GetElementAt(0);
-  MOZ_ASSERT(!frameset || frameset->IsHTML());
-  return static_cast<nsGenericHTMLElement*>(frameset);
+  for (nsIContent* child = html->GetFirstChild();
+       child;
+       child = child->GetNextSibling()) {
+    if (child->IsHTML(nsGkAtoms::body) || child->IsHTML(nsGkAtoms::frameset)) {
+      return static_cast<nsGenericHTMLElement*>(child);
+    }
+  }
+
+  return nullptr;
 }
 
 NS_IMETHODIMP
diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in
index e3a95255b85f..1acffe5bf3ce 100644
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -68,7 +68,6 @@ MOCHITEST_FILES = 	test_bug1682.html \
 		bug499092.xml \
 		bug499092.html \
 		test_bug512367.html \
-		test_bug571981.html \
 		test_bug677495.html \
 		test_bug677495-1.html \
 		test_bug741266.html \
diff --git a/content/html/document/test/test_bug571981.html b/content/html/document/test/test_bug571981.html
deleted file mode 100644
index aee1e6d5d55f..000000000000
--- a/content/html/document/test/test_bug571981.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=571981
--->
-<head>
-  <title>Test for Bug 571981</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=571981">Mozilla Bug 571981</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  <iframe id="testframe"></iframe>
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 571981 **/
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
-  var doc = document.getElementById("testframe").contentDocument;
-  var elem = doc.documentElement;
-  ok(elem.nodeName == "HTML" &&
-     elem.namespaceURI == "http://www.w3.org/1999/xhtml",
-     "documentElement should be an html element with nodename 'HTML'");
-  var childNodes = elem.childNodes;
-  elem = null;
-  for (var i = 0; i < childNodes.length; ++i) {
-    if (childNodes[i].nodeName == "BODY" &&
-        childNodes[i].namespaceURI == "http://www.w3.org/1999/xhtml") {
-      elem = childNodes[i];
-    }
-  }
-  ok(elem && doc.body == elem,
-     "HTMLDocument.body should be an html element with nodeName 'BODY' " +
-     "and a child of the documentElement");
-  doc.removeChild(doc.documentElement);
-  elem = doc.appendChild(doc.createElementNS("http://www.w3.org/1999/xhtml",
-                                             "frameset"));
-  var framesets = doc.getElementsByTagNameNS("http://www.w3.org/1999/xhtml",
-                                             "frameset");
-  ok(doc.body && doc.body == framesets[0],
-     "HTMLDocument.body should be the first html element in the document " +
-     "with nodename 'frameset'");
-  doc.removeChild(doc.documentElement);
-  doc.appendChild(doc.createElementNS('wrongnamespace', 'frameset'));
-  is(doc.body, null,
-     "HTMLDocument.body should not return non-html elements");
-  SimpleTest.finish();
-});
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/content/svg/content/src/SVGAElement.cpp b/content/svg/content/src/SVGAElement.cpp
index e493825a8c80..c7a6e4b48f3d 100644
--- a/content/svg/content/src/SVGAElement.cpp
+++ b/content/svg/content/src/SVGAElement.cpp
@@ -4,13 +4,14 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/SVGAElement.h"
-#include "base/compiler_specific.h"
+
+#include "mozilla/Attributes.h"
 #include "mozilla/dom/SVGAElementBinding.h"
+#include "nsCOMPtr.h"
+#include "nsContentUtils.h"
+#include "nsGkAtoms.h"
 #include "nsILink.h"
 #include "nsSVGString.h"
-#include "nsCOMPtr.h"
-#include "nsGkAtoms.h"
-#include "nsContentUtils.h"
 
 NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(A)
 
@@ -45,8 +46,8 @@ NS_IMPL_ISUPPORTS_INHERITED5(SVGAElement, SVGAElementBase,
 // Implementation
 
 SVGAElement::SVGAElement(already_AddRefed<nsINodeInfo> aNodeInfo)
-  : SVGAElementBase(aNodeInfo),
-    ALLOW_THIS_IN_INITIALIZER_LIST(Link(this))
+  : SVGAElementBase(aNodeInfo)
+  , Link(MOZ_THIS_IN_INITIALIZER_LIST())
 {
 }
 
diff --git a/content/svg/content/src/SVGRect.cpp b/content/svg/content/src/SVGRect.cpp
index 3b45bed4c4eb..4c3ea78c1ee7 100644
--- a/content/svg/content/src/SVGRect.cpp
+++ b/content/svg/content/src/SVGRect.cpp
@@ -5,11 +5,8 @@
 
 #include "mozilla/dom/SVGRect.h"
 #include "nsContentUtils.h"
-#include "nsDOMClassInfoID.h"
 #include "nsSVGElement.h"
 
-DOMCI_DATA(SVGRect, mozilla::dom::SVGRect)
-
 namespace mozilla {
 namespace dom {
 
diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp
index 8849b64321e1..a9058051b48e 100644
--- a/content/xbl/src/nsXBLPrototypeBinding.cpp
+++ b/content/xbl/src/nsXBLPrototypeBinding.cpp
@@ -476,7 +476,7 @@ nsXBLPrototypeBinding::ImplementsInterface(REFNSIID aIID) const
   // Check our IID table.
   if (mInterfaceTable) {
     nsIIDKey key(aIID);
-    nsCOMPtr<nsISupports> supports = getter_AddRefs(static_cast<nsISupports*>(mInterfaceTable->Get(&key)));
+    nsCOMPtr<nsISupports> supports = dont_AddRef(mInterfaceTable->Get(&key));
     return supports != nullptr;
   }
 
diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
index 40a536f6ff31..a38525c42ef5 100644
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -520,9 +520,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(Crypto, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
 
-  NS_DEFINE_CLASSINFO_DATA(CSSRect, nsDOMGenericSH,
-                           DOM_DEFAULT_SCRIPTABLE_FLAGS)
-
   // DOM Chrome Window class.
   NS_DEFINE_CLASSINFO_DATA(ChromeWindow, nsWindowSH,
                            DEFAULT_SCRIPTABLE_FLAGS |
@@ -670,8 +667,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
   NS_DEFINE_CLASSINFO_DATA(IDBOpenDBRequest, IDBEventTargetSH,
                            IDBEVENTTARGET_SCRIPTABLE_FLAGS)
 
-  NS_DEFINE_CLASSINFO_DATA(TouchList, nsDOMTouchListSH,
-                           ARRAY_SCRIPTABLE_FLAGS)
 
   NS_DEFINE_CLASSINFO_DATA(MozCSSKeyframeRule, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
@@ -789,9 +784,6 @@ jsid nsDOMClassInfo::sDocument_id        = JSID_VOID;
 jsid nsDOMClassInfo::sFrames_id          = JSID_VOID;
 jsid nsDOMClassInfo::sSelf_id            = JSID_VOID;
 jsid nsDOMClassInfo::sWrappedJSObject_id = JSID_VOID;
-jsid nsDOMClassInfo::sURL_id             = JSID_VOID;
-jsid nsDOMClassInfo::sOnload_id          = JSID_VOID;
-jsid nsDOMClassInfo::sOnerror_id         = JSID_VOID;
 
 static const JSClass *sObjectClass = nullptr;
 
@@ -984,9 +976,6 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
   SET_JSID_TO_STRING(sFrames_id,          cx, "frames");
   SET_JSID_TO_STRING(sSelf_id,            cx, "self");
   SET_JSID_TO_STRING(sWrappedJSObject_id, cx, "wrappedJSObject");
-  SET_JSID_TO_STRING(sURL_id,             cx, "URL");
-  SET_JSID_TO_STRING(sOnload_id,          cx, "onload");
-  SET_JSID_TO_STRING(sOnerror_id,         cx, "onerror");
 
   return NS_OK;
 }
@@ -1382,10 +1371,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCSSStyleSheet)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(CSSRect, nsIDOMRect)
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMRect)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(Selection, nsISelection)
     DOM_CLASSINFO_MAP_ENTRY(nsISelection)
   DOM_CLASSINFO_MAP_END
@@ -1645,11 +1630,6 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
   DOM_CLASSINFO_MAP_END
 
-  DOM_CLASSINFO_MAP_BEGIN_MAYBE_DISABLE(TouchList, nsIDOMTouchList,
-                                        !nsDOMTouchEvent::PrefEnabled())
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMTouchList)
-  DOM_CLASSINFO_MAP_END
-
   DOM_CLASSINFO_MAP_BEGIN(MozCSSKeyframeRule, nsIDOMMozCSSKeyframeRule)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMMozCSSKeyframeRule)
   DOM_CLASSINFO_MAP_END
@@ -2065,14 +2045,6 @@ nsDOMClassInfo::NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
   return NS_OK;
 }
 
-nsISupports*
-nsDOMTouchListSH::GetItemAt(nsISupports *aNative, uint32_t aIndex,
-                            nsWrapperCache **aCache, nsresult *aResult)
-{
-  nsDOMTouchList* list = static_cast<nsDOMTouchList*>(aNative);
-  return list->GetItemAt(aIndex);
-}
-
 NS_IMETHODIMP
 nsDOMClassInfo::Convert(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
                         JSObject *obj, uint32_t type, jsval *vp,
@@ -2409,8 +2381,6 @@ nsDOMClassInfo::ShutDown()
   sFrames_id          = JSID_VOID;
   sSelf_id            = JSID_VOID;
   sWrappedJSObject_id = JSID_VOID;
-  sOnload_id          = JSID_VOID;
-  sOnerror_id         = JSID_VOID;
 
   NS_IF_RELEASE(sXPConnect);
   NS_IF_RELEASE(sSecMan);
diff --git a/dom/base/nsDOMClassInfo.h b/dom/base/nsDOMClassInfo.h
index 8e5874bc583c..9c803c8edaff 100644
--- a/dom/base/nsDOMClassInfo.h
+++ b/dom/base/nsDOMClassInfo.h
@@ -179,8 +179,7 @@ protected:
             id == sScrollMaxY_id   ||
             id == sLength_id       ||
             id == sFrames_id       ||
-            id == sSelf_id         ||
-            id == sURL_id);
+            id == sSelf_id);
   }
 
   static nsIXPConnect *sXPConnect;
@@ -203,7 +202,6 @@ public:
   static jsid sLocationbar_id;
   static jsid sPersonalbar_id;
   static jsid sStatusbar_id;
-  static jsid sDialogArguments_id;
   static jsid sControllers_id;
   static jsid sLength_id;
   static jsid sScrollX_id;
@@ -219,15 +217,7 @@ public:
   static jsid sFrames_id;
   static jsid sSelf_id;
   static jsid sJava_id;
-  static jsid sPackages_id;
   static jsid sWrappedJSObject_id;
-  static jsid sURL_id;
-  static jsid sOnload_id;
-  static jsid sOnerror_id;
-
-protected:
-  static JSPropertyOp sXPCNativeWrapperGetPropertyOp;
-  static JSPropertyOp sXrayWrapperPropertyHolderGetPropertyOp;
 };
 
 // THIS ONE ISN'T SAFE!! It assumes that the private of the JSObject is
@@ -672,27 +662,6 @@ public:
   }
 };
 
-class nsDOMTouchListSH : public nsArraySH
-{
-  protected:
-  nsDOMTouchListSH(nsDOMClassInfoData* aData) : nsArraySH(aData)
-  {
-  }
-
-  virtual ~nsDOMTouchListSH()
-  {
-  }
-
-  virtual nsISupports* GetItemAt(nsISupports *aNative, uint32_t aIndex,
-                                 nsWrapperCache **aCache, nsresult *aResult) MOZ_OVERRIDE;
-
-  public:
-  static nsIClassInfo* doCreate(nsDOMClassInfoData* aData)
-  {
-    return new nsDOMTouchListSH(aData);
-  }
-};
-
 // WebApps Storage helpers
 
 class nsStorage2SH : public nsDOMGenericSH
diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h
index 92af52a5796f..da4e5cde2438 100644
--- a/dom/base/nsDOMClassInfoClasses.h
+++ b/dom/base/nsDOMClassInfoClasses.h
@@ -48,9 +48,6 @@ DOMCI_CLASS(CRMFObject)
 #endif
 DOMCI_CLASS(Crypto)
 
-// Rect object used by getComputedStyle
-DOMCI_CLASS(CSSRect)
-
 // DOM Chrome Window class, almost identical to Window
 DOMCI_CLASS(ChromeWindow)
 
@@ -134,7 +131,6 @@ DOMCI_CLASS(IDBKeyRange)
 DOMCI_CLASS(IDBIndex)
 DOMCI_CLASS(IDBOpenDBRequest)
 
-DOMCI_CLASS(TouchList)
 
 DOMCI_CLASS(MozCSSKeyframeRule)
 DOMCI_CLASS(MozCSSKeyframesRule)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index bebbd9f11b22..72433184c67f 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -4854,7 +4854,7 @@ nsGlobalWindow::GetScrollXY(int32_t* aScrollX, int32_t* aScrollY,
     return GetScrollXY(aScrollX, aScrollY, true);
   }
 
-  nsIntPoint scrollPosCSSPixels = sf->GetScrollPositionCSSPixels();
+  CSSIntPoint scrollPosCSSPixels = sf->GetScrollPositionCSSPixels();
   if (aScrollX) {
     *aScrollX = scrollPosCSSPixels.x;
   }
@@ -6107,8 +6107,7 @@ nsGlobalWindow::ScrollBy(int32_t aXScrollDif, int32_t aYScrollDif)
 
   if (sf) {
     CSSIntPoint scrollPos =
-      CSSIntPoint::FromAppUnitsRounded(sf->GetScrollPosition()) +
-      CSSIntPoint(aXScrollDif, aYScrollDif);
+      sf->GetScrollPositionCSSPixels() + CSSIntPoint(aXScrollDif, aYScrollDif);
     // It seems like it would make more sense for ScrollBy to use
     // SMOOTH mode, but tests seem to depend on the synchronous behaviour.
     // Perhaps Web content does too.
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 75962959dcbc..132cda6af2d5 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1159,6 +1159,11 @@ DOMInterfaces = {
     'nativeType': 'nsDOMTouchEvent',
 },
 
+'TouchList': {
+    'nativeType': 'nsDOMTouchList',
+    'headerFile': 'nsDOMTouchEvent.h',
+},
+
 'TransitionEvent': {
     'nativeType': 'nsDOMTransitionEvent',
 },
@@ -1731,7 +1736,6 @@ addExternalIface('Selection', nativeType='nsISelection')
 addExternalIface('StyleSheetList')
 addExternalIface('SVGLength')
 addExternalIface('SVGNumber')
-addExternalIface('TouchList', headerFile='nsIDOMTouchEvent.h')
 addExternalIface('URI', nativeType='nsIURI', headerFile='nsIURI.h',
                  notflattened=True)
 addExternalIface('UserDataHandler')
diff --git a/dom/bluetooth/linux/BluetoothDBusService.cpp b/dom/bluetooth/linux/BluetoothDBusService.cpp
index 3e1cc3cd8ed9..260a079bb8b0 100644
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -2094,36 +2094,6 @@ BluetoothDBusService::GetDevicePath(const nsAString& aAdapterPath,
   return true;
 }
 
-static int
-GetDeviceServiceChannel(const nsAString& aObjectPath,
-                        const nsAString& aPattern,
-                        int aAttributeId)
-{
-  // This is a blocking call, should not be run on main thread.
-  MOZ_ASSERT(!NS_IsMainThread());
-
-#ifdef MOZ_WIDGET_GONK
-  // GetServiceAttributeValue only exists in android's bluez dbus binding
-  // implementation
-  nsCString tempPattern = NS_ConvertUTF16toUTF8(aPattern);
-  const char* pattern = tempPattern.get();
-
-  DBusMessage *reply =
-    dbus_func_args(gThreadConnection->GetConnection(),
-                   NS_ConvertUTF16toUTF8(aObjectPath).get(),
-                   DBUS_DEVICE_IFACE, "GetServiceAttributeValue",
-                   DBUS_TYPE_STRING, &pattern,
-                   DBUS_TYPE_UINT16, &aAttributeId,
-                   DBUS_TYPE_INVALID);
-
-  return reply ? dbus_returns_int32(reply) : -1;
-#else
-  // FIXME/Bug 793977 qdot: Just return something for desktop, until we have a
-  // parser for the GetServiceAttributes xml block
-  return 1;
-#endif
-}
-
 // static
 bool
 BluetoothDBusService::RemoveReservedServicesInternal(
@@ -2589,8 +2559,7 @@ public:
     mDeviceAddress = GetAddressFromObjectPath(aObjectPath);
   }
 
-  nsresult
-  Run()
+  NS_IMETHOD Run()
   {
     MOZ_ASSERT(NS_IsMainThread());
 
@@ -2606,55 +2575,92 @@ private:
   BluetoothProfileManagerBase* mManager;
 };
 
-class GetServiceChannelRunnable : public nsRunnable
+class OnGetServiceChannelReplyHandler : public DBusReplyHandler
 {
 public:
-  GetServiceChannelRunnable(const nsAString& aObjectPath,
-                            const nsAString& aServiceUuid,
-                            BluetoothProfileManagerBase* aManager)
-    : mObjectPath(aObjectPath),
-      mServiceUuid(aServiceUuid),
-      mManager(aManager)
+  OnGetServiceChannelReplyHandler(const nsAString& aObjectPath,
+                                  const nsAString& aServiceUUID,
+                                  BluetoothProfileManagerBase* aBluetoothProfileManager)
+  : mObjectPath(aObjectPath),
+    mServiceUUID(aServiceUUID),
+    mBluetoothProfileManager(aBluetoothProfileManager)
   {
-    MOZ_ASSERT(!aObjectPath.IsEmpty());
-    MOZ_ASSERT(!aServiceUuid.IsEmpty());
-    MOZ_ASSERT(aManager);
+    MOZ_ASSERT(mBluetoothProfileManager);
   }
 
-  nsresult
-  Run()
+  void Handle(DBusMessage* aReply)
   {
-    MOZ_ASSERT(!NS_IsMainThread());
+    MOZ_ASSERT(!NS_IsMainThread()); // DBus thread
 
-    int channel = GetDeviceServiceChannel(mObjectPath, mServiceUuid, 0x0004);
-    nsRefPtr<nsRunnable> r(new OnGetServiceChannelRunnable(mObjectPath,
-                                                           mServiceUuid,
-                                                           channel,
-                                                           mManager));
-    NS_DispatchToMainThread(r);
-    return NS_OK;
+    // The default channel is an invalid value of -1. We
+    // update it if we have received a correct reply. Both
+    // cases, valid and invalid channel numbers, are handled
+    // in BluetoothProfileManagerBase::OnGetServiceChannel.
+
+    int channel = -1;
+
+    if (aReply && (dbus_message_get_type(aReply) != DBUS_MESSAGE_TYPE_ERROR)) {
+      channel = dbus_returns_int32(aReply);
+    }
+
+    nsRefPtr<nsRunnable> r = new OnGetServiceChannelRunnable(mObjectPath,
+                                                             mServiceUUID,
+                                                             channel,
+                                                             mBluetoothProfileManager);
+    nsresult rv = NS_DispatchToMainThread(r);
+    NS_ENSURE_SUCCESS_VOID(rv);
   }
 
 private:
   nsString mObjectPath;
-  nsString mServiceUuid;
-  BluetoothProfileManagerBase* mManager;
+  nsString mServiceUUID;
+  BluetoothProfileManagerBase* mBluetoothProfileManager;
 };
 
 nsresult
 BluetoothDBusService::GetServiceChannel(const nsAString& aDeviceAddress,
-                                        const nsAString& aServiceUuid,
+                                        const nsAString& aServiceUUID,
                                         BluetoothProfileManagerBase* aManager)
 {
   MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(mBluetoothCommandThread);
 
   nsString objectPath(GetObjectPathFromAddress(sAdapterPath, aDeviceAddress));
 
-  nsRefPtr<nsRunnable> r(new GetServiceChannelRunnable(objectPath,
-                                                       aServiceUuid,
-                                                       aManager));
-  mBluetoothCommandThread->Dispatch(r, NS_DISPATCH_NORMAL);
+#ifdef MOZ_WIDGET_GONK
+  static const int sProtocolDescriptorList = 0x0004;
+
+  // GetServiceAttributeValue only exists in android's bluez dbus binding
+  // implementation
+  nsCString serviceUUID = NS_ConvertUTF16toUTF8(aServiceUUID);
+  const char* cstrServiceUUID = serviceUUID.get();
+
+  nsRefPtr<OnGetServiceChannelReplyHandler> handler =
+    new OnGetServiceChannelReplyHandler(objectPath, aServiceUUID, aManager);
+
+  bool success = dbus_func_args_async(mConnection, -1,
+                                      OnGetServiceChannelReplyHandler::Callback, handler,
+                                      NS_ConvertUTF16toUTF8(objectPath).get(),
+                                      DBUS_DEVICE_IFACE, "GetServiceAttributeValue",
+                                      DBUS_TYPE_STRING, &cstrServiceUUID,
+                                      DBUS_TYPE_UINT16, &sProtocolDescriptorList,
+                                      DBUS_TYPE_INVALID);
+  NS_ENSURE_TRUE(success, NS_ERROR_FAILURE);
+
+  handler.forget();
+#else
+  // FIXME/Bug 793977 qdot: Just set something for desktop, until we have a
+  // parser for the GetServiceAttributes xml block
+  //
+  // Even though we are on the main thread already, we need to dispatch a
+  // runnable here. OnGetServiceChannel needs mRunnable to be set, which
+  // happens after GetServiceChannel returns.
+  nsRefPtr<nsRunnable> r = new OnGetServiceChannelRunnable(objectPath,
+                                                           aServiceUUID,
+                                                           1,
+                                                           aManager);
+  nsresult rv = NS_DispatchToMainThread(r);
+  NS_ENSURE_SUCCESS_VOID(rv);
+#endif
 
   return NS_OK;
 }
diff --git a/dom/file/ArchiveRequest.cpp b/dom/file/ArchiveRequest.cpp
index 149fe1796c5e..9845923fd10f 100644
--- a/dom/file/ArchiveRequest.cpp
+++ b/dom/file/ArchiveRequest.cpp
@@ -11,7 +11,6 @@
 #include "nsCxPusher.h"
 #include "nsLayoutStatics.h"
 #include "nsEventDispatcher.h"
-#include "nsDOMClassInfoID.h"
 
 USING_FILE_NAMESPACE
 
@@ -279,5 +278,3 @@ NS_INTERFACE_MAP_END_INHERITING(DOMRequest)
 
 NS_IMPL_ADDREF_INHERITED(ArchiveRequest, DOMRequest)
 NS_IMPL_RELEASE_INHERITED(ArchiveRequest, DOMRequest)
-
-DOMCI_DATA(ArchiveRequest, ArchiveRequest)
diff --git a/dom/icc/interfaces/nsIDOMIccManager.idl b/dom/icc/interfaces/nsIDOMIccManager.idl
index ab218426ab7a..e5f7f4a11636 100644
--- a/dom/icc/interfaces/nsIDOMIccManager.idl
+++ b/dom/icc/interfaces/nsIDOMIccManager.idl
@@ -9,7 +9,7 @@ interface nsIDOMEventListener;
 interface nsIDOMDOMRequest;
 interface nsIDOMContact;
 
-[scriptable, builtinclass, uuid(d21b7070-c2bc-11e2-8b8b-0800200c9a66)]
+[scriptable, builtinclass, uuid(5f405112-4da9-4d4d-942c-4da3cb7928e1)]
 interface nsIDOMMozIccManager : nsIDOMEventTarget
 {
   /**
@@ -432,6 +432,20 @@ interface nsIDOMMozIccManager : nsIDOMEventTarget
    */
   [implicit_jscontext] attribute jsval onicccardlockerror;
 
+  /**
+   * Retrieve the number of remaining tries for unlocking the card.
+   *
+   * @param lockType
+   *        Identifies the lock type, e.g. "pin" for the PIN lock, "puk" for
+   *        the PUK lock.
+   *
+   * @return a DOM Request.
+   *         If the lock type is "pin", or "puk", the request's result will be
+   *         an object containing the number of retries for the specified
+   *         lock. For any other lock type, the result is undefined.
+   */
+  nsIDOMDOMRequest getCardLockRetryCount(in DOMString lockType);
+
   // UICC Phonebook Interfaces.
 
   /**
diff --git a/dom/icc/interfaces/nsIIccProvider.idl b/dom/icc/interfaces/nsIIccProvider.idl
index d01e191be802..6b6b00fd62b3 100644
--- a/dom/icc/interfaces/nsIIccProvider.idl
+++ b/dom/icc/interfaces/nsIIccProvider.idl
@@ -21,7 +21,7 @@ interface nsIIccListener : nsISupports
 /**
  * XPCOM component (in the content process) that provides the ICC information.
  */
-[scriptable, uuid(77487bf0-c2be-11e2-8b8b-0800200c9a66)]
+[scriptable, uuid(7131dfbe-9a2c-434d-b6b8-3eebf491ce1a)]
 interface nsIIccProvider : nsISupports
 {
   /**
@@ -57,6 +57,7 @@ interface nsIIccProvider : nsISupports
   nsIDOMDOMRequest getCardLockState(in nsIDOMWindow window, in DOMString lockType);
   nsIDOMDOMRequest unlockCardLock(in nsIDOMWindow window, in jsval info);
   nsIDOMDOMRequest setCardLock(in nsIDOMWindow window, in jsval info);
+  nsIDOMDOMRequest getCardLockRetryCount(in nsIDOMWindow window, in DOMString lockType);
 
   /**
    * Phonebook interfaces.
diff --git a/dom/icc/src/IccManager.cpp b/dom/icc/src/IccManager.cpp
index 734008ea4c9a..5a0dd8eaadaa 100644
--- a/dom/icc/src/IccManager.cpp
+++ b/dom/icc/src/IccManager.cpp
@@ -170,6 +170,16 @@ IccManager::UnlockCardLock(const JS::Value& aInfo, nsIDOMDOMRequest** aDomReques
   return mProvider->UnlockCardLock(GetOwner(), aInfo, aDomRequest);
 }
 
+NS_IMETHODIMP
+IccManager::GetCardLockRetryCount(const nsAString& aLockType, nsIDOMDOMRequest** aDomRequest)
+{
+  if (!mProvider) {
+    return NS_ERROR_FAILURE;
+  }
+
+  return mProvider->GetCardLockRetryCount(GetOwner(), aLockType, aDomRequest);
+}
+
 NS_IMETHODIMP
 IccManager::IccOpenChannel(const nsAString& aAid, nsIDOMDOMRequest** aRequest)
 {
diff --git a/dom/icc/tests/marionette/test_icc_card_lock.js b/dom/icc/tests/marionette/test_icc_card_lock.js
index 561229d55c49..51d0ef3544ad 100644
--- a/dom/icc/tests/marionette/test_icc_card_lock.js
+++ b/dom/icc/tests/marionette/test_icc_card_lock.js
@@ -90,10 +90,80 @@ function testPinChangeSuccess() {
   };
 }
 
+/* Read PIN-lock retry count */
+function testPinCardLockRetryCount() {
+  let request = icc.getCardLockRetryCount('pin');
+
+  ok(request instanceof DOMRequest,
+     'request instanceof ' + request.constructor);
+
+  request.onsuccess = function onsuccess() {
+    is(request.result.lockType, 'pin',
+        'lockType is ' + request.result.lockType);
+    ok(request.result.retryCount >= 0,
+        'retryCount is ' + request.result.retryCount);
+    runNextTest();
+  };
+  request.onerror = function onerror() {
+    // The operation is optional any might not be supported for all
+    // all locks. In this case, we generate 'NotSupportedError' for
+    // the valid lock types.
+    is(request.error.name, 'RequestNotSupported',
+        'error name is ' + request.error.name);
+    runNextTest();
+  };
+}
+
+/* Read PUK-lock retry count */
+function testPukCardLockRetryCount() {
+  let request = icc.getCardLockRetryCount('puk');
+
+  ok(request instanceof DOMRequest,
+     'request instanceof ' + request.constructor);
+
+  request.onsuccess = function onsuccess() {
+    is(request.result.lockType, 'puk',
+        'lockType is ' + request.result.lockType);
+    ok(request.result.retryCount >= 0,
+        'retryCount is ' + request.result.retryCount);
+    runNextTest();
+  };
+  request.onerror = function onerror() {
+    // The operation is optional any might not be supported for all
+    // all locks. In this case, we generate 'NotSupportedError' for
+    // the valid lock types.
+    is(request.error.name, 'RequestNotSupported',
+        'error name is ' + request.error.name);
+    runNextTest();
+  };
+}
+
+/* Read lock retry count for an invalid entries  */
+function testInvalidCardLockRetryCount() {
+  let request = icc.getCardLockRetryCount('invalid-lock-type');
+
+  ok(request instanceof DOMRequest,
+     'request instanceof ' + request.constructor);
+
+  request.onsuccess = function onsuccess() {
+    ok(false,
+        'request should never return success for an invalid lock type');
+    runNextTest();
+  };
+  request.onerror = function onerror() {
+    is(request.error.name, 'GenericFailure',
+        'error name is ' + request.error.name);
+    runNextTest();
+  };
+}
+
 let tests = [
   testPinChangeFailed,
   testPinChangeFailedNotification,
   testPinChangeSuccess,
+  testPinCardLockRetryCount,
+  testPukCardLockRetryCount,
+  testInvalidCardLockRetryCount
 ];
 
 function runNextTest() {
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in b/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
index 4ae7980240f0..4ebdbee44f8a 100644
--- a/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
+++ b/dom/imptests/failures/html/html/dom/documents/dta/Makefile.in
@@ -10,7 +10,6 @@ relativesrcdir := @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES := \
-  test_document.body-getter.html.json \
   test_document.title-03.html.json \
   test_document.title-04.xhtml.json \
   test_document.title-06.html.json \
diff --git a/dom/imptests/failures/html/html/dom/documents/dta/test_document.body-getter.html.json b/dom/imptests/failures/html/html/dom/documents/dta/test_document.body-getter.html.json
deleted file mode 100644
index ff4bfae0436b..000000000000
--- a/dom/imptests/failures/html/html/dom/documents/dta/test_document.body-getter.html.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "Frameset followed by body inside the html element": true,
-  "Body followed by frameset inside a non-HTML html element": true,
-  "Frameset followed by body inside a non-HTML html element": true,
-  "Frameset inside an x element followed by a frameset": true,
-  "Frameset as the root node": true,
-  "Body as the root node with a frameset child": true,
-  "Frameset as the root node with a body child": true
-}
diff --git a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
index 8782fdb0fbd2..4ea8cb30c748 100644
--- a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
+++ b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/Makefile.in
@@ -10,7 +10,6 @@ relativesrcdir := @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES := \
-  test_createTBody.html.json \
   test_table-insertRow.html.json \
   test_table-rows.html.json \
   $(NULL)
diff --git a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/test_createTBody.html.json b/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/test_createTBody.html.json
deleted file mode 100644
index 9460313273b1..000000000000
--- a/dom/imptests/failures/html/html/semantics/tabular-data/the-table-element/test_createTBody.html.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "No child nodes": true,
-  "One tbody child node": true,
-  "Two tbody child nodes": true,
-  "A thead and a tbody child node": true,
-  "A tfoot and a tbody child node": true,
-  "A tbody and a thead child node": true,
-  "A tbody and a tfoot child node": true,
-  "Two tbody child nodes and a div": true,
-  "One HTML and one namespaced tbody child node": true,
-  "Two nested tbody child nodes": true,
-  "A tbody node inside a thead child node": true,
-  "A tbody node inside a tfoot child node": true,
-  "A tbody node inside a thead child node after a tbody child node": true,
-  "A tbody node inside a tfoot child node after a tbody child node": true
-}
diff --git a/dom/interfaces/events/moz.build b/dom/interfaces/events/moz.build
index a03c15eb3885..72da456eb09b 100644
--- a/dom/interfaces/events/moz.build
+++ b/dom/interfaces/events/moz.build
@@ -40,7 +40,6 @@ XPIDL_SOURCES += [
     'nsIDOMNotifyPaintEvent.idl',
     'nsIDOMPageTransitionEvent.idl',
     'nsIDOMPaintRequest.idl',
-    'nsIDOMPaintRequestList.idl',
     'nsIDOMPopStateEvent.idl',
     'nsIDOMPopupBlockedEvent.idl',
     'nsIDOMProgressEvent.idl',
diff --git a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
index c1883f2fe2da..543f2c946407 100644
--- a/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
+++ b/dom/interfaces/events/nsIDOMNotifyPaintEvent.idl
@@ -12,7 +12,7 @@ interface nsIDOMPaintRequestList;
  * event, which fires at a window when painting has happened in
  * that window.
  */
-[scriptable, builtinclass, uuid(e3560df8-0926-48da-b13a-36d3938c95af)]
+[scriptable, builtinclass, uuid(ef68f0d5-5b55-4198-9e59-a5e2c57d3adc)]
 interface nsIDOMNotifyPaintEvent : nsIDOMEvent
 {
   /**
@@ -32,6 +32,6 @@ interface nsIDOMNotifyPaintEvent : nsIDOMEvent
    */
   readonly attribute nsIDOMClientRect boundingClientRect;
 
-  readonly attribute nsIDOMPaintRequestList paintRequests;
+  readonly attribute nsISupports /* PaintRequestList */ paintRequests;
 };
 
diff --git a/dom/interfaces/events/nsIDOMPaintRequestList.idl b/dom/interfaces/events/nsIDOMPaintRequestList.idl
deleted file mode 100644
index df0dce556f9d..000000000000
--- a/dom/interfaces/events/nsIDOMPaintRequestList.idl
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "domstubs.idl"
-
-interface nsIDOMPaintRequest;
-
-[scriptable, uuid(1d6a6e10-e9f0-468b-b8e5-da39c945690e)]
-interface nsIDOMPaintRequestList : nsISupports
-{
-  readonly attribute unsigned long length;
-  nsIDOMPaintRequest        item(in unsigned long index);
-};
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 80ee26ea184c..a30583240720 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2572,5 +2572,37 @@ ContentParent::RecvSystemMessageHandled()
     return true;
 }
 
+bool
+ContentParent::RecvCreateFakeVolume(const nsString& fsName, const nsString& mountPoint)
+{
+#ifdef MOZ_WIDGET_GONK
+  nsresult rv;
+  nsCOMPtr<nsIVolumeService> vs = do_GetService(NS_VOLUMESERVICE_CONTRACTID, &rv);
+  if (vs) {
+    vs->CreateFakeVolume(fsName, mountPoint);
+  }
+  return true;
+#else
+  NS_WARNING("ContentParent::RecvCreateFakeVolume shouldn't be called when MOZ_WIDGET_GONK is not defined");
+  return false;
+#endif
+}
+
+bool
+ContentParent::RecvSetFakeVolumeState(const nsString& fsName, const int32_t& fsState)
+{
+#ifdef MOZ_WIDGET_GONK
+  nsresult rv;
+  nsCOMPtr<nsIVolumeService> vs = do_GetService(NS_VOLUMESERVICE_CONTRACTID, &rv);
+  if (vs) {
+    vs->SetFakeVolumeState(fsName, fsState);
+  }
+  return true;
+#else
+  NS_WARNING("ContentParent::RecvSetFakeVolumeState shouldn't be called when MOZ_WIDGET_GONK is not defined");
+  return false;
+#endif
+}
+
 } // namespace dom
 } // namespace mozilla
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
index ee5d43abd256..abdaa21c3b74 100644
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -416,6 +416,10 @@ private:
 
     virtual bool RecvSystemMessageHandled() MOZ_OVERRIDE;
 
+    virtual bool RecvCreateFakeVolume(const nsString& fsName, const nsString& mountPoint) MOZ_OVERRIDE;
+
+    virtual bool RecvSetFakeVolumeState(const nsString& fsName, const int32_t& fsState) MOZ_OVERRIDE;
+
     virtual void ProcessingError(Result what) MOZ_OVERRIDE;
 
     GeckoChildProcessHost* mSubprocess;
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index 788424509b1f..01a3566c3e78 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -515,6 +515,10 @@ parent:
     // Notify the parent that the child has finished handling a system message.
     async SystemMessageHandled();
 
+    // called by the child (test code only) to propagate volume changes to the parent
+    async CreateFakeVolume(nsString fsName, nsString mountPoint);
+    async SetFakeVolumeState(nsString fsName, int32_t fsState);
+
 both:
      AsyncMessage(nsString aMessage, ClonedMessageData aData);
 };
diff --git a/dom/messages/SystemMessageInternal.js b/dom/messages/SystemMessageInternal.js
index e849e615998a..5c531c3f40f0 100644
--- a/dom/messages/SystemMessageInternal.js
+++ b/dom/messages/SystemMessageInternal.js
@@ -47,6 +47,11 @@ function debug(aMsg) {
   // dump("-- SystemMessageInternal " + Date.now() + " : " + aMsg + "\n");
 }
 
+
+const MSG_SENT_SUCCESS = 0;
+const MSG_SENT_FAILURE_PERM_DENIED = 1;
+const MSG_SENT_FAILURE_APP_NOT_RUNNING = 2;
+
 // Implementation of the component used by internal users.
 
 function SystemMessageInternal() {
@@ -158,13 +163,16 @@ SystemMessageInternal.prototype = {
     debug("Sending " + aType + " " + JSON.stringify(aMessage) +
       " for " + aPageURI.spec + " @ " + aManifestURI.spec);
 
+    let result = this._sendMessageCommon(aType,
+                                         aMessage,
+                                         messageID,
+                                         aPageURI.spec,
+                                         aManifestURI.spec);
+    debug("Returned status of sending message: " + result);
+
     // Don't need to open the pages and queue the system message
     // which was not allowed to be sent.
-    if (!this._sendMessageCommon(aType,
-                                 aMessage,
-                                 messageID,
-                                 aPageURI.spec,
-                                 aManifestURI.spec)) {
+    if (result === MSG_SENT_FAILURE_PERM_DENIED) {
       return;
     }
 
@@ -173,8 +181,10 @@ SystemMessageInternal.prototype = {
       // Queue this message in the corresponding pages.
       this._queueMessage(page, aMessage, messageID);
 
-      // Open app pages to handle their pending messages.
-      this._openAppPage(page, aMessage);
+        if (result === MSG_SENT_FAILURE_APP_NOT_RUNNING) {
+          // Don't open the page again if we already sent the message to it.
+          this._openAppPage(page, aMessage);
+        }
     }
   },
 
@@ -196,21 +206,27 @@ SystemMessageInternal.prototype = {
     // Find pages that registered an handler for this type.
     this._pages.forEach(function(aPage) {
       if (aPage.type == aType) {
+        let result = this._sendMessageCommon(aType,
+                                             aMessage,
+                                             messageID,
+                                             aPage.uri,
+                                             aPage.manifest);
+        debug("Returned status of sending message: " + result);
+
+
         // Don't need to open the pages and queue the system message
         // which was not allowed to be sent.
-        if (!this._sendMessageCommon(aType,
-                                     aMessage,
-                                     messageID,
-                                     aPage.uri,
-                                     aPage.manifest)) {
+        if (result === MSG_SENT_FAILURE_PERM_DENIED) {
           return;
         }
 
         // Queue this message in the corresponding pages.
         this._queueMessage(aPage, aMessage, messageID);
 
-        // Open app pages to handle their pending messages.
-        this._openAppPage(aPage, aMessage);
+        if (result === MSG_SENT_FAILURE_APP_NOT_RUNNING) {
+          // Open app pages to handle their pending messages.
+          this._openAppPage(aPage, aMessage);
+        }
       }
     }, this);
   },
@@ -525,7 +541,7 @@ SystemMessageInternal.prototype = {
           .isSystemMessagePermittedToSend(aType,
                                           aPageURI,
                                           aManifestURI)) {
-      return false;
+      return MSG_SENT_FAILURE_PERM_DENIED;
     }
 
     let appPageIsRunning = false;
@@ -571,9 +587,11 @@ SystemMessageInternal.prototype = {
       // message when the page finishes handling the system message with other
       // pending messages. At that point, we'll release the lock we acquired.
       this._acquireCpuWakeLock(pageKey);
+      return MSG_SENT_FAILURE_APP_NOT_RUNNING;
+    } else {
+      return MSG_SENT_SUCCESS;
     }
 
-    return true;
   },
 
   classID: Components.ID("{70589ca5-91ac-4b9e-b839-d6a88167d714}"),
diff --git a/dom/mobilemessage/src/MmsMessage.cpp b/dom/mobilemessage/src/MmsMessage.cpp
index d76f21455bad..868da60a47ba 100644
--- a/dom/mobilemessage/src/MmsMessage.cpp
+++ b/dom/mobilemessage/src/MmsMessage.cpp
@@ -473,13 +473,7 @@ MmsMessage::GetSmil(nsAString& aSmil)
 NS_IMETHODIMP
 MmsMessage::GetAttachments(JSContext* aCx, JS::Value* aAttachments)
 {
-  // TODO Bug 850529 We should return an empty array (or null)
-  // when it has no attachments? Need to further check this.
   uint32_t length = mAttachments.Length();
-  if (length == 0) {
-    *aAttachments = JSVAL_NULL;
-    return NS_OK;
-  }
 
   JS::Rooted<JSObject*> attachments(aCx, JS_NewArrayObject(aCx, length, nullptr));
   NS_ENSURE_TRUE(attachments, NS_ERROR_OUT_OF_MEMORY);
diff --git a/dom/mobilemessage/tests/marionette/manifest.ini b/dom/mobilemessage/tests/marionette/manifest.ini
index 29f6a64ab721..af4ca41e19c7 100644
--- a/dom/mobilemessage/tests/marionette/manifest.ini
+++ b/dom/mobilemessage/tests/marionette/manifest.ini
@@ -34,3 +34,4 @@ qemu = true
 [test_massive_incoming_delete.js]
 [test_getsegmentinfofortext.js]
 [test_phone_number_normalization.js]
+[test_mmsmessage_attachments.js]
diff --git a/dom/mobilemessage/tests/marionette/test_mmsmessage_attachments.js b/dom/mobilemessage/tests/marionette/test_mmsmessage_attachments.js
new file mode 100644
index 000000000000..3a9a8f878f34
--- /dev/null
+++ b/dom/mobilemessage/tests/marionette/test_mmsmessage_attachments.js
@@ -0,0 +1,121 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 60000;
+
+const MMS_MAX_LENGTH_SUBJECT = 40;
+
+SpecialPowers.addPermission("sms", true, document);
+SpecialPowers.setBoolPref("dom.sms.enabled", true);
+
+let tasks = {
+  // List of test fuctions. Each of them should call |tasks.next()| when
+  // completed or |tasks.finish()| to jump to the last one.
+  _tasks: [],
+  _nextTaskIndex: 0,
+
+  push: function push(func) {
+    this._tasks.push(func);
+  },
+
+  next: function next() {
+    let index = this._nextTaskIndex++;
+    let task = this._tasks[index];
+    try {
+      task();
+    } catch (ex) {
+      ok(false, "test task[" + index + "] throws: " + ex);
+      // Run last task as clean up if possible.
+      if (index != this._tasks.length - 1) {
+        this.finish();
+      }
+    }
+  },
+
+  finish: function finish() {
+    this._tasks[this._tasks.length - 1]();
+  },
+
+  run: function run() {
+    this.next();
+  }
+};
+
+let mozMobileMessage;
+
+function getAllMessages(callback, filter, reverse) {
+  if (!filter) {
+    filter = new MozSmsFilter;
+  }
+  let messages = [];
+  let request = mozMobileMessage.getMessages(filter, reverse || false);
+  request.onsuccess = function(event) {
+    if (request.result) {
+      messages.push(request.result);
+      request.continue();
+      return;
+    }
+
+    window.setTimeout(callback.bind(null, messages), 0);
+  }
+}
+
+function deleteAllMessages() {
+  getAllMessages(function deleteAll(messages) {
+    let message = messages.shift();
+    if (!message) {
+      ok(true, "all messages deleted");
+      tasks.next();
+      return;
+    }
+
+    let request = mozMobileMessage.delete(message.id);
+    request.onsuccess = deleteAll.bind(null, messages);
+    request.onerror = function (event) {
+      ok(false, "failed to delete all messages");
+      tasks.finish();
+    }
+  });
+}
+
+tasks.push(function () {
+  log("Verifying initial state.");
+
+  mozMobileMessage = window.navigator.mozMobileMessage;
+  ok(mozMobileMessage instanceof MozMobileMessageManager);
+
+  tasks.next();
+});
+
+tasks.push(function () {
+  log("MmsMessage.attachments should be an empty array.");
+
+  mozMobileMessage.onfailed = function (event) {
+    mozMobileMessage.onfailed = null;
+
+    let message = event.message;
+    ok(Array.isArray(message.attachments) && message.attachments.length === 0,
+       "message.attachments should be an empty array.");
+
+    tasks.next();
+  };
+
+  // Have a long long subject causes the send fails, so we don't need
+  // networking here.
+  mozMobileMessage.sendMMS({
+    subject: new Array(MMS_MAX_LENGTH_SUBJECT + 2).join("a"),
+    receivers: ["1", "2"],
+    attachments: [],
+  });
+});
+
+tasks.push(deleteAllMessages);
+
+// WARNING: All tasks should be pushed before this!!!
+tasks.push(function cleanUp() {
+  SpecialPowers.removePermission("sms", document);
+  SpecialPowers.clearUserPref("dom.sms.enabled");
+  finish();
+});
+
+tasks.run();
diff --git a/dom/system/gonk/RILContentHelper.js b/dom/system/gonk/RILContentHelper.js
index 5e2bbc6cd5d6..70bde10fedfe 100644
--- a/dom/system/gonk/RILContentHelper.js
+++ b/dom/system/gonk/RILContentHelper.js
@@ -79,6 +79,7 @@ const RIL_IPC_MSG_NAMES = [
   "RIL:VoicemailInfoChanged",
   "RIL:CallError",
   "RIL:CardLockResult",
+  "RIL:CardLockRetryCount",
   "RIL:USSDReceived",
   "RIL:SendMMI:Return:OK",
   "RIL:SendMMI:Return:KO",
@@ -123,6 +124,17 @@ MobileIccCardLockResult.prototype = {
                       success: 'r'}
 };
 
+function MobileIccCardLockRetryCount(options) {
+  this.lockType = options.lockType;
+  this.retryCount = options.retryCount;
+  this.success = options.success;
+}
+MobileIccCardLockRetryCount.prototype = {
+  __exposedProps__ : {lockType: 'r',
+                      retryCount: 'r',
+                      success: 'r'}
+};
+
 function MobileICCInfo() {}
 MobileICCInfo.prototype = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsIDOMMozMobileICCInfo]),
@@ -650,6 +662,23 @@ RILContentHelper.prototype = {
     return request;
   },
 
+  getCardLockRetryCount: function getCardLockRetryCount(window, lockType) {
+    if (window == null) {
+      throw Components.Exception("Can't get window object",
+                                  Cr.NS_ERROR_UNEXPECTED);
+    }
+    let request = Services.DOMRequest.createRequest(window);
+    let requestId = this.getRequestId(request);
+    cpmm.sendAsyncMessage("RIL:GetCardLockRetryCount", {
+      clientId: 0,
+      data: {
+        lockType: lockType,
+        requestId: requestId
+      }
+    });
+    return request;
+  },
+
   sendMMI: function sendMMI(window, mmi) {
     // We need to save the global window to get the proper MMIError
     // constructor once we get the reply from the parent process.
@@ -1378,6 +1407,14 @@ RILContentHelper.prototype = {
           this.fireRequestError(msg.json.requestId, msg.json.errorMsg);
         }
         break;
+      case "RIL:CardLockRetryCount":
+        if (msg.json.success) {
+          let result = new MobileIccCardLockRetryCount(msg.json);
+          this.fireRequestSuccess(msg.json.requestId, result);
+        } else {
+          this.fireRequestError(msg.json.requestId, msg.json.errorMsg);
+        }
+        break;
       case "RIL:USSDReceived": {
         let data = msg.json.data;
         this._deliverEvent("_mobileConnectionListeners",
diff --git a/dom/system/gonk/RadioInterfaceLayer.js b/dom/system/gonk/RadioInterfaceLayer.js
index cb24a3f29b86..3e52a7bb842a 100644
--- a/dom/system/gonk/RadioInterfaceLayer.js
+++ b/dom/system/gonk/RadioInterfaceLayer.js
@@ -115,6 +115,7 @@ const RIL_IPC_ICCMANAGER_MSG_NAMES = [
   "RIL:GetCardLockState",
   "RIL:UnlockCardLock",
   "RIL:SetCardLock",
+  "RIL:GetCardLockRetryCount",
   "RIL:IccOpenChannel",
   "RIL:IccExchangeAPDU",
   "RIL:IccCloseChannel",
@@ -826,6 +827,10 @@ RadioInterface.prototype = {
         gMessageManager.saveRequestTarget(msg);
         this.setCardLock(msg.json.data);
         break;
+      case "RIL:GetCardLockRetryCount":
+        gMessageManager.saveRequestTarget(msg);
+        this.getCardLockRetryCount(msg.json.data);
+        break;
       case "RIL:SendMMI":
         gMessageManager.saveRequestTarget(msg);
         this.sendMMI(msg.json.data);
@@ -1025,6 +1030,9 @@ RadioInterface.prototype = {
       case "iccUnlockCardLock":
         this.handleIccCardLockResult(message);
         break;
+      case "iccGetCardLockRetryCount":
+        this.handleIccCardLockRetryCount(message);
+        break;
       case "icccontacts":
         this.handleReadIccContacts(message);
         break;
@@ -2107,6 +2115,10 @@ RadioInterface.prototype = {
     gMessageManager.sendRequestResults("RIL:CardLockResult", message);
   },
 
+  handleIccCardLockRetryCount: function handleIccCardLockRetryCount(message) {
+    gMessageManager.sendRequestResults("RIL:CardLockRetryCount", message);
+  },
+
   handleUSSDReceived: function handleUSSDReceived(ussd) {
     if (DEBUG) this.debug("handleUSSDReceived " + JSON.stringify(ussd));
     gSystemMessenger.broadcastMessage("ussd-received", ussd);
@@ -3333,6 +3345,11 @@ RadioInterface.prototype = {
     this.worker.postMessage(message);
   },
 
+  getCardLockRetryCount: function getCardLockRetryCount(message) {
+    message.rilMessageType = "iccGetCardLockRetryCount";
+    this.worker.postMessage(message);
+  },
+
   readIccContacts: function readIccContacts(message) {
     message.rilMessageType = "readICCContacts";
     this.worker.postMessage(message);
diff --git a/dom/system/gonk/nsIVolume.idl b/dom/system/gonk/nsIVolume.idl
index f413189f1681..c7170fbb04ba 100644
--- a/dom/system/gonk/nsIVolume.idl
+++ b/dom/system/gonk/nsIVolume.idl
@@ -5,7 +5,7 @@
 #include "nsISupports.idl"
 #include "nsIVolumeStat.idl"
 
-[scriptable, uuid(1134f267-7b81-42f2-b64a-6edb91286576)]
+[scriptable, uuid(4b5bd562-bd05-4658-ab0f-f668a9e25fb5)]
 interface nsIVolume : nsISupports
 {
   // These MUST match the states from android's system/vold/Volume.h header
@@ -49,6 +49,9 @@ interface nsIVolume : nsISupports
   readonly attribute boolean isMountLocked;
 
   nsIVolumeStat getStats();
+
+  // Whether this is a fake volume.
+  readonly attribute boolean isFake;
 };
 
 %{C++
diff --git a/dom/system/gonk/nsIVolumeService.idl b/dom/system/gonk/nsIVolumeService.idl
index bf943d14482b..33a3f4636857 100644
--- a/dom/system/gonk/nsIVolumeService.idl
+++ b/dom/system/gonk/nsIVolumeService.idl
@@ -12,7 +12,7 @@
 %}
 [ref] native nsStringTArrayRef(nsTArray<nsString>);
 
-[scriptable, uuid(7c179fb7-67a0-43a3-9337-294e0360b858)]
+[scriptable, uuid(a3b110cd-74f2-43cb-84c6-2a87713f2774)]
 interface nsIVolumeService : nsISupports
 {
     nsIVolume getVolumeByName(in DOMString volName);
@@ -24,6 +24,10 @@ interface nsIVolumeService : nsISupports
     nsIVolumeMountLock createMountLock(in DOMString volName);
 
     [noscript] void getVolumeNames(in nsStringTArrayRef aVolNames);
+
+    /* for test case only to simulate sdcard insertion/removal */
+    void createFakeVolume(in DOMString name, in DOMString path);
+    void SetFakeVolumeState(in DOMString name, in long state);
 };
 
 %{C++
diff --git a/dom/system/gonk/nsVolume.cpp b/dom/system/gonk/nsVolume.cpp
index 58c3a51ace74..e1318a6b49e4 100644
--- a/dom/system/gonk/nsVolume.cpp
+++ b/dom/system/gonk/nsVolume.cpp
@@ -50,7 +50,8 @@ nsVolume::nsVolume(const Volume* aVolume)
     mMountPoint(NS_ConvertUTF8toUTF16(aVolume->MountPoint())),
     mState(aVolume->State()),
     mMountGeneration(aVolume->MountGeneration()),
-    mMountLocked(aVolume->IsMountLocked())
+    mMountLocked(aVolume->IsMountLocked()),
+    mIsFake(false)
 {
 }
 
@@ -85,6 +86,13 @@ bool nsVolume::Equals(nsIVolume* aVolume)
   if (mMountLocked != volIsMountLocked) {
     return false;
   }
+
+  bool isFake;
+  aVolume->GetIsFake(&isFake);
+  if (mIsFake != isFake) {
+    return false;
+  }
+
   return true;
 }
 
@@ -136,6 +144,12 @@ NS_IMETHODIMP nsVolume::GetStats(nsIVolumeStat **aResult)
   return NS_OK;
 }
 
+NS_IMETHODIMP nsVolume::GetIsFake(bool *aIsFake)
+{
+  *aIsFake = mIsFake;
+  return NS_OK;
+}
+
 void
 nsVolume::LogState() const
 {
@@ -156,6 +170,7 @@ void nsVolume::Set(nsIVolume* aVolume)
   aVolume->GetName(mName);
   aVolume->GetMountPoint(mMountPoint);
   aVolume->GetState(&mState);
+  aVolume->GetIsFake(&mIsFake);
 
   int32_t volMountGeneration;
   aVolume->GetMountGeneration(&volMountGeneration);
@@ -222,5 +237,25 @@ nsVolume::UpdateMountLock(bool aMountLocked)
                          MountGeneration(), aMountLocked));
 }
 
+void
+nsVolume::SetState(int32_t aState)
+{
+  static int32_t sMountGeneration = 0;
+
+  MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(IsFake());
+
+  if (aState == mState) {
+    return;
+  }
+
+  if (aState == nsIVolume::STATE_MOUNTED) {
+    mMountGeneration = ++sMountGeneration;
+  }
+
+  mState = aState;
+}
+
 } // system
 } // mozilla
diff --git a/dom/system/gonk/nsVolume.h b/dom/system/gonk/nsVolume.h
index 3d04f7932e9b..61bdd3479cb4 100644
--- a/dom/system/gonk/nsVolume.h
+++ b/dom/system/gonk/nsVolume.h
@@ -32,7 +32,8 @@ public:
       mMountPoint(aMountPoint),
       mState(aState),
       mMountGeneration(aMountGeneration),
-      mMountLocked(false)
+      mMountLocked(false),
+      mIsFake(false)
   {
   }
 
@@ -42,7 +43,8 @@ public:
     : mName(aName),
       mState(STATE_INIT),
       mMountGeneration(-1),
-      mMountLocked(true)  // Needs to agree with Volume::Volume
+      mMountLocked(true),  // Needs to agree with Volume::Volume
+      mIsFake(false)
   {
   }
 
@@ -72,11 +74,16 @@ private:
   void UpdateMountLock(const nsAString& aMountLockState);
   void UpdateMountLock(bool aMountLocked);
 
+  bool IsFake() const                 { return mIsFake; }
+  void SetIsFake(bool aIsFake)        { mIsFake = aIsFake; }
+  void SetState(int32_t aState);
+
   nsString mName;
   nsString mMountPoint;
   int32_t  mState;
   int32_t  mMountGeneration;
   bool     mMountLocked;
+  bool     mIsFake;
 };
 
 } // system
diff --git a/dom/system/gonk/nsVolumeService.cpp b/dom/system/gonk/nsVolumeService.cpp
index 7e43dafb0cb3..39606c3700ba 100644
--- a/dom/system/gonk/nsVolumeService.cpp
+++ b/dom/system/gonk/nsVolumeService.cpp
@@ -326,7 +326,7 @@ nsVolumeService::FindVolumeByName(const nsAString& aName)
 
 //static
 already_AddRefed<nsVolume>
-nsVolumeService::CreateOrFindVolumeByName(const nsAString& aName)
+nsVolumeService::CreateOrFindVolumeByName(const nsAString& aName, bool aIsFake /*= false*/)
 {
   MonitorAutoLock autoLock(mArrayMonitor);
 
@@ -337,6 +337,7 @@ nsVolumeService::CreateOrFindVolumeByName(const nsAString& aName)
   }
   // Volume not found - add a new one
   vol = new nsVolume(aName);
+  vol->SetIsFake(aIsFake);
   mVolumeArray.AppendElement(vol);
   return vol.forget();
 }
@@ -348,11 +349,19 @@ nsVolumeService::UpdateVolume(nsIVolume* aVolume)
 
   nsString volName;
   aVolume->GetName(volName);
-  nsRefPtr<nsVolume> vol = CreateOrFindVolumeByName(volName);
+  bool aIsFake;
+  aVolume->GetIsFake(&aIsFake);
+  nsRefPtr<nsVolume> vol = CreateOrFindVolumeByName(volName, aIsFake);
   if (vol->Equals(aVolume)) {
     // Nothing has really changed. Don't bother telling anybody.
     return;
   }
+
+  if (!vol->IsFake() && aIsFake) {
+    // Prevent an incoming fake volume from overriding an existing real volume.
+    return;
+  }
+
   vol->Set(aVolume);
   nsCOMPtr<nsIObserverService> obs = GetObserverService();
   if (!obs) {
@@ -362,6 +371,41 @@ nsVolumeService::UpdateVolume(nsIVolume* aVolume)
   obs->NotifyObservers(vol, NS_VOLUME_STATE_CHANGED, stateStr.get());
 }
 
+NS_IMETHODIMP
+nsVolumeService::CreateFakeVolume(const nsAString& name, const nsAString& path)
+{
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    nsRefPtr<nsVolume> vol = new nsVolume(name, path, nsIVolume::STATE_INIT, -1);
+    vol->SetIsFake(true);
+    UpdateVolume(vol.get());
+    return NS_OK;
+  }
+
+  ContentChild::GetSingleton()->SendCreateFakeVolume(nsString(name), nsString(path));
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsVolumeService::SetFakeVolumeState(const nsAString& name, int32_t state)
+{
+  if (XRE_GetProcessType() == GeckoProcessType_Default) {
+    nsRefPtr<nsVolume> vol;
+    {
+      MonitorAutoLock autoLock(mArrayMonitor);
+      vol = FindVolumeByName(name);
+    }
+    if (!vol || !vol->IsFake()) {
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+    vol->SetState(state);
+    UpdateVolume(vol.get());
+    return NS_OK;
+  }
+
+  ContentChild::GetSingleton()->SendSetFakeVolumeState(nsString(name), state);
+  return NS_OK;
+}
+
 /***************************************************************************
 * The UpdateVolumeRunnable creates an nsVolume and updates the main thread
 * data structure while running on the main thread.
diff --git a/dom/system/gonk/nsVolumeService.h b/dom/system/gonk/nsVolumeService.h
index 34eb710cf0a0..e537d99dd75e 100644
--- a/dom/system/gonk/nsVolumeService.h
+++ b/dom/system/gonk/nsVolumeService.h
@@ -50,7 +50,7 @@ private:
                       const nsAString& aMountLockState);
   already_AddRefed<nsVolume> FindVolumeByMountLockName(const nsAString& aMountLockName);
   already_AddRefed<nsVolume> FindVolumeByName(const nsAString& aName);
-  already_AddRefed<nsVolume> CreateOrFindVolumeByName(const nsAString& aName);
+  already_AddRefed<nsVolume> CreateOrFindVolumeByName(const nsAString& aName, bool aIsFake = false);
 
   Monitor mArrayMonitor;
   nsVolume::Array mVolumeArray;
diff --git a/dom/system/gonk/ril_worker.js b/dom/system/gonk/ril_worker.js
index 69a85e4b567d..64478477ffaa 100644
--- a/dom/system/gonk/ril_worker.js
+++ b/dom/system/gonk/ril_worker.js
@@ -1196,6 +1196,36 @@ let RIL = {
     this.queryICCFacilityLock(options);
   },
 
+  /**
+   * Helper function for fetching the number of unlock retries of ICC locks.
+   */
+  iccGetCardLockRetryCount: function iccGetCardLockRetryCount(options) {
+    switch (options.lockType) {
+      case "pin":
+      case "puk":
+      case "pin2":
+      case "puk2":
+      case "nck":
+      case "cck":
+      case "spck":
+        options.errorMsg = GECKO_ERROR_REQUEST_NOT_SUPPORTED;
+        options.success = false;
+        this.sendDOMMessage(options);
+        return;
+      default:
+        options.errorMsg = GECKO_ERROR_GENERIC_FAILURE;
+        options.success = false;
+        this.sendDOMMessage(options);
+        return;
+    }
+
+    // TODO: We currently don't have a way for
+    // reading the retry count. See bug 868896.
+    options.retryCount = 0;
+    options.success = true;
+    this.sendDOMMessage(options);
+  },
+
   /**
    * Query ICC facility lock.
    *
diff --git a/dom/system/gonk/tests/marionette/manifest.ini b/dom/system/gonk/tests/marionette/manifest.ini
index 0499a55955ed..a0a50c70bc93 100644
--- a/dom/system/gonk/tests/marionette/manifest.ini
+++ b/dom/system/gonk/tests/marionette/manifest.ini
@@ -6,3 +6,4 @@ qemu = true
 [test_geolocation.js]
 disabled = Bug 808783
 [test_get_voicemailInfo.js]
+[test_fakevolume.js]
diff --git a/dom/system/gonk/tests/marionette/test_fakevolume.js b/dom/system/gonk/tests/marionette/test_fakevolume.js
new file mode 100644
index 000000000000..5ac84d92ab24
--- /dev/null
+++ b/dom/system/gonk/tests/marionette/test_fakevolume.js
@@ -0,0 +1,29 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+MARIONETTE_TIMEOUT = 10000;
+
+let Cc = SpecialPowers.Cc;
+let Ci = SpecialPowers.Ci;
+
+let volumeService = Cc["@mozilla.org/telephony/volume-service;1"].getService(Ci.nsIVolumeService);
+ok(volumeService, "Should have volume service");
+
+let volName = "fake";
+let mountPoint = "/data/fake/storage";
+volumeService.createFakeVolume(volName, mountPoint);
+
+let vol = volumeService.getVolumeByName(volName);
+ok(vol, "volume shouldn't be null");
+
+is(volName, vol.name, "name");
+is(mountPoint, vol.mountPoint, "moutnPoint");
+is(Ci.nsIVolume.STATE_INIT, vol.state, "state");
+
+
+let oldMountGen = vol.mountGeneration;
+volumeService.SetFakeVolumeState(volName, Ci.nsIVolume.STATE_MOUNTED);
+is(Ci.nsIVolume.STATE_MOUNTED, vol.state, "state");
+ok(vol.mountGeneration > oldMountGen, "mount generation should be incremented");
+
+finish();
diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl
index 59f4902e3387..778d55070a50 100644
--- a/dom/webidl/Document.webidl
+++ b/dom/webidl/Document.webidl
@@ -16,7 +16,6 @@
  */
 
 interface StyleSheetList;
-interface TouchList;
 interface WindowProxy;
 interface nsISupports;
 
diff --git a/dom/webidl/HTMLTableElement.webidl b/dom/webidl/HTMLTableElement.webidl
index 7a6e357ce389..5a7464468ce1 100644
--- a/dom/webidl/HTMLTableElement.webidl
+++ b/dom/webidl/HTMLTableElement.webidl
@@ -24,7 +24,7 @@ interface HTMLTableElement : HTMLElement {
   HTMLElement createTFoot();
   void deleteTFoot();
   readonly attribute HTMLCollection tBodies;
-  //HTMLElement createTBody();
+  HTMLElement createTBody();
   readonly attribute HTMLCollection rows;
   [Throws]
   HTMLElement insertRow(optional long index = -1);
diff --git a/dom/webidl/TouchEvent.webidl b/dom/webidl/TouchEvent.webidl
index e3ec7619a5d4..b76eabf258f6 100644
--- a/dom/webidl/TouchEvent.webidl
+++ b/dom/webidl/TouchEvent.webidl
@@ -4,7 +4,6 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-interface TouchList;
 interface WindowProxy;
 
 [PrefControlled]
diff --git a/dom/webidl/TouchList.webidl b/dom/webidl/TouchList.webidl
index 643ba0ecb824..5b2dca75bd18 100644
--- a/dom/webidl/TouchList.webidl
+++ b/dom/webidl/TouchList.webidl
@@ -4,14 +4,20 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origin of this IDL file is
- * http://dvcs.w3.org/hg/webevents/raw-file/default/touchevents.html
+ * https://dvcs.w3.org/hg/webevents/raw-file/v1/touchevents.html
  *
  * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
  * liability, trademark and document use rules apply.
  */
 
+[PrefControlled]
 interface TouchList {
+  [Pure]
   readonly attribute unsigned long length;
   getter Touch? item(unsigned long index);
-  Touch identifiedTouch(long identifier);
+};
+
+/* Mozilla extension. */
+partial interface TouchList {
+  Touch? identifiedTouch(long identifier);
 };
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index 3fca401b6312..6c03cb89324c 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -347,6 +347,7 @@ webidl_files = \
   TimeRanges.webidl \
   Touch.webidl \
   TouchEvent.webidl \
+  TouchList.webidl \
   TransitionEvent.webidl \
   TreeColumns.webidl \
   TreeWalker.webidl \
diff --git a/dom/wifi/WifiWorker.js b/dom/wifi/WifiWorker.js
index 6426523e40af..f020e73e6ea1 100644
--- a/dom/wifi/WifiWorker.js
+++ b/dom/wifi/WifiWorker.js
@@ -507,10 +507,14 @@ var WifiManager = (function() {
     });
   }
 
-  function setPowerModeCommand(mode, callback) {
+  function setPowerModeCommandICS(mode, callback) {
     doBooleanCommand("DRIVER POWERMODE " + (mode === "AUTO" ? 0 : 1), "OK", callback);
   }
 
+  function setPowerModeCommandJB(mode, callback) {
+    doBooleanCommand("SET ps " + (mode === "AUTO" ? 1 : 0), "OK", callback);
+  }
+
   function getPowerModeCommand(callback) {
     doStringCommand("DRIVER GETPOWER", function(reply) {
       if (reply)
@@ -1508,7 +1512,9 @@ var WifiManager = (function() {
   manager.wpsPbc = wpsPbcCommand;
   manager.wpsPin = wpsPinCommand;
   manager.wpsCancel = wpsCancelCommand;
-  manager.setPowerMode = setPowerModeCommand;
+  manager.setPowerMode = (sdkVersion >= 16)
+                         ? setPowerModeCommandJB
+                         : setPowerModeCommandICS;
   manager.setSuspendOptimizations = setSuspendOptimizationsCommand;
   manager.setStaticIpMode = setStaticIpMode;
   manager.getRssiApprox = getRssiApproxCommand;
diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp
index 7cd960f51ea5..663762394434 100644
--- a/editor/libeditor/base/nsEditor.cpp
+++ b/editor/libeditor/base/nsEditor.cpp
@@ -1734,52 +1734,57 @@ nsEditor::InsertContainerAbove(nsIContent* aNode,
 ///////////////////////////////////////////////////////////////////////////
 // MoveNode:  move aNode to {aParent,aOffset}
 nsresult
-nsEditor::MoveNode(nsIContent* aNode, nsINode* aParent, int32_t aOffset)
+nsEditor::MoveNode(nsIDOMNode* aNode, nsIDOMNode* aParent, int32_t aOffset)
 {
-  MOZ_ASSERT(aNode && aParent);
-  MOZ_ASSERT(aOffset == -1 || (0 <= aOffset &&
-                               aOffset <= (int32_t)aParent->Length()));
-  nsresult res = MoveNode(aNode->AsDOMNode(), aParent->AsDOMNode(), aOffset);
-  NS_ASSERTION(NS_SUCCEEDED(res), "MoveNode failed");
-  NS_ENSURE_SUCCESS(res, res);
-  return NS_OK;
+  nsCOMPtr<nsINode> node = do_QueryInterface(aNode);
+  NS_ENSURE_STATE(node);
+
+  nsCOMPtr<nsINode> parent = do_QueryInterface(aParent);
+  NS_ENSURE_STATE(parent);
+
+  return MoveNode(node, parent, aOffset);
 }
 
 nsresult
-nsEditor::MoveNode(nsIDOMNode *aNode, nsIDOMNode *aParent, int32_t aOffset)
+nsEditor::MoveNode(nsINode* aNode, nsINode* aParent, int32_t aOffset)
 {
-  NS_ENSURE_TRUE(aNode && aParent, NS_ERROR_NULL_POINTER);
-  nsresult res;
+  MOZ_ASSERT(aNode);
+  MOZ_ASSERT(aParent);
+  MOZ_ASSERT(aOffset == -1 ||
+             (0 <= aOffset && SafeCast<uint32_t>(aOffset) <= aParent->Length()));
 
   int32_t oldOffset;
-  nsCOMPtr<nsIDOMNode> oldParent = GetNodeLocation(aNode, &oldOffset);
+  nsCOMPtr<nsINode> oldParent = GetNodeLocation(aNode, &oldOffset);
   
-  if (aOffset == -1)
-  {
-    uint32_t unsignedOffset;
-    // magic value meaning "move to end of aParent"
-    res = GetLengthOfDOMNode(aParent, unsignedOffset);
-    NS_ENSURE_SUCCESS(res, res);
-    aOffset = (int32_t)unsignedOffset;
+  if (aOffset == -1) {
+    // Magic value meaning "move to end of aParent".
+    aOffset = SafeCast<int32_t>(aParent->Length());
   }
   
-  // don't do anything if it's already in right place
-  if ((aParent == oldParent.get()) && (oldOffset == aOffset)) return NS_OK;
+  // Don't do anything if it's already in right place.
+  if (aParent == oldParent && aOffset == oldOffset) {
+    return NS_OK;
+  }
   
-  // notify our internal selection state listener
-  nsAutoMoveNodeSelNotify selNotify(mRangeUpdater, oldParent, oldOffset, aParent, aOffset);
+  // Notify our internal selection state listener.
+  nsAutoMoveNodeSelNotify selNotify(mRangeUpdater, oldParent, oldOffset,
+                                    aParent, aOffset);
   
-  // need to adjust aOffset if we are moving aNode further along in its current parent
-  if ((aParent == oldParent.get()) && (oldOffset < aOffset)) 
-  {
-    aOffset--;  // this is because when we delete aNode, it will make the offsets after it off by one
+  // Need to adjust aOffset if we are moving aNode further along in its current
+  // parent.
+  if (aParent == oldParent && oldOffset < aOffset) {
+    // This is because when we delete aNode, it will make the offsets after it
+    // off by one.
+    aOffset--;
   }
 
-  // Hold a reference so aNode doesn't go away when we remove it (bug 772282)
-  nsCOMPtr<nsIDOMNode> node = aNode;
-  res = DeleteNode(node);
-  NS_ENSURE_SUCCESS(res, res);
-  return InsertNode(node, aParent, aOffset);
+  // Hold a reference so aNode doesn't go away when we remove it (bug 772282).
+  nsCOMPtr<nsINode> kungFuDeathGrip = aNode;
+
+  nsresult rv = DeleteNode(aNode);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return InsertNode(aNode->AsDOMNode(), aParent->AsDOMNode(), aOffset);
 }
 
 
@@ -3073,6 +3078,22 @@ nsEditor::GetNodeLocation(nsIDOMNode* aChild, int32_t* outOffset)
   return parent.forget();
 }
 
+nsINode*
+nsEditor::GetNodeLocation(nsINode* aChild, int32_t* aOffset)
+{
+  MOZ_ASSERT(aChild);
+  MOZ_ASSERT(aOffset);
+
+  nsINode* parent = aChild->GetParentNode();
+  if (parent) {
+    *aOffset = parent->IndexOf(aChild);
+    MOZ_ASSERT(*aOffset != -1);
+  } else {
+    *aOffset = -1;
+  }
+  return parent;
+}
+
 // returns the number of things inside aNode.  
 // If aNode is text, returns number of characters. If not, returns number of children nodes.
 nsresult
diff --git a/editor/libeditor/base/nsEditor.h b/editor/libeditor/base/nsEditor.h
index 3ab32e131040..e8183e66f317 100644
--- a/editor/libeditor/base/nsEditor.h
+++ b/editor/libeditor/base/nsEditor.h
@@ -230,7 +230,7 @@ public:
                                 const nsAString *aAttribute = nullptr,
                                 const nsAString *aValue = nullptr);
   nsresult JoinNodes(nsINode* aNodeToKeep, nsIContent* aNodeToMove);
-  nsresult MoveNode(nsIContent* aNode, nsINode* aParent, int32_t aOffset);
+  nsresult MoveNode(nsINode* aNode, nsINode* aParent, int32_t aOffset);
   nsresult MoveNode(nsIDOMNode *aNode, nsIDOMNode *aParent, int32_t aOffset);
 
   /* Method to replace certain CreateElementNS() calls. 
@@ -471,6 +471,7 @@ public:
    */
   static already_AddRefed<nsIDOMNode> GetNodeLocation(nsIDOMNode* aChild,
                                                       int32_t* outOffset);
+  static nsINode* GetNodeLocation(nsINode* aChild, int32_t* aOffset);
 
   /** returns the number of things inside aNode in the out-param aCount.  
     * @param  aNode is the node to get the length of.  
diff --git a/editor/libeditor/base/nsSelectionState.cpp b/editor/libeditor/base/nsSelectionState.cpp
index 39b42d6aef31..05dbb07d048c 100644
--- a/editor/libeditor/base/nsSelectionState.cpp
+++ b/editor/libeditor/base/nsSelectionState.cpp
@@ -592,47 +592,45 @@ nsRangeUpdater::DidInsertContainer()
 }
 
 
-nsresult
+void
 nsRangeUpdater::WillMoveNode()
 {
-  if (mLock) return NS_ERROR_UNEXPECTED;  
   mLock = true;
-  return NS_OK;
 }
 
 
-nsresult
-nsRangeUpdater::DidMoveNode(nsIDOMNode *aOldParent, int32_t aOldOffset, nsIDOMNode *aNewParent, int32_t aNewOffset)
+void
+nsRangeUpdater::DidMoveNode(nsINode* aOldParent, int32_t aOldOffset,
+                            nsINode* aNewParent, int32_t aNewOffset)
 {
-  NS_ENSURE_TRUE(mLock, NS_ERROR_UNEXPECTED);  
+  MOZ_ASSERT(aOldParent);
+  MOZ_ASSERT(aNewParent);
+  NS_ENSURE_TRUE_VOID(mLock);
   mLock = false;
 
-  NS_ENSURE_TRUE(aOldParent && aNewParent, NS_ERROR_NULL_POINTER);
-  uint32_t i, count = mArray.Length();
-  if (!count) {
-    return NS_OK;
-  }
+  nsIDOMNode* oldParent = aOldParent->AsDOMNode();
+  nsIDOMNode* newParent = aNewParent->AsDOMNode();
 
-  nsRangeStore *item;
-  
-  for (i=0; i<count; i++)
-  {
-    item = mArray[i];
-    NS_ENSURE_TRUE(item, NS_ERROR_NULL_POINTER);
+  for (uint32_t i = 0, count = mArray.Length(); i < count; ++i) {
+    nsRangeStore* item = mArray[i];
+    NS_ENSURE_TRUE_VOID(item);
     
     // like a delete in aOldParent
-    if ((item->startNode.get() == aOldParent) && (item->startOffset > aOldOffset))
+    if (item->startNode == oldParent && item->startOffset > aOldOffset) {
       item->startOffset--;
-    if ((item->endNode.get() == aOldParent) && (item->endOffset > aOldOffset))
+    }
+    if (item->endNode == oldParent && item->endOffset > aOldOffset) {
       item->endOffset--;
+    }
       
     // and like an insert in aNewParent
-    if ((item->startNode.get() == aNewParent) && (item->startOffset > aNewOffset))
+    if (item->startNode == newParent && item->startOffset > aNewOffset) {
       item->startOffset++;
-    if ((item->endNode.get() == aNewParent) && (item->endOffset > aNewOffset))
+    }
+    if (item->endNode == newParent && item->endOffset > aNewOffset) {
       item->endOffset++;
+    }
   }
-  return NS_OK;
 }
 
 
diff --git a/editor/libeditor/base/nsSelectionState.h b/editor/libeditor/base/nsSelectionState.h
index 1bdf49a5f351..dcda9acdd8b3 100644
--- a/editor/libeditor/base/nsSelectionState.h
+++ b/editor/libeditor/base/nsSelectionState.h
@@ -102,8 +102,9 @@ class nsRangeUpdater
     nsresult DidRemoveContainer(nsIDOMNode *aNode, nsIDOMNode *aParent, int32_t aOffset, uint32_t aNodeOrigLen);
     nsresult WillInsertContainer();
     nsresult DidInsertContainer();
-    nsresult WillMoveNode();
-    nsresult DidMoveNode(nsIDOMNode *aOldParent, int32_t aOldOffset, nsIDOMNode *aNewParent, int32_t aNewOffset);
+    void WillMoveNode();
+    void DidMoveNode(nsINode* aOldParent, int32_t aOldOffset,
+                     nsINode* aNewParent, int32_t aNewOffset);
   protected:    
     nsTArray<nsRefPtr<nsRangeStore> > mArray;
     bool mLock;
@@ -242,23 +243,25 @@ class MOZ_STACK_CLASS nsAutoMoveNodeSelNotify
 {
   private:
     nsRangeUpdater &mRU;
-    nsIDOMNode *mOldParent;
-    nsIDOMNode *mNewParent;
+    nsINode* mOldParent;
+    nsINode* mNewParent;
     int32_t    mOldOffset;
     int32_t    mNewOffset;
 
   public:
     nsAutoMoveNodeSelNotify(nsRangeUpdater &aRangeUpdater, 
-                            nsIDOMNode *aOldParent, 
+                            nsINode* aOldParent,
                             int32_t aOldOffset, 
-                            nsIDOMNode *aNewParent, 
-                            int32_t aNewOffset) :
-    mRU(aRangeUpdater)
-    ,mOldParent(aOldParent)
-    ,mNewParent(aNewParent)
-    ,mOldOffset(aOldOffset)
-    ,mNewOffset(aNewOffset)
+                            nsINode* aNewParent,
+                            int32_t aNewOffset)
+      : mRU(aRangeUpdater)
+      , mOldParent(aOldParent)
+      , mNewParent(aNewParent)
+      , mOldOffset(aOldOffset)
+      , mNewOffset(aNewOffset)
     {
+      MOZ_ASSERT(aOldParent);
+      MOZ_ASSERT(aNewParent);
       mRU.WillMoveNode();
     }
     
diff --git a/gfx/layers/ipc/AsyncPanZoomController.cpp b/gfx/layers/ipc/AsyncPanZoomController.cpp
index 81ce46387b8c..f735c6a10b4c 100644
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -268,7 +268,7 @@ AsyncPanZoomController::ReceiveInputEvent(const nsInputEvent& aEvent,
   switch (aEvent.eventStructType) {
   case NS_TOUCH_EVENT: {
     nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aOutEvent);
-    const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+    const nsTArray< nsRefPtr<dom::Touch> >& touches = touchEvent->touches;
     for (uint32_t i = 0; i < touches.Length(); ++i) {
       nsIDOMTouch* touch = touches[i];
       if (touch) {
diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp
index 5841828254e2..f1c9206996d9 100644
--- a/image/src/imgLoader.cpp
+++ b/image/src/imgLoader.cpp
@@ -960,7 +960,7 @@ NS_IMETHODIMP imgLoader::FindEntryProperties(nsIURI *uri, nsIProperties **_retva
     if (mCacheTracker && entry->HasNoProxies())
       mCacheTracker->MarkUsed(entry);
 
-    nsRefPtr<imgRequest> request = getter_AddRefs(entry->GetRequest());
+    nsRefPtr<imgRequest> request = entry->GetRequest();
     if (request) {
       *_retval = request->Properties();
       NS_ADDREF(*_retval);
@@ -1007,7 +1007,7 @@ bool imgLoader::PutIntoCache(nsIURI *key, imgCacheEntry *entry)
   if (cache.Get(spec, getter_AddRefs(tmpCacheEntry)) && tmpCacheEntry) {
     PR_LOG(GetImgLog(), PR_LOG_DEBUG,
            ("[this=%p] imgLoader::PutIntoCache -- Element already in the cache", nullptr));
-    nsRefPtr<imgRequest> tmpRequest = getter_AddRefs(tmpCacheEntry->GetRequest());
+    nsRefPtr<imgRequest> tmpRequest = tmpCacheEntry->GetRequest();
 
     // If it already exists, and we're putting the same key into the cache, we
     // should remove the old version.
@@ -1040,7 +1040,7 @@ bool imgLoader::PutIntoCache(nsIURI *key, imgCacheEntry *entry)
     }
   }
 
-  nsRefPtr<imgRequest> request(getter_AddRefs(entry->GetRequest()));
+  nsRefPtr<imgRequest> request = entry->GetRequest();
   request->SetIsInCache(true);
 
   return true;
@@ -1409,7 +1409,7 @@ bool imgLoader::RemoveFromCache(nsIURI *aKey)
 
     entry->SetEvicted(true);
 
-    nsRefPtr<imgRequest> request(getter_AddRefs(entry->GetRequest()));
+    nsRefPtr<imgRequest> request = entry->GetRequest();
     request->SetIsInCache(false);
 
     return true;
@@ -1422,7 +1422,7 @@ bool imgLoader::RemoveFromCache(imgCacheEntry *entry)
 {
   LOG_STATIC_FUNC(GetImgLog(), "imgLoader::RemoveFromCache entry");
 
-  nsRefPtr<imgRequest> request(getter_AddRefs(entry->GetRequest()));
+  nsRefPtr<imgRequest> request = entry->GetRequest();
   if (request) {
     nsCOMPtr<nsIURI> key;
     if (NS_SUCCEEDED(request->GetURI(getter_AddRefs(key))) && key) {
@@ -1625,7 +1625,7 @@ nsresult imgLoader::LoadImage(nsIURI *aURI,
     if (ValidateEntry(entry, aURI, aInitialDocumentURI, aReferrerURI,
                       aLoadGroup, aObserver, aCX, requestFlags, true,
                       _retval, aPolicy, aLoadingPrincipal, corsmode)) {
-      request = getter_AddRefs(entry->GetRequest());
+      request = entry->GetRequest();
 
       // If this entry has no proxies, its request has no reference to the entry.
       if (entry->HasNoProxies()) {
@@ -1851,7 +1851,7 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel *channel, imgINotificationOb
       if (ValidateEntry(entry, uri, nullptr, nullptr, nullptr, aObserver, aCX,
                         requestFlags, false, nullptr, nullptr, nullptr,
                         imgIRequest::CORS_NONE)) {
-        request = getter_AddRefs(entry->GetRequest());
+        request = entry->GetRequest();
       } else {
         nsCOMPtr<nsICachingChannel> cacheChan(do_QueryInterface(channel));
         bool bUseCacheCopy;
@@ -1861,10 +1861,10 @@ nsresult imgLoader::LoadImageWithChannel(nsIChannel *channel, imgINotificationOb
         else
           bUseCacheCopy = false;
 
-        if (!bUseCacheCopy)
+        if (!bUseCacheCopy) {
           entry = nullptr;
-        else {
-          request = getter_AddRefs(entry->GetRequest());
+        } else {
+          request = entry->GetRequest();
         }
       }
 
diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h
index bfff6f82a20a..5644231bc325 100644
--- a/ipc/chromium/src/base/basictypes.h
+++ b/ipc/chromium/src/base/basictypes.h
@@ -236,72 +236,6 @@ enum Ownership {
   TAKE_OWNERSHIP
 };
 
-// bit_cast<Dest,Source> is a template function that implements the
-// equivalent of "*reinterpret_cast<Dest*>(&source)".  We need this in
-// very low-level functions like the protobuf library and fast math
-// support.
-//
-//   float f = 3.14159265358979;
-//   int i = bit_cast<int32_t>(f);
-//   // i = 0x40490fdb
-//
-// The classical address-casting method is:
-//
-//   // WRONG
-//   float f = 3.14159265358979;            // WRONG
-//   int i = * reinterpret_cast<int*>(&f);  // WRONG
-//
-// The address-casting method actually produces undefined behavior
-// according to ISO C++ specification section 3.10 -15 -.  Roughly, this
-// section says: if an object in memory has one type, and a program
-// accesses it with a different type, then the result is undefined
-// behavior for most values of "different type".
-//
-// This is true for any cast syntax, either *(int*)&f or
-// *reinterpret_cast<int*>(&f).  And it is particularly true for
-// conversions betweeen integral lvalues and floating-point lvalues.
-//
-// The purpose of 3.10 -15- is to allow optimizing compilers to assume
-// that expressions with different types refer to different memory.  gcc
-// 4.0.1 has an optimizer that takes advantage of this.  So a
-// non-conforming program quietly produces wildly incorrect output.
-//
-// The problem is not the use of reinterpret_cast.  The problem is type
-// punning: holding an object in memory of one type and reading its bits
-// back using a different type.
-//
-// The C++ standard is more subtle and complex than this, but that
-// is the basic idea.
-//
-// Anyways ...
-//
-// bit_cast<> calls memcpy() which is blessed by the standard,
-// especially by the example in section 3.9 .  Also, of course,
-// bit_cast<> wraps up the nasty logic in one place.
-//
-// Fortunately memcpy() is very fast.  In optimized mode, with a
-// constant size, gcc 2.95.3, gcc 4.0.1, and msvc 7.1 produce inline
-// code with the minimal amount of data movement.  On a 32-bit system,
-// memcpy(d,s,4) compiles to one load and one store, and memcpy(d,s,8)
-// compiles to two loads and two stores.
-//
-// I tested this code with gcc 2.95.3, gcc 4.0.1, icc 8.1, and msvc 7.1.
-//
-// WARNING: if Dest or Source is a non-POD type, the result of the memcpy
-// is likely to surprise you.
-
-template <class Dest, class Source>
-inline Dest bit_cast(const Source& source) {
-  // Compile time assertion: sizeof(Dest) == sizeof(Source)
-  // A compile error here means your Dest and Source have different sizes.
-  MOZ_STATIC_ASSERT(sizeof(Dest) == sizeof(Source),
-                    "Only bit-cast between identically-sized types!");
-
-  Dest dest;
-  memcpy(&dest, &source, sizeof(dest));
-  return dest;
-}
-
 // The following enum should be used only as a constructor argument to indicate
 // that the variable has static storage class, and that the constructor should
 // do nothing to its state.  It indicates to the reader that it is legal to
diff --git a/ipc/chromium/src/base/time_win.cc b/ipc/chromium/src/base/time_win.cc
index 0fe740abdced..2f7017b1c8ee 100644
--- a/ipc/chromium/src/base/time_win.cc
+++ b/ipc/chromium/src/base/time_win.cc
@@ -46,29 +46,31 @@
 #include "base/cpu.h"
 #include "base/singleton.h"
 #include "base/system_monitor.h"
+#include "mozilla/Casting.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
+using mozilla::BitwiseCast;
 
 namespace {
 
 // From MSDN, FILETIME "Contains a 64-bit value representing the number of
 // 100-nanosecond intervals since January 1, 1601 (UTC)."
 int64_t FileTimeToMicroseconds(const FILETIME& ft) {
-  // Need to bit_cast to fix alignment, then divide by 10 to convert
+  // Need to BitwiseCast to fix alignment, then divide by 10 to convert
   // 100-nanoseconds to milliseconds. This only works on little-endian
   // machines.
-  return bit_cast<int64_t, FILETIME>(ft) / 10;
+  return BitwiseCast<int64_t>(ft) / 10;
 }
 
 void MicrosecondsToFileTime(int64_t us, FILETIME* ft) {
   DCHECK(us >= 0) << "Time is less than 0, negative values are not "
       "representable in FILETIME";
 
-  // Multiply by 10 to convert milliseconds to 100-nanoseconds. Bit_cast will
+  // Multiply by 10 to convert milliseconds to 100-nanoseconds. BitwiseCast will
   // handle alignment problems. This only works on little-endian machines.
-  *ft = bit_cast<FILETIME, int64_t>(us * 10);
+  *ft = BitwiseCast<FILETIME>(us * 10);
 }
 
 int64_t CurrentWallclockMicroseconds() {
diff --git a/ipc/chromium/src/chrome/common/ipc_channel.h b/ipc/chromium/src/chrome/common/ipc_channel.h
index 448b5cfade47..bc61fd38ba24 100644
--- a/ipc/chromium/src/chrome/common/ipc_channel.h
+++ b/ipc/chromium/src/chrome/common/ipc_channel.h
@@ -113,6 +113,10 @@ class Channel : public Message::Sender {
 
   // Return the server side of the socketpair.
   int GetServerFileDescriptor() const;
+
+  // Close the client side of the socketpair.
+  void CloseClientFileDescriptor();
+
 #elif defined(OS_WIN)
   // Return the server pipe handle.
   void* GetServerPipeHandle() const;
diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
index 9820a16df206..e427165bca9d 100644
--- a/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
+++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.cc
@@ -779,6 +779,14 @@ void Channel::ChannelImpl::GetClientFileDescriptorMapping(int *src_fd,
   *dest_fd = kClientChannelFd;
 }
 
+void Channel::ChannelImpl::CloseClientFileDescriptor() {
+  if (client_pipe_ != -1) {
+    Singleton<PipeMap>()->Remove(pipe_name_);
+    HANDLE_EINTR(close(client_pipe_));
+    client_pipe_ = -1;
+  }
+}
+
 // Called by libevent when we can read from th pipe without blocking.
 void Channel::ChannelImpl::OnFileCanReadWithoutBlocking(int fd) {
   bool send_server_hello_msg = false;
@@ -944,4 +952,8 @@ int Channel::GetServerFileDescriptor() const {
   return channel_impl_->GetServerFileDescriptor();
 }
 
+void Channel::CloseClientFileDescriptor() {
+  channel_impl_->CloseClientFileDescriptor();
+}
+
 }  // namespace IPC
diff --git a/ipc/chromium/src/chrome/common/ipc_channel_posix.h b/ipc/chromium/src/chrome/common/ipc_channel_posix.h
index 7994ceeee5e4..a96750631e36 100644
--- a/ipc/chromium/src/chrome/common/ipc_channel_posix.h
+++ b/ipc/chromium/src/chrome/common/ipc_channel_posix.h
@@ -40,6 +40,7 @@ class Channel::ChannelImpl : public MessageLoopForIO::Watcher {
     DCHECK(mode_ == MODE_SERVER);
     return pipe_;
   }
+  void CloseClientFileDescriptor();
 
  private:
   void Init(Mode mode, Listener* listener);
diff --git a/ipc/dbus/DBusUtils.cpp b/ipc/dbus/DBusUtils.cpp
index 80701010b3ab..962de6eb1e9b 100644
--- a/ipc/dbus/DBusUtils.cpp
+++ b/ipc/dbus/DBusUtils.cpp
@@ -627,7 +627,6 @@ int dbus_returns_int32(DBusMessage *reply)
     LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
   }
 
-  dbus_message_unref(reply);
   return ret;
 }
 
@@ -647,5 +646,15 @@ int dbus_returns_uint32(DBusMessage *reply)
   return ret;
 }
 
+void DBusReplyHandler::Callback(DBusMessage* aReply, void* aData)
+{
+  MOZ_ASSERT(aData);
+
+  nsRefPtr<DBusReplyHandler> handler =
+    already_AddRefed<DBusReplyHandler>(static_cast<DBusReplyHandler*>(aData));
+
+  handler->Handle(aReply);
+}
+
 }
 }
diff --git a/ipc/dbus/DBusUtils.h b/ipc/dbus/DBusUtils.h
index a1ec0ebadb1a..b3f0f018ce68 100644
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -20,6 +20,7 @@
 #define mozilla_ipc_dbus_dbusutils_h__
 
 #include <dbus/dbus.h>
+#include "mozilla/RefPtr.h"
 #include "mozilla/Scoped.h"
 
 // LOGE and free a D-Bus error
@@ -50,8 +51,45 @@ private:
   DBusMessage* mMsg;
 };
 
-typedef void (*DBusCallback)(DBusMessage *, void *);
+/**
+ * DBusReplyHandler represents a handler for DBus reply messages. Inherit
+ * from this class and implement the Handle method. The method Callback
+ * should be passed to the DBus send function, with the class instance as
+ * user-data argument.
+ */
+class DBusReplyHandler : public mozilla::RefCounted<DBusReplyHandler>
+{
+public:
+  virtual ~DBusReplyHandler() {
+  }
 
+  /**
+   * Implements a call-back function for DBus. The supplied value for
+   * aData must be a pointer to an instance of DBusReplyHandler.
+   */
+  static void Callback(DBusMessage* aReply, void* aData);
+
+  /**
+   * Call-back method for handling the reply message from DBus.
+   */
+  virtual void Handle(DBusMessage* aReply) = 0;
+
+protected:
+  DBusReplyHandler()
+  {
+  }
+
+  DBusReplyHandler(const DBusReplyHandler& aHandler)
+  {
+  }
+
+  DBusReplyHandler& operator = (const DBusReplyHandler& aRhs)
+  {
+    return *this;
+  }
+};
+
+typedef void (*DBusCallback)(DBusMessage *, void *);
 
 void log_and_free_dbus_error(DBusError* err,
                              const char* function,
diff --git a/ipc/glue/GeckoChildProcessHost.cpp b/ipc/glue/GeckoChildProcessHost.cpp
index 9e319079bd4f..9addf4f697cb 100644
--- a/ipc/glue/GeckoChildProcessHost.cpp
+++ b/ipc/glue/GeckoChildProcessHost.cpp
@@ -656,6 +656,11 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
 #endif
                   false, &process, arch);
 
+  // We're in the parent and the child was launched. Close the child FD in the
+  // parent as soon as possible, which will allow the parent to detect when the
+  // child closes its FD (either due to normal exit or due to crash).
+  GetChannel()->CloseClientFileDescriptor();
+
 #ifdef MOZ_WIDGET_COCOA
   // Wait for the child process to send us its 'task_t' data.
   const int kTimeoutMs = 10000;
diff --git a/js/jsd/jsd_xpc.cpp b/js/jsd/jsd_xpc.cpp
index 9e32581c8f3d..2a6301400d2e 100644
--- a/js/jsd/jsd_xpc.cpp
+++ b/js/jsd/jsd_xpc.cpp
@@ -502,7 +502,7 @@ jsds_ErrorHookProc (JSDContext *jsdc, JSContext *cx, const char *message,
         jsval jv;
         JS_GetPendingException(cx, &jv);
         JSDValue *jsdv = JSD_NewValue (jsdc, jv);
-        val = getter_AddRefs(jsdValue::FromPtr(jsdc, jsdv));
+        val = dont_AddRef(jsdValue::FromPtr(jsdc, jsdv));
     }
     
     nsAutoCString fileName;
@@ -567,8 +567,7 @@ jsds_CallHookProc (JSDContext* jsdc, JSDThreadState* jsdthreadstate,
 
     JSDStackFrameInfo *native_frame = JSD_GetStackFrame (jsdc, jsdthreadstate);
     nsCOMPtr<jsdIStackFrame> frame =
-        getter_AddRefs(jsdStackFrame::FromPtr(jsdc, jsdthreadstate,
-                                              native_frame));
+        dont_AddRef(jsdStackFrame::FromPtr(jsdc, jsdthreadstate, native_frame));
     gJsds->DoPause(nullptr, true);
     hook->OnCall(frame, type);    
     gJsds->DoUnPause(nullptr, true);
@@ -613,7 +612,7 @@ jsds_ExecutionHookProc (JSDContext* jsdc, JSDThreadState* jsdthreadstate,
             gJsds->GetThrowHook(getter_AddRefs(hook));
             if (hook) {
                 JSDValue *jsdv = JSD_GetException (jsdc, jsdthreadstate);
-                js_rv = getter_AddRefs(jsdValue::FromPtr (jsdc, jsdv));
+                js_rv = dont_AddRef(jsdValue::FromPtr (jsdc, jsdv));
             }
             break;
         }
@@ -629,8 +628,7 @@ jsds_ExecutionHookProc (JSDContext* jsdc, JSDThreadState* jsdthreadstate,
     
     JSDStackFrameInfo *native_frame = JSD_GetStackFrame (jsdc, jsdthreadstate);
     nsCOMPtr<jsdIStackFrame> frame =
-        getter_AddRefs(jsdStackFrame::FromPtr(jsdc, jsdthreadstate,
-                                              native_frame));
+        dont_AddRef(jsdStackFrame::FromPtr(jsdc, jsdthreadstate, native_frame));
     gJsds->DoPause(nullptr, true);
     jsdIValue *inout_rv = js_rv;
     NS_IF_ADDREF(inout_rv);
@@ -672,7 +670,7 @@ jsds_ScriptHookProc (JSDContext* jsdc, JSDScript* jsdscript, JSBool creating,
         }
             
         nsCOMPtr<jsdIScript> script = 
-            getter_AddRefs(jsdScript::FromPtr(jsdc, jsdscript));
+            dont_AddRef(jsdScript::FromPtr(jsdc, jsdscript));
 #ifdef CAUTIOUS_SCRIPTHOOK
         JS_UNKEEP_ATOMS(rt);
 #endif
@@ -2681,7 +2679,7 @@ jsdService::EnumerateContexts (jsdIContextEnumerator *enumerator)
     while ((cx = JS_ContextIterator (mRuntime, &iter)))
     {
         nsCOMPtr<jsdIContext> jsdicx = 
-            getter_AddRefs(jsdContext::FromPtr(mCx, cx));
+            dont_AddRef(jsdContext::FromPtr(mCx, cx));
         if (jsdicx)
         {
             if (NS_FAILED(enumerator->EnumerateContext(jsdicx)))
@@ -2704,7 +2702,7 @@ jsdService::EnumerateScripts (jsdIScriptEnumerator *enumerator)
     JSD_LockScriptSubsystem(mCx);
     while((script = JSD_IterateScripts(mCx, &iter))) {
         nsCOMPtr<jsdIScript> jsdis =
-            getter_AddRefs(jsdScript::FromPtr(mCx, script));
+            dont_AddRef(jsdScript::FromPtr(mCx, script));
         rv = enumerator->EnumerateScript (jsdis);
         if (NS_FAILED(rv))
             break;
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 81bfe65240ad..389b8077809e 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -357,12 +357,10 @@ ifdef BOTH_MANIFESTS
 MAKE_JARS_FLAGS += --both-manifests
 endif
 
-TAR_CREATE_FLAGS = -cvhf
-TAR_CREATE_FLAGS_QUIET = -chf
+TAR_CREATE_FLAGS = -chf
 
 ifeq ($(OS_ARCH),OS2)
-TAR_CREATE_FLAGS = -cvf
-TAR_CREATE_FLAGS_QUIET = -cf
+TAR_CREATE_FLAGS = -cf
 endif
 
 #
diff --git a/js/src/config/makefiles/makeutils.mk b/js/src/config/makefiles/makeutils.mk
index d3de7c6d2cd3..0ae1044643c0 100644
--- a/js/src/config/makefiles/makeutils.mk
+++ b/js/src/config/makefiles/makeutils.mk
@@ -118,4 +118,4 @@ ifdef USE_RCS_MK
 endif
 
 ## copy(src, dst): recursive copy
-copy_dir = (cd $(1)/. && $(TAR) $(TAR_CREATE_FLAGS_QUIET) - .) | (cd $(2)/. && tar -xf -)
+copy_dir = (cd $(1)/. && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(2)/. && tar -xf -)
diff --git a/js/src/tests/Makefile.in b/js/src/tests/Makefile.in
index aff3cdf177e8..149c02a15cba 100644
--- a/js/src/tests/Makefile.in
+++ b/js/src/tests/Makefile.in
@@ -44,6 +44,6 @@ PKG_STAGE = $(DIST)/test-package-stage
 # stage tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/jsreftest/tests
-	(cd $(srcdir) && tar $(TAR_CREATE_FLAGS_QUIET) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -)
+	(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -)
 	$(PYTHON) $(srcdir)/jstests.py --make-manifests $(PKG_STAGE)/jsreftest/tests/
 
diff --git a/js/xpconnect/src/dom_quickstubs.qsconf b/js/xpconnect/src/dom_quickstubs.qsconf
index ac569e219692..9ee4ddefa9f0 100644
--- a/js/xpconnect/src/dom_quickstubs.qsconf
+++ b/js/xpconnect/src/dom_quickstubs.qsconf
@@ -53,8 +53,6 @@ members = [
     # dom/interfaces/core
     'nsIDOMDOMStringList.*',
 
-    'nsIDOMTouchList.*',
-
     # dom/interfaces/storage
     'nsIDOMToString.toString',
     'nsIDOMStorage.setItem',
@@ -115,14 +113,8 @@ members = [
 irregularFilenames = {
     # stowaways
     'nsIDOMBlob': 'nsIDOMFile',
-
     'nsIIndexedDatabaseUsageCallback': 'nsIIndexedDatabaseManager',
-
-    'nsIDOMTouch': 'nsIDOMTouchEvent',
-    'nsIDOMTouchList': 'nsIDOMTouchEvent',
-
     'nsITelephoneCallback': 'nsITelephone',
-
     'nsIDOMWindowPerformance': 'nsIDOMWindow',
     }
 
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index 5ab3aff4801a..223517e2d4fd 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -36,7 +36,7 @@
 #include <stdio.h> // for FILE definition
 #include "nsChangeHint.h"
 #include "nsGUIEvent.h"
-#include "nsInterfaceHashtable.h"
+#include "nsRefPtrHashtable.h"
 #include "nsEventStates.h"
 #include "nsPresArena.h"
 #include "nsIImageLoadingContent.h"
@@ -1129,7 +1129,7 @@ public:
 
   static CapturingContentInfo gCaptureInfo;
 
-  static nsInterfaceHashtable<nsUint32HashKey, nsIDOMTouch> gCaptureTouchList;
+  static nsRefPtrHashtable<nsUint32HashKey, mozilla::dom::Touch> gCaptureTouchList;
   static bool gPreventMouseEvents;
 
   /**
diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp
index 2735bb9c68d1..d1f94b8d643a 100644
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -198,7 +198,7 @@ CapturingContentInfo nsIPresShell::gCaptureInfo =
   { false /* mAllowed */, false /* mPointerLock */, false /* mRetargetToElement */,
     false /* mPreventDrag */, nullptr /* mContent */ };
 nsIContent* nsIPresShell::gKeyDownTarget;
-nsInterfaceHashtable<nsUint32HashKey, nsIDOMTouch> nsIPresShell::gCaptureTouchList;
+nsRefPtrHashtable<nsUint32HashKey, dom::Touch> nsIPresShell::gCaptureTouchList;
 bool nsIPresShell::gPreventMouseEvents = false;
 
 // convert a color value to a string, in the CSS format #RRGGBB
@@ -5862,11 +5862,11 @@ PresShell::RecordMouseLocation(nsGUIEvent* aEvent)
 }
 
 static void
-EvictTouchPoint(nsCOMPtr<nsIDOMTouch>& aTouch)
+EvictTouchPoint(nsRefPtr<dom::Touch>& aTouch)
 {
   nsIWidget *widget = nullptr;
   // is there an easier/better way to dig out the widget?
-  nsCOMPtr<nsINode> node(do_QueryInterface(aTouch->GetTarget()));
+  nsCOMPtr<nsINode> node(do_QueryInterface(aTouch->mTarget));
   if (!node) {
     return;
   }
@@ -5899,21 +5899,21 @@ EvictTouchPoint(nsCOMPtr<nsIDOMTouch>& aTouch)
 }
 
 static PLDHashOperator
-AppendToTouchList(const uint32_t& aKey, nsCOMPtr<nsIDOMTouch>& aData, void *aTouchList)
+AppendToTouchList(const uint32_t& aKey, nsRefPtr<dom::Touch>& aData, void *aTouchList)
 {
-  nsTArray<nsCOMPtr<nsIDOMTouch> > *touches = static_cast<nsTArray<nsCOMPtr<nsIDOMTouch> > *>(aTouchList);
+  nsTArray< nsRefPtr<dom::Touch> >* touches =
+    static_cast<nsTArray< nsRefPtr<dom::Touch> >*>(aTouchList);
   aData->mChanged = false;
   touches->AppendElement(aData);
   return PL_DHASH_NEXT;
 }
 
 static PLDHashOperator
-FindAnyTarget(const uint32_t& aKey, nsCOMPtr<nsIDOMTouch>& aData,
+FindAnyTarget(const uint32_t& aKey, nsRefPtr<dom::Touch>& aData,
               void* aAnyTarget)
 {
   if (aData) {
-    nsCOMPtr<nsIDOMEventTarget> target;
-    aData->GetTarget(getter_AddRefs(target));
+    dom::EventTarget* target = aData->Target();
     if (target) {
       nsCOMPtr<nsIContent>* content =
         static_cast<nsCOMPtr<nsIContent>*>(aAnyTarget);
@@ -6133,7 +6133,7 @@ PresShell::HandleEvent(nsIFrame        *aFrame,
         // the start of a new touch session and evict any old touches in the
         // queue
         if (touchEvent->touches.Length() == 1) {
-          nsTArray<nsCOMPtr<nsIDOMTouch> > touches;
+          nsTArray< nsRefPtr<dom::Touch> > touches;
           gCaptureTouchList.Enumerate(&AppendToTouchList, (void *)&touches);
           for (uint32_t i = 0; i < touches.Length(); ++i) {
             EvictTouchPoint(touches[i]);
@@ -6152,12 +6152,10 @@ PresShell::HandleEvent(nsIFrame        *aFrame,
         // Add any new touches to the queue
         for (int32_t i = touchEvent->touches.Length(); i; ) {
           --i;
-          nsIDOMTouch *touch = touchEvent->touches[i];
-          Touch *domtouch = static_cast<Touch*>(touch);
+          dom::Touch* touch = touchEvent->touches[i];
           touch->mMessage = aEvent->message;
 
-          int32_t id = 0;
-          touch->GetIdentifier(&id);
+          int32_t id = touch->Identifier();
           if (!gCaptureTouchList.Get(id, nullptr)) {
             // This event is a new touch. Mark it as a changedTouch and
             // add it to the queue.
@@ -6177,7 +6175,7 @@ PresShell::HandleEvent(nsIFrame        *aFrame,
               while (anyTarget && !anyTarget->IsElement()) {
                 anyTarget = anyTarget->GetParent();
               }
-              domtouch->SetTarget(anyTarget);
+              touch->SetTarget(anyTarget);
               gCaptureTouchList.Put(id, touch);
             } else {
               nsIFrame* newTargetFrame = nullptr;
@@ -6217,13 +6215,11 @@ PresShell::HandleEvent(nsIFrame        *aFrame,
             // This touch is an old touch, we need to ensure that is not
             // marked as changed and set its target correctly
             touch->mChanged = false;
-            int32_t id;
-            touch->GetIdentifier(&id);
+            int32_t id = touch->Identifier();
 
-            nsCOMPtr<nsIDOMTouch> oldTouch;
-            gCaptureTouchList.Get(id, getter_AddRefs(oldTouch));
+            nsRefPtr<dom::Touch> oldTouch = gCaptureTouchList.GetWeak(id);
             if (oldTouch) {
-              domtouch->SetTarget(oldTouch->GetTarget());
+              touch->SetTarget(oldTouch->mTarget);
               gCaptureTouchList.Put(id, touch);
             }
           }
@@ -6286,24 +6282,21 @@ PresShell::HandleEvent(nsIFrame        *aFrame,
       case NS_TOUCH_END: {
         // get the correct shell to dispatch to
         nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aEvent);
-        nsTArray<nsCOMPtr<nsIDOMTouch> >  &touches = touchEvent->touches;
+        nsTArray< nsRefPtr<dom::Touch> >& touches = touchEvent->touches;
         for (uint32_t i = 0; i < touches.Length(); ++i) {
-          nsIDOMTouch *touch = touches[i];
+          dom::Touch* touch = touches[i];
           if (!touch) {
             break;
           }
   
-          int32_t id;
-          touch->GetIdentifier(&id);
-          nsCOMPtr<nsIDOMTouch> oldTouch;
-          gCaptureTouchList.Get(id, getter_AddRefs(oldTouch));
+          nsRefPtr<dom::Touch> oldTouch =
+            gCaptureTouchList.GetWeak(touch->Identifier());
           if (!oldTouch) {
             break;
           }
   
-          nsCOMPtr<nsIDOMEventTarget> targetPtr;
-          oldTouch->GetTarget(getter_AddRefs(targetPtr));
-          nsCOMPtr<nsIContent> content = do_QueryInterface(targetPtr);
+          nsCOMPtr<nsIContent> content =
+            do_QueryInterface(oldTouch->Target());
           if (!content) {
             break;
           }
@@ -6681,28 +6674,24 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsEventStatus* aStatus)
         // Remove the changed touches
         // need to make sure we only remove touches that are ending here
         nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aEvent);
-        nsTArray<nsCOMPtr<nsIDOMTouch> >  &touches = touchEvent->touches;
+        nsTArray< nsRefPtr<dom::Touch> >& touches = touchEvent->touches;
         for (uint32_t i = 0; i < touches.Length(); ++i) {
-          nsIDOMTouch *touch = touches[i];
-          Touch *domtouch = static_cast<Touch*>(touch);
+          dom::Touch* touch = touches[i];
           if (!touch) {
             continue;
           }
           touch->mMessage = aEvent->message;
           touch->mChanged = true;
-          nsCOMPtr<nsIDOMTouch> oldTouch;
 
-          int32_t id;
-          touch->GetIdentifier(&id);
-
-          gCaptureTouchList.Get(id, getter_AddRefs(oldTouch));
+          int32_t id = touch->Identifier();
+          nsRefPtr<dom::Touch> oldTouch = gCaptureTouchList.GetWeak(id);
           if (!oldTouch) {
             continue;
           }
-          nsCOMPtr<EventTarget> targetPtr = oldTouch->GetTarget();
+          nsCOMPtr<EventTarget> targetPtr = oldTouch->mTarget;
 
           mCurrentEventContent = do_QueryInterface(targetPtr);
-          domtouch->SetTarget(targetPtr);
+          touch->SetTarget(targetPtr);
           gCaptureTouchList.Remove(id);
         }
         // add any touches left in the touch list, but ensure changed=false
@@ -6712,36 +6701,33 @@ PresShell::HandleEventInternal(nsEvent* aEvent, nsEventStatus* aStatus)
       case NS_TOUCH_MOVE: {
         // Check for touches that changed. Mark them add to queue
         nsTouchEvent* touchEvent = static_cast<nsTouchEvent*>(aEvent);
-        nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = touchEvent->touches;
+        nsTArray< nsRefPtr<dom::Touch> >& touches = touchEvent->touches;
         bool haveChanged = false;
         for (int32_t i = touches.Length(); i; ) {
           --i;
-          nsIDOMTouch *touch = touches[i];
-          Touch *domtouch = static_cast<Touch*>(touch);
+          dom::Touch* touch = touches[i];
           if (!touch) {
             continue;
           }
-          int32_t id;
-          touch->GetIdentifier(&id);
+          int32_t id = touch->Identifier();
           touch->mMessage = aEvent->message;
 
-          nsCOMPtr<nsIDOMTouch> oldTouch;
-          gCaptureTouchList.Get(id, getter_AddRefs(oldTouch));
+          nsRefPtr<dom::Touch> oldTouch = gCaptureTouchList.GetWeak(id);
           if (!oldTouch) {
             touches.RemoveElementAt(i);
             continue;
           }
-          if(domtouch->Equals(oldTouch)) {
+          if (touch->Equals(oldTouch)) {
             touch->mChanged = true;
             haveChanged = true;
           }
 
-          nsCOMPtr<EventTarget> targetPtr = oldTouch->GetTarget();
+          nsCOMPtr<dom::EventTarget> targetPtr = oldTouch->mTarget;
           if (!targetPtr) {
             touches.RemoveElementAt(i);
             continue;
           }
-          domtouch->SetTarget(targetPtr);
+          touch->SetTarget(targetPtr);
 
           gCaptureTouchList.Put(id, touch);
           // if we're moving from touchstart to touchmove for this touch
diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 01e66b3392c6..4768945a2127 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -1580,7 +1580,7 @@ void
 nsGfxScrollFrameInner::ScrollToCSSPixels(const CSSIntPoint& aScrollPosition)
 {
   nsPoint current = GetScrollPosition();
-  nsIntPoint currentCSSPixels = GetScrollPositionCSSPixels();
+  CSSIntPoint currentCSSPixels = GetScrollPositionCSSPixels();
   nsPoint pt = CSSPoint::ToAppUnits(aScrollPosition);
   nscoord halfPixel = nsPresContext::CSSPixelsToAppUnits(0.5f);
   nsRect range(pt.x - halfPixel, pt.y - halfPixel, 2*halfPixel - 1, 2*halfPixel - 1);
@@ -1609,12 +1609,10 @@ nsGfxScrollFrameInner::ScrollToCSSPixelsApproximate(const CSSPoint& aScrollPosit
   ScrollTo(pt, nsIScrollableFrame::INSTANT, &range);
 }
 
-nsIntPoint
+CSSIntPoint
 nsGfxScrollFrameInner::GetScrollPositionCSSPixels()
 {
-  nsPoint pt = GetScrollPosition();
-  return nsIntPoint(nsPresContext::AppUnitsToIntCSSPixels(pt.x),
-                    nsPresContext::AppUnitsToIntCSSPixels(pt.y));
+  return CSSIntPoint::FromAppUnitsRounded(GetScrollPosition());
 }
 
 /*
diff --git a/layout/generic/nsGfxScrollFrame.h b/layout/generic/nsGfxScrollFrame.h
index ec749a0cabbb..51c36237612b 100644
--- a/layout/generic/nsGfxScrollFrame.h
+++ b/layout/generic/nsGfxScrollFrame.h
@@ -47,6 +47,7 @@ class ScrollbarActivity;
 
 class nsGfxScrollFrameInner : public nsIReflowCallback {
 public:
+  typedef mozilla::CSSIntPoint CSSIntPoint;
   typedef mozilla::layout::ScrollbarActivity ScrollbarActivity;
 
   class AsyncScroll;
@@ -170,9 +171,9 @@ public:
                 const nsRect* aRange = nullptr) {
     ScrollToWithOrigin(aScrollPosition, aMode, nsGkAtoms::other, aRange);
   }
-  void ScrollToCSSPixels(const mozilla::CSSIntPoint& aScrollPosition);
+  void ScrollToCSSPixels(const CSSIntPoint& aScrollPosition);
   void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition);
-  nsIntPoint GetScrollPositionCSSPixels();
+  CSSIntPoint GetScrollPositionCSSPixels();
   void ScrollToImpl(nsPoint aScrollPosition, const nsRect& aRange);
   void ScrollVisual(nsPoint aOldScrolledFramePosition);
   void ScrollBy(nsIntPoint aDelta, nsIScrollableFrame::ScrollUnit aUnit,
@@ -377,6 +378,7 @@ class nsHTMLScrollFrame : public nsContainerFrame,
                           public nsIAnonymousContentCreator,
                           public nsIStatefulFrame {
 public:
+  typedef mozilla::CSSIntPoint CSSIntPoint;
   friend nsIFrame* NS_NewHTMLScrollFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, bool aIsRoot);
 
   NS_DECL_QUERYFRAME
@@ -519,13 +521,13 @@ public:
                         const nsRect* aRange = nullptr) MOZ_OVERRIDE {
     mInner.ScrollTo(aScrollPosition, aMode, aRange);
   }
-  virtual void ScrollToCSSPixels(const mozilla::CSSIntPoint& aScrollPosition) MOZ_OVERRIDE {
+  virtual void ScrollToCSSPixels(const CSSIntPoint& aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixels(aScrollPosition);
   }
   virtual void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixelsApproximate(aScrollPosition);
   }
-  virtual nsIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
+  virtual CSSIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
     return mInner.GetScrollPositionCSSPixels();
   }
   virtual void ScrollBy(nsIntPoint aDelta, ScrollUnit aUnit, ScrollMode aMode,
@@ -630,6 +632,8 @@ class nsXULScrollFrame : public nsBoxFrame,
                          public nsIAnonymousContentCreator,
                          public nsIStatefulFrame {
 public:
+  typedef mozilla::CSSIntPoint CSSIntPoint;
+
   NS_DECL_QUERYFRAME
   NS_DECL_FRAMEARENA_HELPERS
 
@@ -783,13 +787,13 @@ public:
                         const nsRect* aRange = nullptr) MOZ_OVERRIDE {
     mInner.ScrollTo(aScrollPosition, aMode, aRange);
   }
-  virtual void ScrollToCSSPixels(const mozilla::CSSIntPoint& aScrollPosition) MOZ_OVERRIDE {
+  virtual void ScrollToCSSPixels(const CSSIntPoint& aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixels(aScrollPosition);
   }
   virtual void ScrollToCSSPixelsApproximate(const mozilla::CSSPoint& aScrollPosition) MOZ_OVERRIDE {
     mInner.ScrollToCSSPixelsApproximate(aScrollPosition);
   }
-  virtual nsIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
+  virtual CSSIntPoint GetScrollPositionCSSPixels() MOZ_OVERRIDE {
     return mInner.GetScrollPositionCSSPixels();
   }
   virtual void ScrollBy(nsIntPoint aDelta, ScrollUnit aUnit, ScrollMode aMode,
diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h
index 837b56a1e277..3c9e943e6c91 100644
--- a/layout/generic/nsIScrollableFrame.h
+++ b/layout/generic/nsIScrollableFrame.h
@@ -31,6 +31,8 @@ class nsIFrame;
  */
 class nsIScrollableFrame : public nsIScrollbarOwner {
 public:
+  typedef mozilla::CSSIntPoint CSSIntPoint;
+
   NS_DECL_QUERYFRAME_TARGET(nsIScrollableFrame)
 
   /**
@@ -156,7 +158,7 @@ public:
    * rounding to CSS pixels) will be exactly aScrollPosition.
    * The scroll mode is INSTANT.
    */
-  virtual void ScrollToCSSPixels(const mozilla::CSSIntPoint& aScrollPosition) = 0;
+  virtual void ScrollToCSSPixels(const CSSIntPoint& aScrollPosition) = 0;
   /**
    * Scrolls to a particular position in float CSS pixels.
    * This does not guarantee that GetScrollPositionCSSPixels equals
@@ -171,7 +173,7 @@ public:
    * Returns the scroll position in integer CSS pixels, rounded to the nearest
    * pixel.
    */
-  virtual nsIntPoint GetScrollPositionCSSPixels() = 0;
+  virtual CSSIntPoint GetScrollPositionCSSPixels() = 0;
   /**
    * When scrolling by a relative amount, we can choose various units.
    */
diff --git a/layout/reftests/forms/button-first-letter-1-noref.html b/layout/reftests/forms/button/first-letter-1-noref.html
similarity index 100%
rename from layout/reftests/forms/button-first-letter-1-noref.html
rename to layout/reftests/forms/button/first-letter-1-noref.html
diff --git a/layout/reftests/forms/button-first-letter-1-ref.html b/layout/reftests/forms/button/first-letter-1-ref.html
similarity index 100%
rename from layout/reftests/forms/button-first-letter-1-ref.html
rename to layout/reftests/forms/button/first-letter-1-ref.html
diff --git a/layout/reftests/forms/button-first-letter-1.html b/layout/reftests/forms/button/first-letter-1.html
similarity index 100%
rename from layout/reftests/forms/button-first-letter-1.html
rename to layout/reftests/forms/button/first-letter-1.html
diff --git a/layout/reftests/forms/button-max-height-ref.html b/layout/reftests/forms/button/max-height-ref.html
similarity index 100%
rename from layout/reftests/forms/button-max-height-ref.html
rename to layout/reftests/forms/button/max-height-ref.html
diff --git a/layout/reftests/forms/button-max-height.html b/layout/reftests/forms/button/max-height.html
similarity index 100%
rename from layout/reftests/forms/button-max-height.html
rename to layout/reftests/forms/button/max-height.html
diff --git a/layout/reftests/forms/button/reftest.list b/layout/reftests/forms/button/reftest.list
new file mode 100644
index 000000000000..540cc9a67117
--- /dev/null
+++ b/layout/reftests/forms/button/reftest.list
@@ -0,0 +1,3 @@
+asserts(2) == first-letter-1.html first-letter-1-ref.html
+asserts(1) != first-letter-1.html first-letter-1-noref.html
+== max-height.html max-height-ref.html
diff --git a/layout/reftests/forms/checkbox-checked-native-notref.html b/layout/reftests/forms/input/checkbox/checked-native-notref.html
similarity index 100%
rename from layout/reftests/forms/checkbox-checked-native-notref.html
rename to layout/reftests/forms/input/checkbox/checked-native-notref.html
diff --git a/layout/reftests/forms/checkbox-checked-native.html b/layout/reftests/forms/input/checkbox/checked-native.html
similarity index 100%
rename from layout/reftests/forms/checkbox-checked-native.html
rename to layout/reftests/forms/input/checkbox/checked-native.html
diff --git a/layout/reftests/forms/checkbox-checked-notref.html b/layout/reftests/forms/input/checkbox/checked-notref.html
similarity index 100%
rename from layout/reftests/forms/checkbox-checked-notref.html
rename to layout/reftests/forms/input/checkbox/checked-notref.html
diff --git a/layout/reftests/forms/checkbox-checked.html b/layout/reftests/forms/input/checkbox/checked.html
similarity index 100%
rename from layout/reftests/forms/checkbox-checked.html
rename to layout/reftests/forms/input/checkbox/checked.html
diff --git a/layout/reftests/forms/indeterminate-checked-notref.html b/layout/reftests/forms/input/checkbox/indeterminate-checked-notref.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-checked-notref.html
rename to layout/reftests/forms/input/checkbox/indeterminate-checked-notref.html
diff --git a/layout/reftests/forms/indeterminate-checked.html b/layout/reftests/forms/input/checkbox/indeterminate-checked.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-checked.html
rename to layout/reftests/forms/input/checkbox/indeterminate-checked.html
diff --git a/layout/reftests/forms/indeterminate-native-checked-notref.html b/layout/reftests/forms/input/checkbox/indeterminate-native-checked-notref.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-native-checked-notref.html
rename to layout/reftests/forms/input/checkbox/indeterminate-native-checked-notref.html
diff --git a/layout/reftests/forms/indeterminate-native-checked.html b/layout/reftests/forms/input/checkbox/indeterminate-native-checked.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-native-checked.html
rename to layout/reftests/forms/input/checkbox/indeterminate-native-checked.html
diff --git a/layout/reftests/forms/indeterminate-native-unchecked-notref.html b/layout/reftests/forms/input/checkbox/indeterminate-native-unchecked-notref.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-native-unchecked-notref.html
rename to layout/reftests/forms/input/checkbox/indeterminate-native-unchecked-notref.html
diff --git a/layout/reftests/forms/indeterminate-native-unchecked.html b/layout/reftests/forms/input/checkbox/indeterminate-native-unchecked.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-native-unchecked.html
rename to layout/reftests/forms/input/checkbox/indeterminate-native-unchecked.html
diff --git a/layout/reftests/forms/indeterminate-selector-ref.html b/layout/reftests/forms/input/checkbox/indeterminate-selector-ref.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-selector-ref.html
rename to layout/reftests/forms/input/checkbox/indeterminate-selector-ref.html
diff --git a/layout/reftests/forms/indeterminate-selector.html b/layout/reftests/forms/input/checkbox/indeterminate-selector.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-selector.html
rename to layout/reftests/forms/input/checkbox/indeterminate-selector.html
diff --git a/layout/reftests/forms/indeterminate-unchecked-notref.html b/layout/reftests/forms/input/checkbox/indeterminate-unchecked-notref.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-unchecked-notref.html
rename to layout/reftests/forms/input/checkbox/indeterminate-unchecked-notref.html
diff --git a/layout/reftests/forms/indeterminate-unchecked.html b/layout/reftests/forms/input/checkbox/indeterminate-unchecked.html
similarity index 100%
rename from layout/reftests/forms/indeterminate-unchecked.html
rename to layout/reftests/forms/input/checkbox/indeterminate-unchecked.html
diff --git a/layout/reftests/forms/checkbox-label-dynamic-ref.html b/layout/reftests/forms/input/checkbox/label-dynamic-ref.html
similarity index 100%
rename from layout/reftests/forms/checkbox-label-dynamic-ref.html
rename to layout/reftests/forms/input/checkbox/label-dynamic-ref.html
diff --git a/layout/reftests/forms/checkbox-label-dynamic.html b/layout/reftests/forms/input/checkbox/label-dynamic.html
similarity index 100%
rename from layout/reftests/forms/checkbox-label-dynamic.html
rename to layout/reftests/forms/input/checkbox/label-dynamic.html
diff --git a/layout/reftests/forms/checkbox-radio-stretched-ref.html b/layout/reftests/forms/input/checkbox/radio-stretched-ref.html
similarity index 100%
rename from layout/reftests/forms/checkbox-radio-stretched-ref.html
rename to layout/reftests/forms/input/checkbox/radio-stretched-ref.html
diff --git a/layout/reftests/forms/checkbox-radio-stretched.html b/layout/reftests/forms/input/checkbox/radio-stretched.html
similarity index 100%
rename from layout/reftests/forms/checkbox-radio-stretched.html
rename to layout/reftests/forms/input/checkbox/radio-stretched.html
diff --git a/layout/reftests/forms/input/checkbox/reftest.list b/layout/reftests/forms/input/checkbox/reftest.list
new file mode 100644
index 000000000000..5d4b9b428797
--- /dev/null
+++ b/layout/reftests/forms/input/checkbox/reftest.list
@@ -0,0 +1,13 @@
+== label-dynamic.html label-dynamic-ref.html
+skip-if(B2G) fails-if(Android) == radio-stretched.html radio-stretched-ref.html # test for bug 464589
+!= checked.html checked-notref.html
+!= checked-native.html checked-native-notref.html
+!= checked.html about:blank
+!= checked-notref.html about:blank
+!= checked-native.html about:blank
+!= checked-native-notref.html about:blank
+!= indeterminate-checked.html indeterminate-checked-notref.html
+!= indeterminate-unchecked.html indeterminate-unchecked-notref.html
+!= indeterminate-native-checked.html indeterminate-native-checked-notref.html
+!= indeterminate-native-unchecked.html indeterminate-native-unchecked-notref.html
+== indeterminate-selector.html indeterminate-selector-ref.html
diff --git a/layout/reftests/forms/input/email/input-email-1.html b/layout/reftests/forms/input/email/1.html
similarity index 100%
rename from layout/reftests/forms/input/email/input-email-1.html
rename to layout/reftests/forms/input/email/1.html
diff --git a/layout/reftests/forms/input/email/input-email-2.html b/layout/reftests/forms/input/email/2.html
similarity index 100%
rename from layout/reftests/forms/input/email/input-email-2.html
rename to layout/reftests/forms/input/email/2.html
diff --git a/layout/reftests/forms/input/email/input-email-3.html b/layout/reftests/forms/input/email/3.html
similarity index 100%
rename from layout/reftests/forms/input/email/input-email-3.html
rename to layout/reftests/forms/input/email/3.html
diff --git a/layout/reftests/forms/input/email/input-email-ref.html b/layout/reftests/forms/input/email/ref.html
similarity index 100%
rename from layout/reftests/forms/input/email/input-email-ref.html
rename to layout/reftests/forms/input/email/ref.html
diff --git a/layout/reftests/forms/input/email/reftest.list b/layout/reftests/forms/input/email/reftest.list
index 562e33101ae9..dcca7a3cde31 100644
--- a/layout/reftests/forms/input/email/reftest.list
+++ b/layout/reftests/forms/input/email/reftest.list
@@ -1,3 +1,3 @@
-== input-email-1.html input-email-ref.html
-== input-email-2.html input-email-ref.html
-!= input-email-3.html input-email-ref.html
+== 1.html ref.html
+== 2.html ref.html
+!= 3.html ref.html
diff --git a/layout/reftests/forms/input/file/input-file-background-ref.xul b/layout/reftests/forms/input/file/background-ref.xul
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-background-ref.xul
rename to layout/reftests/forms/input/file/background-ref.xul
diff --git a/layout/reftests/forms/input/file/input-file-background.html b/layout/reftests/forms/input/file/background.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-background.html
rename to layout/reftests/forms/input/file/background.html
diff --git a/layout/reftests/forms/input/file/input-file-color-inherit-ref.html b/layout/reftests/forms/input/file/color-inherit-ref.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-color-inherit-ref.html
rename to layout/reftests/forms/input/file/color-inherit-ref.html
diff --git a/layout/reftests/forms/input/file/input-file-color-inherit.html b/layout/reftests/forms/input/file/color-inherit.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-color-inherit.html
rename to layout/reftests/forms/input/file/color-inherit.html
diff --git a/layout/reftests/forms/input/file/reftest.list b/layout/reftests/forms/input/file/reftest.list
index 018d52bffd8d..0aefd31b8bea 100644
--- a/layout/reftests/forms/input/file/reftest.list
+++ b/layout/reftests/forms/input/file/reftest.list
@@ -1,8 +1,8 @@
 # B2G failures: bug 855352.
-fails-if(B2G) fuzzy-if(OSX==10.6,8,128) == input-file-simple.html input-file-simple-ref.xul
-fails-if(B2G) fuzzy-if(OSX==10.6,8,64) == input-file-rtl.html input-file-rtl-ref.xul
-fails-if(B2G) fuzzy-if(OSX==10.6,8,128) == input-file-size.html input-file-simple-ref.xul
-fails-if(B2G) fuzzy-if(OSX==10.6,8,64) == input-file-background.html input-file-background-ref.xul
-fails-if(B2G) == input-file-style.html input-file-style-ref.xul
-!= input-file-width-clip.html input-file-width-clip-ref.html
-fails-if(B2G) == input-file-color-inherit.html input-file-color-inherit-ref.html
+fails-if(B2G) fuzzy-if(OSX==10.6,8,128) == simple.html simple-ref.xul
+fails-if(B2G) fuzzy-if(OSX==10.6,8,64) == rtl.html rtl-ref.xul
+fails-if(B2G) fuzzy-if(OSX==10.6,8,128) == size.html simple-ref.xul
+fails-if(B2G) fuzzy-if(OSX==10.6,8,64) == background.html background-ref.xul
+fails-if(B2G) == style.html style-ref.xul
+!= width-clip.html width-clip-ref.html
+fails-if(B2G) == color-inherit.html color-inherit-ref.html
diff --git a/layout/reftests/forms/input/file/input-file-rtl-ref.xul b/layout/reftests/forms/input/file/rtl-ref.xul
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-rtl-ref.xul
rename to layout/reftests/forms/input/file/rtl-ref.xul
diff --git a/layout/reftests/forms/input/file/input-file-rtl.html b/layout/reftests/forms/input/file/rtl.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-rtl.html
rename to layout/reftests/forms/input/file/rtl.html
diff --git a/layout/reftests/forms/input/file/input-file-simple-ref.xul b/layout/reftests/forms/input/file/simple-ref.xul
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-simple-ref.xul
rename to layout/reftests/forms/input/file/simple-ref.xul
diff --git a/layout/reftests/forms/input/file/input-file-simple.html b/layout/reftests/forms/input/file/simple.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-simple.html
rename to layout/reftests/forms/input/file/simple.html
diff --git a/layout/reftests/forms/input/file/input-file-size.html b/layout/reftests/forms/input/file/size.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-size.html
rename to layout/reftests/forms/input/file/size.html
diff --git a/layout/reftests/forms/input/file/input-file-style-ref.xul b/layout/reftests/forms/input/file/style-ref.xul
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-style-ref.xul
rename to layout/reftests/forms/input/file/style-ref.xul
diff --git a/layout/reftests/forms/input/file/input-file-style.html b/layout/reftests/forms/input/file/style.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-style.html
rename to layout/reftests/forms/input/file/style.html
diff --git a/layout/reftests/forms/input/file/input-file-width-clip-ref.html b/layout/reftests/forms/input/file/width-clip-ref.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-width-clip-ref.html
rename to layout/reftests/forms/input/file/width-clip-ref.html
diff --git a/layout/reftests/forms/input/file/input-file-width-clip.html b/layout/reftests/forms/input/file/width-clip.html
similarity index 100%
rename from layout/reftests/forms/input/file/input-file-width-clip.html
rename to layout/reftests/forms/input/file/width-clip.html
diff --git a/layout/reftests/forms/input-hidden-border.html b/layout/reftests/forms/input/hidden/border.html
similarity index 100%
rename from layout/reftests/forms/input-hidden-border.html
rename to layout/reftests/forms/input/hidden/border.html
diff --git a/layout/reftests/forms/input/hidden/reftest.list b/layout/reftests/forms/input/hidden/reftest.list
new file mode 100644
index 000000000000..64fa2bda56a1
--- /dev/null
+++ b/layout/reftests/forms/input/hidden/reftest.list
@@ -0,0 +1 @@
+== border.html about:blank
diff --git a/layout/reftests/forms/input-percentage-padding-ref.html b/layout/reftests/forms/input/percentage/padding-ref.html
similarity index 100%
rename from layout/reftests/forms/input-percentage-padding-ref.html
rename to layout/reftests/forms/input/percentage/padding-ref.html
diff --git a/layout/reftests/forms/input-percentage-padding.html b/layout/reftests/forms/input/percentage/padding.html
similarity index 100%
rename from layout/reftests/forms/input-percentage-padding.html
rename to layout/reftests/forms/input/percentage/padding.html
diff --git a/layout/reftests/forms/input/percentage/reftest.list b/layout/reftests/forms/input/percentage/reftest.list
new file mode 100644
index 000000000000..5d9f72902631
--- /dev/null
+++ b/layout/reftests/forms/input/percentage/reftest.list
@@ -0,0 +1 @@
+== padding.html padding-ref.html
diff --git a/layout/reftests/forms/radio-checked-native-notref.html b/layout/reftests/forms/input/radio/checked-native-notref.html
similarity index 100%
rename from layout/reftests/forms/radio-checked-native-notref.html
rename to layout/reftests/forms/input/radio/checked-native-notref.html
diff --git a/layout/reftests/forms/radio-checked-native.html b/layout/reftests/forms/input/radio/checked-native.html
similarity index 100%
rename from layout/reftests/forms/radio-checked-native.html
rename to layout/reftests/forms/input/radio/checked-native.html
diff --git a/layout/reftests/forms/radio-checked-notref.html b/layout/reftests/forms/input/radio/checked-notref.html
similarity index 100%
rename from layout/reftests/forms/radio-checked-notref.html
rename to layout/reftests/forms/input/radio/checked-notref.html
diff --git a/layout/reftests/forms/radio-checked.html b/layout/reftests/forms/input/radio/checked.html
similarity index 100%
rename from layout/reftests/forms/radio-checked.html
rename to layout/reftests/forms/input/radio/checked.html
diff --git a/layout/reftests/forms/radio-label-dynamic-ref.html b/layout/reftests/forms/input/radio/label-dynamic-ref.html
similarity index 100%
rename from layout/reftests/forms/radio-label-dynamic-ref.html
rename to layout/reftests/forms/input/radio/label-dynamic-ref.html
diff --git a/layout/reftests/forms/radio-label-dynamic.html b/layout/reftests/forms/input/radio/label-dynamic.html
similarity index 100%
rename from layout/reftests/forms/radio-label-dynamic.html
rename to layout/reftests/forms/input/radio/label-dynamic.html
diff --git a/layout/reftests/forms/input/radio/reftest.list b/layout/reftests/forms/input/radio/reftest.list
new file mode 100644
index 000000000000..48d0cd10a40e
--- /dev/null
+++ b/layout/reftests/forms/input/radio/reftest.list
@@ -0,0 +1,7 @@
+== label-dynamic.html label-dynamic-ref.html
+!= checked.html checked-notref.html
+!= checked-native.html checked-native-notref.html
+!= checked.html about:blank
+!= checked-notref.html about:blank
+!= checked-native.html about:blank
+!= checked-native-notref.html about:blank
diff --git a/layout/reftests/forms/input/range/input-75pct-common-ref.html b/layout/reftests/forms/input/range/75pct-common-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-75pct-common-ref.html
rename to layout/reftests/forms/input/range/75pct-common-ref.html
diff --git a/layout/reftests/forms/input/range/input-75pct-unthemed-common-ref.html b/layout/reftests/forms/input/range/75pct-unthemed-common-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-75pct-unthemed-common-ref.html
rename to layout/reftests/forms/input/range/75pct-unthemed-common-ref.html
diff --git a/layout/reftests/forms/input/range/input-range-different-fraction-of-range-unthemed-1-notref.html b/layout/reftests/forms/input/range/different-fraction-of-range-unthemed-1-notref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-different-fraction-of-range-unthemed-1-notref.html
rename to layout/reftests/forms/input/range/different-fraction-of-range-unthemed-1-notref.html
diff --git a/layout/reftests/forms/input/range/input-range-different-fraction-of-range-unthemed-1.html b/layout/reftests/forms/input/range/different-fraction-of-range-unthemed-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-different-fraction-of-range-unthemed-1.html
rename to layout/reftests/forms/input/range/different-fraction-of-range-unthemed-1.html
diff --git a/layout/reftests/forms/input/range/input-range-direction-unthemed-1-ref.html b/layout/reftests/forms/input/range/direction-unthemed-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-direction-unthemed-1-ref.html
rename to layout/reftests/forms/input/range/direction-unthemed-1-ref.html
diff --git a/layout/reftests/forms/input/range/input-range-direction-unthemed-1.html b/layout/reftests/forms/input/range/direction-unthemed-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-direction-unthemed-1.html
rename to layout/reftests/forms/input/range/direction-unthemed-1.html
diff --git a/layout/reftests/forms/input/range/input-from-range-to-other-type-unthemed-1-ref.html b/layout/reftests/forms/input/range/from-range-to-other-type-unthemed-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-from-range-to-other-type-unthemed-1-ref.html
rename to layout/reftests/forms/input/range/from-range-to-other-type-unthemed-1-ref.html
diff --git a/layout/reftests/forms/input/range/input-from-range-to-other-type-unthemed-1.html b/layout/reftests/forms/input/range/from-range-to-other-type-unthemed-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-from-range-to-other-type-unthemed-1.html
rename to layout/reftests/forms/input/range/from-range-to-other-type-unthemed-1.html
diff --git a/layout/reftests/forms/input/range/input-range-moz-range-progress-1-ref.html b/layout/reftests/forms/input/range/moz-range-progress-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-moz-range-progress-1-ref.html
rename to layout/reftests/forms/input/range/moz-range-progress-1-ref.html
diff --git a/layout/reftests/forms/input/range/input-range-moz-range-progress-1.html b/layout/reftests/forms/input/range/moz-range-progress-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-moz-range-progress-1.html
rename to layout/reftests/forms/input/range/moz-range-progress-1.html
diff --git a/layout/reftests/forms/input/range/input-range-moz-range-progress-2-ref.html b/layout/reftests/forms/input/range/moz-range-progress-2-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-moz-range-progress-2-ref.html
rename to layout/reftests/forms/input/range/moz-range-progress-2-ref.html
diff --git a/layout/reftests/forms/input/range/input-range-moz-range-progress-2.html b/layout/reftests/forms/input/range/moz-range-progress-2.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-moz-range-progress-2.html
rename to layout/reftests/forms/input/range/moz-range-progress-2.html
diff --git a/layout/reftests/forms/input/range/input-range-moz-range-progress-3-ref.html b/layout/reftests/forms/input/range/moz-range-progress-3-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-moz-range-progress-3-ref.html
rename to layout/reftests/forms/input/range/moz-range-progress-3-ref.html
diff --git a/layout/reftests/forms/input/range/input-range-moz-range-progress-3.html b/layout/reftests/forms/input/range/moz-range-progress-3.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-moz-range-progress-3.html
rename to layout/reftests/forms/input/range/moz-range-progress-3.html
diff --git a/layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1.html b/layout/reftests/forms/input/range/not-other-type-unthemed-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1.html
rename to layout/reftests/forms/input/range/not-other-type-unthemed-1.html
diff --git a/layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1a-notref.html b/layout/reftests/forms/input/range/not-other-type-unthemed-1a-notref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1a-notref.html
rename to layout/reftests/forms/input/range/not-other-type-unthemed-1a-notref.html
diff --git a/layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1b-notref.html b/layout/reftests/forms/input/range/not-other-type-unthemed-1b-notref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1b-notref.html
rename to layout/reftests/forms/input/range/not-other-type-unthemed-1b-notref.html
diff --git a/layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1c-notref.html b/layout/reftests/forms/input/range/not-other-type-unthemed-1c-notref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-not-other-type-unthemed-1c-notref.html
rename to layout/reftests/forms/input/range/not-other-type-unthemed-1c-notref.html
diff --git a/layout/reftests/forms/input/range/reftest.list b/layout/reftests/forms/input/range/reftest.list
index e82889ed8c8c..806397481590 100644
--- a/layout/reftests/forms/input/range/reftest.list
+++ b/layout/reftests/forms/input/range/reftest.list
@@ -2,33 +2,33 @@
 default-preferences pref(dom.experimental_forms_range,true)
 
 # sanity checks:
-!= input-range-not-other-type-unthemed-1.html input-range-not-other-type-unthemed-1a-notref.html
-!= input-range-not-other-type-unthemed-1.html input-range-not-other-type-unthemed-1b-notref.html
-!= input-range-not-other-type-unthemed-1.html input-range-not-other-type-unthemed-1c-notref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1b-notref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1c-notref.html
 
 # dynamic type changes:
-== input-to-range-from-other-type-unthemed-1.html input-to-range-from-other-type-unthemed-1-ref.html
-== input-from-range-to-other-type-unthemed-1.html input-from-range-to-other-type-unthemed-1-ref.html
+== to-range-from-other-type-unthemed-1.html to-range-from-other-type-unthemed-1-ref.html
+== from-range-to-other-type-unthemed-1.html from-range-to-other-type-unthemed-1-ref.html
 
 # for different values:
-!= input-range-different-fraction-of-range-unthemed-1.html input-range-different-fraction-of-range-unthemed-1-notref.html
-== input-range-same-fraction-of-range-unthemed-1.html input-range-same-fraction-of-range-unthemed-1-ref.html
+!= different-fraction-of-range-unthemed-1.html different-fraction-of-range-unthemed-1-notref.html
+== same-fraction-of-range-unthemed-1.html same-fraction-of-range-unthemed-1-ref.html
 
 # dynamic value changes:
-== input-value-prop-unthemed.html input-75pct-unthemed-common-ref.html
-== input-value-prop.html input-75pct-common-ref.html
-== input-valueAsNumber-prop-unthemed.html input-75pct-unthemed-common-ref.html
-== input-valueAsNumber-prop.html input-75pct-common-ref.html
-fails-if(B2G) == input-stepDown-unthemed.html input-75pct-unthemed-common-ref.html
-fails-if(B2G) == input-stepDown.html input-75pct-common-ref.html
-== input-stepUp-unthemed.html input-75pct-unthemed-common-ref.html
-== input-stepUp.html input-75pct-common-ref.html
+== value-prop-unthemed.html 75pct-unthemed-common-ref.html
+== value-prop.html 75pct-common-ref.html
+== valueAsNumber-prop-unthemed.html 75pct-unthemed-common-ref.html
+== valueAsNumber-prop.html 75pct-common-ref.html
+fails-if(B2G) == stepDown-unthemed.html 75pct-unthemed-common-ref.html
+fails-if(B2G) == stepDown.html 75pct-common-ref.html
+== stepUp-unthemed.html 75pct-unthemed-common-ref.html
+== stepUp.html 75pct-common-ref.html
 
 # 'direction' property:
-== input-range-direction-unthemed-1.html input-range-direction-unthemed-1-ref.html
+== direction-unthemed-1.html direction-unthemed-1-ref.html
 
 # ::-moz-range-progress pseudo-element:
-fails-if(B2G) == input-range-moz-range-progress-1.html input-range-moz-range-progress-1-ref.html
-== input-range-moz-range-progress-2.html input-range-moz-range-progress-2-ref.html
-== input-range-moz-range-progress-3.html input-range-moz-range-progress-3-ref.html
+fails-if(B2G) == moz-range-progress-1.html moz-range-progress-1-ref.html
+== moz-range-progress-2.html moz-range-progress-2-ref.html
+== moz-range-progress-3.html moz-range-progress-3-ref.html
 
diff --git a/layout/reftests/forms/input/range/input-range-same-fraction-of-range-unthemed-1-ref.html b/layout/reftests/forms/input/range/same-fraction-of-range-unthemed-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-same-fraction-of-range-unthemed-1-ref.html
rename to layout/reftests/forms/input/range/same-fraction-of-range-unthemed-1-ref.html
diff --git a/layout/reftests/forms/input/range/input-range-same-fraction-of-range-unthemed-1.html b/layout/reftests/forms/input/range/same-fraction-of-range-unthemed-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-range-same-fraction-of-range-unthemed-1.html
rename to layout/reftests/forms/input/range/same-fraction-of-range-unthemed-1.html
diff --git a/layout/reftests/forms/input/range/input-stepDown-unthemed.html b/layout/reftests/forms/input/range/stepDown-unthemed.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-stepDown-unthemed.html
rename to layout/reftests/forms/input/range/stepDown-unthemed.html
diff --git a/layout/reftests/forms/input/range/input-stepDown.html b/layout/reftests/forms/input/range/stepDown.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-stepDown.html
rename to layout/reftests/forms/input/range/stepDown.html
diff --git a/layout/reftests/forms/input/range/input-stepUp-unthemed.html b/layout/reftests/forms/input/range/stepUp-unthemed.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-stepUp-unthemed.html
rename to layout/reftests/forms/input/range/stepUp-unthemed.html
diff --git a/layout/reftests/forms/input/range/input-stepUp.html b/layout/reftests/forms/input/range/stepUp.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-stepUp.html
rename to layout/reftests/forms/input/range/stepUp.html
diff --git a/layout/reftests/forms/input/range/input-to-range-from-other-type-unthemed-1-ref.html b/layout/reftests/forms/input/range/to-range-from-other-type-unthemed-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-to-range-from-other-type-unthemed-1-ref.html
rename to layout/reftests/forms/input/range/to-range-from-other-type-unthemed-1-ref.html
diff --git a/layout/reftests/forms/input/range/input-to-range-from-other-type-unthemed-1.html b/layout/reftests/forms/input/range/to-range-from-other-type-unthemed-1.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-to-range-from-other-type-unthemed-1.html
rename to layout/reftests/forms/input/range/to-range-from-other-type-unthemed-1.html
diff --git a/layout/reftests/forms/input/range/input-value-prop-unthemed.html b/layout/reftests/forms/input/range/value-prop-unthemed.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-value-prop-unthemed.html
rename to layout/reftests/forms/input/range/value-prop-unthemed.html
diff --git a/layout/reftests/forms/input/range/input-value-prop.html b/layout/reftests/forms/input/range/value-prop.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-value-prop.html
rename to layout/reftests/forms/input/range/value-prop.html
diff --git a/layout/reftests/forms/input/range/input-valueAsNumber-prop-unthemed.html b/layout/reftests/forms/input/range/valueAsNumber-prop-unthemed.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-valueAsNumber-prop-unthemed.html
rename to layout/reftests/forms/input/range/valueAsNumber-prop-unthemed.html
diff --git a/layout/reftests/forms/input/range/input-valueAsNumber-prop.html b/layout/reftests/forms/input/range/valueAsNumber-prop.html
similarity index 100%
rename from layout/reftests/forms/input/range/input-valueAsNumber-prop.html
rename to layout/reftests/forms/input/range/valueAsNumber-prop.html
diff --git a/layout/reftests/forms/input/reftest.list b/layout/reftests/forms/input/reftest.list
index 1425afa71939..4287bc4387ea 100644
--- a/layout/reftests/forms/input/reftest.list
+++ b/layout/reftests/forms/input/reftest.list
@@ -1,7 +1,11 @@
+include checkbox/reftest.list
 include email/reftest.list
 include tel/reftest.list
 include search/reftest.list
 include url/reftest.list
 include file/reftest.list
+include radio/reftest.list
 include range/reftest.list
-
+include text/reftest.list
+include percentage/reftest.list
+include hidden/reftest.list
diff --git a/layout/reftests/forms/input/search/input-search-1.html b/layout/reftests/forms/input/search/1.html
similarity index 100%
rename from layout/reftests/forms/input/search/input-search-1.html
rename to layout/reftests/forms/input/search/1.html
diff --git a/layout/reftests/forms/input/search/input-search-2.html b/layout/reftests/forms/input/search/2.html
similarity index 100%
rename from layout/reftests/forms/input/search/input-search-2.html
rename to layout/reftests/forms/input/search/2.html
diff --git a/layout/reftests/forms/input/search/input-search-3.html b/layout/reftests/forms/input/search/3.html
similarity index 100%
rename from layout/reftests/forms/input/search/input-search-3.html
rename to layout/reftests/forms/input/search/3.html
diff --git a/layout/reftests/forms/input/search/input-search-ref.html b/layout/reftests/forms/input/search/ref.html
similarity index 100%
rename from layout/reftests/forms/input/search/input-search-ref.html
rename to layout/reftests/forms/input/search/ref.html
diff --git a/layout/reftests/forms/input/search/reftest.list b/layout/reftests/forms/input/search/reftest.list
index 7a8542767944..dcca7a3cde31 100644
--- a/layout/reftests/forms/input/search/reftest.list
+++ b/layout/reftests/forms/input/search/reftest.list
@@ -1,3 +1,3 @@
-== input-search-1.html input-search-ref.html
-== input-search-2.html input-search-ref.html
-!= input-search-3.html input-search-ref.html
+== 1.html ref.html
+== 2.html ref.html
+!= 3.html ref.html
diff --git a/layout/reftests/forms/input/tel/input-tel-1.html b/layout/reftests/forms/input/tel/1.html
similarity index 100%
rename from layout/reftests/forms/input/tel/input-tel-1.html
rename to layout/reftests/forms/input/tel/1.html
diff --git a/layout/reftests/forms/input/tel/input-tel-2.html b/layout/reftests/forms/input/tel/2.html
similarity index 100%
rename from layout/reftests/forms/input/tel/input-tel-2.html
rename to layout/reftests/forms/input/tel/2.html
diff --git a/layout/reftests/forms/input/tel/input-tel-3.html b/layout/reftests/forms/input/tel/3.html
similarity index 100%
rename from layout/reftests/forms/input/tel/input-tel-3.html
rename to layout/reftests/forms/input/tel/3.html
diff --git a/layout/reftests/forms/input/tel/input-tel-ref.html b/layout/reftests/forms/input/tel/ref.html
similarity index 100%
rename from layout/reftests/forms/input/tel/input-tel-ref.html
rename to layout/reftests/forms/input/tel/ref.html
diff --git a/layout/reftests/forms/input/tel/reftest.list b/layout/reftests/forms/input/tel/reftest.list
index 1ff31e2db174..dcca7a3cde31 100644
--- a/layout/reftests/forms/input/tel/reftest.list
+++ b/layout/reftests/forms/input/tel/reftest.list
@@ -1,3 +1,3 @@
-== input-tel-1.html input-tel-ref.html
-== input-tel-2.html input-tel-ref.html
-!= input-tel-3.html input-tel-ref.html
+== 1.html ref.html
+== 2.html ref.html
+!= 3.html ref.html
diff --git a/layout/reftests/forms/input-text-baseline-1-ref.html b/layout/reftests/forms/input/text/baseline-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input-text-baseline-1-ref.html
rename to layout/reftests/forms/input/text/baseline-1-ref.html
diff --git a/layout/reftests/forms/input-text-baseline-1.html b/layout/reftests/forms/input/text/baseline-1.html
similarity index 100%
rename from layout/reftests/forms/input-text-baseline-1.html
rename to layout/reftests/forms/input/text/baseline-1.html
diff --git a/layout/reftests/forms/input-text-bounds-1-ref.html b/layout/reftests/forms/input/text/bounds-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input-text-bounds-1-ref.html
rename to layout/reftests/forms/input/text/bounds-1-ref.html
diff --git a/layout/reftests/forms/input-text-bounds-1.html b/layout/reftests/forms/input/text/bounds-1.html
similarity index 100%
rename from layout/reftests/forms/input-text-bounds-1.html
rename to layout/reftests/forms/input/text/bounds-1.html
diff --git a/layout/reftests/forms/input-text-centering-1-ref.xul b/layout/reftests/forms/input/text/centering-1-ref.xul
similarity index 100%
rename from layout/reftests/forms/input-text-centering-1-ref.xul
rename to layout/reftests/forms/input/text/centering-1-ref.xul
diff --git a/layout/reftests/forms/input-text-centering-1.xul b/layout/reftests/forms/input/text/centering-1.xul
similarity index 100%
rename from layout/reftests/forms/input-text-centering-1.xul
rename to layout/reftests/forms/input/text/centering-1.xul
diff --git a/layout/reftests/forms/input-text-dynamic-height-1-ref.xul b/layout/reftests/forms/input/text/dynamic-height-1-ref.xul
similarity index 100%
rename from layout/reftests/forms/input-text-dynamic-height-1-ref.xul
rename to layout/reftests/forms/input/text/dynamic-height-1-ref.xul
diff --git a/layout/reftests/forms/input-text-dynamic-height-1.xul b/layout/reftests/forms/input/text/dynamic-height-1.xul
similarity index 100%
rename from layout/reftests/forms/input-text-dynamic-height-1.xul
rename to layout/reftests/forms/input/text/dynamic-height-1.xul
diff --git a/layout/reftests/forms/input/text/reftest.list b/layout/reftests/forms/input/text/reftest.list
new file mode 100644
index 000000000000..fccb19fd9fa3
--- /dev/null
+++ b/layout/reftests/forms/input/text/reftest.list
@@ -0,0 +1,6 @@
+== bounds-1.html bounds-1-ref.html
+== size-1.html size-1-ref.html
+skip-if(B2G) fails-if(Android) == size-2.html size-2-ref.html
+HTTP(..) == baseline-1.html baseline-1-ref.html
+HTTP(..) == centering-1.xul centering-1-ref.xul
+== dynamic-height-1.xul dynamic-height-1-ref.xul
\ No newline at end of file
diff --git a/layout/reftests/forms/input-text-size-1-ref.html b/layout/reftests/forms/input/text/size-1-ref.html
similarity index 100%
rename from layout/reftests/forms/input-text-size-1-ref.html
rename to layout/reftests/forms/input/text/size-1-ref.html
diff --git a/layout/reftests/forms/input-text-size-1.html b/layout/reftests/forms/input/text/size-1.html
similarity index 100%
rename from layout/reftests/forms/input-text-size-1.html
rename to layout/reftests/forms/input/text/size-1.html
diff --git a/layout/reftests/forms/input-text-size-2-ref.html b/layout/reftests/forms/input/text/size-2-ref.html
similarity index 100%
rename from layout/reftests/forms/input-text-size-2-ref.html
rename to layout/reftests/forms/input/text/size-2-ref.html
diff --git a/layout/reftests/forms/input-text-size-2.html b/layout/reftests/forms/input/text/size-2.html
similarity index 100%
rename from layout/reftests/forms/input-text-size-2.html
rename to layout/reftests/forms/input/text/size-2.html
diff --git a/layout/reftests/forms/input/url/input-url-1.html b/layout/reftests/forms/input/url/1.html
similarity index 100%
rename from layout/reftests/forms/input/url/input-url-1.html
rename to layout/reftests/forms/input/url/1.html
diff --git a/layout/reftests/forms/input/url/input-url-2.html b/layout/reftests/forms/input/url/2.html
similarity index 100%
rename from layout/reftests/forms/input/url/input-url-2.html
rename to layout/reftests/forms/input/url/2.html
diff --git a/layout/reftests/forms/input/url/input-url-3.html b/layout/reftests/forms/input/url/3.html
similarity index 100%
rename from layout/reftests/forms/input/url/input-url-3.html
rename to layout/reftests/forms/input/url/3.html
diff --git a/layout/reftests/forms/input/url/input-url-ref.html b/layout/reftests/forms/input/url/ref.html
similarity index 100%
rename from layout/reftests/forms/input/url/input-url-ref.html
rename to layout/reftests/forms/input/url/ref.html
diff --git a/layout/reftests/forms/input/url/reftest.list b/layout/reftests/forms/input/url/reftest.list
index 515a9530eb87..dcca7a3cde31 100644
--- a/layout/reftests/forms/input/url/reftest.list
+++ b/layout/reftests/forms/input/url/reftest.list
@@ -1,3 +1,3 @@
-== input-url-1.html input-url-ref.html
-== input-url-2.html input-url-ref.html
-!= input-url-3.html input-url-ref.html
+== 1.html ref.html
+== 2.html ref.html
+!= 3.html ref.html
diff --git a/layout/reftests/forms/legend-ref.html b/layout/reftests/forms/legend/legend-ref.html
similarity index 100%
rename from layout/reftests/forms/legend-ref.html
rename to layout/reftests/forms/legend/legend-ref.html
diff --git a/layout/reftests/forms/legend.html b/layout/reftests/forms/legend/legend.html
similarity index 100%
rename from layout/reftests/forms/legend.html
rename to layout/reftests/forms/legend/legend.html
diff --git a/layout/reftests/forms/legend/reftest.list b/layout/reftests/forms/legend/reftest.list
new file mode 100644
index 000000000000..b00e59270d78
--- /dev/null
+++ b/layout/reftests/forms/legend/reftest.list
@@ -0,0 +1 @@
+skip-if(B2G) == legend.html legend-ref.html
diff --git a/layout/reftests/forms/reftest.list b/layout/reftests/forms/reftest.list
index 8e012aaa90f2..95382723ea21 100644
--- a/layout/reftests/forms/reftest.list
+++ b/layout/reftests/forms/reftest.list
@@ -1,72 +1,10 @@
-
-== checkbox-label-dynamic.html checkbox-label-dynamic-ref.html
-skip-if(B2G) fails-if(Android) == checkbox-radio-stretched.html checkbox-radio-stretched-ref.html # test for bug 464589
-
-== input-hidden-border.html about:blank
-== input-text-bounds-1.html input-text-bounds-1-ref.html
-== input-text-size-1.html input-text-size-1-ref.html
-skip-if(B2G) fails-if(Android) == input-text-size-2.html input-text-size-2-ref.html
-HTTP(..) == input-text-baseline-1.html input-text-baseline-1-ref.html
-HTTP(..) == input-text-centering-1.xul input-text-centering-1-ref.xul
 skip-if(B2G) fails-if(Android) HTTP(..) == text-control-baseline-1.html text-control-baseline-1-ref.html
-== input-text-dynamic-height-1.xul input-text-dynamic-height-1-ref.xul
 
-# access-key tests are no use on OS X because access keys are not indicated visually
-skip-if(cocoaWidget) != textbox-accesskey-1.xul textbox-accesskey-1-notref.xul
-skip-if(cocoaWidget) == textbox-accesskey-2.xul textbox-accesskey-2-ref.xul
-# textbox-accesskey-3 fails because of defects in XUL bidi support
-skip-if(cocoaWidget) fails-if(!cocoaWidget) == textbox-accesskey-3.xul textbox-accesskey-3-ref.xul
-skip-if(cocoaWidget) != textbox-accesskey-3.xul textbox-accesskey-3-notref.xul
-skip-if(cocoaWidget) == textbox-accesskey-4.xul textbox-accesskey-4-ref.xul
-skip-if(cocoaWidget) != textbox-accesskey-4.xul textbox-accesskey-4-notref.xul
+# button element
+include button/reftest.list
 
-== textbox-align-baseline-1.xul textbox-align-baseline-1-ref.xul # test for bug 494901
-skip-if(B2G) fails-if(Android) == textbox-setsize.xul textbox-setsize-ref.xul
-skip-if(B2G) fails-if(Android) == textarea-resize.html textarea-resize-ref.html
-# an offset seems to apply to the native resizer on windows so skip this test for now
-skip-if(B2G) fails-if(Android) skip-if(winWidget) == textarea-resize-background.html textarea-resize-background-ref.html
-skip-if(B2G) fails-if(Android) != textarea-ltr.html textarea-rtl.html
-skip-if(B2G) fails-if(Android) != textarea-ltr-scrollbar.html textarea-rtl-scrollbar.html
-skip-if(B2G) fails-if(Android) != textarea-in-ltr-doc-scrollbar.html textarea-in-rtl-doc-scrollbar.html
-skip-if(B2G) fails-if(Android) != textarea-ltr.html textarea-no-resize.html
-skip-if(B2G) fails-if(Android) fails-if(gtk2Widget) != textarea-rtl.html textarea-no-resize.html # bug 834724
-== textarea-rtl.html textarea-rtl-dynamic-attr.html
-== textarea-rtl.html textarea-rtl-dynamic-style.html
-== textarea-rtl.html textarea-in-dynamic-rtl-doc.html
-== textarea-setvalue-framereconstruction-1.html textarea-setvalue-framereconstruction-ref.html
-
-== radio-label-dynamic.html radio-label-dynamic-ref.html
-skip-if(B2G) == out-of-bounds-selectedindex.html out-of-bounds-selectedindex-ref.html # test for bug 471741
-!= indeterminate-checked.html indeterminate-checked-notref.html
-!= indeterminate-unchecked.html indeterminate-unchecked-notref.html
-!= indeterminate-native-checked.html indeterminate-native-checked-notref.html
-!= indeterminate-native-unchecked.html indeterminate-native-unchecked-notref.html
-== indeterminate-selector.html indeterminate-selector-ref.html
-
-!= checkbox-checked.html checkbox-checked-notref.html
-!= checkbox-checked-native.html checkbox-checked-native-notref.html
-!= radio-checked.html radio-checked-notref.html
-!= radio-checked-native.html radio-checked-native-notref.html
-
-!= checkbox-checked.html about:blank
-!= checkbox-checked-notref.html about:blank
-!= radio-checked.html about:blank
-!= radio-checked-notref.html about:blank
-!= checkbox-checked-native.html about:blank
-!= checkbox-checked-native-notref.html about:blank
-!= radio-checked-native.html about:blank
-!= radio-checked-native-notref.html about:blank
-
-skip-if(B2G) == select-multiple.html select-multiple-ref.html
-== select-boguskids.html select-boguskids-ref.html
-== select-dynamic-boguskids.html select-boguskids-ref.html
-== select-option-children.html select-option-children-ref.html
-
-asserts(2) == button-first-letter-1.html button-first-letter-1-ref.html
-asserts(1) != button-first-letter-1.html button-first-letter-1-noref.html
-== button-max-height.html button-max-height-ref.html
-
-skip-if(B2G) == legend.html legend-ref.html
+# legend element
+include legend/reftest.list
 
 # placeholder
 include placeholder/reftest.list
@@ -83,4 +21,11 @@ include output/reftest.list
 # progress element
 include progress/reftest.list
 
-== input-percentage-padding.html input-percentage-padding-ref.html
+# select element
+include select/reftest.list
+
+# textarea element
+include textarea/reftest.list
+
+# textbox element
+include textbox/reftest.list
diff --git a/layout/reftests/forms/select-boguskids-ref.html b/layout/reftests/forms/select/boguskids-ref.html
similarity index 100%
rename from layout/reftests/forms/select-boguskids-ref.html
rename to layout/reftests/forms/select/boguskids-ref.html
diff --git a/layout/reftests/forms/select-boguskids.html b/layout/reftests/forms/select/boguskids.html
similarity index 100%
rename from layout/reftests/forms/select-boguskids.html
rename to layout/reftests/forms/select/boguskids.html
diff --git a/layout/reftests/forms/select-dynamic-boguskids.html b/layout/reftests/forms/select/dynamic-boguskids.html
similarity index 100%
rename from layout/reftests/forms/select-dynamic-boguskids.html
rename to layout/reftests/forms/select/dynamic-boguskids.html
diff --git a/layout/reftests/forms/select-multiple-ref.html b/layout/reftests/forms/select/multiple-ref.html
similarity index 100%
rename from layout/reftests/forms/select-multiple-ref.html
rename to layout/reftests/forms/select/multiple-ref.html
diff --git a/layout/reftests/forms/select-multiple.html b/layout/reftests/forms/select/multiple.html
similarity index 100%
rename from layout/reftests/forms/select-multiple.html
rename to layout/reftests/forms/select/multiple.html
diff --git a/layout/reftests/forms/select-option-children-ref.html b/layout/reftests/forms/select/option-children-ref.html
similarity index 100%
rename from layout/reftests/forms/select-option-children-ref.html
rename to layout/reftests/forms/select/option-children-ref.html
diff --git a/layout/reftests/forms/select-option-children.html b/layout/reftests/forms/select/option-children.html
similarity index 100%
rename from layout/reftests/forms/select-option-children.html
rename to layout/reftests/forms/select/option-children.html
diff --git a/layout/reftests/forms/out-of-bounds-selectedindex-ref.html b/layout/reftests/forms/select/out-of-bounds-selectedindex-ref.html
similarity index 100%
rename from layout/reftests/forms/out-of-bounds-selectedindex-ref.html
rename to layout/reftests/forms/select/out-of-bounds-selectedindex-ref.html
diff --git a/layout/reftests/forms/out-of-bounds-selectedindex.html b/layout/reftests/forms/select/out-of-bounds-selectedindex.html
similarity index 100%
rename from layout/reftests/forms/out-of-bounds-selectedindex.html
rename to layout/reftests/forms/select/out-of-bounds-selectedindex.html
diff --git a/layout/reftests/forms/select/reftest.list b/layout/reftests/forms/select/reftest.list
new file mode 100644
index 000000000000..8dad6a5fcf6c
--- /dev/null
+++ b/layout/reftests/forms/select/reftest.list
@@ -0,0 +1,5 @@
+skip-if(B2G) == out-of-bounds-selectedindex.html out-of-bounds-selectedindex-ref.html # test for bug 471741
+skip-if(B2G) == multiple.html multiple-ref.html
+== boguskids.html boguskids-ref.html
+== dynamic-boguskids.html boguskids-ref.html
+== option-children.html option-children-ref.html
diff --git a/layout/reftests/forms/textarea-in-dynamic-rtl-doc.html b/layout/reftests/forms/textarea/in-dynamic-rtl-doc.html
similarity index 100%
rename from layout/reftests/forms/textarea-in-dynamic-rtl-doc.html
rename to layout/reftests/forms/textarea/in-dynamic-rtl-doc.html
diff --git a/layout/reftests/forms/textarea-in-ltr-doc-scrollbar.html b/layout/reftests/forms/textarea/in-ltr-doc-scrollbar.html
similarity index 100%
rename from layout/reftests/forms/textarea-in-ltr-doc-scrollbar.html
rename to layout/reftests/forms/textarea/in-ltr-doc-scrollbar.html
diff --git a/layout/reftests/forms/textarea-in-rtl-doc-scrollbar.html b/layout/reftests/forms/textarea/in-rtl-doc-scrollbar.html
similarity index 100%
rename from layout/reftests/forms/textarea-in-rtl-doc-scrollbar.html
rename to layout/reftests/forms/textarea/in-rtl-doc-scrollbar.html
diff --git a/layout/reftests/forms/textarea-ltr-scrollbar.html b/layout/reftests/forms/textarea/ltr-scrollbar.html
similarity index 100%
rename from layout/reftests/forms/textarea-ltr-scrollbar.html
rename to layout/reftests/forms/textarea/ltr-scrollbar.html
diff --git a/layout/reftests/forms/textarea-ltr.html b/layout/reftests/forms/textarea/ltr.html
similarity index 100%
rename from layout/reftests/forms/textarea-ltr.html
rename to layout/reftests/forms/textarea/ltr.html
diff --git a/layout/reftests/forms/textarea-no-resize.html b/layout/reftests/forms/textarea/no-resize.html
similarity index 100%
rename from layout/reftests/forms/textarea-no-resize.html
rename to layout/reftests/forms/textarea/no-resize.html
diff --git a/layout/reftests/forms/textarea/reftest.list b/layout/reftests/forms/textarea/reftest.list
new file mode 100644
index 000000000000..e4b8e6344a5d
--- /dev/null
+++ b/layout/reftests/forms/textarea/reftest.list
@@ -0,0 +1,12 @@
+skip-if(B2G) fails-if(Android) == resize.html resize-ref.html
+# an offset seems to apply to the native resizer on windows so skip this test for now
+skip-if(B2G) fails-if(Android) skip-if(winWidget) == resize-background.html resize-background-ref.html
+skip-if(B2G) fails-if(Android) != ltr.html rtl.html
+skip-if(B2G) fails-if(Android) != ltr-scrollbar.html rtl-scrollbar.html
+skip-if(B2G) fails-if(Android) != in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html
+skip-if(B2G) fails-if(Android) != ltr.html no-resize.html
+skip-if(B2G) fails-if(Android) fails-if(gtk2Widget) != rtl.html no-resize.html # bug 834724
+== rtl.html rtl-dynamic-attr.html
+== rtl.html rtl-dynamic-style.html
+== rtl.html in-dynamic-rtl-doc.html
+== setvalue-framereconstruction-1.html setvalue-framereconstruction-ref.html
diff --git a/layout/reftests/forms/textarea-resize-background-ref.html b/layout/reftests/forms/textarea/resize-background-ref.html
similarity index 100%
rename from layout/reftests/forms/textarea-resize-background-ref.html
rename to layout/reftests/forms/textarea/resize-background-ref.html
diff --git a/layout/reftests/forms/textarea-resize-background.html b/layout/reftests/forms/textarea/resize-background.html
similarity index 100%
rename from layout/reftests/forms/textarea-resize-background.html
rename to layout/reftests/forms/textarea/resize-background.html
diff --git a/layout/reftests/forms/textarea-resize-ref.html b/layout/reftests/forms/textarea/resize-ref.html
similarity index 100%
rename from layout/reftests/forms/textarea-resize-ref.html
rename to layout/reftests/forms/textarea/resize-ref.html
diff --git a/layout/reftests/forms/textarea-resize.html b/layout/reftests/forms/textarea/resize.html
similarity index 100%
rename from layout/reftests/forms/textarea-resize.html
rename to layout/reftests/forms/textarea/resize.html
diff --git a/layout/reftests/forms/textarea-rtl-dynamic-attr.html b/layout/reftests/forms/textarea/rtl-dynamic-attr.html
similarity index 100%
rename from layout/reftests/forms/textarea-rtl-dynamic-attr.html
rename to layout/reftests/forms/textarea/rtl-dynamic-attr.html
diff --git a/layout/reftests/forms/textarea-rtl-dynamic-style.html b/layout/reftests/forms/textarea/rtl-dynamic-style.html
similarity index 100%
rename from layout/reftests/forms/textarea-rtl-dynamic-style.html
rename to layout/reftests/forms/textarea/rtl-dynamic-style.html
diff --git a/layout/reftests/forms/textarea-rtl-scrollbar.html b/layout/reftests/forms/textarea/rtl-scrollbar.html
similarity index 100%
rename from layout/reftests/forms/textarea-rtl-scrollbar.html
rename to layout/reftests/forms/textarea/rtl-scrollbar.html
diff --git a/layout/reftests/forms/textarea-rtl.html b/layout/reftests/forms/textarea/rtl.html
similarity index 100%
rename from layout/reftests/forms/textarea-rtl.html
rename to layout/reftests/forms/textarea/rtl.html
diff --git a/layout/reftests/forms/textarea-setvalue-framereconstruction-1.html b/layout/reftests/forms/textarea/setvalue-framereconstruction-1.html
similarity index 100%
rename from layout/reftests/forms/textarea-setvalue-framereconstruction-1.html
rename to layout/reftests/forms/textarea/setvalue-framereconstruction-1.html
diff --git a/layout/reftests/forms/textarea-setvalue-framereconstruction-ref.html b/layout/reftests/forms/textarea/setvalue-framereconstruction-ref.html
similarity index 100%
rename from layout/reftests/forms/textarea-setvalue-framereconstruction-ref.html
rename to layout/reftests/forms/textarea/setvalue-framereconstruction-ref.html
diff --git a/layout/reftests/forms/textbox-accesskey-1-notref.xul b/layout/reftests/forms/textbox/accesskey-1-notref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-1-notref.xul
rename to layout/reftests/forms/textbox/accesskey-1-notref.xul
diff --git a/layout/reftests/forms/textbox-accesskey-1.xul b/layout/reftests/forms/textbox/accesskey-1.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-1.xul
rename to layout/reftests/forms/textbox/accesskey-1.xul
diff --git a/layout/reftests/forms/textbox-accesskey-2-ref.xul b/layout/reftests/forms/textbox/accesskey-2-ref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-2-ref.xul
rename to layout/reftests/forms/textbox/accesskey-2-ref.xul
diff --git a/layout/reftests/forms/textbox-accesskey-2.xul b/layout/reftests/forms/textbox/accesskey-2.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-2.xul
rename to layout/reftests/forms/textbox/accesskey-2.xul
diff --git a/layout/reftests/forms/textbox-accesskey-3-notref.xul b/layout/reftests/forms/textbox/accesskey-3-notref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-3-notref.xul
rename to layout/reftests/forms/textbox/accesskey-3-notref.xul
diff --git a/layout/reftests/forms/textbox-accesskey-3-ref.xul b/layout/reftests/forms/textbox/accesskey-3-ref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-3-ref.xul
rename to layout/reftests/forms/textbox/accesskey-3-ref.xul
diff --git a/layout/reftests/forms/textbox-accesskey-3.xul b/layout/reftests/forms/textbox/accesskey-3.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-3.xul
rename to layout/reftests/forms/textbox/accesskey-3.xul
diff --git a/layout/reftests/forms/textbox-accesskey-4-notref.xul b/layout/reftests/forms/textbox/accesskey-4-notref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-4-notref.xul
rename to layout/reftests/forms/textbox/accesskey-4-notref.xul
diff --git a/layout/reftests/forms/textbox-accesskey-4-ref.xul b/layout/reftests/forms/textbox/accesskey-4-ref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-4-ref.xul
rename to layout/reftests/forms/textbox/accesskey-4-ref.xul
diff --git a/layout/reftests/forms/textbox-accesskey-4.xul b/layout/reftests/forms/textbox/accesskey-4.xul
similarity index 100%
rename from layout/reftests/forms/textbox-accesskey-4.xul
rename to layout/reftests/forms/textbox/accesskey-4.xul
diff --git a/layout/reftests/forms/textbox-align-baseline-1-ref.xul b/layout/reftests/forms/textbox/align-baseline-1-ref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-align-baseline-1-ref.xul
rename to layout/reftests/forms/textbox/align-baseline-1-ref.xul
diff --git a/layout/reftests/forms/textbox-align-baseline-1.xul b/layout/reftests/forms/textbox/align-baseline-1.xul
similarity index 100%
rename from layout/reftests/forms/textbox-align-baseline-1.xul
rename to layout/reftests/forms/textbox/align-baseline-1.xul
diff --git a/layout/reftests/forms/textbox/reftest.list b/layout/reftests/forms/textbox/reftest.list
new file mode 100644
index 000000000000..28b66fae15e8
--- /dev/null
+++ b/layout/reftests/forms/textbox/reftest.list
@@ -0,0 +1,10 @@
+# access-key tests are no use on OS X because access keys are not indicated visually
+skip-if(cocoaWidget) != accesskey-1.xul accesskey-1-notref.xul
+skip-if(cocoaWidget) == accesskey-2.xul accesskey-2-ref.xul
+# accesskey-3 fails because of defects in XUL bidi support
+skip-if(cocoaWidget) fails-if(!cocoaWidget) == accesskey-3.xul accesskey-3-ref.xul
+skip-if(cocoaWidget) != accesskey-3.xul accesskey-3-notref.xul
+skip-if(cocoaWidget) == accesskey-4.xul accesskey-4-ref.xul
+skip-if(cocoaWidget) != accesskey-4.xul accesskey-4-notref.xul
+== align-baseline-1.xul align-baseline-1-ref.xul # test for bug 494901
+skip-if(B2G) fails-if(Android) == setsize.xul setsize-ref.xul
diff --git a/layout/reftests/forms/textbox-setsize-ref.xul b/layout/reftests/forms/textbox/setsize-ref.xul
similarity index 100%
rename from layout/reftests/forms/textbox-setsize-ref.xul
rename to layout/reftests/forms/textbox/setsize-ref.xul
diff --git a/layout/reftests/forms/textbox-setsize.xul b/layout/reftests/forms/textbox/setsize.xul
similarity index 100%
rename from layout/reftests/forms/textbox-setsize.xul
rename to layout/reftests/forms/textbox/setsize.xul
diff --git a/layout/style/nsDOMCSSRect.cpp b/layout/style/nsDOMCSSRect.cpp
index 16e2704f9992..235a913a1d67 100644
--- a/layout/style/nsDOMCSSRect.cpp
+++ b/layout/style/nsDOMCSSRect.cpp
@@ -9,7 +9,6 @@
 #include "nsROCSSPrimitiveValue.h"
 #include "nsContentUtils.h"
 #include "nsDOMCSSRect.h"
-#include "nsDOMClassInfoID.h"
 
 using namespace mozilla;
 
@@ -26,13 +25,9 @@ nsDOMCSSRect::~nsDOMCSSRect(void)
 {
 }
 
-DOMCI_DATA(CSSRect, nsDOMCSSRect)
-
-// QueryInterface implementation for nsCSSRect
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCSSRect)
   NS_INTERFACE_MAP_ENTRY(nsIDOMRect)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
-  NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(CSSRect)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
 NS_INTERFACE_MAP_END
 
diff --git a/layout/tools/reftest/Makefile.in b/layout/tools/reftest/Makefile.in
index a5721b1f0fcd..a9a54a65186a 100644
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -85,10 +85,10 @@ PKG_STAGE = $(DIST)/test-package-stage
 # stage harness and tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/reftest && $(NSINSTALL) -D $(PKG_STAGE)/reftest/tests
-	(cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -)
+	(cd $(DEPTH)/_tests/reftest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/reftest && tar -xf -)
 	$(PYTHON) $(topsrcdir)/layout/tools/reftest/print-manifest-dirs.py \
           $(topsrcdir) \
           $(topsrcdir)/layout/reftests/reftest.list \
           $(topsrcdir)/testing/crashtest/crashtests.list \
-          | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS_QUIET) -) \
+          | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \
           | (cd $(PKG_STAGE)/reftest/tests && tar -xf -)
diff --git a/layout/xul/base/src/nsScrollBoxObject.cpp b/layout/xul/base/src/nsScrollBoxObject.cpp
index d408fb02e35e..1b197ba14cca 100644
--- a/layout/xul/base/src/nsScrollBoxObject.cpp
+++ b/layout/xul/base/src/nsScrollBoxObject.cpp
@@ -265,7 +265,7 @@ NS_IMETHODIMP nsScrollBoxObject::GetPosition(int32_t *x, int32_t *y)
   if (!sf)
      return NS_ERROR_FAILURE;
 
-  nsIntPoint pt = sf->GetScrollPositionCSSPixels();
+  CSSIntPoint pt = sf->GetScrollPositionCSSPixels();
   *x = pt.x;
   *y = pt.y;
 
diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp
index f4b615375599..071cca255444 100644
--- a/netwerk/base/src/nsSocketTransport2.cpp
+++ b/netwerk/base/src/nsSocketTransport2.cpp
@@ -8,7 +8,8 @@
 #endif
 
 #include "nsSocketTransport2.h"
-#include "base/compiler_specific.h"
+
+#include "mozilla/Attributes.h"
 #include "nsAtomicRefcnt.h"
 #include "nsIOService.h"
 #include "nsStreamUtils.h"
@@ -685,8 +686,8 @@ nsSocketTransport::nsSocketTransport()
     , mFD(nullptr)
     , mFDref(0)
     , mFDconnected(false)
-    , ALLOW_THIS_IN_INITIALIZER_LIST(mInput(this))
-    , ALLOW_THIS_IN_INITIALIZER_LIST(mOutput(this))
+    , mInput(MOZ_THIS_IN_INITIALIZER_LIST())
+    , mOutput(MOZ_THIS_IN_INITIALIZER_LIST())
     , mQoSBits(0x00)
 {
     SOCKET_LOG(("creating nsSocketTransport @%p\n", this));
diff --git a/netwerk/protocol/http/HttpChannelChild.cpp b/netwerk/protocol/http/HttpChannelChild.cpp
index 7914937270bb..c785d36bae86 100644
--- a/netwerk/protocol/http/HttpChannelChild.cpp
+++ b/netwerk/protocol/http/HttpChannelChild.cpp
@@ -18,7 +18,7 @@
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsSerializationHelper.h"
-#include "base/compiler_specific.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/ipc/InputStreamUtils.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "mozilla/net/DNS.h"
@@ -34,7 +34,7 @@ namespace net {
 //-----------------------------------------------------------------------------
 
 HttpChannelChild::HttpChannelChild()
-  : ALLOW_THIS_IN_INITIALIZER_LIST(HttpAsyncAborter<HttpChannelChild>(this))
+  : HttpAsyncAborter<HttpChannelChild>(MOZ_THIS_IN_INITIALIZER_LIST())
   , mIsFromCache(false)
   , mCacheEntryAvailable(false)
   , mCacheExpirationTime(nsICache::NO_EXPIRATION_TIME)
diff --git a/netwerk/protocol/http/nsHttpAuthCache.cpp b/netwerk/protocol/http/nsHttpAuthCache.cpp
index 43067d314f80..f2f29d28caa2 100644
--- a/netwerk/protocol/http/nsHttpAuthCache.cpp
+++ b/netwerk/protocol/http/nsHttpAuthCache.cpp
@@ -7,8 +7,10 @@
 #include "HttpLog.h"
 
 #include "nsHttpAuthCache.h"
+
 #include <stdlib.h>
-#include "base/compiler_specific.h"
+
+#include "mozilla/Attributes.h"
 #include "nsHttp.h"
 #include "nsString.h"
 #include "nsCRT.h"
@@ -54,7 +56,7 @@ StrEquivalent(const PRUnichar *a, const PRUnichar *b)
 
 nsHttpAuthCache::nsHttpAuthCache()
     : mDB(nullptr)
-    , ALLOW_THIS_IN_INITIALIZER_LIST(mObserver(new AppDataClearObserver(this)))
+    , mObserver(new AppDataClearObserver(MOZ_THIS_IN_INITIALIZER_LIST()))
 {
     nsCOMPtr<nsIObserverService> obsSvc = mozilla::services::GetObserverService();
     if (obsSvc) {
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 62c9ddbc1025..60af7a572ba6 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -37,7 +37,6 @@
 #include "nsAlgorithm.h"
 #include "GeckoProfiler.h"
 #include "nsIConsoleService.h"
-#include "base/compiler_specific.h"
 #include "NullHttpTransaction.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/VisualEventTracer.h"
@@ -298,7 +297,7 @@ NS_IMPL_ISUPPORTS_INHERITED1(HttpCacheQuery, nsRunnable, nsICacheListener)
 //-----------------------------------------------------------------------------
 
 nsHttpChannel::nsHttpChannel()
-    : ALLOW_THIS_IN_INITIALIZER_LIST(HttpAsyncAborter<nsHttpChannel>(this))
+    : HttpAsyncAborter<nsHttpChannel>(MOZ_THIS_IN_INITIALIZER_LIST())
     , mLogicalOffset(0)
     , mCacheAccess(0)
     , mCacheEntryDeviceTelemetryID(UNKNOWN_DEVICE)
diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 338d3cdc1f3f..3cdfc89fc81b 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -201,8 +201,8 @@ $(_DEST_DIR):
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins && $(NSINSTALL) -D $(DIST)/plugins
-	(cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -)
+	(cd $(DEPTH)/_tests/testing/mochitest/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mochitest && tar -xf -)
 	@(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -)
 	@(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
-	(cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/certs && tar -xf -)
+	(cd $(topsrcdir)/build/pgo/certs && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/certs && tar -xf -)
 	@(cd $(DIST)/plugins && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_PLUGINS)) | (cd $(PKG_STAGE)/bin/plugins && tar -xf -)
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index 9b56bdd88dfe..cafc02e25b08 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -483,7 +483,7 @@ stage-tps: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/tps/tests
 	@(cd $(topsrcdir)/testing/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps && tar -xf -)
 	@(cd $(topsrcdir)/services/sync/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps && tar -xf -)
-	(cd $(topsrcdir)/services/sync/tests/tps && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/tps/tests && tar -xf -)
+	(cd $(topsrcdir)/services/sync/tests/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps/tests && tar -xf -)
 
 stage-modules: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/modules
@@ -508,7 +508,7 @@ stage-marionette: make-stage-dir
 	$(PYTHON) $(topsrcdir)/testing/marionette/client/marionette/tests/print-manifest-dirs.py \
           $(topsrcdir) \
           $(topsrcdir)/testing/marionette/client/marionette/tests/unit-tests.ini \
-          | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS_QUIET) -) \
+          | (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \
           | (cd $(MARIONETTE_DIR)/tests && tar -xf -)
 
 stage-mozbase: make-stage-dir
diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in
index f7a327ad41e3..7797afb147b6 100644
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -67,5 +67,5 @@ stage-package:
 	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/xpcshell
 	@cp $(DEPTH)/build/automation.py $(PKG_STAGE)/xpcshell
 	@(cd $(topsrcdir)/testing/mozbase/mozdevice/mozdevice && tar $(TAR_CREATE_FLAGS) - $(MOZDEVICE_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
-	(cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS_QUIET) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -)
+	(cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -)
 	@(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 77e0aa16ba25..86b3090ba613 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3098,6 +3098,30 @@
     "n_buckets": "80 + 1",
     "description": "The time (in milliseconds) after showing a PopupNotification that the mainAction was first triggered"
   },
+  "DEVTOOLS_DEBUGGER_RDP_LOCAL_RELOAD_MS": {
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": "1000",
+    "description": "The time (in milliseconds) that it took a 'reload' request to go round trip."
+  },
+  "DEVTOOLS_DEBUGGER_RDP_REMOTE_RELOAD_MS": {
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": "1000",
+    "description": "The time (in milliseconds) that it took a 'reload' request to go round trip."
+  },
+  "DEVTOOLS_DEBUGGER_RDP_LOCAL_NAVIGATETO_MS": {
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": "1000",
+    "description": "The time (in milliseconds) that it took a 'navigateTo' request to go round trip."
+  },
+  "DEVTOOLS_DEBUGGER_RDP_REMOTE_NAVIGATETO_MS": {
+    "kind": "exponential",
+    "high": "10000",
+    "n_buckets": "1000",
+    "description": "The time (in milliseconds) that it took a 'navigateTo' request to go round trip."
+  },
   "DEVTOOLS_DEBUGGER_RDP_LOCAL_DETACH_MS": {
     "kind": "exponential",
     "high": "10000",
diff --git a/toolkit/devtools/client/dbg-client.jsm b/toolkit/devtools/client/dbg-client.jsm
index 94e2cb28f599..54edd60b4c0d 100644
--- a/toolkit/devtools/client/dbg-client.jsm
+++ b/toolkit/devtools/client/dbg-client.jsm
@@ -492,16 +492,16 @@ DebuggerClient.prototype = {
   /**
    * Reconfigure a thread actor.
    *
-   * @param boolean aUseSourceMaps
-   *        A flag denoting whether to use source maps or not.
+   * @param object aOptions
+   *        A dictionary object of the new options to use in the thread actor.
    * @param function aOnResponse
    *        Called with the response packet.
    */
-  reconfigureThread: function DC_reconfigureThread(aUseSourceMaps, aOnResponse) {
+  reconfigureThread: function(aOptions, aOnResponse) {
     let packet = {
       to: this.activeThread._actor,
       type: "reconfigure",
-      options: { useSourceMaps: aUseSourceMaps }
+      options: aOptions
     };
     this.request(packet, aOnResponse);
   },
@@ -923,6 +923,28 @@ TabClient.prototype = {
     },
     telemetry: "TABDETACH"
   }),
+
+  /**
+   * Reload the page in this tab.
+   */
+  reload: DebuggerClient.requester({
+    type: "reload"
+  }, {
+    telemetry: "RELOAD"
+  }),
+
+  /**
+   * Navigate to another URL.
+   *
+   * @param string url
+   *        The URL to navigate to.
+   */
+  navigateTo: DebuggerClient.requester({
+    type: "navigateTo",
+    url: args(0)
+  }, {
+    telemetry: "NAVIGATETO"
+  }),
 };
 
 eventSource(TabClient.prototype);
@@ -1108,19 +1130,21 @@ ThreadClient.prototype = {
    */
   pauseOnExceptions: function TC_pauseOnExceptions(aFlag, aOnResponse) {
     this._pauseOnExceptions = aFlag;
-    // If the debuggee is paused, the value of the flag will be communicated in
-    // the next resumption. Otherwise we have to force a pause in order to send
-    // the flag.
-    if (!this.paused) {
-      this.interrupt(function(aResponse) {
-        if (aResponse.error) {
-          // Can't continue if pausing failed.
-          aOnResponse(aResponse);
-          return;
-        }
-        this.resume(aOnResponse);
-      }.bind(this));
+    // If the debuggee is paused, we have to send the flag via a reconfigure
+    // request.
+    if (this.paused) {
+      this._client.reconfigureThread({ pauseOnExceptions: aFlag }, aOnResponse);
+      return;
     }
+    // Otherwise send the flag using a standard resume request.
+    this.interrupt(aResponse => {
+      if (aResponse.error) {
+        // Can't continue if pausing failed.
+        aOnResponse(aResponse);
+        return;
+      }
+      this.resume(aOnResponse);
+    });
   },
 
   /**
diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js
index 89f794998b6e..802dd4a2742f 100644
--- a/toolkit/devtools/server/actors/script.js
+++ b/toolkit/devtools/server/actors/script.js
@@ -415,14 +415,24 @@ ThreadActor.prototype = {
       }
     }
 
-    if (aRequest && aRequest.pauseOnExceptions) {
-      this.dbg.onExceptionUnwind = this.onExceptionUnwind.bind(this);
+    if (aRequest) {
+      this._options.pauseOnExceptions = aRequest.pauseOnExceptions;
+      this.maybePauseOnExceptions();
     }
     let packet = this._resumed();
     DebuggerServer.xpcInspector.exitNestedEventLoop();
     return packet;
   },
 
+  /**
+   * Set the debugging hook to pause on exceptions if configured to do so.
+   */
+  maybePauseOnExceptions: function() {
+    if (this._options.pauseOnExceptions) {
+      this.dbg.onExceptionUnwind = this.onExceptionUnwind.bind(this);
+    }
+  },
+
   /**
    * Helper method that returns the next frame when stepping.
    */
diff --git a/toolkit/devtools/server/actors/styleeditor.js b/toolkit/devtools/server/actors/styleeditor.js
index d4ef50186dc4..831573d89a8e 100644
--- a/toolkit/devtools/server/actors/styleeditor.js
+++ b/toolkit/devtools/server/actors/styleeditor.js
@@ -331,7 +331,6 @@ function StyleSheetActor(aStyleSheet, aParentActor) {
   this._transitionRefCount = 0;
 
   this._onSourceLoad = this._onSourceLoad.bind(this);
-  this._notifyError = this._notifyError.bind(this);
 
   // if this sheet has an @import, then it's rules are loaded async
   let ownerNode = this.styleSheet.ownerNode;
@@ -444,43 +443,38 @@ StyleSheetActor.prototype = {
   _notifyPropertyChanged: function(property) {
     this.conn.send({
       from: this.actorID,
-      type: "propertyChange-" + this.actorID,
+      type: "propertyChange",
       property: property,
       value: this.form()[property]
     })
   },
 
-  /**
-   * Send an event notifying that an error has occured
-   *
-   * @param  {string} message
-   *         Error message
-   */
-  _notifyError: function(message) {
-    this.conn.send({
-      from: this.actorID,
-      type: "error-" + this.actorID,
-      errorMessage: message
-    });
-  },
-
   /**
    * Handler for event when the style sheet's full text has been
    * loaded from its source.
    *
+   * @param  {string} error
+   *         Error from source load, null if no error
    * @param  {string} source
    *         Text of the style sheet
    * @param  {[type]} charset
    *         Optional charset of the source
    */
-  _onSourceLoad: function(source, charset) {
-    this.text = this._decodeCSSCharset(source, charset || "");
-
-    this.conn.send({
+  _onSourceLoad: function(error, source, charset) {
+    let message = {
       from: this.actorID,
-      type: "sourceLoad-" + this.actorID,
-      source: this.text
-    });
+      type: "sourceLoad",
+    };
+
+    if (error) {
+      message.error = error;
+    }
+    else {
+      this.text = this._decodeCSSCharset(source, charset || "");
+      message.source = this.text;
+    }
+
+    this.conn.send(message);
   },
 
   /**
@@ -490,7 +484,7 @@ StyleSheetActor.prototype = {
     if (!this.styleSheet.href) {
       // this is an inline <style> sheet
       let source = this.styleSheet.ownerNode.textContent;
-      this._onSourceLoad(source);
+      this._onSourceLoad(null, source);
       return {};
     }
 
@@ -602,15 +596,15 @@ StyleSheetActor.prototype = {
     try {
       NetUtil.asyncFetch(href, (stream, status) => {
         if (!Components.isSuccessCode(status)) {
-          this._notifyError(LOAD_ERROR);
+          this._onSourceLoad(LOAD_ERROR);
           return;
         }
         let source = NetUtil.readInputStreamToString(stream, stream.available());
         stream.close();
-        this._onSourceLoad(source);
+        this._onSourceLoad(null, source);
       });
     } catch (ex) {
-      this._notifyError(LOAD_ERROR);
+      this._onSourceLoad(LOAD_ERROR);
     }
   },
 
@@ -628,7 +622,7 @@ StyleSheetActor.prototype = {
     let streamListener = { // nsIStreamListener inherits nsIRequestObserver
       onStartRequest: (aRequest, aContext, aStatusCode) => {
         if (!Components.isSuccessCode(aStatusCode)) {
-          this._notifyError(LOAD_ERROR);
+          this._onSourceLoad(LOAD_ERROR);
         }
       },
       onDataAvailable: (aRequest, aContext, aStream, aOffset, aCount) => {
@@ -640,11 +634,11 @@ StyleSheetActor.prototype = {
       },
       onStopRequest: (aRequest, aContext, aStatusCode) => {
         if (!Components.isSuccessCode(aStatusCode)) {
-          this._notifyError(LOAD_ERROR);
+          this._onSourceLoad(LOAD_ERROR);
           return;
         }
         let source = chunks.join("");
-        this._onSourceLoad(source, channelCharset);
+        this._onSourceLoad(null, source, channelCharset);
       }
     };
 
@@ -722,7 +716,7 @@ StyleSheetActor.prototype = {
   {
     this.conn.send({
       from: this.actorID,
-      type: "styleApplied-" + this.actorID
+      type: "styleApplied"
     })
   }
 }
diff --git a/toolkit/devtools/server/actors/webbrowser.js b/toolkit/devtools/server/actors/webbrowser.js
index 26e2b0db6eb7..ec0a98ae0258 100644
--- a/toolkit/devtools/server/actors/webbrowser.js
+++ b/toolkit/devtools/server/actors/webbrowser.js
@@ -695,6 +695,30 @@ BrowserTabActor.prototype = {
     return { type: "detached" };
   },
 
+  /**
+   * Reload the page in this tab.
+   */
+  onReload: function(aRequest) {
+    // Wait a tick so that the response packet can be dispatched before the
+    // subsequent navigation event packet.
+    Services.tm.currentThread.dispatch(makeInfallible(() => {
+      this.contentWindow.location.reload();
+    }, "BrowserTabActor.prototype.onReload's delayed body"), 0);
+    return {};
+  },
+
+  /**
+   * Navigate this tab to a new location
+   */
+  onNavigateTo: function(aRequest) {
+    // Wait a tick so that the response packet can be dispatched before the
+    // subsequent navigation event packet.
+    Services.tm.currentThread.dispatch(makeInfallible(() => {
+      this.contentWindow.location = aRequest.url;
+    }, "BrowserTabActor.prototype.onNavigateTo's delayed body"), 0);
+    return {};
+  },
+
   /**
    * Prepare to enter a nested event loop by disabling debuggee events.
    */
@@ -730,8 +754,9 @@ BrowserTabActor.prototype = {
   },
 
   /**
-   * Handle location changes, by sending a tabNavigated notification to the
-   * client.
+   * Handle location changes, by clearing the previous debuggees and enabling
+   * debugging, which may have been disabled temporarily by the
+   * DebuggerProgressListener.
    */
   onWindowCreated:
   makeInfallible(function BTA_onWindowCreated(evt) {
@@ -745,6 +770,7 @@ BrowserTabActor.prototype = {
         this.threadActor.clearDebuggees();
         if (this.threadActor.dbg) {
           this.threadActor.dbg.enabled = true;
+          this.threadActor.maybePauseOnExceptions();
         }
       }
     }
@@ -782,7 +808,9 @@ BrowserTabActor.prototype = {
  */
 BrowserTabActor.prototype.requestTypes = {
   "attach": BrowserTabActor.prototype.onAttach,
-  "detach": BrowserTabActor.prototype.onDetach
+  "detach": BrowserTabActor.prototype.onDetach,
+  "reload": BrowserTabActor.prototype.onReload,
+  "navigateTo": BrowserTabActor.prototype.onNavigateTo
 };
 
 /**
diff --git a/toolkit/devtools/server/actors/webconsole.js b/toolkit/devtools/server/actors/webconsole.js
index 3e7e2bd9fc48..d85c8f2f6e5a 100644
--- a/toolkit/devtools/server/actors/webconsole.js
+++ b/toolkit/devtools/server/actors/webconsole.js
@@ -626,7 +626,8 @@ WebConsoleActor.prototype =
   {
     // TODO: Bug 842682 - use the debugger API for autocomplete in the Web
     // Console, and provide suggestions from the selected debugger stack frame.
-    let result = JSPropertyProvider(this.window, aRequest.text) || {};
+    let result = JSPropertyProvider(this.window, aRequest.text,
+                                    aRequest.cursor) || {};
     return {
       from: this.actorID,
       matches: result.matches || [],
diff --git a/toolkit/devtools/webconsole/WebConsoleUtils.jsm b/toolkit/devtools/webconsole/WebConsoleUtils.jsm
index 3f560a0572d7..d061d54819f8 100644
--- a/toolkit/devtools/webconsole/WebConsoleUtils.jsm
+++ b/toolkit/devtools/webconsole/WebConsoleUtils.jsm
@@ -727,10 +727,12 @@ function findCompletionBeginning(aStr)
  *
  * @param object aScope
  *        Scope to use for the completion.
- *
  * @param string aInputValue
  *        Value that should be completed.
- *
+ * @param number [aCursor=aInputValue.length]
+ *        Optional offset in the input where the cursor is located. If this is
+ *        omitted then the cursor is assumed to be at the end of the input
+ *        value.
  * @returns null or object
  *          If no completion valued could be computed, null is returned,
  *          otherwise a object with the following form is returned:
@@ -740,13 +742,18 @@ function findCompletionBeginning(aStr)
  *                         the matches-strings.
  *            }
  */
-function JSPropertyProvider(aScope, aInputValue)
+function JSPropertyProvider(aScope, aInputValue, aCursor)
 {
+  if (aCursor === undefined) {
+    aCursor = aInputValue.length;
+  }
+
+  let inputValue = aInputValue.substring(0, aCursor);
   let obj = WCU.unwrap(aScope);
 
-  // Analyse the aInputValue and find the beginning of the last part that
+  // Analyse the inputValue and find the beginning of the last part that
   // should be completed.
-  let beginning = findCompletionBeginning(aInputValue);
+  let beginning = findCompletionBeginning(inputValue);
 
   // There was an error analysing the string.
   if (beginning.err) {
@@ -759,7 +766,7 @@ function JSPropertyProvider(aScope, aInputValue)
     return null;
   }
 
-  let completionPart = aInputValue.substring(beginning.startPos);
+  let completionPart = inputValue.substring(beginning.startPos);
 
   // Don't complete on just an empty string.
   if (completionPart.trim() == "") {
diff --git a/toolkit/devtools/webconsole/test/test_jsterm.html b/toolkit/devtools/webconsole/test/test_jsterm.html
index bf69f18a8810..bc3637312f33 100644
--- a/toolkit/devtools/webconsole/test/test_jsterm.html
+++ b/toolkit/devtools/webconsole/test/test_jsterm.html
@@ -37,15 +37,16 @@ function onAttach(aState, aResponse)
 
   gState = aState;
 
-  let tests = [doAutocomplete1, doAutocomplete2, doSimpleEval, doWindowEval,
-    doEvalWithException, doEvalWithHelper, doEvalString, doEvalLongString];
+  let tests = [doAutocomplete1, doAutocomplete2, doAutocomplete3,
+               doAutocomplete4, doSimpleEval, doWindowEval, doEvalWithException,
+               doEvalWithHelper, doEvalString, doEvalLongString];
   runTests(tests, testEnd);
 }
 
 function doAutocomplete1()
 {
   info("test autocomplete for 'window.foo'");
-  gState.client.autocomplete("window.foo", 0, onAutocomplete1);
+  gState.client.autocomplete("window.foo", 10, onAutocomplete1);
 }
 
 function onAutocomplete1(aResponse)
@@ -62,7 +63,7 @@ function onAutocomplete1(aResponse)
 function doAutocomplete2()
 {
   info("test autocomplete for 'window.foobarObject.'");
-  gState.client.autocomplete("window.foobarObject.", 0, onAutocomplete2);
+  gState.client.autocomplete("window.foobarObject.", 20, onAutocomplete2);
 }
 
 function onAutocomplete2(aResponse)
@@ -77,6 +78,40 @@ function onAutocomplete2(aResponse)
   nextTest();
 }
 
+function doAutocomplete3()
+{
+  // Check that completion suggestions are offered inside the string.
+  info("test autocomplete for 'dump(window.foobarObject.)'");
+  gState.client.autocomplete("dump(window.foobarObject.)", 25, onAutocomplete3);
+}
+
+function onAutocomplete3(aResponse)
+{
+  let matches = aResponse.matches;
+
+  ok(!aResponse.matchProp, "matchProp");
+  is(matches.length, 7, "matches.length");
+  checkObject(matches,
+    ["foo", "foobar", "foobaz", "omg", "omgfoo", "omgstr", "strfoo"]);
+
+  nextTest();
+}
+
+function doAutocomplete4()
+{
+  // Check that completion requests can have no suggestions.
+  info("test autocomplete for 'dump(window.foobarObject.)'");
+  gState.client.autocomplete("dump(window.foobarObject.)", 26, onAutocomplete4);
+}
+
+function onAutocomplete4(aResponse)
+{
+  ok(!aResponse.matchProp, "matchProp");
+  is(aResponse.matches.length, 0, "matches.length");
+
+  nextTest();
+}
+
 function doSimpleEval()
 {
   info("test eval '2+2'");
diff --git a/widget/gonk/libdisplay/GonkDisplayJB.cpp b/widget/gonk/libdisplay/GonkDisplayJB.cpp
index ca146a2cb804..968fc5404e6a 100644
--- a/widget/gonk/libdisplay/GonkDisplayJB.cpp
+++ b/widget/gonk/libdisplay/GonkDisplayJB.cpp
@@ -18,6 +18,7 @@
 
 #include <hardware/hardware.h>
 #include <hardware/hwcomposer.h>
+#include <hardware/power.h>
 #include <suspend/autosuspend.h>
 
 #include "GraphicBufferAlloc.h"
@@ -36,6 +37,7 @@ GonkDisplayJB::GonkDisplayJB()
     , mHwc(nullptr)
     , mFBDevice(nullptr)
     , mEnabledCallback(nullptr)
+    , mPowerModule(nullptr)
 {
     int err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &mFBModule);
     ALOGW_IF(err, "%s module not found", GRALLOC_HARDWARE_MODULE_ID);
@@ -82,6 +84,12 @@ GonkDisplayJB::GonkDisplayJB()
         surfaceformat = HAL_PIXEL_FORMAT_RGBA_8888;
     }
 
+    err = hw_get_module(POWER_HARDWARE_MODULE_ID,
+                                           (hw_module_t const**)&mPowerModule);
+    if (!err)
+        mPowerModule->init(mPowerModule);
+    ALOGW_IF(err, "Couldn't load %s module (%s)", POWER_HARDWARE_MODULE_ID, strerror(-err));
+
     mAlloc = new GraphicBufferAlloc();
     mFBSurface = new FramebufferSurface(0, mWidth, mHeight, surfaceformat, mAlloc);
 
@@ -115,8 +123,10 @@ GonkDisplayJB::GetNativeWindow()
 void
 GonkDisplayJB::SetEnabled(bool enabled)
 {
-    if (enabled)
+    if (enabled) {
         autosuspend_disable();
+        mPowerModule->setInteractive(mPowerModule, true);
+    }
 
     if (mHwc)
         mHwc->blank(mHwc, HWC_DISPLAY_PRIMARY, !enabled);
@@ -126,8 +136,10 @@ GonkDisplayJB::SetEnabled(bool enabled)
     if (mEnabledCallback)
         mEnabledCallback(enabled);
 
-    if (!enabled)
+    if (!enabled) {
         autosuspend_enable();
+        mPowerModule->setInteractive(mPowerModule, false);
+    }
 }
 
 void
diff --git a/widget/gonk/libdisplay/GonkDisplayJB.h b/widget/gonk/libdisplay/GonkDisplayJB.h
index 51494805be18..e2ad00b7ca02 100644
--- a/widget/gonk/libdisplay/GonkDisplayJB.h
+++ b/widget/gonk/libdisplay/GonkDisplayJB.h
@@ -19,6 +19,7 @@
 #include "GonkDisplay.h"
 #include "FramebufferSurface.h"
 #include "hardware/hwcomposer.h"
+#include "hardware/power.h"
 #include "utils/RefBase.h"
 
 namespace mozilla {
@@ -49,6 +50,7 @@ private:
     hw_module_t const*        mFBModule;
     hwc_composer_device_1_t*  mHwc;
     framebuffer_device_t*     mFBDevice;
+    power_module_t*           mPowerModule;
     android::sp<android::FramebufferSurface> mFBSurface;
     android::sp<ANativeWindow> mSTClient;
     android::sp<android::IGraphicBufferAlloc> mAlloc;
diff --git a/widget/nsGUIEvent.h b/widget/nsGUIEvent.h
index 25e62c1ae2d3..f77c18583104 100644
--- a/widget/nsGUIEvent.h
+++ b/widget/nsGUIEvent.h
@@ -30,6 +30,7 @@
 #include "nsStyleConsts.h"
 #include "nsAutoPtr.h"
 #include "mozilla/dom/EventTarget.h"
+#include "mozilla/dom/Touch.h"
 
 namespace mozilla {
 namespace dom {
@@ -1651,7 +1652,7 @@ public:
     MOZ_COUNT_DTOR(nsTouchEvent);
   }
 
-  nsTArray<nsCOMPtr<nsIDOMTouch> > touches;
+  nsTArray< nsRefPtr<mozilla::dom::Touch> > touches;
 };
 
 /**
diff --git a/widget/nsGUIEventIPC.h b/widget/nsGUIEventIPC.h
index 567774395381..07dfc84ab89f 100644
--- a/widget/nsGUIEventIPC.h
+++ b/widget/nsGUIEventIPC.h
@@ -206,10 +206,10 @@ struct ParamTraits<nsTouchEvent>
     WriteParam(aMsg, static_cast<const nsInputEvent&>(aParam));
     // Sigh, Touch bites us again!  We want to be able to do
     //   WriteParam(aMsg, aParam.touches);
-    const nsTArray<nsCOMPtr<nsIDOMTouch> >& touches = aParam.touches;
+    const nsTArray< nsRefPtr<mozilla::dom::Touch> >& touches = aParam.touches;
     WriteParam(aMsg, touches.Length());
     for (uint32_t i = 0; i < touches.Length(); ++i) {
-      mozilla::dom::Touch* touch = static_cast<mozilla::dom::Touch*>(touches[i].get());
+      mozilla::dom::Touch* touch = touches[i];
       WriteParam(aMsg, touch->mIdentifier);
       WriteParam(aMsg, touch->mRefPoint);
       WriteParam(aMsg, touch->mRadius);
diff --git a/widget/xpwidgets/nsTransferable.cpp b/widget/xpwidgets/nsTransferable.cpp
index 2f15f4727962..996fd3646813 100644
--- a/widget/xpwidgets/nsTransferable.cpp
+++ b/widget/xpwidgets/nsTransferable.cpp
@@ -99,13 +99,13 @@ DataStruct::GetData ( nsISupports** aData, uint32_t *aDataLen )
 
 
 //-------------------------------------------------------------------------
-nsIFile*
-DataStruct::GetFileSpec(const char * aFileName)
+already_AddRefed<nsIFile>
+DataStruct::GetFileSpec(const char* aFileName)
 {
-  nsIFile* cacheFile;
-  NS_GetSpecialDirectory(NS_OS_TEMP_DIR, &cacheFile);
+  nsCOMPtr<nsIFile> cacheFile;
+  NS_GetSpecialDirectory(NS_OS_TEMP_DIR, getter_AddRefs(cacheFile));
   
-  if (cacheFile == nullptr)
+  if (!cacheFile)
     return nullptr;
 
   // if the param aFileName contains a name we should use that
@@ -118,7 +118,7 @@ DataStruct::GetFileSpec(const char * aFileName)
     cacheFile->AppendNative(nsDependentCString(aFileName));
   }
   
-  return cacheFile;
+  return cacheFile.forget();
 }
 
 
@@ -127,7 +127,7 @@ nsresult
 DataStruct::WriteCache(nsISupports* aData, uint32_t aDataLen)
 {
   // Get a new path and file to the temp directory
-  nsCOMPtr<nsIFile> cacheFile ( getter_AddRefs(GetFileSpec(mCacheFileName)) );
+  nsCOMPtr<nsIFile> cacheFile = GetFileSpec(mCacheFileName);
   if (cacheFile) {
     // remember the file name
     if (!mCacheFileName) {
@@ -168,7 +168,7 @@ DataStruct::ReadCache(nsISupports** aData, uint32_t* aDataLen)
     return NS_ERROR_FAILURE;
 
   // get the path and file name
-  nsCOMPtr<nsIFile> cacheFile ( getter_AddRefs(GetFileSpec(mCacheFileName)) );
+  nsCOMPtr<nsIFile> cacheFile = GetFileSpec(mCacheFileName);
   bool exists;
   if ( cacheFile && NS_SUCCEEDED(cacheFile->Exists(&exists)) && exists ) {
     // get the size of the file
diff --git a/widget/xpwidgets/nsTransferable.h b/widget/xpwidgets/nsTransferable.h
index 28611295313a..4c80bfe6deac 100644
--- a/widget/xpwidgets/nsTransferable.h
+++ b/widget/xpwidgets/nsTransferable.h
@@ -29,7 +29,7 @@ struct DataStruct
   const nsCString& GetFlavor() const { return mFlavor; }
   void SetData( nsISupports* inData, uint32_t inDataLen );
   void GetData( nsISupports** outData, uint32_t *outDataLen );
-  nsIFile * GetFileSpec(const char * aFileName);
+  already_AddRefed<nsIFile> GetFileSpec(const char* aFileName);
   bool IsDataAvailable() const { return (mData && mDataLen > 0) || (!mData && mCacheFileName); }
   
 protected:
diff --git a/xpcom/glue/nsCOMPtr.h b/xpcom/glue/nsCOMPtr.h
index d0829280376e..75711754fe51 100644
--- a/xpcom/glue/nsCOMPtr.h
+++ b/xpcom/glue/nsCOMPtr.h
@@ -217,26 +217,6 @@ struct already_AddRefed
     T* mRawPtr;
   };
 
-template <class T>
-inline
-const already_AddRefed<T>
-getter_AddRefs( T* aRawPtr )
-    /*
-      ...makes typing easier, because it deduces the template type, e.g., 
-      you write |dont_AddRef(fooP)| instead of |already_AddRefed<IFoo>(fooP)|.
-    */
-  {
-    return already_AddRefed<T>(aRawPtr);
-  }
-
-template <class T>
-inline
-const already_AddRefed<T>
-getter_AddRefs( const already_AddRefed<T> aAlreadyAddRefedPtr )
-  {
-    return aAlreadyAddRefedPtr;
-  }
-
 template <class T>
 inline
 const already_AddRefed<T>
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index c159c082fb49..49e760d0828c 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -130,12 +130,6 @@ ifneq (,$(SIMPLE_PROGRAMS))
 	$(INSTALL) $(SIMPLE_PROGRAMS) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
 endif
 
-# Copy TestHarness.h into its own module, for ease of setting up includes
-# correctly.
-export::
-	$(NSINSTALL) -D $(DIST)/include/testing
-	$(INSTALL) $(srcdir)/TestHarness.h $(DIST)/include/testing
-
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/test.properties $(DESTDIR)$(mozappdir)/res
 
diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build
index ea3f5a2c62cd..a55f0a20d6e2 100644
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -14,6 +14,10 @@ DIRS += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['windows']
 
+EXPORTS.testing += [
+    'TestHarness.h',
+]
+
 if CONFIG['OS_TARGET'] == 'WINNT':
     CPP_SOURCES += [
         'TestBase64.cpp',