diff --git a/accessible/tests/mochitest/textattrs/test_general.html b/accessible/tests/mochitest/textattrs/test_general.html
index b94b8ff3a2712a..4eebe604a0b4b6 100644
--- a/accessible/tests/mochitest/textattrs/test_general.html
+++ b/accessible/tests/mochitest/textattrs/test_general.html
@@ -478,14 +478,17 @@
       attrs = { "font-family": kAbsentFontFamily };
       testTextAttrs(ID, 18, attrs, defAttrs, 18, 22);
 
-      attrs = { };
-      testTextAttrs(ID, 22, attrs, defAttrs, 22, 27);
+      // bug 1224498 - this fails with 'cursive' fontconfig lookup
+      if (!LINUX) {
+        attrs = { };
+        testTextAttrs(ID, 22, attrs, defAttrs, 22, 27);
 
-      attrs = { "font-family": kCursiveFontFamily };
-      testTextAttrs(ID, 27, attrs, defAttrs, 27, 31);
+        attrs = { "font-family": kCursiveFontFamily };
+        testTextAttrs(ID, 27, attrs, defAttrs, 27, 31);
 
-      attrs = { };
-      testTextAttrs(ID, 31, attrs, defAttrs, 31, 44);
+        attrs = { };
+        testTextAttrs(ID, 31, attrs, defAttrs, 31, 44);
+      }
 
       //////////////////////////////////////////////////////////////////////////
       // area17, "text-decoration" tests
diff --git a/devtools/shared/webconsole/test/helper_serviceworker.js b/devtools/shared/webconsole/test/helper_serviceworker.js
index fe1b2d1b02fd4b..951067a5e00815 100644
--- a/devtools/shared/webconsole/test/helper_serviceworker.js
+++ b/devtools/shared/webconsole/test/helper_serviceworker.js
@@ -1,2 +1,19 @@
+console.log('script evaluation');
 
-console.log("Hello from serviceworker");
+addEventListener('install', function(evt) {
+  console.log('install event');
+});
+
+addEventListener('activate', function(evt) {
+  console.log('activate event');
+});
+
+addEventListener('fetch', function(evt) {
+  console.log('fetch event: ' + evt.request.url);
+  evt.respondWith(new Response('Hello world'));
+});
+
+addEventListener('message', function(evt) {
+  console.log('message event: ' + evt.data.message);
+  evt.source.postMessage({ type: 'PONG' });
+});
diff --git a/devtools/shared/webconsole/test/test_console_serviceworker.html b/devtools/shared/webconsole/test/test_console_serviceworker.html
index e14c44647e0ba4..c429974f6521c8 100644
--- a/devtools/shared/webconsole/test/test_console_serviceworker.html
+++ b/devtools/shared/webconsole/test/test_console_serviceworker.html
@@ -14,16 +14,40 @@
 <script class="testbody" type="text/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
-let SERVICE_WORKER_URL = "https://example.com/chrome/devtools/shared/webconsole/test/helper_serviceworker.js";
-let FRAME_URL = "https://example.com/chrome/devtools/shared/webconsole/test/sandboxed_iframe.html";
+let BASE_URL = "https://example.com/chrome/devtools/shared/webconsole/test/";
+let SERVICE_WORKER_URL = BASE_URL + "helper_serviceworker.js";
+let SCOPE = BASE_URL + "foo/";
+let NONSCOPE_FRAME_URL = BASE_URL + "sandboxed_iframe.html";
+let SCOPE_FRAME_URL = SCOPE + "fake.html";
+let SCOPE_FRAME_URL2 = SCOPE + "whatsit.html";
+let MESSAGE = 'Tic Tock';
 
-let swClosed = new Promise(() => {});
 let expectedConsoleCalls = [
     {
       level: "log",
       filename: /helper_serviceworker/,
-      arguments: ["Hello from serviceworker"],
-    }
+      arguments: ['script evaluation'],
+    },
+    {
+      level: "log",
+      filename: /helper_serviceworker/,
+      arguments: ['install event'],
+    },
+    {
+      level: "log",
+      filename: /helper_serviceworker/,
+      arguments: ['activate event'],
+    },
+    {
+      level: "log",
+      filename: /helper_serviceworker/,
+      arguments: ['fetch event: ' + SCOPE_FRAME_URL],
+    },
+    {
+      level: "log",
+      filename: /helper_serviceworker/,
+      arguments: ['fetch event: ' + SCOPE_FRAME_URL2],
+    },
 ];
 let consoleCalls = [];
 
@@ -40,55 +64,160 @@
 });
 addEventListener("load", startTest);
 
-function onAttach(state, response) {
-  onConsoleAPICall = onConsoleAPICall.bind(null, state);
-  state.dbgClient.addListener("consoleAPICall", onConsoleAPICall);
-
-  info("Loading a ServiceWorker that will use console API");
-  swClosed = new Promise(resolve => {
+function withFrame(url) {
+  return new Promise(resolve => {
     let iframe = document.createElement("iframe");
     iframe.onload = function() {
-      let win = iframe.contentWindow;
-      info("Registering the service worker");
-      win.navigator.serviceWorker.register(SERVICE_WORKER_URL).then(swr => {
-
-        info("Service worker registered.  Unregistering");
-        swr.unregister().then(() => {
-          resolve();
-        });
-      }, error => {
-        info("Error registering service worker: " + error);
-      });
+      resolve(iframe);
     };
-    iframe.src = FRAME_URL;
-
+    iframe.src = url;
     document.body.appendChild(iframe);
   });
 }
 
-function onConsoleAPICall(state, type, packet) {
-  info("received message level: " + packet.message.level);
-  is(packet.from, state.actor, "console API call actor");
+function navigateFrame(iframe, url) {
+  return new Promise(resolve => {
+    iframe.onload = function() {
+      resolve(iframe);
+    };
+    iframe.src = url;
+  });
+}
 
-  consoleCalls.push(packet.message);
-  if (consoleCalls.length != expectedConsoleCalls.length) {
-    return;
-  }
+function forceReloadFrame(iframe) {
+  return new Promise(resolve => {
+    iframe.onload = function() {
+      resolve(iframe);
+    };
+    iframe.contentWindow.location.reload(true);
+  });
+}
 
-  state.dbgClient.removeListener("consoleAPICall", onConsoleAPICall);
+function withActiveServiceWorker(win, url, scope) {
+  return win.navigator.serviceWorker.register(url, { scope: scope }).then(swr => {
+    if (swr.active) {
+      return swr;
+    }
+
+    // Unfortunately we can't just use navigator.serviceWorker.ready promise
+    // here.  If the service worker is for a scope that does not cover the window
+    // then the ready promise will never resolve.  Instead monitor the service
+    // workers state change events to determine when its activated.
+    return new Promise(resolve => {
+      let sw = swr.waiting || swr.installing;
+      sw.addEventListener('statechange', function stateHandler(evt) {
+        if (sw.state === 'activated') {
+          sw.removeEventListener('statechange', stateHandler);
+          resolve(swr);
+        }
+      });
+    });
+  });
+}
+
+function messageServiceWorker(win, scope, message) {
+  return win.navigator.serviceWorker.getRegistration(scope).then(swr => {
+    return new Promise(resolve => {
+      win.navigator.serviceWorker.onmessage = evt => {
+        resolve();
+      };
+      let sw = swr.active || swr.waiting || swr.installing;
+      sw.postMessage({ type: 'PING', message: message });
+    });
+  })
+}
 
-  expectedConsoleCalls.forEach(function(aMessage, aIndex) {
-    info("checking received console call #" + aIndex);
-    checkConsoleAPICall(consoleCalls[aIndex], expectedConsoleCalls[aIndex]);
+function unregisterServiceWorker(win) {
+  return win.navigator.serviceWorker.ready.then(swr => {
+    return swr.unregister();
   });
+}
 
-  consoleCalls = [];
+let onAttach = Task.async(function*(state, response) {
+  onConsoleAPICall = onConsoleAPICall.bind(null, state);
+  state.dbgClient.addListener("consoleAPICall", onConsoleAPICall);
 
-  closeDebugger(state, function() {
-    swClosed.then(() => {
+  let currentFrame;
+  try {
+    // First, we need a frame from which to register our script.  This
+    // will not trigger any console calls.
+    info("Loading a non-scope frame from which to register a service worker.");
+    currentFrame = yield withFrame(NONSCOPE_FRAME_URL);
+
+    // Now register the service worker and wait for it to become
+    // activate.  This should trigger 3 console calls; 1 for script
+    // evaluation, 1 for the install event, and 1 for the activate
+    // event.  These console calls are received because we called
+    // register(), not because we are in scope for the worker.
+    info("Registering the service worker");
+    yield withActiveServiceWorker(currentFrame.contentWindow,
+                                  SERVICE_WORKER_URL, SCOPE);
+    ok(!currentFrame.contentWindow.navigator.serviceWorker.controller,
+       'current frame should not be controlled');
+
+    // Now that the service worker is activate, lets navigate our frame.
+    // This will trigger 1 more console call for the fetch event.
+    info("Service worker registered. Navigating frame.");
+    yield navigateFrame(currentFrame, SCOPE_FRAME_URL);
+    ok(currentFrame.contentWindow.navigator.serviceWorker.controller,
+       'navigated frame should be controlled');
+
+    // We now have a controlled frame.  Lets perform a non-navigation fetch.
+    // This should produce another console call for the fetch event.
+    info("Frame navigated.  Calling fetch().");
+    yield currentFrame.contentWindow.fetch(SCOPE_FRAME_URL2);
+
+    // Now force refresh our controlled frame.  This will cause the frame
+    // to bypass the service worker and become an uncontrolled frame.  It
+    // also happens to make the frame display a 404 message because the URL
+    // does not resolve to a real resource.  This is ok, as we really only
+    // care about the frame being non-controlled, but still having a location
+    // that matches our service worker scope so we can provide its not
+    // incorrectly getting console calls.
+    info("Completed fetch().  Force refreshing to get uncontrolled frame.");
+    yield forceReloadFrame(currentFrame);
+    ok(!currentFrame.contentWindow.navigator.serviceWorker.controller,
+       'current frame should not be controlled after force refresh');
+    is(currentFrame.contentWindow.location.toString(), SCOPE_FRAME_URL,
+       'current frame should still have in-scope location URL even though it got 404');
+
+    // Now postMessage() the service worker to trigger its message event
+    // handler.  This will generate 1 or 2 to console.log() statements
+    // depending on if the worker thread needs to spin up again.  In either
+    // case, though, we should not get any console calls because we don't
+    // have a controlled or registering document.
+    info("Completed force refresh.  Messaging service worker.");
+    yield messageServiceWorker(currentFrame.contentWindow, SCOPE, MESSAGE);
+
+    info("Done messaging service worker.  Unregistering service worker.");
+    yield unregisterServiceWorker(currentFrame.contentWindow);
+
+    info('Service worker unregistered.  Checking console calls.');
+    state.dbgClient.removeListener("consoleAPICall", onConsoleAPICall);
+    is(consoleCalls.length, expectedConsoleCalls.length,
+       'received correct number of console calls');
+    expectedConsoleCalls.forEach(function(aMessage, aIndex) {
+      info("checking received console call #" + aIndex);
+      checkConsoleAPICall(consoleCalls[aIndex], expectedConsoleCalls[aIndex]);
+    });
+  } catch(error) {
+    ok(false, 'unexpected error: ' + error);
+  } finally {
+    if (currentFrame) {
+      currentFrame.remove();
+      currentFrame = null;
+    }
+    consoleCalls = [];
+    closeDebugger(state, function() {
       SimpleTest.finish();
     });
-  });
+  }
+});
+
+function onConsoleAPICall(state, type, packet) {
+  info("received message level: " + packet.message.level);
+  is(packet.from, state.actor, "console API call actor");
+  consoleCalls.push(packet.message);
 }
 </script>
 </body>
diff --git a/devtools/shared/webconsole/utils.js b/devtools/shared/webconsole/utils.js
index cd6b529294e8fd..45dc8be7c35593 100644
--- a/devtools/shared/webconsole/utils.js
+++ b/devtools/shared/webconsole/utils.js
@@ -18,6 +18,11 @@ loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");
 loader.lazyImporter(this, "VariablesView", "resource://devtools/client/shared/widgets/VariablesView.jsm");
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
+XPCOMUtils.defineLazyServiceGetter(this,
+                                   "swm",
+                                   "@mozilla.org/serviceworkers/manager;1",
+                                   "nsIServiceWorkerManager");
+
 // Match the function name from the result of toString() or toSource().
 //
 // Examples:
@@ -126,29 +131,6 @@ var WebConsoleUtils = {
     aTo.style.fontStyle = style.getPropertyCSSValue("font-style").cssText;
   },
 
-  /**
-   * Recursively gather a list of window locations given
-   * a top level window.
-   *
-   * @param nsIDOMWindow aWindow
-   * @return Array
-   *         list of window locations as strings
-   */
-  getLocationsForFrames: function(aWindow)
-  {
-    let location = aWindow.location.toString();
-    let locations = [location];
-
-    if (aWindow.frames) {
-      for (let i = 0; i < aWindow.frames.length; i++) {
-        let frame = aWindow.frames[i];
-        locations = locations.concat(this.getLocationsForFrames(frame));
-      }
-    }
-
-    return locations;
-  },
-
   /**
    * Gets the ID of the inner window of this DOM window.
    *
@@ -994,9 +976,8 @@ ConsoleAPIListener.prototype =
       // scope, which can be used to determine whether it's controlling
       // a window.
       let scope = message.ID;
-      let locations = WebConsoleUtils.getLocationsForFrames(this.window);
 
-      if (!locations.some(loc => loc.startsWith(scope))) {
+      if (!swm.shouldReportToWindow(this.window, scope)) {
         return false;
       }
     }
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 66688848f6ed82..abe8d5d0a3efd8 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -13714,6 +13714,13 @@ nsDocShell::SetIsBrowserInsideApp(uint32_t aContainingAppId)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+nsDocShell::SetIsSignedPackage(const nsAString& aSignedPkg)
+{
+  mSignedPkg = aSignedPkg;
+  return NS_OK;
+}
+
 /* [infallible] */ NS_IMETHODIMP
 nsDocShell::GetIsBrowserElement(bool* aIsBrowser)
 {
@@ -13821,6 +13828,9 @@ nsDocShell::GetOriginAttributes()
     attrs.mInBrowser = true;
   }
 
+  // Bug 1209162 will address the inheritance of each attributes.
+  attrs.mSignedPkg = mSignedPkg;
+
   return attrs;
 }
 
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 4b75df163a1a27..75703bec35ed6d 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -1005,6 +1005,10 @@ class nsDocShell final
 
   nsString GetInheritedPaymentRequestId();
 
+  // The packageId for a signed packaged iff this docShell is created
+  // for a signed package.
+  nsString mSignedPkg;
+
 private:
   nsCString mForcedCharset;
   nsCString mParentCharset;
diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl
index c960577a9f16c3..7a052406359881 100644
--- a/docshell/base/nsIDocShell.idl
+++ b/docshell/base/nsIDocShell.idl
@@ -43,7 +43,7 @@ interface nsITabParent;
 
 typedef unsigned long nsLoadFlags;
 
-[scriptable, builtinclass, uuid(41b1cf17-b37b-4a62-9df8-5f67cfecab3f)]
+[scriptable, builtinclass, uuid(63adb599-6dc9-4746-972e-c22e9018020b)]
 interface nsIDocShell : nsIDocShellTreeItem
 {
   /**
@@ -824,6 +824,12 @@ interface nsIDocShell : nsIDocShellTreeItem
     */
    void setIsBrowserInsideApp(in unsigned long containingAppId);
 
+   /**
+    * Indicate that this docshell corresponds to a signed package with
+    * the given packageId.
+    */
+   void setIsSignedPackage(in AString packageId);
+
   /**
    * Returns the id of the app associated with this docshell.  If this docshell
    * is an <iframe mozbrowser> inside an <iframe mozapp>, we return the app's
diff --git a/dom/alarm/AlarmService.jsm b/dom/alarm/AlarmService.jsm
index a87fc5982d17a0..7af0a910eceaa4 100644
--- a/dom/alarm/AlarmService.jsm
+++ b/dom/alarm/AlarmService.jsm
@@ -49,6 +49,8 @@ XPCOMUtils.defineLazyGetter(this, "powerManagerService", function() {
  */
 
 this.AlarmService = {
+  lastChromeId: 0,
+
   init: function init() {
     debug("init()");
 
@@ -205,6 +207,12 @@ this.AlarmService = {
       };
     }
 
+    // Is this a chrome alarm?
+    if (aId < 0) {
+      aRemoveSuccessCb();
+      return;
+    }
+
     this._db.remove(aId, aManifestURL, aRemoveSuccessCb,
                     function removeErrorCb(aErrorMsg) {
                       throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
@@ -241,11 +249,19 @@ this.AlarmService = {
   _notifyAlarmObserver: function _notifyAlarmObserver(aAlarm) {
     debug("_notifyAlarmObserver()");
 
-    if (aAlarm.manifestURL) {
-      this._fireSystemMessage(aAlarm);
-    } else if (typeof aAlarm.alarmFiredCb === "function") {
-      aAlarm.alarmFiredCb(this._publicAlarm(aAlarm));
-    }
+    let wakeLock = powerManagerService.newWakeLock("cpu");
+
+    let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+    timer.initWithCallback(() => {
+      debug("_notifyAlarmObserver - timeout()");
+      if (aAlarm.manifestURL) {
+        this._fireSystemMessage(aAlarm);
+      } else if (typeof aAlarm.alarmFiredCb === "function") {
+        aAlarm.alarmFiredCb(this._publicAlarm(aAlarm));
+      }
+
+      wakeLock.unlock();
+    }, 0, Ci.nsITimer.TYPE_ONE_SHOT);
   },
 
   _onAlarmFired: function _onAlarmFired() {
@@ -265,8 +281,12 @@ this.AlarmService = {
       }
 
       this._removeAlarmFromDb(this._currentAlarm.id, null);
-      this._notifyAlarmObserver(this._currentAlarm);
+      // We need to clear the current alarm before notifying because chrome
+      // alarms may add a new alarm during their callback, and we do not want
+      // to clobber it.
+      let firingAlarm = this._currentAlarm;
       this._currentAlarm = null;
+      this._notifyAlarmObserver(firingAlarm);
     }
 
     // Reset the next alarm from the queue.
@@ -309,15 +329,25 @@ this.AlarmService = {
         debug("Callback after getting alarms from database: " +
               JSON.stringify(aAlarms));
 
-        // Clear any alarms set or queued in the cache.
+        // Clear any alarms set or queued in the cache if coming from db.
         let alarmQueue = this._alarmQueue;
-        alarmQueue.length = 0;
-        this._currentAlarm = null;
+        if (this._currentAlarm) {
+          alarmQueue.unshift(this._currentAlarm);
+          this._currentAlarm = null;
+        }
+        for (let i = 0; i < alarmQueue.length;) {
+          if (alarmQueue[i]['id'] < 0) {
+            ++i;
+            continue;
+          }
+          alarmQueue.splice(i, 1);
+        }
 
         // Only restore the alarm that's not yet expired; otherwise, remove it
         // from the database and notify the observer.
         aAlarms.forEach(function addAlarm(aAlarm) {
-          if (this._getAlarmTime(aAlarm) > Date.now()) {
+          if ("manifestURL" in aAlarm && aAlarm.manifestURL &&
+              this._getAlarmTime(aAlarm) > Date.now()) {
             alarmQueue.push(aAlarm);
           } else {
             this._removeAlarmFromDb(aAlarm.id, null);
@@ -416,55 +446,65 @@ this.AlarmService = {
 
     aNewAlarm['timezoneOffset'] = this._currentTimezoneOffset;
 
-    this._db.add(aNewAlarm,
-      function addSuccessCb(aNewId) {
-        debug("Callback after adding alarm in database.");
+    if ("manifestURL" in aNewAlarm) {
+      this._db.add(aNewAlarm,
+        function addSuccessCb(aNewId) {
+          debug("Callback after adding alarm in database.");
+          this.processNewAlarm(aNewAlarm, aNewId, aAlarmFiredCb, aSuccessCb);
+        }.bind(this),
+        function addErrorCb(aErrorMsg) {
+          aErrorCb(aErrorMsg);
+        }.bind(this));
+    } else {
+      // alarms without manifests are managed by chrome code. For them we use
+      // negative IDs.
+      this.processNewAlarm(aNewAlarm, --this.lastChromeId, aAlarmFiredCb,
+                           aSuccessCb);
+    }
+  },
 
-        aNewAlarm['id'] = aNewId;
+  processNewAlarm: function(aNewAlarm, aNewId, aAlarmFiredCb, aSuccessCb) {
+    aNewAlarm['id'] = aNewId;
 
-        // Now that the alarm has been added to the database, we can tack on
-        // the non-serializable callback to the in-memory object.
-        aNewAlarm['alarmFiredCb'] = aAlarmFiredCb;
+    // Now that the alarm has been added to the database, we can tack on
+    // the non-serializable callback to the in-memory object.
+    aNewAlarm['alarmFiredCb'] = aAlarmFiredCb;
 
-        // If the new alarm already expired at this moment, we directly
-        // notify this alarm
-        let aNewAlarmTime = this._getAlarmTime(aNewAlarm);
-        if (aNewAlarmTime < Date.now()) {
-          aSuccessCb(aNewId);
-          this._removeAlarmFromDb(aNewAlarm.id, null);
-          this._notifyAlarmObserver(aNewAlarm);
-          return;
-        }
+    // If the new alarm already expired at this moment, we directly
+    // notify this alarm
+    let newAlarmTime = this._getAlarmTime(aNewAlarm);
+    if (newAlarmTime < Date.now()) {
+      aSuccessCb(aNewId);
+      this._removeAlarmFromDb(aNewAlarm.id, null);
+      this._notifyAlarmObserver(aNewAlarm);
+      return;
+    }
 
-        // If there is no alarm being set in system, set the new alarm.
-        if (this._currentAlarm == null) {
-          this._currentAlarm = aNewAlarm;
-          this._debugCurrentAlarm();
-          aSuccessCb(aNewId);
-          return;
-        }
+    // If there is no alarm being set in system, set the new alarm.
+    if (this._currentAlarm == null) {
+      this._currentAlarm = aNewAlarm;
+      this._debugCurrentAlarm();
+      aSuccessCb(aNewId);
+      return;
+    }
 
-        // If the new alarm is earlier than the current alarm, swap them and
-        // push the previous alarm back to the queue.
-        let alarmQueue = this._alarmQueue;
-        let currentAlarmTime = this._getAlarmTime(this._currentAlarm);
-        if (aNewAlarmTime < currentAlarmTime) {
-          alarmQueue.unshift(this._currentAlarm);
-          this._currentAlarm = aNewAlarm;
-          this._debugCurrentAlarm();
-          aSuccessCb(aNewId);
-          return;
-        }
+    // If the new alarm is earlier than the current alarm, swap them and
+    // push the previous alarm back to the queue.
+    let alarmQueue = this._alarmQueue;
+    let currentAlarmTime = this._getAlarmTime(this._currentAlarm);
+    if (newAlarmTime < currentAlarmTime) {
+      alarmQueue.unshift(this._currentAlarm);
+      this._currentAlarm = aNewAlarm;
+      this._debugCurrentAlarm();
+      aSuccessCb(aNewId);
+      return;
+    }
 
-        // Push the new alarm in the queue.
-        alarmQueue.push(aNewAlarm);
-        alarmQueue.sort(this._sortAlarmByTimeStamps.bind(this));
-        this._debugCurrentAlarm();
-        aSuccessCb(aNewId);
-      }.bind(this),
-      function addErrorCb(aErrorMsg) {
-        aErrorCb(aErrorMsg);
-      }.bind(this));
+    // Push the new alarm in the queue.
+    alarmQueue.push(aNewAlarm);
+    alarmQueue.sort(this._sortAlarmByTimeStamps.bind(this));
+    this._debugCurrentAlarm();
+    aSuccessCb(aNewId);
   },
 
   /*
diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp
index 665e6fbc30e5d7..96a530961aaba0 100644
--- a/dom/animation/Animation.cpp
+++ b/dom/animation/Animation.cpp
@@ -601,6 +601,10 @@ Animation::DoCancel()
   mStartTime.SetNull();
 
   UpdateTiming(SeekFlag::NoSeek, SyncNotifyFlag::Async);
+
+  if (mTimeline) {
+    mTimeline->RemoveAnimation(this);
+  }
 }
 
 void
diff --git a/dom/animation/Animation.h b/dom/animation/Animation.h
index 011d3413ff9225..6f71853cabc21c 100644
--- a/dom/animation/Animation.h
+++ b/dom/animation/Animation.h
@@ -10,6 +10,7 @@
 #include "nsWrapperCache.h"
 #include "nsCycleCollectionParticipant.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/LinkedList.h"
 #include "mozilla/TimeStamp.h" // for TimeStamp, TimeDuration
 #include "mozilla/dom/AnimationBinding.h" // for AnimationPlayState
 #include "mozilla/dom/AnimationTimeline.h" // for AnimationTimeline
@@ -48,6 +49,7 @@ class CSSTransition;
 
 class Animation
   : public DOMEventTargetHelper
+  , public LinkedListElement<Animation>
 {
 protected:
   virtual ~Animation() {}
diff --git a/dom/animation/AnimationTimeline.cpp b/dom/animation/AnimationTimeline.cpp
index cd020e5b00c872..1628c043f19a6a 100644
--- a/dom/animation/AnimationTimeline.cpp
+++ b/dom/animation/AnimationTimeline.cpp
@@ -6,12 +6,25 @@
 
 #include "AnimationTimeline.h"
 #include "mozilla/AnimationComparator.h"
+#include "mozilla/dom/Animation.h"
 
 namespace mozilla {
 namespace dom {
 
-NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(AnimationTimeline, mWindow,
-                                      mAnimationOrder)
+NS_IMPL_CYCLE_COLLECTION_CLASS(AnimationTimeline)
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(AnimationTimeline)
+  tmp->mAnimationOrder.clear();
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow, mAnimations)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(AnimationTimeline)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow, mAnimations)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(AnimationTimeline)
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(AnimationTimeline)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(AnimationTimeline)
@@ -32,9 +45,10 @@ AnimationTimeline::GetAnimations(AnimationSequence& aAnimations)
     }
   }
 
-  aAnimations.SetCapacity(mAnimationOrder.Length());
+  aAnimations.SetCapacity(mAnimations.Count());
 
-  for (Animation* animation : mAnimationOrder) {
+  for (Animation* animation = mAnimationOrder.getFirst(); animation;
+       animation = animation->getNext()) {
 
     // Skip animations which are no longer relevant or which have been
     // associated with another timeline. These animations will be removed
@@ -69,8 +83,22 @@ AnimationTimeline::NotifyAnimationUpdated(Animation& aAnimation)
     return;
   }
 
+  if (aAnimation.GetTimeline() && aAnimation.GetTimeline() != this) {
+    aAnimation.GetTimeline()->RemoveAnimation(&aAnimation);
+  }
+
   mAnimations.PutEntry(&aAnimation);
-  mAnimationOrder.AppendElement(&aAnimation);
+  mAnimationOrder.insertBack(&aAnimation);
+}
+
+void
+AnimationTimeline::RemoveAnimation(Animation* aAnimation)
+{
+  MOZ_ASSERT(!aAnimation->GetTimeline() || aAnimation->GetTimeline() == this);
+  if (aAnimation->isInList()) {
+    aAnimation->remove();
+  }
+  mAnimations.RemoveEntry(aAnimation);
 }
 
 } // namespace dom
diff --git a/dom/animation/AnimationTimeline.h b/dom/animation/AnimationTimeline.h
index 24708ec1d4e550..7163d435020c5d 100644
--- a/dom/animation/AnimationTimeline.h
+++ b/dom/animation/AnimationTimeline.h
@@ -40,7 +40,10 @@ class AnimationTimeline
   }
 
 protected:
-  virtual ~AnimationTimeline() { }
+  virtual ~AnimationTimeline()
+  {
+    mAnimationOrder.clear();
+  }
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -91,6 +94,8 @@ class AnimationTimeline
    */
   virtual void NotifyAnimationUpdated(Animation& aAnimation);
 
+  void RemoveAnimation(Animation* aAnimation);
+
 protected:
   nsCOMPtr<nsIGlobalObject> mWindow;
 
@@ -99,13 +104,11 @@ class AnimationTimeline
   // We store them in (a) a hashset for quick lookup, and (b) an array
   // to maintain a fixed sampling order.
   //
-  // The array keeps a strong reference to each animation in order
-  // to save some addref/release traffic and because we never dereference
-  // the pointers in the hashset.
-  typedef nsTHashtable<nsPtrHashKey<dom::Animation>> AnimationSet;
-  typedef nsTArray<RefPtr<dom::Animation>>         AnimationArray;
-  AnimationSet   mAnimations;
-  AnimationArray mAnimationOrder;
+  // The hashset keeps a strong reference to each animation since
+  // dealing with addref/release with LinkedList is difficult.
+  typedef nsTHashtable<nsRefPtrHashKey<dom::Animation>> AnimationSet;
+  AnimationSet mAnimations;
+  LinkedList<dom::Animation> mAnimationOrder;
 };
 
 } // namespace dom
diff --git a/dom/animation/DocumentTimeline.cpp b/dom/animation/DocumentTimeline.cpp
index a0c48a3c2a3f66..3d457bab977939 100644
--- a/dom/animation/DocumentTimeline.cpp
+++ b/dom/animation/DocumentTimeline.cpp
@@ -112,14 +112,18 @@ DocumentTimeline::WillRefresh(mozilla::TimeStamp aTime)
   MOZ_ASSERT(mIsObservingRefreshDriver);
 
   bool needsTicks = false;
-  AnimationArray animationsToKeep(mAnimationOrder.Length());
+  nsTArray<Animation*> animationsToRemove(mAnimations.Count());
 
   nsAutoAnimationMutationBatch mb(mDocument);
 
-  for (Animation* animation : mAnimationOrder) {
+  for (Animation* animation = mAnimationOrder.getFirst(); animation;
+       animation = animation->getNext()) {
     // Skip any animations that are longer need associated with this timeline.
     if (animation->GetTimeline() != this) {
-      mAnimations.RemoveEntry(animation);
+      // If animation has some other timeline, it better not be also in the
+      // animation list of this timeline object!
+      MOZ_ASSERT(!animation->GetTimeline());
+      animationsToRemove.AppendElement(animation);
       continue;
     }
 
@@ -129,14 +133,14 @@ DocumentTimeline::WillRefresh(mozilla::TimeStamp aTime)
     // order to dispatch events.
     animation->Tick();
 
-    if (animation->IsRelevant() || animation->NeedsTicks()) {
-      animationsToKeep.AppendElement(animation);
-    } else {
-      mAnimations.RemoveEntry(animation);
+    if (!animation->IsRelevant() && !animation->NeedsTicks()) {
+      animationsToRemove.AppendElement(animation);
     }
   }
 
-  mAnimationOrder.SwapElements(animationsToKeep);
+  for (Animation* animation : animationsToRemove) {
+    RemoveAnimation(animation);
+  }
 
   if (!needsTicks) {
     // If another refresh driver observer destroys the nsPresContext,
@@ -155,7 +159,7 @@ DocumentTimeline::NotifyRefreshDriverCreated(nsRefreshDriver* aDriver)
              "Timeline should not be observing the refresh driver before"
              " it is created");
 
-  if (!mAnimationOrder.IsEmpty()) {
+  if (!mAnimationOrder.isEmpty()) {
     aDriver->AddRefreshObserver(this, Flush_Style);
     mIsObservingRefreshDriver = true;
   }
diff --git a/dom/archivereader/test/helpers.js b/dom/archivereader/test/helpers.js
index eee603213432ec..3ba4304360495f 100644
--- a/dom/archivereader/test/helpers.js
+++ b/dom/archivereader/test/helpers.js
@@ -10,8 +10,15 @@ function runTest()
   SimpleTest.waitForExplicitFinish();
 
   SpecialPowers.pushPrefEnv({'set': [ ["dom.archivereader.enabled", true] ]}, function() {
-    testGenerator = testSteps();
-    return testGenerator.next();
+    SpecialPowers.createFiles(filesToCreate(),
+                              function (files) {
+                                testGenerator = testSteps(files);
+                                return testGenerator.next();
+                              },
+                              function (msg) {
+                                ok(false, "File creation error: " + msg);
+                                finishTest();
+                              });
   });
 }
 
diff --git a/dom/archivereader/test/mochitest.ini b/dom/archivereader/test/mochitest.ini
index 400a53107697f6..ba366a400beac4 100644
--- a/dom/archivereader/test/mochitest.ini
+++ b/dom/archivereader/test/mochitest.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = e10s
 support-files =
   helpers.js
 
diff --git a/dom/archivereader/test/test_basic.html b/dom/archivereader/test/test_basic.html
index 5e9e40a6e01c02..b3e5ab852ace87 100644
--- a/dom/archivereader/test/test_basic.html
+++ b/dom/archivereader/test/test_basic.html
@@ -10,57 +10,7 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script type="text/javascript;version=1.7">
-  function createZipFileWithData(fileData) {
-    var Cc = SpecialPowers.Cc;
-    var Ci = SpecialPowers.Ci;
-
-    var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
-    var testFile = dirSvc.get("ProfD", Ci.nsIFile);
-    testFile.append("fileArchiveReader.zip");
-    var outStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
-    outStream.init(testFile, 0x02 | 0x08 | 0x20, // write, create, truncate
-                   0666, 0);
-    outStream.write(fileData, fileData.length);
-    outStream.close();
-
-    var fileList = document.getElementById('fileList');
-    SpecialPowers.wrap(fileList).value = testFile.path;
-
-    return fileList.files[0];
-  }
-
-  function createTextFileWithData(fileData) {
-    var Cc = SpecialPowers.Cc;
-    var Ci = SpecialPowers.Ci;
-
-    var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
-    var testFile = dirSvc.get("ProfD", Ci.nsIFile);
-    testFile.append("fileArchiveReader.txt");
-    var outStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
-    outStream.init(testFile, 0x02 | 0x08 | 0x20, // write, create, truncate
-                   0666, 0);
-    outStream.write(fileData, fileData.length);
-    outStream.close();
-
-    var fileList = document.getElementById('fileList');
-    SpecialPowers.wrap(fileList).value = testFile.path;
-
-    return fileList.files[0];
-  }
-
-  handleFinished = 0;
-  function markTestDone() {
-    ++handleFinished;
-    if (isFinished()) {
-      finishTest();
-    }
-  }
-  function isFinished() {
-    return handleFinished == 6;
-  }
-
-  function testSteps()
-  {
+  function filesToCreate() {
     var binaryString = '504B03040A00000000002E6BF14000000000000000000000000005001C00746573742F555409000337CA055039CA055075780B' +
                        '000104E803000004E8030000504B03041400000008002D6BF1401780E15015000000580200000A001C00746573742F612E7478' +
                        '74555409000336CA05503ACA055075780B000104E803000004E8030000CB48CDC9C95728CF2FCA49E1CA18658FB2A9C4060050' +
@@ -78,8 +28,25 @@
       binaryData += String.fromCharCode(parseInt(hex,16));
     }
 
-    var binaryFile = createZipFileWithData(binaryData);
-    var textFile = createTextFileWithData("Hello World");
+    return [ {name: "fileArchiveReader.zip", data: binaryData},
+             {name: "fileArchiveReader.txt", data: "Hello World"}];
+  }
+
+  handleFinished = 0;
+  function markTestDone() {
+    ++handleFinished;
+    if (isFinished()) {
+      finishTest();
+    }
+  }
+  function isFinished() {
+    return handleFinished == 6;
+  }
+
+  function testSteps(files)
+  {
+    var binaryFile = files[0];
+    var textFile = files[1];
 
     var status;
 
@@ -254,7 +221,6 @@
 
 <body onload="runTest();">
 <p id="display">
-  <input id="fileList" type="file"></input>
 </p>
 </body>
 
diff --git a/dom/archivereader/test/test_nonUnicode.html b/dom/archivereader/test/test_nonUnicode.html
index 1b40c817d251a5..6237ce10f9feb3 100644
--- a/dom/archivereader/test/test_nonUnicode.html
+++ b/dom/archivereader/test/test_nonUnicode.html
@@ -10,35 +10,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script type="text/javascript;version=1.7">
-  function createNonUnicodeData() {
-    const Cc = SpecialPowers.Cc;
-    const Ci = SpecialPowers.Ci;
-
-    var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
-    var testFile = dirSvc.get("ProfD", Ci.nsIFile);
-    testFile.append("fileArchiveReader_nonUnicode.zip");
-    var outStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
-    outStream.init(testFile, 0x02 | 0x08 | 0x20, // write, create, truncate
-                   0666, 0);
-
+  function filesToCreate() {
     var binaryData = "";
     for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
       var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
       binaryData += String.fromCharCode(parseInt(hex,16));
     }
-    outStream.write(binaryData, binaryData.length);
-    outStream.close();
-
-    var fileList = document.getElementById('fileList');
-    SpecialPowers.wrap(fileList).value = testFile.path;
-
-    return fileList.files[0];
+    return [ {name: "fileArchiveReader_nonUnicode.zip", data: binaryData} ];
   }
 
-  function test1()
+  function test1(binaryFile)
   {
-    var binaryFile = createNonUnicodeData();
-
     var r = new ArchiveReader(binaryFile, { encoding: "ISO-8859-1" });
     isnot(r, null, "ArchiveReader cannot be null");
 
@@ -51,14 +33,12 @@
       is(this.result.length, 1, "ArchiveReader.getFilenames(): the array contains 1 item");
       ok(this.reader, r, "ArchiveRequest.reader should be == ArchiveReader");
       dump('Content: ' + this.result[0] + '\n');
-      test2();
+      test2(binaryFile);
     }
   }
 
-  function test2()
+  function test2(binaryFile)
   {
-    var binaryFile = createNonUnicodeData();
-
     try {
       new ArchiveReader(binaryFile, { encoding: "random stuff" });
       ok(false, "Should have thrown for bogus encoding label.");
@@ -68,9 +48,9 @@
     finishTest();
   }
 
-  function testSteps()
+  function testSteps(files)
   {
-    test1();
+    test1(files[0]);
     yield undefined;
   }
 
@@ -82,7 +62,6 @@
 
 <body onload="runTest();">
 <p id="display">
-  <input id="fileList" type="file"></input>
 </p>
 <script type="text/javascript;version=1.7">
 var binaryString = '' +
diff --git a/dom/archivereader/test/test_zip_in_zip.html b/dom/archivereader/test/test_zip_in_zip.html
index 5d386c82a15b34..7e381a1efeae3c 100644
--- a/dom/archivereader/test/test_zip_in_zip.html
+++ b/dom/archivereader/test/test_zip_in_zip.html
@@ -10,34 +10,18 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script type="text/javascript;version=1.7">
-  function createZipInZipData() {
-    var Cc = SpecialPowers.Cc;
-    var Ci = SpecialPowers.Ci;
-
-    var dirSvc = Cc["@mozilla.org/file/directory_service;1"].getService(Ci.nsIProperties);
-    var testFile = dirSvc.get("ProfD", Ci.nsIFile);
-    testFile.append("fileArchiveReader_42.zip");
-    var outStream = Cc["@mozilla.org/network/file-output-stream;1"].createInstance(Ci.nsIFileOutputStream);
-    outStream.init(testFile, 0x02 | 0x08 | 0x20, // write, create, truncate
-                   0666, 0);
-
+  function filesToCreate() {
     var binaryData = "";
     for (var i = 0, len = binaryString.length / 2; i < len; ++i) {
       var hex = binaryString[i * 2] + binaryString[i * 2 + 1];
       binaryData += String.fromCharCode(parseInt(hex,16));
     }
-    outStream.write(binaryData, binaryData.length);
-    outStream.close();
-
-    var fileList = document.getElementById('fileList');
-    SpecialPowers.wrap(fileList).value = testFile.path;
-
-    return fileList.files[0];
+    return [ {name: "fileArchiveReader_42.zip", data: binaryData} ];
   }
 
-  function testSteps()
+  function testSteps(files)
   {
-    var binaryFile = createZipInZipData();
+    var binaryFile = files[0];
 
     // The input is 4 nested zip archives:
     doLoop(binaryFile, 4);
@@ -96,7 +80,6 @@
 
 <body onload="runTest();">
 <p id="display">
-  <input id="fileList" type="file"></input>
 </p>
 <script type="text/javascript;version=1.7">
 var binaryString = '' +
diff --git a/dom/audiochannel/AudioChannelAgent.cpp b/dom/audiochannel/AudioChannelAgent.cpp
index 01014f153b29c8..ac46b5c049b623 100644
--- a/dom/audiochannel/AudioChannelAgent.cpp
+++ b/dom/audiochannel/AudioChannelAgent.cpp
@@ -183,7 +183,10 @@ NS_IMETHODIMP AudioChannelAgent::NotifyStoppedPlaying()
          ("AudioChannelAgent, NotifyStoppedPlaying, this = %p\n", this));
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  service->UnregisterAudioChannelAgent(this, mNotifyPlayback);
+  if (service) {
+    service->UnregisterAudioChannelAgent(this, mNotifyPlayback);
+  }
+
   mIsRegToService = false;
   return NS_OK;
 }
@@ -210,7 +213,9 @@ AudioChannelAgent::WindowVolumeChanged()
   bool muted = false;
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  service->GetState(mWindow, mAudioChannelType, &volume, &muted);
+  if (service) {
+    service->GetState(mWindow, mAudioChannelType, &volume, &muted);
+  }
 
   MOZ_LOG(AudioChannelService::GetAudioChannelLog(), LogLevel::Debug,
          ("AudioChannelAgent, WindowVolumeChanged, this = %p, mute = %d, "
diff --git a/dom/audiochannel/AudioChannelService.cpp b/dom/audiochannel/AudioChannelService.cpp
index 18239805a02050..64520523ae4fcf 100644
--- a/dom/audiochannel/AudioChannelService.cpp
+++ b/dom/audiochannel/AudioChannelService.cpp
@@ -40,6 +40,7 @@ namespace {
 
 // If true, any new AudioChannelAgent will be muted when created.
 bool sAudioChannelMutedByDefault = false;
+bool sXPCOMShuttingDown = false;
 
 class NotifyChannelActiveRunnable final : public nsRunnable
 {
@@ -178,6 +179,10 @@ AudioChannelService::CreateServiceIfNeeded()
 /* static */ already_AddRefed<AudioChannelService>
 AudioChannelService::GetOrCreate()
 {
+  if (sXPCOMShuttingDown) {
+    return nullptr;
+  }
+
   CreateServiceIfNeeded();
   RefPtr<AudioChannelService> service = gAudioChannelService.get();
   return service.forget();
@@ -193,7 +198,7 @@ AudioChannelService::GetAudioChannelLog()
   return gAudioChannelLog;
 }
 
-void
+/* static */ void
 AudioChannelService::Shutdown()
 {
   if (gAudioChannelService) {
@@ -212,6 +217,12 @@ AudioChannelService::Shutdown()
       }
     }
 
+    gAudioChannelService->mWindows.Clear();
+    gAudioChannelService->mPlayingChildren.Clear();
+#ifdef MOZ_WIDGET_GONK
+    gAudioChannelService->mSpeakerManager.Clear();
+#endif
+
     gAudioChannelService = nullptr;
   }
 }
@@ -483,7 +494,7 @@ AudioChannelService::Observe(nsISupports* aSubject, const char* aTopic,
                              const char16_t* aData)
 {
   if (!strcmp(aTopic, "xpcom-shutdown")) {
-    mWindows.Clear();
+    sXPCOMShuttingDown = true;
     Shutdown();
   } else if (!strcmp(aTopic, "outer-window-destroyed")) {
     nsCOMPtr<nsISupportsPRUint64> wrapper = do_QueryInterface(aSubject);
diff --git a/dom/base/AnonymousContent.cpp b/dom/base/AnonymousContent.cpp
index 6ef54a809624d6..90aeab6bcaffce 100644
--- a/dom/base/AnonymousContent.cpp
+++ b/dom/base/AnonymousContent.cpp
@@ -11,6 +11,7 @@
 #include "nsIDocument.h"
 #include "nsIDOMHTMLCollection.h"
 #include "nsStyledElement.h"
+#include "HTMLCanvasElement.h"
 
 namespace mozilla {
 namespace dom {
@@ -112,6 +113,30 @@ AnonymousContent::RemoveAttributeForElement(const nsAString& aElementId,
   element->RemoveAttribute(aName, aRv);
 }
 
+already_AddRefed<nsISupports>
+AnonymousContent::GetCanvasContext(const nsAString& aElementId,
+                                   const nsAString& aContextId,
+                                   ErrorResult& aRv)
+{
+  Element* element = GetElementById(aElementId);
+
+  if (!element) {
+    aRv.Throw(NS_ERROR_NOT_AVAILABLE);
+    return nullptr;
+  }
+
+  if (!element->IsHTMLElement(nsGkAtoms::canvas)) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsISupports> context;
+
+  HTMLCanvasElement* canvas = static_cast<HTMLCanvasElement*>(element);
+  canvas->GetContext(aContextId, getter_AddRefs(context));
+
+  return context.forget();
+}
+
 Element*
 AnonymousContent::GetElementById(const nsAString& aElementId)
 {
diff --git a/dom/base/AnonymousContent.h b/dom/base/AnonymousContent.h
index 38b50f042437f2..6d6b1e2571cec1 100644
--- a/dom/base/AnonymousContent.h
+++ b/dom/base/AnonymousContent.h
@@ -52,6 +52,10 @@ class AnonymousContent final
                                  const nsAString& aName,
                                  ErrorResult& aRv);
 
+  already_AddRefed<nsISupports> GetCanvasContext(const nsAString& aElementId,
+                                                 const nsAString& aContextId,
+                                                 ErrorResult& aRv);
+
 private:
   ~AnonymousContent();
   Element* GetElementById(const nsAString& aElementId);
diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 1bae9b9a1e833d..c8a642a1522133 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -1760,6 +1760,23 @@ Element::UnbindFromTree(bool aDeep, bool aNullParent)
     }
     SetParentIsContent(false);
   }
+
+  // Ensure that CSS transitions don't continue on an element at a
+  // different place in the tree (even if reinserted before next
+  // animation refresh).
+  // We need to delete the properties while we're still in document
+  // (if we were in document).
+  // FIXME (Bug 522599): Need a test for this.
+  //XXXsmaug this looks slow.
+  if (HasFlag(NODE_HAS_PROPERTIES)) {
+    DeleteProperty(nsGkAtoms::transitionsOfBeforeProperty);
+    DeleteProperty(nsGkAtoms::transitionsOfAfterProperty);
+    DeleteProperty(nsGkAtoms::transitionsProperty);
+    DeleteProperty(nsGkAtoms::animationsOfBeforeProperty);
+    DeleteProperty(nsGkAtoms::animationsOfAfterProperty);
+    DeleteProperty(nsGkAtoms::animationsProperty);
+  }
+
   ClearInDocument();
 
   // Editable descendant count only counts descendants that
@@ -1794,19 +1811,6 @@ Element::UnbindFromTree(bool aDeep, bool aNullParent)
     }
   }
 
-  // Ensure that CSS transitions don't continue on an element at a
-  // different place in the tree (even if reinserted before next
-  // animation refresh).
-  // FIXME (Bug 522599): Need a test for this.
-  if (HasFlag(NODE_HAS_PROPERTIES)) {
-    DeleteProperty(nsGkAtoms::transitionsOfBeforeProperty);
-    DeleteProperty(nsGkAtoms::transitionsOfAfterProperty);
-    DeleteProperty(nsGkAtoms::transitionsProperty);
-    DeleteProperty(nsGkAtoms::animationsOfBeforeProperty);
-    DeleteProperty(nsGkAtoms::animationsOfAfterProperty);
-    DeleteProperty(nsGkAtoms::animationsProperty);
-  }
-
   // Unset this since that's what the old code effectively did.
   UnsetFlags(NODE_FORCE_XBL_BINDINGS);
   bool clearBindingParent = true;
diff --git a/dom/base/EventSource.cpp b/dom/base/EventSource.cpp
index 4cf93eb5490b27..f287e74e5b8dc8 100644
--- a/dom/base/EventSource.cpp
+++ b/dom/base/EventSource.cpp
@@ -1051,7 +1051,7 @@ EventSource::DispatchCurrentMessageEvent()
     message->mLastEventID.Assign(mLastEventID);
   }
 
-  int32_t sizeBefore = mMessagesToDispatch.GetSize();
+  size_t sizeBefore = mMessagesToDispatch.GetSize();
   mMessagesToDispatch.Push(message.forget());
   NS_ENSURE_TRUE(mMessagesToDispatch.GetSize() == sizeBefore + 1,
                  NS_ERROR_OUT_OF_MEMORY);
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
index 0315beee905feb..fe1e0691e29dd0 100644
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -2592,37 +2592,6 @@ Navigator::HasMobileIdSupport(JSContext* aCx, JSObject* aGlobal)
 }
 #endif
 
-/* static */
-bool
-Navigator::HasTVSupport(JSContext* aCx, JSObject* aGlobal)
-{
-  JS::Rooted<JSObject*> global(aCx, aGlobal);
-
-  nsCOMPtr<nsPIDOMWindow> win = GetWindowFromGlobal(global);
-  if (!win) {
-    return false;
-  }
-
-  // Just for testing, we can enable TV for any kind of app.
-  if (Preferences::GetBool("dom.testing.tv_enabled_for_hosted_apps", false)) {
-    return true;
-  }
-
-  nsIDocument* doc = win->GetExtantDoc();
-  if (!doc || !doc->NodePrincipal()) {
-    return false;
-  }
-
-  nsIPrincipal* principal = doc->NodePrincipal();
-  uint16_t status;
-  if (NS_FAILED(principal->GetAppStatus(&status))) {
-    return false;
-  }
-
-  // Only support TV Manager API for certified apps for now.
-  return status == nsIPrincipal::APP_STATUS_CERTIFIED;
-}
-
 /* static */
 bool
 Navigator::HasPresentationSupport(JSContext* aCx, JSObject* aGlobal)
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
index b6c592f1f23cb6..ff5f3d8d9bfaee 100644
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -333,8 +333,6 @@ class Navigator final : public nsIDOMNavigator
   static bool HasMobileIdSupport(JSContext* aCx, JSObject* aGlobal);
 #endif
 
-  static bool HasTVSupport(JSContext* aCx, JSObject* aGlobal);
-
   static bool HasPresentationSupport(JSContext* aCx, JSObject* aGlobal);
 
   static bool IsE10sEnabled(JSContext* aCx, JSObject* aGlobal);
diff --git a/dom/base/URLSearchParams.cpp b/dom/base/URLSearchParams.cpp
index f20d2de573637e..d9f3132b5f4959 100644
--- a/dom/base/URLSearchParams.cpp
+++ b/dom/base/URLSearchParams.cpp
@@ -253,8 +253,9 @@ namespace {
 void SerializeString(const nsCString& aInput, nsAString& aValue)
 {
   const unsigned char* p = (const unsigned char*) aInput.get();
+  const unsigned char* end = p + aInput.Length();
 
-  while (p && *p) {
+  while (p != end) {
     // ' ' to '+'
     if (*p == 0x20) {
       aValue.Append(0x2B);
@@ -314,7 +315,7 @@ URLSearchParams::URLSearchParams(nsISupports* aParent,
                                  const URLSearchParams& aOther)
   : mParams(new URLParams(*aOther.mParams.get()))
   , mParent(aParent)
-  , mObserver(aOther.mObserver)
+  , mObserver(nullptr)
 {
 }
 
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 15379bb34c1e6c..def4edbf774c67 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3703,7 +3703,9 @@ void
 nsPIDOMWindow::RefreshMediaElements()
 {
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  service->RefreshAgentsVolume(GetOuterWindow());
+  if (service) {
+    service->RefreshAgentsVolume(GetOuterWindow());
+  }
 }
 
 bool
@@ -3721,7 +3723,9 @@ nsPIDOMWindow::SetAudioCapture(bool aCapture)
   mAudioCaptured = aCapture;
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  service->RefreshAgentsCapture(GetOuterWindow(), mWindowID);
+  if (service) {
+    service->RefreshAgentsCapture(GetOuterWindow(), mWindowID);
+  }
 
   return NS_OK;
 }
diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
index 7ce88c2c6e5b6a..92ab63868a9ad5 100644
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -2809,11 +2809,15 @@ class nsIDocument : public nsINode
   // True iff we've ever fired a DOMTitleChanged event for this document
   bool mHaveFiredTitleChange : 1;
 
-  // True iff IsShowing() should be returning true
+  // State for IsShowing(). mIsShowing starts off false. It becomes true when
+  // OnPageShow happens and becomes false when OnPageHide happens. So it's false
+  // before the initial load completes and when we're in bfcache or unloaded,
+  // true otherwise.
   bool mIsShowing : 1;
 
-  // True iff the document "page" is not hidden (i.e. currently in the
-  // bfcache)
+  // State for IsVisible(). mVisible starts off true. It becomes false when
+  // OnPageHide happens, and becomes true again when OnPageShow happens.  So
+  // it's false only when we're in bfcache or unloaded.
   bool mVisible : 1;
 
   // True if our content viewer has been removed from the docshell
diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
index caff335fb39704..f794134546e59c 100644
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@@ -259,6 +259,8 @@ support-files =
 
 [test_anonymousContent_api.html]
 [test_anonymousContent_append_after_reflow.html]
+[test_anonymousContent_canvas.html]
+skip-if = buildapp == 'b2g' # Requires webgl support
 [test_anonymousContent_insert.html]
 [test_anonymousContent_manipulate_content.html]
 [test_anonymousContent_style_csp.html]
@@ -372,7 +374,6 @@ skip-if = toolkit != 'gonk'
 [test_XHRDocURI.html]
 [test_XHRResponseURL.html]
 [test_XHRSendData.html]
-skip-if = buildapp == 'b2g' || e10s # b2g(seems to stall) b2g-debug(seems to stall) b2g-desktop(seems to stall) e10s(Bug 1220304 - Creates a file)
 [test_XHR_anon.html]
 [test_XHR_header.html]
 [test_XHR_onuploadprogress.html]
@@ -794,7 +795,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM
 [test_w3element_traversal.xhtml]
 [test_w3element_traversal_svg.html]
 [test_websocket.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
+skip-if = buildapp == 'b2g' || toolkit == 'android' # TC: Bug 1144079 - Re-enable Mulet mochitests and reftests taskcluster-specific disables.
 [test_websocket_basic.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android'
 [test_websocket_hello.html]
diff --git a/dom/base/test/test_XHRSendData.html b/dom/base/test/test_XHRSendData.html
index 05e0b4f49c2ee5..c210efc9c47d4c 100644
--- a/dom/base/test/test_XHRSendData.html
+++ b/dom/base/test/test_XHRSendData.html
@@ -5,27 +5,48 @@
 -->
 <head>
   <title>XMLHttpRequest send data and headers</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="gen.next();">
+<body onload="createFiles();">
 <a target="_blank"
    href="https://bugzilla.mozilla.org/show_bug.cgi?id=464848">Mozilla Bug 464848</a>
 <p id="display">
-  <input id="fileList" type="file"></input>
 </p>
 <div id="content" style="display: none">
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="application/javascript;version=1.8">
 SimpleTest.waitForExplicitFinish();
 
+var testData = "blahblahblahblahblahblahblaaaaaaaah. blah.";
+var extensions = [".txt",".png",".jpg",".gif",".xml", "noext"];
+var fileTypes = ["text/plain", "image/png", "image/jpeg", "image/gif", "text/xml", null];
 var gen = runTests();
+var testDOMFiles;
+
+function createFiles() {
+  var filesToCreate = new Array();
+  extensions.forEach(function (extension) {
+    filesToCreate.push({name: "testfile" + extension, data: testData});
+  });
+  SpecialPowers.createFiles(filesToCreate,
+                            function (files) {
+                              testDOMFiles = files;
+                              gen.next();
+                            },
+                            function (msg) {
+                              testDOMFiles = new Array;
+                              ok(false, "File creation error: " + msg);
+                              gen.next();
+                            });
+};
+
+
 function continueTest() { gen.next(); }
 
 function runTests() {
-
 xhr = new XMLHttpRequest();
 xhr.open("GET", "file_XHRSendData_doc.xml", false);
 xhr.send();
@@ -38,12 +59,6 @@
 testDoc2.documentElement.appendChild(testDoc2.createTextNode("text"));
 is(testDoc2.inputEncoding, "UTF-8", "wrong encoding");
 
-var testData = "blahblahblahblahblahblahblaaaaaaaah. blah.";
-var extensions = [".txt",".png",".jpg",".gif",".xml", "noext"];
-var fileTypes = ["text/plain", "image/png", "image/jpeg", "image/gif", "text/xml", null];
-var testFiles = new Array;
-var testDOMFiles = new Array;
-
 // arraybuffer test objects
 var shortArray = new ArrayBuffer(1);
 var shortInt8View = new Uint8Array(shortArray);
@@ -64,28 +79,6 @@
 var longInt8View1 = new Int8Array(longArraySlice)
 var longInt8View2 = new Int8Array(longArray, 256, 128)
 
-extensions.forEach(
-    function (extension) {
-      var testFile = createFileWithDataExt(testData, extension);
-      testFiles.push(testFile);
-
-      var fileList = document.getElementById('fileList');
-      SpecialPowers.wrap(fileList).value = testFile.path;
-      testDOMFiles.push(fileList.files[0]);
-    }
-);
-
-function createFileWithDataExt(fileData, extension) {
-  var testFile = SpecialPowers.Services.dirsvc.get("ProfD", SpecialPowers.Ci.nsIFile);
-  testFile.append("testfile" + extension);
-  var outStream = SpecialPowers.Cc["@mozilla.org/network/file-output-stream;1"].createInstance(SpecialPowers.Ci.nsIFileOutputStream);
-  outStream.init(testFile, 0x02 | 0x08 | 0x20, 0666, 0);
-  outStream.write(fileData, fileData.length);
-  outStream.close();
-
-  return testFile;
-}
-
 tests = [{ body: null,
            resBody: "",
          },
@@ -253,19 +246,7 @@
                                   "Wrong page for redirect");
     }
   }
-}
-finally {
-  cleanUpData();
-}
-
-function cleanUpData() {
-  testFiles.forEach(
-      function (testFile) {
-        try {
-          testFile.remove(false);
-        } catch (e) {}
-      }
-  );
+} catch (e) {
 }
 
 function is_identical_arraybuffer(ab1, ab2) {
diff --git a/dom/base/test/test_anonymousContent_api.html b/dom/base/test/test_anonymousContent_api.html
index 7f5423c275c054..bcb2b28770053e 100644
--- a/dom/base/test/test_anonymousContent_api.html
+++ b/dom/base/test/test_anonymousContent_api.html
@@ -45,7 +45,7 @@
 
   let members = ["getTextContentForElement", "setTextContentForElement",
                  "getAttributeForElement", "setAttributeForElement",
-                 "removeAttributeForElement"];
+                 "removeAttributeForElement", "getCanvasContext"];
   for (let member of members) {
     ok(member in anonymousContent, "AnonymousContent object defines " + member);
   }
diff --git a/dom/base/test/test_anonymousContent_canvas.html b/dom/base/test/test_anonymousContent_canvas.html
new file mode 100644
index 00000000000000..9ee1eca200c042
--- /dev/null
+++ b/dom/base/test/test_anonymousContent_canvas.html
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=1212477
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 1212477 - Needs a way to access to &lt;canvas&gt;'s context (2d, webgl) from Anonymous Content API</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=1212477">Mozilla Bug 1212477</a>
+  <div>
+    <div id="id" class="test">text content</div>
+    <canvas id="canvas2d"></canvas>
+    <canvas id="canvas-webgl"></canvas>
+    <canvas id="canvas-foo"></canvas>
+  </div>
+  <script type="application/javascript;version=1.8">
+    let chromeDocument = SpecialPowers.wrap(document);
+    let testElement = document.querySelector("div");
+
+    let anonymousContent = chromeDocument.insertAnonymousContent(testElement);
+
+    is(anonymousContent.getCanvasContext("id", "2d"), null,
+        "Context is null for non-canvas elements");
+
+    let context2d = anonymousContent.getCanvasContext("canvas2d", "2d");
+
+    is(context2d.toString(), "[object CanvasRenderingContext2D]",
+        "2D Context is returned properly");
+
+    is(context2d.canvas, null,
+        "context's canvas property is null in anonymous content");
+
+    is (anonymousContent.getCanvasContext("canvas-foo", "foo"), null,
+        "Context is null for unknown context type");
+
+    SimpleTest.doesThrow(
+      () => anonymousContent.getCanvasContext("foo", "2d"),
+      "NS_ERROR_NOT_AVAILABLE",
+      "Get a context using unexisting id should throw"
+    );
+
+    let webgl = anonymousContent.getCanvasContext("canvas-webgl", "webgl");
+
+    is(webgl.toString(), "[object WebGLRenderingContext]",
+        "WebGL Context is returned properly");
+
+    is(webgl.canvas, null,
+        "WebGL context's canvas property is null in anonymous content");
+
+    chromeDocument.removeAnonymousContent(anonymousContent);
+  </script>
+</body>
+</html>
diff --git a/dom/base/test/test_urlSearchParams.html b/dom/base/test/test_urlSearchParams.html
index c42a00ad9feae7..a3036f8076bf9b 100644
--- a/dom/base/test/test_urlSearchParams.html
+++ b/dom/base/test/test_urlSearchParams.html
@@ -289,6 +289,31 @@
     runTest();
   }
 
+  function testZeroHandling() {
+    var u = new URLSearchParams;
+    u.set("a", "b\0c");
+    u.set("d\0e", "f");
+    u.set("g\0h", "i\0j");
+    is(u.toString(), "a=b%00c&d%00e=f&g%00h=i%00j",
+       "Should encode U+0000 as %00");
+
+    runTest();
+  }
+
+  function testCopyConstructor() {
+    var url = new URL("http://example.com/");
+    var p = url.searchParams;
+    var q = new URLSearchParams(p);
+    q.set("a", "b");
+    is(url.href, "http://example.com/",
+       "Messing with copy of URLSearchParams should not affect URL");
+    p.set("c", "d");
+    is(url.href, "http://example.com/?c=d",
+       "Messing with URLSearchParams should affect URL");
+
+    runTest();
+  }
+
   var tests = [
     testSimpleURLSearchParams,
     testCopyURLSearchParams,
@@ -301,7 +326,9 @@
     testDelete,
     testGetNULL,
     testSet,
-    testIterable
+    testIterable,
+    testZeroHandling,
+    testCopyConstructor,
   ];
 
   function runTest() {
diff --git a/dom/base/test/test_websocket.html b/dom/base/test/test_websocket.html
index a09cc7db6fbcf3..7e572d238084ce 100644
--- a/dom/base/test/test_websocket.html
+++ b/dom/base/test/test_websocket.html
@@ -9,7 +9,6 @@
 <body onload="testWebSocket()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=472529">Mozilla Bug </a>
 <p id="display">
-  <input id="fileList" type="file"></input>
 </p>
 <div id="content">
 </div>
@@ -66,8 +65,8 @@
  * 41. HSTS
  * 42. non-char utf-8 sequences
  * 43. Test setting binaryType attribute
- * 44. Test sending/receving binary ArrayBuffer 
- * 45. Test sending/receving binary Blob 
+ * 44. Test sending/receving binary ArrayBuffer
+ * 45. Test sending/receving binary Blob
  * 46. Test that we don't dispatch incoming msgs once in CLOSING state
  * 47. Make sure onerror/onclose aren't called during close()
  */
@@ -77,13 +76,13 @@
 
 
 // Set this to >1 if you want to run the suite multiple times to probe for
-// random orange failures. 
+// random orange failures.
 // - Do NOT check into mozilla-central with a value != 1.
 // - Too large a count will wind up causing tryserver to timeout the test (which
 //   is ok, but means all testruns will be orange).  If I set first_test to >22
 //   (i.e don't run any of the tests that require waiting) I can get ~250-300
 //   iterations of the remaining tests w/o a timeout.
-var testsuite_iterations = 1;   
+var testsuite_iterations = 1;
 
 
 var current_test = first_test;
@@ -113,7 +112,7 @@
       extendedErrorInfo += (i + ": " + e[i] + "\n");
     }
   }
-  
+
   // FIXME: see bug 578276. This should be a test failure, but it's too flaky on the tbox.
   ok(true, "onclose shouldn't be called on test " + ws._testNumber + "!" + extendedErrorInfo);
 }
@@ -191,7 +190,7 @@
   }
 
   if (testsuite_iteration > 1) {
-    $("feedback").innerHTML = "test suite iteration #" + testsuite_iteration + " of " + testsuite_iterations + 
+    $("feedback").innerHTML = "test suite iteration #" + testsuite_iteration + " of " + testsuite_iterations +
       ": executing test: " + number + " of " + last_test + " tests.";
   } else {
     $("feedback").innerHTML = "executing test: " + number + " of " + last_test + " tests.";
@@ -390,7 +389,7 @@
   {
     shouldCloseCleanly(e);
     // We called close() with no close code: so pywebsocket will also send no
-    // close code, which translates to code 1005 
+    // close code, which translates to code 1005
     ok(e.code == 1005, "test-8 close code has wrong value:" + e.code);
     ok(e.reason == "", "test-8 close reason has wrong value:" + e.reason);
     doTest(9);
@@ -419,7 +418,7 @@
   };
 
   ws.close();
-  
+
   // the server injects a delay, so proceed with this in the background
   doTest(10);
 }
@@ -520,7 +519,7 @@
 
 function test13()
 {
-    // previous versions of this test counted the number of protocol errors returned, but the 
+    // previous versions of this test counted the number of protocol errors returned, but the
     // protocol stack typically closes down after reporting a protocol level error - trying
     // to resync is too dangerous
 
@@ -1110,7 +1109,7 @@
       {
          ok(e.code != 3101, "test 37c custom server code not present");
          ok(e.reason == "", "test 37c custom server reason not present");
-         doTest(38);  
+         doTest(38);
       }
     }
   }
@@ -1152,7 +1151,7 @@
   ws.onclose = function(e)
   {
     ok(true, "test 39 close");
-    ok(status_test39 == "opened", "test 39 did open"); 
+    ok(status_test39 == "opened", "test 39 did open");
     doTest(40);
   };
 }
@@ -1176,7 +1175,7 @@
   ws.onclose = function(e)
   {
     ok(true, "test 40 close");
-    ok(status_test40 == "started", "test 40 did not open"); 
+    ok(status_test40 == "started", "test 40 did not open");
     doTest(41);
   };
 }
@@ -1211,7 +1210,7 @@
 
       // try ws:// again, it should be done over wss:// now due to hsts
       var wsc = CreateTestWS("ws://example.com/tests/dom/base/test/file_websocket", "test-41c");
-   
+
       wsc.onopen = function(e)
       {
         ok(true, "test 41c open");
@@ -1328,35 +1327,21 @@
   {
     ok(ws.readyState == 3, "onclose bad readyState in test-44!");
     shouldCloseCleanly(e);
-    doTest(45);
+    SpecialPowers.createFiles([{name: "testBlobFile", data: "flob"}], function (files) {
+      blobFile = files[0];
+      doTest(45);
+    },
+    function (msg) {
+      testFailed("Failed to create file for test45: " + msg);
+      doTest(46);
+    });
   }
 }
 
-function createDOMFile(fileName, fileData)
-{
-  // create File in profile dir 
-  var dirSvc = SpecialPowers.Cc["@mozilla.org/file/directory_service;1"]
-                         .getService(SpecialPowers.Ci.nsIProperties);
-  var testFile = dirSvc.get("ProfD", SpecialPowers.Ci.nsIFile);
-  testFile.append(fileName);
-  var outStream = SpecialPowers.Cc["@mozilla.org/network/file-output-stream;1"]
-                            .createInstance(SpecialPowers.Ci.nsIFileOutputStream);
-  outStream.init(testFile, 0x02 | 0x08 | 0x20, 0666, 0);
-  outStream.write(fileData, fileData.length);
-  outStream.close();
-
-  // Set filename into DOM <input> field, as if selected by user 
-  var fileList = document.getElementById('fileList');
-  SpecialPowers.wrap(fileList).value = testFile.path;
-
-  // return JS File object, aka Blob
-  return fileList.files[0];
-}
+var blobFile;
 
 function test45()
 {
-  var blobFile = createDOMFile("testBlobFile", "flob");
-
   var ws = CreateTestWS("ws://mochi.test:8888/tests/dom/base/test/file_websocket", "test-45");
   ok(ws.readyState == 0, "bad readyState in test-45!");
 
@@ -1387,7 +1372,7 @@
     var reader = new FileReader();
     reader.onload = function(event)
     {
-      ok(reader.result == "flob", "response should be 'flob': got '" 
+      ok(reader.result == "flob", "response should be 'flob': got '"
          + reader.result + "'");
     };
     reader.onerror = function(event)
@@ -1433,7 +1418,7 @@
 
   ws.onerror = function (e)
   {
-    ok(ws.readyState == 3, "test-47: readyState should be CLOSED(3) in onerror: got " 
+    ok(ws.readyState == 3, "test-47: readyState should be CLOSED(3) in onerror: got "
        + ws.readyState);
     ok(!ws._withinClose, "onerror() called during close()!");
     hasError = true;
@@ -1443,7 +1428,7 @@
   {
     shouldCloseNotCleanly(e);
     ok(hasError, "test-47: should have called onerror before onclose");
-    ok(ws.readyState == 3, "test-47: readyState should be CLOSED(3) in onclose: got " 
+    ok(ws.readyState == 3, "test-47: readyState should be CLOSED(3) in onclose: got "
        + ws.readyState);
     ok(!ws._withinClose, "onclose() called during close()!");
     ok(e.code == 1006, "test-47 close code should be 1006 but is:" + e.code);
diff --git a/dom/base/test/websocket_hybi/mochitest.ini b/dom/base/test/websocket_hybi/mochitest.ini
index 376dd9205da21e..b3ce53452dccf5 100644
--- a/dom/base/test/websocket_hybi/mochitest.ini
+++ b/dom/base/test/websocket_hybi/mochitest.ini
@@ -10,4 +10,4 @@ skip-if = buildapp == 'b2g' || toolkit == 'android'
 [test_send-arraybuffer.html]
 skip-if = buildapp == 'b2g' || toolkit == 'android'
 [test_send-blob.html]
-skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
+skip-if = buildapp == 'b2g' || toolkit == 'android'
diff --git a/dom/base/test/websocket_hybi/test_send-blob.html b/dom/base/test/websocket_hybi/test_send-blob.html
index 0ef94377a0c61e..291883cd7658c0 100644
--- a/dom/base/test/websocket_hybi/test_send-blob.html
+++ b/dom/base/test/websocket_hybi/test_send-blob.html
@@ -7,7 +7,6 @@
 <body>
 
 <p id="display">
-  <input id="fileList" type="file"></input>
 </p>
 <div id="content" style="display: none">
 </div>
@@ -20,74 +19,51 @@
     return target.indexOf(prefix) === 0;
 }
 
-function createDOMFile(fileName, fileData)
-{
-    // create File in profile dir 
-    var dirSvc = SpecialPowers.Cc["@mozilla.org/file/directory_service;1"]
-                         .getService(SpecialPowers.Ci.nsIProperties);
-    var testFile = dirSvc.get("ProfD", SpecialPowers.Ci.nsIFile);
-    testFile.append(fileName);
-    var outStream = SpecialPowers.Cc["@mozilla.org/network/file-output-stream;1"]
-                               .createInstance(SpecialPowers.Ci.nsIFileOutputStream);
-    outStream.init(testFile, 0x02 | 0x08 | 0x20, 0666, 0);
-    if (fileData) {
-        outStream.write(fileData, fileData.length);
-        outStream.close();
-    } 
-
-    // Set filename into DOM <input> field, as if selected by user 
-    var fileList = document.getElementById('fileList');
-    SpecialPowers.wrap(fileList).value = testFile.path;
-
-    // return JS File object, aka Blob
-    return fileList.files[0];
-}
-
-
-function createBlobContainingHelloWorld()
-{
-    return createDOMFile("hellofile", "Hello, world!");
-}
-
-function createEmptyBlob()
-{
-    return createDOMFile("emptyfile");
-}
-
-function createBlobContainingAllDistinctBytes()
+function distinctBytes()
 {
     var array = new Array();
     for (var i = 0; i < 256; ++i)
         array[i] = i;
-    // Concatenates chars into a single binary string 
-    binaryString = String.fromCharCode.apply(null, array);
-    return createDOMFile("allchars", binaryString);
+    // Concatenates chars into a single binary string
+    return String.fromCharCode.apply(null, array);
 }
 
-var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_check-binary-messages");
-var closeEvent;
-
-ws.onopen = function()
-{
-    ws.send(createBlobContainingHelloWorld());
-    ws.send(createEmptyBlob());
-    ws.send(createBlobContainingAllDistinctBytes());
-};
-
-ws.onmessage = function(event)
-{
-    var message = event.data;
-    if (startsWith(message, "PASS"))
-        ok(true, message);
-    else
-        ok(false, message);
-};
-
-ws.onclose = function(event)
-{
+var filesToCreate = [
+  {name: "hellofile", data: "Hello, world!"},
+  {name: "emptyfile"},
+  {name: "allchars", data: distinctBytes()},
+];
+
+SpecialPowers.createFiles(filesToCreate, function (files) {
+  var ws = new WebSocket("ws://mochi.test:8888/tests/dom/base/test/websocket_hybi/file_check-binary-messages");
+  var closeEvent;
+
+  ws.onopen = function()
+  {
+      ws.send(files[0]);
+      ws.send(files[1]);
+      ws.send(files[2]);
+  };
+
+  ws.onmessage = function(event)
+  {
+      var message = event.data;
+      if (startsWith(message, "PASS"))
+          ok(true, message);
+      else
+          ok(false, message);
+  };
+
+  ws.onclose = function(event)
+  {
     ok(event.wasClean, "should have closed cleanly");
     SimpleTest.finish();
-};
+  };
+},
+function (msg) {
+  ok(false, "Failed to create files: " + msg);
+  SimpleTest.finish();
+});
 
 SimpleTest.waitForExplicitFinish();
 
diff --git a/dom/bindings/Errors.msg b/dom/bindings/Errors.msg
index c60d1646236dbf..4d2cf1fc68894d 100644
--- a/dom/bindings/Errors.msg
+++ b/dom/bindings/Errors.msg
@@ -83,3 +83,5 @@ MSG_DEF(MSG_NOTIFICATION_PERMISSION_DENIED, 0, JSEXN_TYPEERR, "Permission to sho
 MSG_DEF(MSG_NOTIFICATION_NO_CONSTRUCTOR_IN_SERVICEWORKER, 0, JSEXN_TYPEERR, "Notification constructor cannot be used in ServiceWorkerGlobalScope. Use registration.showNotification() instead.")
 MSG_DEF(MSG_INVALID_SCOPE, 2, JSEXN_TYPEERR, "Invalid scope trying to resolve {0} with base URL {1}.")
 MSG_DEF(MSG_INVALID_KEYFRAME_OFFSETS, 0, JSEXN_TYPEERR, "Keyframes with specified offsets must be in order and all be in the range [0, 1].")
+MSG_DEF(MSG_SW_INSTALL_ERROR, 2, JSEXN_TYPEERR, "ServiceWorker script at {0} for scope {1} encountered an error during installation.")
+MSG_DEF(MSG_SW_SCRIPT_THREW, 2, JSEXN_TYPEERR, "ServiceWorker script at {0} for scope {1} threw an exception during script evaluation.")
diff --git a/dom/browser-element/BrowserElementAudioChannel.cpp b/dom/browser-element/BrowserElementAudioChannel.cpp
index 854ad81c50d8a4..2349efb6c0ad8b 100644
--- a/dom/browser-element/BrowserElementAudioChannel.cpp
+++ b/dom/browser-element/BrowserElementAudioChannel.cpp
@@ -203,7 +203,9 @@ class BaseRunnable : public nsRunnable
   NS_IMETHODIMP Run() override
   {
     RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-    MOZ_ASSERT(service);
+    if (!service) {
+      return NS_OK;
+    }
 
     AutoJSAPI jsapi;
     if (!jsapi.Init(mParentWindow)) {
@@ -400,9 +402,9 @@ BrowserElementAudioChannel::SetVolume(float aVolume, ErrorResult& aRv)
   }
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  MOZ_ASSERT(service);
-
-  service->SetAudioChannelVolume(mFrameWindow, mAudioChannel, aVolume);
+  if (service) {
+    service->SetAudioChannelVolume(mFrameWindow, mAudioChannel, aVolume);
+  }
 
   RefPtr<DOMRequest> domRequest = new DOMRequest(GetOwner());
   nsCOMPtr<nsIRunnable> runnable = new FireSuccessRunnable(GetOwner(),
@@ -459,9 +461,9 @@ BrowserElementAudioChannel::SetMuted(bool aMuted, ErrorResult& aRv)
   }
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  MOZ_ASSERT(service);
-
-  service->SetAudioChannelMuted(mFrameWindow, mAudioChannel, aMuted);
+  if (service) {
+    service->SetAudioChannelMuted(mFrameWindow, mAudioChannel, aMuted);
+  }
 
   RefPtr<DOMRequest> domRequest = new DOMRequest(GetOwner());
   nsCOMPtr<nsIRunnable> runnable = new FireSuccessRunnable(GetOwner(),
diff --git a/dom/canvas/CanvasRenderingContext2D.h b/dom/canvas/CanvasRenderingContext2D.h
index 9264e356a8e4b5..d2782b594d3493 100644
--- a/dom/canvas/CanvasRenderingContext2D.h
+++ b/dom/canvas/CanvasRenderingContext2D.h
@@ -71,6 +71,10 @@ class CanvasRenderingContext2D final :
 
   HTMLCanvasElement* GetCanvas() const
   {
+    if (mCanvasElement->IsInNativeAnonymousSubtree()) {
+      return nullptr;
+    }
+
     // corresponds to changes to the old bindings made in bug 745025
     return mCanvasElement->GetOriginalCanvas();
   }
diff --git a/dom/canvas/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp
index 7a712f62392697..958a7bce24ee89 100644
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -1235,7 +1235,12 @@ WebGLContext::GetCanvas(Nullable<dom::OwningHTMLCanvasElementOrOffscreenCanvas>&
 {
     if (mCanvasElement) {
         MOZ_RELEASE_ASSERT(!mOffscreenCanvas);
-        retval.SetValue().SetAsHTMLCanvasElement() = mCanvasElement;
+
+        if (mCanvasElement->IsInNativeAnonymousSubtree()) {
+          retval.SetNull();
+        } else {
+          retval.SetValue().SetAsHTMLCanvasElement() = mCanvasElement;
+        }
     } else if (mOffscreenCanvas) {
         retval.SetValue().SetAsOffscreenCanvas() = mOffscreenCanvas;
     } else {
diff --git a/dom/contacts/tests/contacts_chromescript.js b/dom/contacts/tests/contacts_chromescript.js
new file mode 100644
index 00000000000000..be4dea9069448b
--- /dev/null
+++ b/dom/contacts/tests/contacts_chromescript.js
@@ -0,0 +1,2 @@
+// Ensure the contacts service is running in the parent.
+Components.utils.import("resource://gre/modules/ContactService.jsm");
diff --git a/dom/contacts/tests/mochitest.ini b/dom/contacts/tests/mochitest.ini
index a894f9a84165e1..3f39d064e50ac5 100644
--- a/dom/contacts/tests/mochitest.ini
+++ b/dom/contacts/tests/mochitest.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
-skip-if = e10s
-support-files = shared.js
+support-files = shared.js contacts_chromescript.js
 
 [test_contacts_basics.html]
 skip-if = (toolkit == 'gonk' && debug) #debug-only failure
diff --git a/dom/contacts/tests/shared.js b/dom/contacts/tests/shared.js
index 00a6110b00afef..b049c060c2223a 100644
--- a/dom/contacts/tests/shared.js
+++ b/dom/contacts/tests/shared.js
@@ -3,6 +3,8 @@
 // Fix the environment to run Contacts tests
 if (SpecialPowers.isMainProcess()) {
   SpecialPowers.Cu.import("resource://gre/modules/ContactService.jsm");
+} else {
+  SpecialPowers.loadChromeScript(SimpleTest.getTestFileURL('contacts_chromescript.js'));
 }
 
 // Some helpful global vars
diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp
index 8f22b38e9a096a..8fd2a47a9a6440 100644
--- a/dom/events/IMEStateManager.cpp
+++ b/dom/events/IMEStateManager.cpp
@@ -162,7 +162,7 @@ GetNotifyIMEMessageName(IMEMessage aMessage)
 
 StaticRefPtr<nsIContent> IMEStateManager::sContent;
 nsPresContext* IMEStateManager::sPresContext = nullptr;
-StaticRefPtr<nsIWidget> IMEStateManager::sFocusedIMEWidget;
+nsIWidget* IMEStateManager::sFocusedIMEWidget;
 StaticRefPtr<TabParent> IMEStateManager::sActiveTabParent;
 StaticRefPtr<IMEContentObserver> IMEStateManager::sActiveIMEContentObserver;
 TextCompositionArray* IMEStateManager::sTextCompositions = nullptr;
@@ -217,6 +217,15 @@ IMEStateManager::OnTabParentDestroying(TabParent* aTabParent)
   //       disable IME.
 }
 
+// static
+void
+IMEStateManager::WidgetDestroyed(nsIWidget* aWidget)
+{
+  if (sFocusedIMEWidget == aWidget) {
+    sFocusedIMEWidget = nullptr;
+  }
+}
+
 // static
 void
 IMEStateManager::StopIMEStateManagement()
@@ -1316,7 +1325,7 @@ IMEStateManager::NotifyIME(const IMENotification& aNotification,
      "aWidget=0x%p, aOriginIsRemote=%s), sFocusedIMEWidget=0x%p, "
      "sRemoteHasFocus=%s",
      GetNotifyIMEMessageName(aNotification.mMessage), aWidget,
-     GetBoolName(aOriginIsRemote), sFocusedIMEWidget.get(),
+     GetBoolName(aOriginIsRemote), sFocusedIMEWidget,
      GetBoolName(sRemoteHasFocus)));
 
   if (NS_WARN_IF(!aWidget)) {
diff --git a/dom/events/IMEStateManager.h b/dom/events/IMEStateManager.h
index 04baa90e6baa5e..eee1f0785b86e7 100644
--- a/dom/events/IMEStateManager.h
+++ b/dom/events/IMEStateManager.h
@@ -64,6 +64,11 @@ class IMEStateManager
    */
   static void OnTabParentDestroying(TabParent* aTabParent);
 
+  /**
+   * Called when aWidget is being deleted.
+   */
+  static void WidgetDestroyed(nsIWidget* aWidget);
+
   /**
    * SetIMEContextForChildProcess() is called when aTabParent receives
    * SetInputContext() from the remote process.
@@ -225,7 +230,7 @@ class IMEStateManager
 
   static StaticRefPtr<nsIContent> sContent;
   static nsPresContext* sPresContext;
-  static StaticRefPtr<nsIWidget> sFocusedIMEWidget;
+  static nsIWidget* sFocusedIMEWidget;
   static StaticRefPtr<TabParent> sActiveTabParent;
   // sActiveIMEContentObserver points to the currently active
   // IMEContentObserver.  This is null if there is no focused editor.
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index efcb3f1c56715e..cd7ba73b94d0ca 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -2773,7 +2773,9 @@ nsresult HTMLMediaElement::InitializeDecoderAsClone(MediaDecoder* aOriginal)
 
   decoder->SetMediaSeekable(aOriginal->IsMediaSeekable());
 
-  RefPtr<MediaResource> resource = originalResource->CloneData(decoder);
+  RefPtr<MediaResource> resource =
+    originalResource->CloneData(decoder->GetResourceCallback());
+
   if (!resource) {
     LOG(LogLevel::Debug, ("%p Failed to cloned stream for decoder %p", this, decoder.get()));
     return NS_ERROR_FAILURE;
@@ -2805,7 +2807,9 @@ nsresult HTMLMediaElement::InitializeDecoderForChannel(nsIChannel* aChannel,
 
   LOG(LogLevel::Debug, ("%p Created decoder %p for type %s", this, decoder.get(), mimeType.get()));
 
-  RefPtr<MediaResource> resource = MediaResource::Create(decoder, aChannel);
+  RefPtr<MediaResource> resource =
+    MediaResource::Create(decoder->GetResourceCallback(), aChannel);
+
   if (!resource)
     return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/dom/interfaces/base/nsIServiceWorkerManager.idl b/dom/interfaces/base/nsIServiceWorkerManager.idl
index 33f5e6637d3c8b..c76fe71a623d1b 100644
--- a/dom/interfaces/base/nsIServiceWorkerManager.idl
+++ b/dom/interfaces/base/nsIServiceWorkerManager.idl
@@ -59,7 +59,7 @@ interface nsIServiceWorkerManagerListener : nsISupports
   void onUnregister(in nsIServiceWorkerRegistrationInfo aInfo);
 };
 
-[scriptable, builtinclass, uuid(2f61820a-1e9a-4c16-bf1c-ce182c5f5d6d)]
+[scriptable, builtinclass, uuid(c945e2e6-30c2-48e6-a282-e69de0c7ebb1)]
 interface nsIServiceWorkerManager : nsISupports
 {
   /**
@@ -174,6 +174,8 @@ interface nsIServiceWorkerManager : nsISupports
   void addListener(in nsIServiceWorkerManagerListener aListener);
 
   void removeListener(in nsIServiceWorkerManagerListener aListener);
+
+  bool shouldReportToWindow(in nsIDOMWindow aWindow, in ACString aScope);
 };
 
 %{ C++
diff --git a/dom/ipc/ProcessPriorityManager.cpp b/dom/ipc/ProcessPriorityManager.cpp
index 41b1f5906bfef1..5811be9234a7ae 100644
--- a/dom/ipc/ProcessPriorityManager.cpp
+++ b/dom/ipc/ProcessPriorityManager.cpp
@@ -1108,7 +1108,7 @@ ParticularProcessPriorityManager::ComputePriority()
   }
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  if (service->ProcessContentOrNormalChannelIsActive(ChildID())) {
+  if (service && service->ProcessContentOrNormalChannelIsActive(ChildID())) {
     return PROCESS_PRIORITY_BACKGROUND_PERCEIVABLE;
   }
 
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 8b1b216799ef16..b921773be1a4c0 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -833,6 +833,7 @@ TabChild::NotifyTabContextUpdated()
         } else {
           docShell->SetIsApp(OwnAppId());
         }
+        docShell->SetIsSignedPackage(OriginAttributesRef().mSignedPkg);
     }
 }
 
diff --git a/dom/media/AudioStream.cpp b/dom/media/AudioStream.cpp
index 2277b37b5cd581..93cf584d1be206 100644
--- a/dom/media/AudioStream.cpp
+++ b/dom/media/AudioStream.cpp
@@ -25,7 +25,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-PRLogModuleInfo* gAudioStreamLog = nullptr;
+LazyLogModule gAudioStreamLog("AudioStream");
 // For simple logs
 #define LOG(x) MOZ_LOG(gAudioStreamLog, mozilla::LogLevel::Debug, x)
 
diff --git a/dom/media/CubebUtils.cpp b/dom/media/CubebUtils.cpp
index 59e03ac10223eb..d9cfcc19dcf52d 100644
--- a/dom/media/CubebUtils.cpp
+++ b/dom/media/CubebUtils.cpp
@@ -40,7 +40,7 @@ uint32_t sPreferredSampleRate;
 
 } // namespace
 
-extern PRLogModuleInfo* gAudioStreamLog;
+extern LazyLogModule gAudioStreamLog;
 
 static const uint32_t CUBEB_NORMAL_LATENCY_MS = 100;
 
@@ -126,7 +126,6 @@ bool CubebLatencyPrefSet()
 
 void InitLibrary()
 {
-  gAudioStreamLog = PR_NewLogModule("AudioStream");
   PrefChanged(PREF_VOLUME_SCALE, nullptr);
   Preferences::RegisterCallback(PrefChanged, PREF_VOLUME_SCALE);
   PrefChanged(PREF_CUBEB_LATENCY, nullptr);
diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp
index 08a700927cd267..ca4e9ea5387236 100644
--- a/dom/media/DOMMediaStream.cpp
+++ b/dom/media/DOMMediaStream.cpp
@@ -27,13 +27,13 @@
 #undef LOG
 #endif
 
-static PRLogModuleInfo* gMediaStreamLog;
-#define LOG(type, msg) MOZ_LOG(gMediaStreamLog, type, msg)
-
 using namespace mozilla;
 using namespace mozilla::dom;
 using namespace mozilla::layers;
 
+static LazyLogModule gMediaStreamLog("MediaStream");
+#define LOG(type, msg) MOZ_LOG(gMediaStreamLog, type, msg)
+
 const TrackID TRACK_VIDEO_PRIMARY = 1;
 
 
@@ -318,10 +318,6 @@ DOMMediaStream::DOMMediaStream()
   nsCOMPtr<nsIUUIDGenerator> uuidgen =
     do_GetService("@mozilla.org/uuid-generator;1", &rv);
 
-  if (!gMediaStreamLog) {
-    gMediaStreamLog = PR_NewLogModule("MediaStream");
-  }
-
   if (NS_SUCCEEDED(rv) && uuidgen) {
     nsID uuid;
     memset(&uuid, 0, sizeof(uuid));
diff --git a/dom/media/FileBlockCache.h b/dom/media/FileBlockCache.h
index 026c5fe943cde9..e16fa7592fa00e 100644
--- a/dom/media/FileBlockCache.h
+++ b/dom/media/FileBlockCache.h
@@ -136,7 +136,7 @@ class FileBlockCache : public nsRunnable {
     }
 
     bool Contains(int32_t aValue) {
-      for (int32_t i = 0; i < GetSize(); ++i) {
+      for (size_t i = 0; i < GetSize(); ++i) {
         if (ObjectAt(i) == aValue) {
           return true;
         }
@@ -149,7 +149,7 @@ class FileBlockCache : public nsRunnable {
     }
 
   private:
-    int32_t ObjectAt(int32_t aIndex) {
+    int32_t ObjectAt(size_t aIndex) {
       void* v = nsDeque::ObjectAt(aIndex);
       return reinterpret_cast<uintptr_t>(v);
     }
diff --git a/dom/media/GraphDriver.cpp b/dom/media/GraphDriver.cpp
index 4479ca5129a68d..e3cdacad5bb080 100644
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -10,7 +10,7 @@
 #include <sys/sysctl.h>
 #endif
 
-extern PRLogModuleInfo* gMediaStreamGraphLog;
+extern mozilla::LazyLogModule gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 // We don't use NSPR log here because we want this interleaved with adb logcat
diff --git a/dom/media/Latency.cpp b/dom/media/Latency.cpp
index 870bc99c98a532..d3400777ad0f24 100644
--- a/dom/media/Latency.cpp
+++ b/dom/media/Latency.cpp
@@ -37,17 +37,13 @@ const char* LatencyLogIndex2Strings[] = {
 
 static StaticRefPtr<AsyncLatencyLogger> gAsyncLogger;
 
-PRLogModuleInfo*
+LogModule*
 GetLatencyLog()
 {
-  static PRLogModuleInfo* sLog;
-  if (!sLog) {
-    sLog = PR_NewLogModule("MediaLatency");
-  }
+  static LazyLogModule sLog("MediaLatency");
   return sLog;
 }
 
-
 class LogEvent : public nsRunnable
 {
 public:
@@ -111,6 +107,8 @@ void LogLatency(uint32_t aIndex, uint64_t aID, int64_t aValue)
 void AsyncLatencyLogger::InitializeStatics()
 {
   NS_ASSERTION(NS_IsMainThread(), "Main thread only");
+
+  //Make sure that the underlying logger is allocated.
   GetLatencyLog();
   gAsyncLogger = new AsyncLatencyLogger();
 }
diff --git a/dom/media/Latency.h b/dom/media/Latency.h
index e7a83d78b8cf43..b86ee7b54b21a6 100644
--- a/dom/media/Latency.h
+++ b/dom/media/Latency.h
@@ -17,7 +17,7 @@
 
 class AsyncLatencyLogger;
 
-PRLogModuleInfo* GetLatencyLog();
+mozilla::LogModule* GetLatencyLog();
 
 // This class is a singleton. It is refcounted.
 class AsyncLatencyLogger : public nsIObserver
diff --git a/dom/media/MP3Demuxer.cpp b/dom/media/MP3Demuxer.cpp
index d3a9c4dcfd784b..f7ce9ae7011cda 100644
--- a/dom/media/MP3Demuxer.cpp
+++ b/dom/media/MP3Demuxer.cpp
@@ -16,7 +16,7 @@
 #include "prenv.h"
 
 #ifdef PR_LOGGING
-PRLogModuleInfo* gMP3DemuxerLog;
+mozilla::LazyLogModule gMP3DemuxerLog("MP3Demuxer");
 #define MP3LOG(msg, ...) \
   MOZ_LOG(gMP3DemuxerLog, LogLevel::Debug, ("MP3Demuxer " msg, ##__VA_ARGS__))
 #define MP3LOGV(msg, ...) \
@@ -112,12 +112,6 @@ MP3TrackDemuxer::MP3TrackDemuxer(MediaResource* aSource)
   , mChannels(0)
 {
   Reset();
-
-#ifdef PR_LOGGING
-  if (!gMP3DemuxerLog) {
-    gMP3DemuxerLog = PR_NewLogModule("MP3Demuxer");
-  }
-#endif
 }
 
 bool
diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp
index da69a7e00f66df..ce39cce3d91cfa 100644
--- a/dom/media/MediaCache.cpp
+++ b/dom/media/MediaCache.cpp
@@ -24,7 +24,7 @@
 
 namespace mozilla {
 
-PRLogModuleInfo* gMediaCacheLog;
+LazyLogModule gMediaCacheLog("MediaCache");
 #define CACHE_LOG(type, msg) MOZ_LOG(gMediaCacheLog, type, msg)
 
 // Readahead blocks for non-seekable streams will be limited to this
@@ -580,10 +580,6 @@ MediaCache::Init()
   rv = mFileCache->Open(fileDesc);
   NS_ENSURE_SUCCESS(rv,rv);
 
-  if (!gMediaCacheLog) {
-    gMediaCacheLog = PR_NewLogModule("MediaCache");
-  }
-
   MediaCacheFlusher::Init();
 
   return NS_OK;
diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 870be3d8676b20..6925cf0f32af93 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -46,7 +46,7 @@ static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
 // avoid redefined macro in unified build
 #undef DECODER_LOG
 
-PRLogModuleInfo* gMediaDecoderLog;
+LazyLogModule gMediaDecoderLog("MediaDecoder");
 #define DECODER_LOG(x, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("Decoder=%p " x, this, ##__VA_ARGS__))
 
@@ -113,27 +113,169 @@ class MediaMemoryTracker : public nsIMemoryReporter
 StaticRefPtr<MediaMemoryTracker> MediaMemoryTracker::sUniqueInstance;
 
 #if defined(PR_LOGGING)
-PRLogModuleInfo* gMediaTimerLog;
-PRLogModuleInfo* gMediaSampleLog;
+LazyLogModule gMediaTimerLog("MediaTimer");
+LazyLogModule gMediaSampleLog("MediaSample");
 #endif
 
 void
 MediaDecoder::InitStatics()
 {
   MOZ_ASSERT(NS_IsMainThread());
-
-#if defined(PR_LOGGING)
-  // Log modules.
-  gMediaDecoderLog = PR_NewLogModule("MediaDecoder");
-  gMediaTimerLog = PR_NewLogModule("MediaTimer");
-  gMediaSampleLog = PR_NewLogModule("MediaSample");
-#endif
 }
 
 NS_IMPL_ISUPPORTS(MediaMemoryTracker, nsIMemoryReporter)
 
 NS_IMPL_ISUPPORTS0(MediaDecoder)
 
+
+void
+MediaDecoder::ResourceCallback::Connect(MediaDecoder* aDecoder)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mDecoder = aDecoder;
+}
+
+void
+MediaDecoder::ResourceCallback::Disconnect()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  mDecoder = nullptr;
+}
+
+MediaDecoderOwner*
+MediaDecoder::ResourceCallback::GetMediaOwner() const
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  return mDecoder ? mDecoder->GetOwner() : nullptr;
+}
+
+void
+MediaDecoder::ResourceCallback::SetInfinite(bool aInfinite)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->SetInfinite(aInfinite);
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::SetMediaSeekable(bool aMediaSeekable)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->SetMediaSeekable(aMediaSeekable);
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::ResetConnectionState()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->ResetConnectionState();
+  }
+}
+
+nsresult
+MediaDecoder::ResourceCallback::FinishDecoderSetup(MediaResource* aResource)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  return mDecoder ? mDecoder->FinishDecoderSetup(aResource) : NS_ERROR_FAILURE;
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyNetworkError()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->NetworkError();
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyDecodeError()
+{
+  RefPtr<ResourceCallback> self = this;
+  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction([=] () {
+    if (self->mDecoder) {
+      self->mDecoder->DecodeError();
+    }
+  });
+  AbstractThread::MainThread()->Dispatch(r.forget());
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyDataArrived()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->NotifyDataArrived();
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyBytesDownloaded()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->NotifyBytesDownloaded();
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyDataEnded(nsresult aStatus)
+{
+  RefPtr<ResourceCallback> self = this;
+  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction([=] () {
+    if (!self->mDecoder) {
+      return;
+    }
+    self->mDecoder->NotifyDownloadEnded(aStatus);
+    if (NS_SUCCEEDED(aStatus)) {
+      HTMLMediaElement* element = self->GetMediaOwner()->GetMediaElement();
+      if (element) {
+        element->DownloadSuspended();
+      }
+      // NotifySuspendedStatusChanged will tell the element that download
+      // has been suspended "by the cache", which is true since we never
+      // download anything. The element can then transition to HAVE_ENOUGH_DATA.
+      self->mDecoder->NotifySuspendedStatusChanged();
+    }
+  });
+  AbstractThread::MainThread()->Dispatch(r.forget());
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyPrincipalChanged()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->NotifyPrincipalChanged();
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::NotifySuspendedStatusChanged()
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  if (mDecoder) {
+    mDecoder->NotifySuspendedStatusChanged();
+  }
+}
+
+void
+MediaDecoder::ResourceCallback::NotifyBytesConsumed(int64_t aBytes,
+                                                    int64_t aOffset)
+{
+  RefPtr<ResourceCallback> self = this;
+  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction([=] () {
+    if (self->mDecoder) {
+      self->mDecoder->NotifyBytesConsumed(aBytes, aOffset);
+    }
+  });
+  AbstractThread::MainThread()->Dispatch(r.forget());
+}
+
 void
 MediaDecoder::NotifyOwnerActivityChanged()
 {
@@ -334,6 +476,7 @@ void
 MediaDecoder::SetInfinite(bool aInfinite)
 {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShuttingDown);
   mInfiniteStream = aInfinite;
   DurationChanged();
 }
@@ -350,6 +493,7 @@ MediaDecoder::MediaDecoder(MediaDecoderOwner* aOwner)
   , mDormantSupported(false)
   , mLogicalPosition(0.0)
   , mDuration(std::numeric_limits<double>::quiet_NaN())
+  , mResourceCallback(new ResourceCallback())
 #ifdef MOZ_EME
   , mCDMProxyPromise(mCDMProxyPromiseHolder.Ensure(__func__))
 #endif
@@ -417,6 +561,7 @@ MediaDecoder::MediaDecoder(MediaDecoderOwner* aOwner)
   MediaMemoryTracker::AddMediaDecoder(this);
 
   mAudioChannel = AudioChannelService::GetDefaultAudioChannel();
+  mResourceCallback->Connect(this);
 
   //
   // Initialize watchers.
@@ -453,6 +598,8 @@ MediaDecoder::Shutdown()
 
   mShuttingDown = true;
 
+  mResourceCallback->Disconnect();
+
 #ifdef MOZ_EME
   mCDMProxyPromiseHolder.RejectIfExists(true, __func__);
 #endif
@@ -486,6 +633,12 @@ MediaDecoder::~MediaDecoder()
   MOZ_COUNT_DTOR(MediaDecoder);
 }
 
+MediaResourceCallback*
+MediaDecoder::GetResourceCallback() const
+{
+  return mResourceCallback;
+}
+
 nsresult
 MediaDecoder::OpenResource(nsIStreamListener** aStreamListener)
 {
@@ -720,55 +873,18 @@ nsresult
 MediaDecoder::FinishDecoderSetup(MediaResource* aResource)
 {
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShuttingDown);
   HTMLMediaElement* element = mOwner->GetMediaElement();
   NS_ENSURE_TRUE(element, NS_ERROR_FAILURE);
   element->FinishDecoderSetup(this, aResource);
   return NS_OK;
 }
 
-void
-MediaDecoder::NotifyNetworkError()
-{
-  NetworkError();
-}
-
-void
-MediaDecoder::NotifyDecodeError()
-{
-  nsCOMPtr<nsIRunnable> r =
-    NS_NewRunnableMethod(this, &MediaDecoder::DecodeError);
-  AbstractThread::MainThread()->Dispatch(r.forget());
-}
-
-void
-MediaDecoder::NotifyDataEnded(nsresult aStatus)
-{
-  RefPtr<MediaDecoder> self = this;
-  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction([=] () {
-    if (self->mShuttingDown) {
-      return;
-    }
-    self->NotifyDownloadEnded(aStatus);
-    if (NS_SUCCEEDED(aStatus)) {
-      HTMLMediaElement* element = self->mOwner->GetMediaElement();
-      if (element) {
-        element->DownloadSuspended();
-      }
-      // NotifySuspendedStatusChanged will tell the element that download
-      // has been suspended "by the cache", which is true since we never
-      // download anything. The element can then transition to HAVE_ENOUGH_DATA.
-      self->NotifySuspendedStatusChanged();
-    }
-  });
-  AbstractThread::MainThread()->Dispatch(r.forget());
-}
-
 void
 MediaDecoder::ResetConnectionState()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (mShuttingDown)
-    return;
+  MOZ_ASSERT(!mShuttingDown);
 
   // Notify the media element that connection gets lost.
   mOwner->ResetConnectionState();
@@ -912,9 +1028,7 @@ void
 MediaDecoder::NotifySuspendedStatusChanged()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (mShuttingDown) {
-    return;
-  }
+  MOZ_ASSERT(!mShuttingDown);
   if (mResource) {
     bool suspended = mResource->IsSuspendedByCache();
     mOwner->NotifySuspendedByCache(suspended);
@@ -936,10 +1050,7 @@ void
 MediaDecoder::NotifyDownloadEnded(nsresult aStatus)
 {
   MOZ_ASSERT(NS_IsMainThread());
-
-  if (mShuttingDown) {
-    return;
-  }
+  MOZ_ASSERT(!mShuttingDown);
 
   DECODER_LOG("NotifyDownloadEnded, status=%x", aStatus);
 
@@ -965,25 +1076,17 @@ void
 MediaDecoder::NotifyPrincipalChanged()
 {
   MOZ_ASSERT(NS_IsMainThread());
-  if (mShuttingDown) {
-    return;
-  }
+  MOZ_ASSERT(!mShuttingDown);
   mOwner->NotifyDecoderPrincipalChanged();
 }
 
 void
 MediaDecoder::NotifyBytesConsumed(int64_t aBytes, int64_t aOffset)
 {
-  if (!NS_IsMainThread()) {
-    nsCOMPtr<nsIRunnable> r = NS_NewRunnableMethodWithArgs<int64_t, int64_t>(
-      this, &MediaDecoder::NotifyBytesConsumed, aBytes, aOffset);
-    AbstractThread::MainThread()->Dispatch(r.forget());
-    return;
-  }
-
   MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mShuttingDown);
 
-  if (mShuttingDown || mIgnoreProgressData) {
+  if (mIgnoreProgressData) {
     return;
   }
 
@@ -1367,12 +1470,6 @@ MediaDecoder::BreakCycles() {
   SetStateMachine(nullptr);
 }
 
-MediaDecoderOwner*
-MediaDecoder::GetMediaOwner() const
-{
-  return mOwner;
-}
-
 void
 MediaDecoder::FireTimeUpdate()
 {
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index 664ed455ccc585..16fc3843eb39e0 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -273,7 +273,7 @@ struct SeekTarget {
   MediaDecoderEventVisibility mEventVisibility;
 };
 
-class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
+class MediaDecoder : public AbstractMediaDecoder
 {
 public:
   struct SeekResolveValue {
@@ -283,6 +283,35 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
     MediaDecoderEventVisibility mEventVisibility;
   };
 
+  // Used to register with MediaResource to receive notifications which will
+  // be forwarded to MediaDecoder.
+  class ResourceCallback : public MediaResourceCallback {
+  public:
+    // Start to receive notifications from ResourceCallback.
+    void Connect(MediaDecoder* aDecoder);
+    // Called upon shutdown to stop receiving notifications.
+    void Disconnect();
+
+  private:
+    /* MediaResourceCallback functions */
+    MediaDecoderOwner* GetMediaOwner() const override;
+    void SetInfinite(bool aInfinite) override;
+    void SetMediaSeekable(bool aMediaSeekable) override;
+    void ResetConnectionState() override;
+    nsresult FinishDecoderSetup(MediaResource* aResource) override;
+    void NotifyNetworkError() override;
+    void NotifyDecodeError() override;
+    void NotifyDataArrived() override;
+    void NotifyBytesDownloaded() override;
+    void NotifyDataEnded(nsresult aStatus) override;
+    void NotifyPrincipalChanged() override;
+    void NotifySuspendedStatusChanged() override;
+    void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset) override;
+
+    // The decoder to send notifications. Main-thread only.
+    MediaDecoder* mDecoder = nullptr;
+  };
+
   typedef MozPromise<SeekResolveValue, bool /* aIgnored */, /* IsExclusive = */ true> SeekPromise;
 
   NS_DECL_THREADSAFE_ISUPPORTS
@@ -302,9 +331,10 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
 
   explicit MediaDecoder(MediaDecoderOwner* aOwner);
 
-  // Reset the decoder and notify the media element that
-  // server connection is closed.
-  virtual void ResetConnectionState() override;
+  // Return a callback object used to register with MediaResource to receive
+  // notifications.
+  MediaResourceCallback* GetResourceCallback() const;
+
   // Create a new decoder of the same type as this one.
   // Subclasses must implement this.
   virtual MediaDecoder* Clone(MediaDecoderOwner* aOwner) = 0;
@@ -325,7 +355,7 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
   nsresult OpenResource(nsIStreamListener** aStreamListener);
 
   // Called if the media file encounters a network error.
-  virtual void NetworkError();
+  void NetworkError();
 
   // Get the current MediaResource being used. Its URI will be returned
   // by currentSrc. Returns what was passed to Load(), if Load() has been called.
@@ -403,47 +433,17 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
   // Return the duration of the video in seconds.
   virtual double GetDuration();
 
-  // A media stream is assumed to be infinite if the metadata doesn't
-  // contain the duration, and range requests are not supported, and
-  // no headers give a hint of a possible duration (Content-Length,
-  // Content-Duration, and variants), and we cannot seek in the media
-  // stream to determine the duration.
-  //
-  // When the media stream ends, we can know the duration, thus the stream is
-  // no longer considered to be infinite.
-  virtual void SetInfinite(bool aInfinite) override;
-
   // Return true if the stream is infinite (see SetInfinite).
   virtual bool IsInfinite();
 
-  // Called by MediaResource when the "cache suspended" status changes.
-  // If MediaResource::IsSuspendedByCache returns true, then the decoder
-  // should stop buffering or otherwise waiting for download progress and
-  // start consuming data, if possible, because the cache is full.
-  virtual void NotifySuspendedStatusChanged() override;
-
   // Called by MediaResource when some data has been received.
   // Call on the main thread only.
-  virtual void NotifyBytesDownloaded() override;
-
-  // Called by nsChannelToPipeListener or MediaResource when the
-  // download has ended. Called on the main thread only. aStatus is
-  // the result from OnStopRequest.
-  virtual void NotifyDownloadEnded(nsresult aStatus);
+  virtual void NotifyBytesDownloaded();
 
   // Called as data arrives on the stream and is read into the cache.  Called
   // on the main thread only.
   virtual void NotifyDataArrived() override;
 
-  // Called by MediaResource when the principal of the resource has
-  // changed. Called on main thread only.
-  virtual void NotifyPrincipalChanged() override;
-
-  // Called by the MediaResource to keep track of the number of bytes read
-  // from the resource. Called on the main by an event runner dispatched
-  // by the MediaResource read functions.
-  void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset) final override;
-
   // Return true if we are currently seeking in the media resource.
   // Call on the main thread only.
   virtual bool IsSeeking() const;
@@ -508,9 +508,6 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
   // SetLoadInBackground() on mResource.
   void SetLoadInBackground(bool aLoadInBackground);
 
-  // Returns a weak reference to the media decoder owner.
-  MediaDecoderOwner* GetMediaOwner() const override;
-
   MediaDecoderStateMachine* GetStateMachine() const;
   void SetStateMachine(MediaDecoderStateMachine* aStateMachine);
 
@@ -673,7 +670,7 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
   virtual void BreakCycles();
 
   // Notifies the element that decoding has failed.
-  virtual void DecodeError();
+  void DecodeError();
 
   // Indicate whether the media is same-origin with the element.
   void UpdateSameOriginStatus(bool aSameOrigin);
@@ -832,6 +829,8 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
   // Explicitly prievate to force access via accessors.
   RefPtr<MediaDecoderStateMachine> mDecoderStateMachine;
 
+  RefPtr<ResourceCallback> mResourceCallback;
+
 #ifdef MOZ_EME
   MozPromiseHolder<CDMProxyPromise> mCDMProxyPromiseHolder;
   RefPtr<CDMProxyPromise> mCDMProxyPromise;
@@ -1054,11 +1053,43 @@ class MediaDecoder : public AbstractMediaDecoder, public MediaResourceCallback
   }
 
 private:
-  /* MediaResourceCallback functions */
-  virtual nsresult FinishDecoderSetup(MediaResource* aResource) override;
-  virtual void NotifyNetworkError() override;
-  virtual void NotifyDecodeError() override;
-  virtual void NotifyDataEnded(nsresult aStatus) override;
+  /* Functions called by ResourceCallback */
+
+  // A media stream is assumed to be infinite if the metadata doesn't
+  // contain the duration, and range requests are not supported, and
+  // no headers give a hint of a possible duration (Content-Length,
+  // Content-Duration, and variants), and we cannot seek in the media
+  // stream to determine the duration.
+  //
+  // When the media stream ends, we can know the duration, thus the stream is
+  // no longer considered to be infinite.
+  void SetInfinite(bool aInfinite);
+
+  // Reset the decoder and notify the media element that
+  // server connection is closed.
+  void ResetConnectionState();
+
+  nsresult FinishDecoderSetup(MediaResource* aResource);
+
+  // Called by MediaResource when the principal of the resource has
+  // changed. Called on main thread only.
+  void NotifyPrincipalChanged();
+
+  // Called by MediaResource when the "cache suspended" status changes.
+  // If MediaResource::IsSuspendedByCache returns true, then the decoder
+  // should stop buffering or otherwise waiting for download progress and
+  // start consuming data, if possible, because the cache is full.
+  void NotifySuspendedStatusChanged();
+
+  // Called by the MediaResource to keep track of the number of bytes read
+  // from the resource. Called on the main by an event runner dispatched
+  // by the MediaResource read functions.
+  void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset) final override;
+
+  // Called by nsChannelToPipeListener or MediaResource when the
+  // download has ended. Called on the main thread only. aStatus is
+  // the result from OnStopRequest.
+  void NotifyDownloadEnded(nsresult aStatus);
 };
 
 } // namespace mozilla
diff --git a/dom/media/MediaDecoderReader.cpp b/dom/media/MediaDecoderReader.cpp
index 5b9b28544370b4..38a0d2b444526f 100644
--- a/dom/media/MediaDecoderReader.cpp
+++ b/dom/media/MediaDecoderReader.cpp
@@ -22,7 +22,7 @@ namespace mozilla {
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define DECODER_LOG(x, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("Decoder=%p " x, mDecoder, ##__VA_ARGS__))
 
diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index 2cbd14378daf99..1ed83bf97b5e00 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -472,6 +472,10 @@ bool MediaDecoderStateMachine::HaveEnoughDecodedVideo()
 {
   MOZ_ASSERT(OnTaskQueue());
 
+  if (VideoQueue().GetSize() == 0) {
+    return false;
+  }
+
   if (VideoQueue().GetSize() - 1 < GetAmpleVideoFrames() * mPlaybackRate) {
     return false;
   }
diff --git a/dom/media/MediaDecoderStateMachine.h b/dom/media/MediaDecoderStateMachine.h
index 1be5090c5084f0..462d22230a1615 100644
--- a/dom/media/MediaDecoderStateMachine.h
+++ b/dom/media/MediaDecoderStateMachine.h
@@ -107,8 +107,8 @@ class AudioSegment;
 class DecodedStream;
 class TaskQueue;
 
-extern PRLogModuleInfo* gMediaDecoderLog;
-extern PRLogModuleInfo* gMediaSampleLog;
+extern LazyLogModule gMediaDecoderLog;
+extern LazyLogModule gMediaSampleLog;
 
 /*
   The state machine class. This manages the decoding and seeking in the
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
index 29c9fcf4be2d3d..2ac3e151f40e4b 100644
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -28,15 +28,10 @@ using mozilla::layers::Image;
 using mozilla::layers::LayerManager;
 using mozilla::layers::LayersBackend;
 
-PRLogModuleInfo* GetFormatDecoderLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("MediaFormatReader");
-  }
-  return log;
-}
-#define LOG(arg, ...) MOZ_LOG(GetFormatDecoderLog(), mozilla::LogLevel::Debug, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-#define LOGV(arg, ...) MOZ_LOG(GetFormatDecoderLog(), mozilla::LogLevel::Verbose, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+static mozilla::LazyLogModule sFormatDecoderLog("MediaFormatReader");
+
+#define LOG(arg, ...) MOZ_LOG(sFormatDecoderLog, mozilla::LogLevel::Debug, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
+#define LOGV(arg, ...) MOZ_LOG(sFormatDecoderLog, mozilla::LogLevel::Verbose, ("MediaFormatReader(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 namespace mozilla {
 
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
index 00a88dae197121..15f639838c57c3 100644
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -104,12 +104,10 @@ namespace mozilla {
 #undef LOG
 #endif
 
-PRLogModuleInfo*
+LogModule*
 GetMediaManagerLog()
 {
-  static PRLogModuleInfo *sLog;
-  if (!sLog)
-    sLog = PR_NewLogModule("MediaManager");
+  static LazyLogModule sLog("MediaManager");
   return sLog;
 }
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
diff --git a/dom/media/MediaManager.h b/dom/media/MediaManager.h
index 0454f7a769afef..45223fe779b94e 100644
--- a/dom/media/MediaManager.h
+++ b/dom/media/MediaManager.h
@@ -51,7 +51,7 @@ struct MediaTrackConstraints;
 struct MediaTrackConstraintSet;
 } // namespace dom
 
-extern PRLogModuleInfo* GetMediaManagerLog();
+extern LogModule* GetMediaManagerLog();
 #define MM_LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
 
 class MediaDevice : public nsIMediaDevice
diff --git a/dom/media/MediaPermissionGonk.cpp b/dom/media/MediaPermissionGonk.cpp
index 0c04d7cdcb7f94..7e0da954943187 100644
--- a/dom/media/MediaPermissionGonk.cpp
+++ b/dom/media/MediaPermissionGonk.cpp
@@ -330,7 +330,7 @@ class MediaDeviceSuccessCallback: public nsIGetUserMediaDevicesSuccessCallback
   NS_DECL_ISUPPORTS
   NS_DECL_NSIGETUSERMEDIADEVICESSUCCESSCALLBACK
 
-  MediaDeviceSuccessCallback(RefPtr<dom::GetUserMediaRequest> &aRequest)
+  explicit MediaDeviceSuccessCallback(RefPtr<dom::GetUserMediaRequest> &aRequest)
     : mRequest(aRequest) {}
 
 protected:
@@ -395,7 +395,7 @@ class MediaDeviceErrorCallback: public nsIDOMGetUserMediaErrorCallback
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMGETUSERMEDIAERRORCALLBACK
 
-  MediaDeviceErrorCallback(const nsAString &aCallID)
+  explicit MediaDeviceErrorCallback(const nsAString &aCallID)
     : mCallID(aCallID) {}
 
 protected:
diff --git a/dom/media/MediaQueue.h b/dom/media/MediaQueue.h
index 94a2fa619d36c7..712f700e8b88cf 100644
--- a/dom/media/MediaQueue.h
+++ b/dom/media/MediaQueue.h
@@ -36,7 +36,7 @@ class MediaQueue : private nsDeque {
     Reset();
   }
 
-  inline int32_t GetSize() {
+  inline size_t GetSize() {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     return nsDeque::GetSize();
   }
@@ -124,9 +124,9 @@ class MediaQueue : private nsDeque {
   // Elements whose start time is before aTime are ignored.
   void GetElementsAfter(int64_t aTime, nsTArray<RefPtr<T>>* aResult) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-    if (!GetSize())
+    if (GetSize() == 0)
       return;
-    int32_t i;
+    size_t i;
     for (i = GetSize() - 1; i > 0; --i) {
       T* v = static_cast<T*>(ObjectAt(i));
       if (v->GetEndTime() < aTime)
@@ -135,14 +135,14 @@ class MediaQueue : private nsDeque {
     // Elements less than i have a end time before aTime. It's also possible
     // that the element at i has a end time before aTime, but that's OK.
     for (; i < GetSize(); ++i) {
-      RefPtr<T> elem = static_cast<T*>(ObjectAt(i));
+      RefPtr<T> elem = static_cast<T*>(ObjectAt(static_cast<size_t>(i)));
       aResult->AppendElement(elem);
     }
   }
 
   void GetFirstElements(uint32_t aMaxElements, nsTArray<RefPtr<T>>* aResult) {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-    for (int32_t i = 0; i < (int32_t)aMaxElements && i < GetSize(); ++i) {
+    for (size_t i = 0; i < aMaxElements && i < GetSize(); ++i) {
       *aResult->AppendElement() = static_cast<T*>(ObjectAt(i));
     }
   }
@@ -150,7 +150,7 @@ class MediaQueue : private nsDeque {
   uint32_t FrameCount() {
     ReentrantMonitorAutoEnter mon(mReentrantMonitor);
     uint32_t frames = 0;
-    for (int32_t i = 0; i < GetSize(); ++i) {
+    for (size_t i = 0; i < GetSize(); ++i) {
       T* v = static_cast<T*>(ObjectAt(i));
       frames += v->mFrames;
     }
diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
index d87fe653ac8253..eab79e863147b3 100644
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -31,7 +31,7 @@
 #undef LOG
 #endif
 
-PRLogModuleInfo* gMediaRecorderLog;
+mozilla::LazyLogModule gMediaRecorderLog("MediaRecorder");
 #define LOG(type, msg) MOZ_LOG(gMediaRecorderLog, type, msg)
 
 namespace mozilla {
@@ -776,9 +776,7 @@ MediaRecorder::MediaRecorder(DOMMediaStream& aSourceMediaStream,
   MOZ_ASSERT(aOwnerWindow);
   MOZ_ASSERT(aOwnerWindow->IsInnerWindow());
   mDOMStream = &aSourceMediaStream;
-  if (!gMediaRecorderLog) {
-    gMediaRecorderLog = PR_NewLogModule("MediaRecorder");
-  }
+
   RegisterActivityObserver();
 }
 
@@ -809,9 +807,7 @@ MediaRecorder::MediaRecorder(AudioNode& aSrcAudioNode,
     }
   }
   mAudioNode = &aSrcAudioNode;
-  if (!gMediaRecorderLog) {
-    gMediaRecorderLog = PR_NewLogModule("MediaRecorder");
-  }
+
   RegisterActivityObserver();
 }
 
diff --git a/dom/media/MediaResource.cpp b/dom/media/MediaResource.cpp
index 3bfbe677e1824b..bc28f31baa7b4f 100644
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -36,7 +36,7 @@
 
 using mozilla::media::TimeUnit;
 
-PRLogModuleInfo* gMediaResourceLog;
+mozilla::LazyLogModule gMediaResourceLog("MediaResource");
 #define RESOURCE_LOG(msg, ...) MOZ_LOG(gMediaResourceLog, mozilla::LogLevel::Debug, \
                                       (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
@@ -79,9 +79,6 @@ ChannelMediaResource::ChannelMediaResource(MediaResourceCallback* aCallback,
     mIsTransportSeekable(true),
     mSuspendAgent(mChannel)
 {
-  if (!gMediaResourceLog) {
-    gMediaResourceLog = PR_NewLogModule("MediaResource");
-  }
 }
 
 ChannelMediaResource::~ChannelMediaResource()
@@ -249,7 +246,7 @@ ChannelMediaResource::OnStartRequest(nsIRequest* aRequest)
         // Content-Range header text should be parse-able.
         CMLOG("Error processing \'Content-Range' for "
               "HTTP_PARTIAL_RESPONSE_CODE: rv[%x] channel[%p] decoder[%p]",
-              rv, hc.get(), mCallback);
+              rv, hc.get(), mCallback.get());
         mCallback->NotifyNetworkError();
         CloseChannel();
         return NS_OK;
@@ -377,7 +374,7 @@ ChannelMediaResource::ParseContentRangeHeader(nsIHttpChannel * aHttpChan,
   }
 
   CMLOG("Received bytes [%lld] to [%lld] of [%lld] for decoder[%p]",
-        aRangeStart, aRangeEnd, aRangeTotal, mCallback);
+        aRangeStart, aRangeEnd, aRangeTotal, mCallback.get());
 
   return NS_OK;
 }
@@ -461,7 +458,7 @@ ChannelMediaResource::CopySegmentToCache(nsIInputStream *aInStream,
   RESOURCE_LOG("%p [ChannelMediaResource]: CopySegmentToCache at mOffset [%lld] add "
                "[%d] bytes for decoder[%p]",
                closure->mResource, closure->mResource->mOffset, aCount,
-               closure->mResource->mCallback);
+               closure->mResource->mCallback.get());
   closure->mResource->mOffset += aCount;
 
   closure->mResource->mCacheStream.NotifyDataReceived(aCount, aFromSegment,
@@ -930,7 +927,7 @@ ChannelMediaResource::CacheClientSeek(int64_t aOffset, bool aResume)
   NS_ASSERTION(NS_IsMainThread(), "Don't call on non-main thread");
 
   CMLOG("CacheClientSeek requested for aOffset [%lld] for decoder [%p]",
-        aOffset, mCallback);
+        aOffset, mCallback.get());
 
   CloseChannel();
 
diff --git a/dom/media/MediaResource.h b/dom/media/MediaResource.h
index 88751746a6df1a..9b37f14e83d8cb 100644
--- a/dom/media/MediaResource.h
+++ b/dom/media/MediaResource.h
@@ -16,6 +16,7 @@
 #include "nsIInterfaceRequestor.h"
 #include "MediaCache.h"
 #include "MediaData.h"
+#include "MediaResourceCallback.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/TimeStamp.h"
@@ -43,7 +44,6 @@ class nsIPrincipal;
 
 namespace mozilla {
 
-class MediaResourceCallback;
 class MediaChannelStatistics;
 
 /**
@@ -513,10 +513,7 @@ class BaseMediaResource : public MediaResource {
   // on the main thread. This is called automatically after every read.
   void DispatchBytesConsumed(int64_t aNumBytes, int64_t aOffset);
 
-  // This is not an nsCOMPointer to prevent a circular reference
-  // between the decoder to the media stream object. The stream never
-  // outlives the lifetime of the decoder.
-  MediaResourceCallback* mCallback;
+  RefPtr<MediaResourceCallback> mCallback;
 
   // Channel used to download the media data. Must be accessed
   // from the main thread only.
diff --git a/dom/media/MediaResourceCallback.h b/dom/media/MediaResourceCallback.h
index a4cee7ba55fcbb..aa6519ec246d1d 100644
--- a/dom/media/MediaResourceCallback.h
+++ b/dom/media/MediaResourceCallback.h
@@ -8,9 +8,11 @@
 #define MediaResourceCallback_h_
 
 #include "nsError.h"
+#include "nsISupportsImpl.h"
 
 namespace mozilla {
 
+class MediaDecoderOwner;
 class MediaResource;
 
 /**
@@ -24,6 +26,8 @@ class MediaResource;
  */
 class MediaResourceCallback {
 public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(MediaResourceCallback);
+
   // Returns a weak reference to the media decoder owner.
   virtual MediaDecoderOwner* GetMediaOwner() const { return nullptr; }
 
@@ -67,6 +71,9 @@ class MediaResourceCallback {
 
   // Notify the number of bytes read from the resource.
   virtual void NotifyBytesConsumed(int64_t aBytes, int64_t aOffset) {}
+
+protected:
+  virtual ~MediaResourceCallback() {}
 };
 
 } // namespace mozilla
diff --git a/dom/media/MediaShutdownManager.cpp b/dom/media/MediaShutdownManager.cpp
index 46952f2227ee19..b55954b66440c7 100644
--- a/dom/media/MediaShutdownManager.cpp
+++ b/dom/media/MediaShutdownManager.cpp
@@ -12,7 +12,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 NS_IMPL_ISUPPORTS(MediaShutdownManager, nsIObserver)
diff --git a/dom/media/MediaStreamGraph.cpp b/dom/media/MediaStreamGraph.cpp
index 626a6d915e7671..6c5f8992f6242e 100644
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -39,7 +39,7 @@ using namespace mozilla::gfx;
 
 namespace mozilla {
 
-PRLogModuleInfo* gMediaStreamGraphLog;
+LazyLogModule gMediaStreamGraphLog("MediaStreamGraph");
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 // #define ENABLE_LIFECYCLE_LOG
@@ -2639,10 +2639,6 @@ MediaStreamGraphImpl::MediaStreamGraphImpl(GraphDriverType aDriverRequested,
 #endif
   , mAudioChannel(aChannel)
 {
-  if (!gMediaStreamGraphLog) {
-    gMediaStreamGraphLog = PR_NewLogModule("MediaStreamGraph");
-  }
-
   if (mRealtime) {
     if (aDriverRequested == AUDIO_THREAD_DRIVER) {
       AudioCallbackDriver* driver = new AudioCallbackDriver(this);
diff --git a/dom/media/MediaStreamGraph.h b/dom/media/MediaStreamGraph.h
index 05eb8b46c66621..724ff0c24ba314 100644
--- a/dom/media/MediaStreamGraph.h
+++ b/dom/media/MediaStreamGraph.h
@@ -35,7 +35,7 @@ class nsAutoRefTraits<SpeexResamplerState> : public nsPointerRefTraits<SpeexResa
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaStreamGraphLog;
+extern LazyLogModule gMediaStreamGraphLog;
 
 namespace dom {
   enum class AudioContextOperation;
diff --git a/dom/media/MediaTimer.h b/dom/media/MediaTimer.h
index f19c6c572791a1..3d6269936911d3 100644
--- a/dom/media/MediaTimer.h
+++ b/dom/media/MediaTimer.h
@@ -18,7 +18,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaTimerLog;
+extern LazyLogModule gMediaTimerLog;
 
 #define TIMER_LOG(x, ...) \
   MOZ_ASSERT(gMediaTimerLog); \
diff --git a/dom/media/RtspMediaResource.cpp b/dom/media/RtspMediaResource.cpp
index bd864da809bac3..0c6eddae9d34d1 100644
--- a/dom/media/RtspMediaResource.cpp
+++ b/dom/media/RtspMediaResource.cpp
@@ -21,7 +21,7 @@
 using namespace mozilla::net;
 using namespace mozilla::media;
 
-PRLogModuleInfo* gRtspMediaResourceLog;
+mozilla::LazyLogModule gRtspMediaResourceLog("RtspMediaResource");
 #define RTSP_LOG(msg, ...) MOZ_LOG(gRtspMediaResourceLog, mozilla::LogLevel::Debug, \
                                   (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
@@ -505,9 +505,6 @@ RtspMediaResource::RtspMediaResource(MediaResourceCallback* aCallback,
   MOZ_ASSERT(mMediaStreamController);
   mListener = new Listener(this);
   mMediaStreamController->AsyncOpen(mListener);
-  if (!gRtspMediaResourceLog) {
-    gRtspMediaResourceLog = PR_NewLogModule("RtspMediaResource");
-  }
 #endif
 }
 
@@ -860,7 +857,7 @@ nsresult RtspMediaResource::SeekTime(int64_t aOffset)
   NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
 
   RTSPMLOG("Seek requested for aOffset [%lld] for decoder [%p]",
-           aOffset, mCallback);
+           aOffset, mCallback.get());
   // Clear buffer and raise the frametype flag.
   for(uint32_t i = 0 ; i < mTrackBuffer.Length(); ++i) {
     mTrackBuffer[i]->ResetWithFrameType(MEDIASTREAM_FRAMETYPE_DISCONTINUITY);
diff --git a/dom/media/StreamBuffer.cpp b/dom/media/StreamBuffer.cpp
index 5af63e5b01c388..516982ca701b95 100644
--- a/dom/media/StreamBuffer.cpp
+++ b/dom/media/StreamBuffer.cpp
@@ -9,7 +9,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaStreamGraphLog;
+extern LazyLogModule gMediaStreamGraphLog;
 #define STREAM_LOG(type, msg) MOZ_LOG(gMediaStreamGraphLog, type, msg)
 
 #ifdef DEBUG
diff --git a/dom/media/TrackUnionStream.cpp b/dom/media/TrackUnionStream.cpp
index e4e844a4380c01..9325641970a37a 100644
--- a/dom/media/TrackUnionStream.cpp
+++ b/dom/media/TrackUnionStream.cpp
@@ -42,15 +42,12 @@ namespace mozilla {
 #undef STREAM_LOG
 #endif
 
-PRLogModuleInfo* gTrackUnionStreamLog;
+LazyLogModule gTrackUnionStreamLog("TrackUnionStream");
 #define STREAM_LOG(type, msg) MOZ_LOG(gTrackUnionStreamLog, type, msg)
 
 TrackUnionStream::TrackUnionStream(DOMMediaStream* aWrapper) :
   ProcessedMediaStream(aWrapper), mNextAvailableTrackID(1)
 {
-  if (!gTrackUnionStreamLog) {
-    gTrackUnionStreamLog = PR_NewLogModule("TrackUnionStream");
-  }
 }
 
   void TrackUnionStream::RemoveInput(MediaInputPort* aPort)
diff --git a/dom/media/WebVTTListener.cpp b/dom/media/WebVTTListener.cpp
index 5727e8c71879da..a93217ad5ed310 100644
--- a/dom/media/WebVTTListener.cpp
+++ b/dom/media/WebVTTListener.cpp
@@ -28,16 +28,13 @@ NS_INTERFACE_MAP_END
 NS_IMPL_CYCLE_COLLECTING_ADDREF(WebVTTListener)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(WebVTTListener)
 
-PRLogModuleInfo* gTextTrackLog;
+LazyLogModule gTextTrackLog("TextTrack");
 # define VTT_LOG(...) MOZ_LOG(gTextTrackLog, LogLevel::Debug, (__VA_ARGS__))
 
 WebVTTListener::WebVTTListener(HTMLTrackElement* aElement)
   : mElement(aElement)
 {
   MOZ_ASSERT(mElement, "Must pass an element to the callback");
-  if (!gTextTrackLog) {
-    gTextTrackLog = PR_NewLogModule("TextTrack");
-  }
   VTT_LOG("WebVTTListener created.");
 }
 
diff --git a/dom/media/apple/AppleMP3Reader.cpp b/dom/media/apple/AppleMP3Reader.cpp
index 68a6318c28021b..18bfe15a0fe574 100644
--- a/dom/media/apple/AppleMP3Reader.cpp
+++ b/dom/media/apple/AppleMP3Reader.cpp
@@ -23,7 +23,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define LOGE(...) MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Error, (__VA_ARGS__))
 #define LOGW(...) MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Warning, (__VA_ARGS__))
 #define LOGD(...) MOZ_LOG(gMediaDecoderLog, mozilla::LogLevel::Debug, (__VA_ARGS__))
diff --git a/dom/media/directshow/AudioSinkFilter.cpp b/dom/media/directshow/AudioSinkFilter.cpp
index 3d2b93b46bc867..5682af1a587627 100644
--- a/dom/media/directshow/AudioSinkFilter.cpp
+++ b/dom/media/directshow/AudioSinkFilter.cpp
@@ -23,7 +23,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-PRLogModuleInfo* GetDirectShowLog();
+extern LogModule* GetDirectShowLog();
 #define LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 AudioSinkFilter::AudioSinkFilter(const wchar_t* aObjectName, HRESULT* aOutResult)
diff --git a/dom/media/directshow/AudioSinkInputPin.cpp b/dom/media/directshow/AudioSinkInputPin.cpp
index d3187c58f2a9b5..285dc3ca8736af 100644
--- a/dom/media/directshow/AudioSinkInputPin.cpp
+++ b/dom/media/directshow/AudioSinkInputPin.cpp
@@ -15,7 +15,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-PRLogModuleInfo* GetDirectShowLog();
+extern LogModule* GetDirectShowLog();
 #define LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 AudioSinkInputPin::AudioSinkInputPin(wchar_t* aObjectName,
diff --git a/dom/media/directshow/DirectShowReader.cpp b/dom/media/directshow/DirectShowReader.cpp
index b2a52850bdf5b3..ed6390a79e5c3f 100644
--- a/dom/media/directshow/DirectShowReader.cpp
+++ b/dom/media/directshow/DirectShowReader.cpp
@@ -18,13 +18,9 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-
-PRLogModuleInfo*
+LogModule*
 GetDirectShowLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("DirectShowDecoder");
-  }
+  static LazyLogModule log("DirectShowDecoder");
   return log;
 }
 
diff --git a/dom/media/directshow/SampleSink.cpp b/dom/media/directshow/SampleSink.cpp
index 54b62508d265a9..1102d32f5a382e 100644
--- a/dom/media/directshow/SampleSink.cpp
+++ b/dom/media/directshow/SampleSink.cpp
@@ -14,7 +14,7 @@ using namespace mozilla::media;
 
 namespace mozilla {
 
-PRLogModuleInfo* GetDirectShowLog();
+extern LogModule* GetDirectShowLog();
 #define LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 SampleSink::SampleSink()
diff --git a/dom/media/directshow/SourceFilter.cpp b/dom/media/directshow/SourceFilter.cpp
index 3eb11ea4b8b51b..e563b49cf608ed 100644
--- a/dom/media/directshow/SourceFilter.cpp
+++ b/dom/media/directshow/SourceFilter.cpp
@@ -20,7 +20,7 @@ namespace mozilla {
 //#define DEBUG_SOURCE_TRACE 1
 
 #if defined (DEBUG_SOURCE_TRACE)
-PRLogModuleInfo* GetDirectShowLog();
+extern LogModule* GetDirectShowLog();
 #define DIRECTSHOW_LOG(...) MOZ_LOG(GetDirectShowLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #else
 #define DIRECTSHOW_LOG(...)
diff --git a/dom/media/eme/EMEUtils.cpp b/dom/media/eme/EMEUtils.cpp
index 5d0af6f71791e0..b89879a6f8ec7d 100644
--- a/dom/media/eme/EMEUtils.cpp
+++ b/dom/media/eme/EMEUtils.cpp
@@ -8,19 +8,13 @@
 
 namespace mozilla {
 
-PRLogModuleInfo* GetEMELog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("EME");
-  }
+LogModule* GetEMELog() {
+  static LazyLogModule log("EME");
   return log;
 }
 
-PRLogModuleInfo* GetEMEVerboseLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("EMEV");
-  }
+LogModule* GetEMEVerboseLog() {
+  static LazyLogModule log("EMEV");
   return log;
 }
 
diff --git a/dom/media/eme/EMEUtils.h b/dom/media/eme/EMEUtils.h
index a8fde65f8532b6..6768213b5d90ec 100644
--- a/dom/media/eme/EMEUtils.h
+++ b/dom/media/eme/EMEUtils.h
@@ -13,13 +13,13 @@
 namespace mozilla {
 
 #ifndef EME_LOG
-  PRLogModuleInfo* GetEMELog();
+  LogModule* GetEMELog();
   #define EME_LOG(...) MOZ_LOG(GetEMELog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
   #define EME_LOG_ENABLED() MOZ_LOG_TEST(GetEMELog(), mozilla::LogLevel::Debug)
 #endif
 
 #ifndef EME_VERBOSE_LOG
-  PRLogModuleInfo* GetEMEVerboseLog();
+  LogModule* GetEMEVerboseLog();
   #define EME_VERBOSE_LOG(...) MOZ_LOG(GetEMEVerboseLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #else
   #ifndef EME_LOG
diff --git a/dom/media/encoder/MediaEncoder.cpp b/dom/media/encoder/MediaEncoder.cpp
index 4a7b26ba7df539..2d37598c40f846 100644
--- a/dom/media/encoder/MediaEncoder.cpp
+++ b/dom/media/encoder/MediaEncoder.cpp
@@ -31,7 +31,7 @@
 #undef LOG
 #endif
 
-PRLogModuleInfo* gMediaEncoderLog;
+mozilla::LazyLogModule gMediaEncoderLog("MediaEncoder");
 #define LOG(type, msg) MOZ_LOG(gMediaEncoderLog, type, msg)
 
 namespace mozilla {
@@ -79,9 +79,6 @@ MediaEncoder::CreateEncoder(const nsAString& aMIMEType, uint32_t aAudioBitrate,
                             uint32_t aVideoBitrate, uint32_t aBitrate,
                             uint8_t aTrackTypes)
 {
-  if (!gMediaEncoderLog) {
-    gMediaEncoderLog = PR_NewLogModule("MediaEncoder");
-  }
   PROFILER_LABEL("MediaEncoder", "CreateEncoder",
     js::ProfileEntry::Category::OTHER);
 
diff --git a/dom/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp
index c617980a140107..7e2161a0c59050 100644
--- a/dom/media/encoder/TrackEncoder.cpp
+++ b/dom/media/encoder/TrackEncoder.cpp
@@ -18,7 +18,7 @@
 
 namespace mozilla {
 
-PRLogModuleInfo* gTrackEncoderLog;
+LazyLogModule gTrackEncoderLog("TrackEncoder");
 #define TRACK_LOG(type, msg) MOZ_LOG(gTrackEncoderLog, type, msg)
 
 static const int DEFAULT_CHANNELS = 1;
@@ -37,9 +37,6 @@ TrackEncoder::TrackEncoder()
   , mAudioInitCounter(0)
   , mVideoInitCounter(0)
 {
-  if (!gTrackEncoderLog) {
-    gTrackEncoderLog = PR_NewLogModule("TrackEncoder");
-  }
 }
 
 void
diff --git a/dom/media/encoder/VP8TrackEncoder.cpp b/dom/media/encoder/VP8TrackEncoder.cpp
index f318cc9ca47527..48a33a4d19a4ac 100644
--- a/dom/media/encoder/VP8TrackEncoder.cpp
+++ b/dom/media/encoder/VP8TrackEncoder.cpp
@@ -17,7 +17,7 @@
 
 namespace mozilla {
 
-PRLogModuleInfo* gVP8TrackEncoderLog;
+LazyLogModule gVP8TrackEncoderLog("VP8TrackEncoder");
 #define VP8LOG(msg, ...) MOZ_LOG(gVP8TrackEncoderLog, mozilla::LogLevel::Debug, \
                                   (msg, ##__VA_ARGS__))
 // Debug logging macro with object pointer and class name.
@@ -37,9 +37,6 @@ VP8TrackEncoder::VP8TrackEncoder()
   , mVPXImageWrapper(new vpx_image_t())
 {
   MOZ_COUNT_CTOR(VP8TrackEncoder);
-  if (!gVP8TrackEncoderLog) {
-    gVP8TrackEncoderLog = PR_NewLogModule("VP8TrackEncoder");
-  }
 }
 
 VP8TrackEncoder::~VP8TrackEncoder()
diff --git a/dom/media/encoder/VorbisTrackEncoder.cpp b/dom/media/encoder/VorbisTrackEncoder.cpp
index c22b3e05600d7e..3a1c153bd51347 100644
--- a/dom/media/encoder/VorbisTrackEncoder.cpp
+++ b/dom/media/encoder/VorbisTrackEncoder.cpp
@@ -17,7 +17,7 @@ static const float BASE_QUALITY = 0.4f;
 namespace mozilla {
 
 #undef LOG
-PRLogModuleInfo* gVorbisTrackEncoderLog;
+LazyLogModule gVorbisTrackEncoderLog("VorbisTrackEncoder");
 #define VORBISLOG(msg, ...) MOZ_LOG(gVorbisTrackEncoderLog, mozilla::LogLevel::Debug, \
                              (msg, ##__VA_ARGS__))
 
@@ -25,9 +25,6 @@ VorbisTrackEncoder::VorbisTrackEncoder()
   : AudioTrackEncoder()
 {
   MOZ_COUNT_CTOR(VorbisTrackEncoder);
-  if (!gVorbisTrackEncoderLog) {
-    gVorbisTrackEncoderLog = PR_NewLogModule("VorbisTrackEncoder");
-  }
 }
 
 VorbisTrackEncoder::~VorbisTrackEncoder()
diff --git a/dom/media/fmp4/MP4Demuxer.cpp b/dom/media/fmp4/MP4Demuxer.cpp
index d281594181afe6..6c11eca7bbb107 100644
--- a/dom/media/fmp4/MP4Demuxer.cpp
+++ b/dom/media/fmp4/MP4Demuxer.cpp
@@ -20,11 +20,8 @@
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/H264.h"
 
-PRLogModuleInfo* GetDemuxerLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("MP4Demuxer");
-  }
+mozilla::LogModule* GetDemuxerLog() {
+  static mozilla::LazyLogModule log("MP4Demuxer");
   return log;
 }
 
diff --git a/dom/media/gmp/GMPAudioDecoderParent.cpp b/dom/media/gmp/GMPAudioDecoderParent.cpp
index b9a8cba8d5dfbe..b73c0d973f14fb 100644
--- a/dom/media/gmp/GMPAudioDecoderParent.cpp
+++ b/dom/media/gmp/GMPAudioDecoderParent.cpp
@@ -17,7 +17,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGV(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Verbose, msg)
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp
index 8d0279ecea53f5..95ee0eb747632d 100644
--- a/dom/media/gmp/GMPChild.cpp
+++ b/dom/media/gmp/GMPChild.cpp
@@ -43,7 +43,7 @@ namespace mozilla {
 #undef LOG
 #undef LOGD
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
 #define LOGD(x, ...) LOG(mozilla::LogLevel::Debug, "GMPChild[pid=%d] " x, (int)base::GetCurrentProcId(), ##__VA_ARGS__)
 
diff --git a/dom/media/gmp/GMPContentParent.cpp b/dom/media/gmp/GMPContentParent.cpp
index b238445f8965db..4b89dc7c532d37 100644
--- a/dom/media/gmp/GMPContentParent.cpp
+++ b/dom/media/gmp/GMPContentParent.cpp
@@ -20,7 +20,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
diff --git a/dom/media/gmp/GMPDecryptorParent.cpp b/dom/media/gmp/GMPDecryptorParent.cpp
index 375b46aad003a2..60d206ee678e4a 100644
--- a/dom/media/gmp/GMPDecryptorParent.cpp
+++ b/dom/media/gmp/GMPDecryptorParent.cpp
@@ -14,7 +14,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGV(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Verbose, msg)
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp
index 1593f0e28545cf..28e9671fd9f2b7 100644
--- a/dom/media/gmp/GMPParent.cpp
+++ b/dom/media/gmp/GMPParent.cpp
@@ -43,7 +43,7 @@ namespace mozilla {
 #undef LOG
 #undef LOGD
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 #define LOG(level, x, ...) MOZ_LOG(GetGMPLog(), (level), (x, ##__VA_ARGS__))
 #define LOGD(x, ...) LOG(mozilla::LogLevel::Debug, "GMPParent[%p|childPid=%d] " x, this, mChildPid, ##__VA_ARGS__)
 
diff --git a/dom/media/gmp/GMPService.cpp b/dom/media/gmp/GMPService.cpp
index 8c5b151eb16588..03dac0fdb813f7 100644
--- a/dom/media/gmp/GMPService.cpp
+++ b/dom/media/gmp/GMPService.cpp
@@ -46,12 +46,10 @@ namespace mozilla {
 #undef LOG
 #endif
 
-PRLogModuleInfo*
+LogModule*
 GetGMPLog()
 {
-  static PRLogModuleInfo *sLog;
-  if (!sLog)
-    sLog = PR_NewLogModule("GMP");
+  static LazyLogModule sLog("GMP");
   return sLog;
 }
 
diff --git a/dom/media/gmp/GMPService.h b/dom/media/gmp/GMPService.h
index 313fd1daf99836..0dac2d8a75e10c 100644
--- a/dom/media/gmp/GMPService.h
+++ b/dom/media/gmp/GMPService.h
@@ -24,7 +24,7 @@ template <class> struct already_AddRefed;
 
 namespace mozilla {
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 namespace gmp {
 
diff --git a/dom/media/gmp/GMPStorageParent.cpp b/dom/media/gmp/GMPStorageParent.cpp
index 2ec2210772d92d..c048f876950bab 100644
--- a/dom/media/gmp/GMPStorageParent.cpp
+++ b/dom/media/gmp/GMPStorageParent.cpp
@@ -25,7 +25,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
diff --git a/dom/media/gmp/GMPTimerParent.cpp b/dom/media/gmp/GMPTimerParent.cpp
index 8e584904810c90..260433d01583e7 100644
--- a/dom/media/gmp/GMPTimerParent.cpp
+++ b/dom/media/gmp/GMPTimerParent.cpp
@@ -13,7 +13,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
diff --git a/dom/media/gmp/GMPVideoDecoderParent.cpp b/dom/media/gmp/GMPVideoDecoderParent.cpp
index 7b368234886ff8..864576ecd9f3c4 100644
--- a/dom/media/gmp/GMPVideoDecoderParent.cpp
+++ b/dom/media/gmp/GMPVideoDecoderParent.cpp
@@ -21,7 +21,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGV(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Verbose, msg)
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
diff --git a/dom/media/gmp/GMPVideoEncoderParent.cpp b/dom/media/gmp/GMPVideoEncoderParent.cpp
index 4237d8c5beaaaf..404c7dc4e8951a 100644
--- a/dom/media/gmp/GMPVideoEncoderParent.cpp
+++ b/dom/media/gmp/GMPVideoEncoderParent.cpp
@@ -23,7 +23,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetGMPLog();
+extern LogModule* GetGMPLog();
 
 #define LOGD(msg) MOZ_LOG(GetGMPLog(), mozilla::LogLevel::Debug, msg)
 #define LOG(level, msg) MOZ_LOG(GetGMPLog(), (level), msg)
diff --git a/dom/media/gstreamer/GStreamerFormatHelper.cpp b/dom/media/gstreamer/GStreamerFormatHelper.cpp
index d7649b806a1cf9..fd545ac7ea967b 100644
--- a/dom/media/gstreamer/GStreamerFormatHelper.cpp
+++ b/dom/media/gstreamer/GStreamerFormatHelper.cpp
@@ -16,7 +16,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define LOG(msg, ...) \
     MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, ("GStreamerFormatHelper " msg, ##__VA_ARGS__))
 
diff --git a/dom/media/gstreamer/GStreamerReader.cpp b/dom/media/gstreamer/GStreamerReader.cpp
index 58bd4dcaa3d6b6..aff07e085819e6 100644
--- a/dom/media/gstreamer/GStreamerReader.cpp
+++ b/dom/media/gstreamer/GStreamerReader.cpp
@@ -29,7 +29,7 @@ using namespace media;
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define LOG(type, msg, ...) \
   MOZ_LOG(gMediaDecoderLog, type, ("GStreamerReader(%p) " msg, this, ##__VA_ARGS__))
 
diff --git a/dom/media/imagecapture/ImageCapture.cpp b/dom/media/imagecapture/ImageCapture.cpp
index f016647211774d..a169d9c3807edd 100644
--- a/dom/media/imagecapture/ImageCapture.cpp
+++ b/dom/media/imagecapture/ImageCapture.cpp
@@ -18,12 +18,9 @@
 
 namespace mozilla {
 
-PRLogModuleInfo* GetICLog()
+LogModule* GetICLog()
 {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("ImageCapture");
-  }
+  static LazyLogModule log("ImageCapture");
   return log;
 }
 
diff --git a/dom/media/imagecapture/ImageCapture.h b/dom/media/imagecapture/ImageCapture.h
index 7a47af45e7213a..fc8f5385acb615 100644
--- a/dom/media/imagecapture/ImageCapture.h
+++ b/dom/media/imagecapture/ImageCapture.h
@@ -14,7 +14,7 @@
 namespace mozilla {
 
 #ifndef IC_LOG
-PRLogModuleInfo* GetICLog();
+LogModule* GetICLog();
 #define IC_LOG(...) MOZ_LOG(GetICLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #endif
 
diff --git a/dom/media/mediasink/DecodedAudioDataSink.cpp b/dom/media/mediasink/DecodedAudioDataSink.cpp
index 5d0c89e2381b02..8a8eaaf6221de8 100644
--- a/dom/media/mediasink/DecodedAudioDataSink.cpp
+++ b/dom/media/mediasink/DecodedAudioDataSink.cpp
@@ -14,7 +14,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define SINK_LOG(msg, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, \
     ("DecodedAudioDataSink=%p " msg, this, ##__VA_ARGS__))
diff --git a/dom/media/mediasink/VideoSink.cpp b/dom/media/mediasink/VideoSink.cpp
index c5275a042699fa..2b673dd670a13f 100644
--- a/dom/media/mediasink/VideoSink.cpp
+++ b/dom/media/mediasink/VideoSink.cpp
@@ -8,7 +8,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define VSINK_LOG(msg, ...) \
   MOZ_LOG(gMediaDecoderLog, LogLevel::Debug, \
     ("VideoSink=%p " msg, this, ##__VA_ARGS__))
@@ -285,10 +285,9 @@ VideoSink::RenderVideoFrames(int32_t aMaxFrames,
   for (uint32_t i = 0; i < frames.Length(); ++i) {
     VideoData* frame = frames[i]->As<VideoData>();
 
-    bool valid = !frame->mImage || frame->mImage->IsValid();
     frame->mSentToCompositor = true;
 
-    if (!valid) {
+    if (!frame->mImage || !frame->mImage->IsValid()) {
       continue;
     }
 
diff --git a/dom/media/mediasource/ContainerParser.cpp b/dom/media/mediasource/ContainerParser.cpp
index f2be166346c96c..349723ef045794 100644
--- a/dom/media/mediasource/ContainerParser.cpp
+++ b/dom/media/mediasource/ContainerParser.cpp
@@ -20,7 +20,7 @@
 #endif
 #include "SourceBufferResource.h"
 
-extern PRLogModuleInfo* GetMediaSourceSamplesLog();
+extern mozilla::LogModule* GetMediaSourceSamplesLog();
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp
index ac3ebe99d19e1c..b0de675f68e447 100644
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -36,21 +36,15 @@
 struct JSContext;
 class JSObject;
 
-PRLogModuleInfo* GetMediaSourceLog()
+mozilla::LogModule* GetMediaSourceLog()
 {
-  static PRLogModuleInfo* sLogModule = nullptr;
-  if (!sLogModule) {
-    sLogModule = PR_NewLogModule("MediaSource");
-  }
+  static mozilla::LazyLogModule sLogModule("MediaSource");
   return sLogModule;
 }
 
-PRLogModuleInfo* GetMediaSourceAPILog()
+mozilla::LogModule* GetMediaSourceAPILog()
 {
-  static PRLogModuleInfo* sLogModule = nullptr;
-  if (!sLogModule) {
-    sLogModule = PR_NewLogModule("MediaSource");
-  }
+  static mozilla::LazyLogModule sLogModule("MediaSource");
   return sLogModule;
 }
 
diff --git a/dom/media/mediasource/MediaSourceDecoder.cpp b/dom/media/mediasource/MediaSourceDecoder.cpp
index 1859f330cdce52..395b82739bd504 100644
--- a/dom/media/mediasource/MediaSourceDecoder.cpp
+++ b/dom/media/mediasource/MediaSourceDecoder.cpp
@@ -17,7 +17,7 @@
 #include "MediaSourceDemuxer.h"
 #include "SourceBufferList.h"
 
-extern PRLogModuleInfo* GetMediaSourceLog();
+extern mozilla::LogModule* GetMediaSourceLog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("MediaSourceDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
diff --git a/dom/media/mediasource/MediaSourceResource.h b/dom/media/mediasource/MediaSourceResource.h
index 38b2c347fb2038..467232117d08bc 100644
--- a/dom/media/mediasource/MediaSourceResource.h
+++ b/dom/media/mediasource/MediaSourceResource.h
@@ -11,7 +11,7 @@
 #include "mozilla/Monitor.h"
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetMediaSourceLog();
+extern mozilla::LogModule* GetMediaSourceLog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("MediaSourceResource(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
diff --git a/dom/media/mediasource/ResourceQueue.cpp b/dom/media/mediasource/ResourceQueue.cpp
index 019764062908e4..58cc0a2fb582db 100644
--- a/dom/media/mediasource/ResourceQueue.cpp
+++ b/dom/media/mediasource/ResourceQueue.cpp
@@ -10,7 +10,7 @@
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetSourceBufferResourceLog();
+extern mozilla::LogModule* GetSourceBufferResourceLog();
 
 #define SBR_DEBUG(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), mozilla::LogLevel::Debug, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #define SBR_DEBUGV(arg, ...) MOZ_LOG(GetSourceBufferResourceLog(), mozilla::LogLevel::Verbose, ("ResourceQueue(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
diff --git a/dom/media/mediasource/SourceBuffer.cpp b/dom/media/mediasource/SourceBuffer.cpp
index ac7a9fbfab03ae..acddb5309215eb 100644
--- a/dom/media/mediasource/SourceBuffer.cpp
+++ b/dom/media/mediasource/SourceBuffer.cpp
@@ -26,8 +26,8 @@
 struct JSContext;
 class JSObject;
 
-extern PRLogModuleInfo* GetMediaSourceLog();
-extern PRLogModuleInfo* GetMediaSourceAPILog();
+extern mozilla::LogModule* GetMediaSourceLog();
+extern mozilla::LogModule* GetMediaSourceAPILog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("SourceBuffer(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
diff --git a/dom/media/mediasource/SourceBufferList.cpp b/dom/media/mediasource/SourceBufferList.cpp
index 5984bc5348746d..bea935f3d1e6bb 100644
--- a/dom/media/mediasource/SourceBufferList.cpp
+++ b/dom/media/mediasource/SourceBufferList.cpp
@@ -16,8 +16,8 @@
 #include "nsThreadUtils.h"
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetMediaSourceLog();
-extern PRLogModuleInfo* GetMediaSourceAPILog();
+extern mozilla::LogModule* GetMediaSourceLog();
+extern mozilla::LogModule* GetMediaSourceAPILog();
 
 #define MSE_API(arg, ...) MOZ_LOG(GetMediaSourceAPILog(), mozilla::LogLevel::Debug, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("SourceBufferList(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
diff --git a/dom/media/mediasource/SourceBufferResource.cpp b/dom/media/mediasource/SourceBufferResource.cpp
index 9611a60f272b44..32c4230e66b087 100644
--- a/dom/media/mediasource/SourceBufferResource.cpp
+++ b/dom/media/mediasource/SourceBufferResource.cpp
@@ -13,12 +13,9 @@
 #include "mozilla/Logging.h"
 #include "MediaData.h"
 
-PRLogModuleInfo* GetSourceBufferResourceLog()
+mozilla::LogModule* GetSourceBufferResourceLog()
 {
-  static PRLogModuleInfo* sLogModule = nullptr;
-  if (!sLogModule) {
-    sLogModule = PR_NewLogModule("SourceBufferResource");
-  }
+  static mozilla::LazyLogModule sLogModule("SourceBufferResource");
   return sLogModule;
 }
 
diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp
index c2b97634b5eb36..21a3f078dad547 100644
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -23,17 +23,14 @@
 
 #include <limits>
 
-extern PRLogModuleInfo* GetMediaSourceLog();
+extern mozilla::LogModule* GetMediaSourceLog();
 
 #define MSE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Debug, ("TrackBuffersManager(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 #define MSE_DEBUGV(arg, ...) MOZ_LOG(GetMediaSourceLog(), mozilla::LogLevel::Verbose, ("TrackBuffersManager(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
 
-PRLogModuleInfo* GetMediaSourceSamplesLog()
+mozilla::LogModule* GetMediaSourceSamplesLog()
 {
-  static PRLogModuleInfo* sLogModule = nullptr;
-  if (!sLogModule) {
-    sLogModule = PR_NewLogModule("MediaSourceSamples");
-  }
+  static mozilla::LazyLogModule sLogModule("MediaSourceSamples");
   return sLogModule;
 }
 #define SAMPLE_DEBUG(arg, ...) MOZ_LOG(GetMediaSourceSamplesLog(), mozilla::LogLevel::Debug, ("TrackBuffersManager(%p:%s)::%s: " arg, this, mType.get(), __func__, ##__VA_ARGS__))
diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
index e0761d0fb774cb..8184053ec710cf 100644
--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -32,7 +32,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 /** Decoder base class for Ogg-encapsulated streams. */
diff --git a/dom/media/ogg/OggReader.cpp b/dom/media/ogg/OggReader.cpp
index 91d4a27898312e..c97d1928e1f0dd 100644
--- a/dom/media/ogg/OggReader.cpp
+++ b/dom/media/ogg/OggReader.cpp
@@ -37,7 +37,7 @@ namespace mozilla {
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #ifdef SEEK_LOGGING
 #define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
diff --git a/dom/media/ogg/OpusParser.cpp b/dom/media/ogg/OpusParser.cpp
index 8bdaf7f550175b..c450df9a22a6e6 100644
--- a/dom/media/ogg/OpusParser.cpp
+++ b/dom/media/ogg/OpusParser.cpp
@@ -24,7 +24,7 @@ extern "C" {
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define OPUS_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 OpusParser::OpusParser():
diff --git a/dom/media/omx/AudioOffloadPlayer.cpp b/dom/media/omx/AudioOffloadPlayer.cpp
index 61dd15d003bef8..cb8a7df9c04052 100644
--- a/dom/media/omx/AudioOffloadPlayer.cpp
+++ b/dom/media/omx/AudioOffloadPlayer.cpp
@@ -42,7 +42,7 @@ using namespace android;
 
 namespace mozilla {
 
-PRLogModuleInfo* gAudioOffloadPlayerLog;
+LazyLogModule gAudioOffloadPlayerLog("AudioOffloadPlayer");
 #define AUDIO_OFFLOAD_LOG(type, msg) \
   MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
 
@@ -63,10 +63,6 @@ AudioOffloadPlayer::AudioOffloadPlayer(MediaOmxCommonDecoder* aObserver) :
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  if (!gAudioOffloadPlayerLog) {
-    gAudioOffloadPlayerLog = PR_NewLogModule("AudioOffloadPlayer");
-  }
-
   CHECK(aObserver);
 #if ANDROID_VERSION >= 21
   mSessionId = AudioSystem::newAudioUniqueId();
diff --git a/dom/media/omx/AudioOutput.cpp b/dom/media/omx/AudioOutput.cpp
index 9754da32b3d049..132d09d77c2da8 100644
--- a/dom/media/omx/AudioOutput.cpp
+++ b/dom/media/omx/AudioOutput.cpp
@@ -24,7 +24,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gAudioOffloadPlayerLog;
+extern LazyLogModule gAudioOffloadPlayerLog;
 #define AUDIO_OFFLOAD_LOG(type, msg) \
   MOZ_LOG(gAudioOffloadPlayerLog, type, msg)
 
@@ -37,9 +37,6 @@ AudioOutput::AudioOutput(int aSessionId, int aUid) :
   mUid(aUid),
   mSessionId(aSessionId)
 {
-  if (!gAudioOffloadPlayerLog) {
-    gAudioOffloadPlayerLog = PR_NewLogModule("AudioOffloadPlayer");
-  }
 }
 
 AudioOutput::~AudioOutput()
diff --git a/dom/media/omx/I420ColorConverterHelper.cpp b/dom/media/omx/I420ColorConverterHelper.cpp
index 8afcbc4cb07343..f1e248499d2a04 100644
--- a/dom/media/omx/I420ColorConverterHelper.cpp
+++ b/dom/media/omx/I420ColorConverterHelper.cpp
@@ -10,7 +10,7 @@
 
 #include "mozilla/Logging.h"
 
-PRLogModuleInfo *gI420ColorConverterHelperLog;
+mozilla::LazyLogModule gI420ColorConverterHelperLog("I420ColorConverterHelper");
 #define LOG(msg...) MOZ_LOG(gI420ColorConverterHelperLog, mozilla::LogLevel::Warning, (msg))
 
 namespace android {
@@ -19,9 +19,6 @@ I420ColorConverterHelper::I420ColorConverterHelper()
   : mHandle(nullptr)
   , mConverter({nullptr, nullptr, nullptr, nullptr, nullptr})
 {
-  if (!gI420ColorConverterHelperLog) {
-    gI420ColorConverterHelperLog = PR_NewLogModule("I420ColorConverterHelper");
-  }
 }
 
 I420ColorConverterHelper::~I420ColorConverterHelper()
diff --git a/dom/media/omx/MediaOmxCommonDecoder.cpp b/dom/media/omx/MediaOmxCommonDecoder.cpp
index 638e9e69d4fd36..73ab320d383532 100644
--- a/dom/media/omx/MediaOmxCommonDecoder.cpp
+++ b/dom/media/omx/MediaOmxCommonDecoder.cpp
@@ -20,7 +20,7 @@ using namespace android;
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 MediaOmxCommonDecoder::MediaOmxCommonDecoder(MediaDecoderOwner* aOwner)
diff --git a/dom/media/omx/MediaOmxCommonReader.cpp b/dom/media/omx/MediaOmxCommonReader.cpp
index 280bc26f35b291..2926ea940c102b 100644
--- a/dom/media/omx/MediaOmxCommonReader.cpp
+++ b/dom/media/omx/MediaOmxCommonReader.cpp
@@ -23,7 +23,7 @@ using namespace android;
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 MediaOmxCommonReader::MediaOmxCommonReader(AbstractMediaDecoder *aDecoder)
diff --git a/dom/media/omx/MediaOmxReader.cpp b/dom/media/omx/MediaOmxReader.cpp
index e67277cb37a409..65a370b260b151 100644
--- a/dom/media/omx/MediaOmxReader.cpp
+++ b/dom/media/omx/MediaOmxReader.cpp
@@ -28,7 +28,7 @@ using namespace android;
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define DECODER_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 
 class MediaOmxReader::ProcessCachedDataTask : public Task
diff --git a/dom/media/omx/OmxDecoder.cpp b/dom/media/omx/OmxDecoder.cpp
index 6427a313d151c3..531256ecad973e 100644
--- a/dom/media/omx/OmxDecoder.cpp
+++ b/dom/media/omx/OmxDecoder.cpp
@@ -37,7 +37,7 @@
 #define OD_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "OmxDecoder", __VA_ARGS__)
 
 #undef LOG
-PRLogModuleInfo *gOmxDecoderLog;
+mozilla::LazyLogModule gOmxDecoderLog("OmxDecoder");
 #define LOG(type, msg...) MOZ_LOG(gOmxDecoderLog, type, (msg))
 
 using namespace MPAPI;
@@ -102,10 +102,6 @@ static sp<IOMX> GetOMX()
 
 bool
 OmxDecoder::Init(sp<MediaExtractor>& extractor) {
-  if (!gOmxDecoderLog) {
-    gOmxDecoderLog = PR_NewLogModule("OmxDecoder");
-  }
-
   sp<MetaData> meta = extractor->getMetaData();
 
   ssize_t audioTrackIndex = -1;
diff --git a/dom/media/platforms/PlatformDecoderModule.cpp b/dom/media/platforms/PlatformDecoderModule.cpp
index bb02119700bc22..a2b979c374b0ab 100644
--- a/dom/media/platforms/PlatformDecoderModule.cpp
+++ b/dom/media/platforms/PlatformDecoderModule.cpp
@@ -6,10 +6,7 @@
 
 #include "PlatformDecoderModule.h"
 
-PRLogModuleInfo* GetPDMLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("PlatformDecoderModule");
-  }
+mozilla::LogModule* GetPDMLog() {
+  static mozilla::LazyLogModule log("PlatformDecoderModule");
   return log;
 }
diff --git a/dom/media/platforms/agnostic/OpusDecoder.cpp b/dom/media/platforms/agnostic/OpusDecoder.cpp
index 89e02079797b57..25223854868500 100644
--- a/dom/media/platforms/agnostic/OpusDecoder.cpp
+++ b/dom/media/platforms/agnostic/OpusDecoder.cpp
@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <inttypes.h>  // For PRId64
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define OPUS_DEBUG(arg, ...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, \
     ("OpusDataDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
diff --git a/dom/media/platforms/agnostic/VPXDecoder.cpp b/dom/media/platforms/agnostic/VPXDecoder.cpp
index 9a31ab653a96ef..2fb87f65080f76 100644
--- a/dom/media/platforms/agnostic/VPXDecoder.cpp
+++ b/dom/media/platforms/agnostic/VPXDecoder.cpp
@@ -14,7 +14,7 @@
 #include <algorithm>
 
 #undef LOG
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(arg, ...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, ("VPXDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/agnostic/VorbisDecoder.cpp b/dom/media/platforms/agnostic/VorbisDecoder.cpp
index dce4c8a97e447d..8f37a8fbc3aeec 100644
--- a/dom/media/platforms/agnostic/VorbisDecoder.cpp
+++ b/dom/media/platforms/agnostic/VorbisDecoder.cpp
@@ -12,7 +12,7 @@
 #include "nsAutoPtr.h"
 
 #undef LOG
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(type, msg) MOZ_LOG(GetPDMLog(), type, msg)
 
 namespace mozilla {
diff --git a/dom/media/platforms/apple/AppleATDecoder.cpp b/dom/media/platforms/apple/AppleATDecoder.cpp
index 578266e28f3aa6..fd8078208d67d7 100644
--- a/dom/media/platforms/apple/AppleATDecoder.cpp
+++ b/dom/media/platforms/apple/AppleATDecoder.cpp
@@ -11,7 +11,7 @@
 #include "AppleATDecoder.h"
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 #define FourCC2Str(n) ((char[5]){(char)(n >> 24), (char)(n >> 16), (char)(n >> 8), (char)(n), 0})
 
diff --git a/dom/media/platforms/apple/AppleCMLinker.cpp b/dom/media/platforms/apple/AppleCMLinker.cpp
index d32119ba9068ec..a61cb0e9f2fe47 100644
--- a/dom/media/platforms/apple/AppleCMLinker.cpp
+++ b/dom/media/platforms/apple/AppleCMLinker.cpp
@@ -15,7 +15,7 @@
 #include "nsCocoaFeatures.h"
 #endif
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/apple/AppleVDADecoder.cpp b/dom/media/platforms/apple/AppleVDADecoder.cpp
index 1851852ec1a243..8d1aebcade4c65 100644
--- a/dom/media/platforms/apple/AppleVDADecoder.cpp
+++ b/dom/media/platforms/apple/AppleVDADecoder.cpp
@@ -27,7 +27,7 @@
 #include "MacIOSurfaceImage.h"
 #endif
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 //#define LOG_MEDIA_SHA1
 
diff --git a/dom/media/platforms/apple/AppleVDALinker.cpp b/dom/media/platforms/apple/AppleVDALinker.cpp
index 79f5c96d742289..045b1e24d31152 100644
--- a/dom/media/platforms/apple/AppleVDALinker.cpp
+++ b/dom/media/platforms/apple/AppleVDALinker.cpp
@@ -10,7 +10,7 @@
 #include "MainThreadUtils.h"
 #include "nsDebug.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/apple/AppleVTDecoder.cpp b/dom/media/platforms/apple/AppleVTDecoder.cpp
index 5432b41b110fd7..000f95c6389da1 100644
--- a/dom/media/platforms/apple/AppleVTDecoder.cpp
+++ b/dom/media/platforms/apple/AppleVTDecoder.cpp
@@ -20,7 +20,7 @@
 #include "VideoUtils.h"
 #include "gfxPlatform.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 //#define LOG_MEDIA_SHA1
 
diff --git a/dom/media/platforms/apple/AppleVTLinker.cpp b/dom/media/platforms/apple/AppleVTLinker.cpp
index a4f7e266045dc2..8adda27225486b 100644
--- a/dom/media/platforms/apple/AppleVTLinker.cpp
+++ b/dom/media/platforms/apple/AppleVTLinker.cpp
@@ -11,7 +11,7 @@
 #include "mozilla/ArrayUtils.h"
 #include "nsDebug.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/ffmpeg/FFmpegLog.h b/dom/media/platforms/ffmpeg/FFmpegLog.h
index 19b950bf46d8b4..eb1d22d99cab62 100644
--- a/dom/media/platforms/ffmpeg/FFmpegLog.h
+++ b/dom/media/platforms/ffmpeg/FFmpegLog.h
@@ -7,7 +7,7 @@
 #ifndef __FFmpegLog_h__
 #define __FFmpegLog_h__
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define FFMPEG_LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 #endif // __FFmpegLog_h__
diff --git a/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp b/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
index 7dfa4b267c5b79..e55feb14119be8 100644
--- a/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
+++ b/dom/media/platforms/gonk/GonkAudioDecoderManager.cpp
@@ -27,7 +27,7 @@
 #include <android/log.h>
 #define GADM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkAudioDecoderManager", __VA_ARGS__)
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 using namespace android;
diff --git a/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp b/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp
index 0ff303817b3905..4bbf8acb6d1231 100644
--- a/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp
+++ b/dom/media/platforms/gonk/GonkMediaDataDecoder.cpp
@@ -20,7 +20,7 @@
 #include <utils/AndroidThreads.h>
 #endif
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 using namespace android;
diff --git a/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp b/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp
index 4cd3ecb0955f19..6a70a11be54132 100644
--- a/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp
+++ b/dom/media/platforms/gonk/GonkVideoDecoderManager.cpp
@@ -32,7 +32,7 @@
 #include <android/log.h>
 #define GVDM_LOG(...) __android_log_print(ANDROID_LOG_DEBUG, "GonkVideoDecoderManager", __VA_ARGS__)
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 using namespace mozilla::layers;
 using namespace android;
diff --git a/dom/media/platforms/wmf/MFTDecoder.cpp b/dom/media/platforms/wmf/MFTDecoder.cpp
index 83ff91ba00e579..5558d6d7b2bf14 100644
--- a/dom/media/platforms/wmf/MFTDecoder.cpp
+++ b/dom/media/platforms/wmf/MFTDecoder.cpp
@@ -9,7 +9,7 @@
 #include "WMFUtils.h"
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp
index 1b8d361f1fa43e..a2b5b518ed2bf0 100644
--- a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp
+++ b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp
@@ -13,7 +13,7 @@
 
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp b/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
index 5efca43a1a6160..48cc4f6e535bd7 100644
--- a/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
+++ b/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp
@@ -12,7 +12,7 @@
 
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 namespace mozilla {
diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
index b82f0486a62920..528155ad681055 100644
--- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
+++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
@@ -23,7 +23,7 @@
 #include "mozilla/Preferences.h"
 #include "nsPrintfCString.h"
 
-extern PRLogModuleInfo* GetPDMLog();
+extern mozilla::LogModule* GetPDMLog();
 #define LOG(...) MOZ_LOG(GetPDMLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 using mozilla::layers::Image;
diff --git a/dom/media/platforms/wrappers/FuzzingWrapper.cpp b/dom/media/platforms/wrappers/FuzzingWrapper.cpp
index 2e58facf3eed8a..6b87a8fb5adbeb 100644
--- a/dom/media/platforms/wrappers/FuzzingWrapper.cpp
+++ b/dom/media/platforms/wrappers/FuzzingWrapper.cpp
@@ -6,11 +6,8 @@
 
 #include "FuzzingWrapper.h"
 
-PRLogModuleInfo* GetFuzzingWrapperLog() {
-  static PRLogModuleInfo* log = nullptr;
-  if (!log) {
-    log = PR_NewLogModule("MediaFuzzingWrapper");
-  }
+mozilla::LogModule* GetFuzzingWrapperLog() {
+  static mozilla::LazyLogModule log("MediaFuzzingWrapper");
   return log;
 }
 #define DFW_LOGD(arg, ...) MOZ_LOG(GetFuzzingWrapperLog(), mozilla::LogLevel::Debug, ("DecoderFuzzingWrapper(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
diff --git a/dom/media/systemservices/CamerasChild.cpp b/dom/media/systemservices/CamerasChild.cpp
index 44ad63cdad6ade..d4adf6f024a809 100644
--- a/dom/media/systemservices/CamerasChild.cpp
+++ b/dom/media/systemservices/CamerasChild.cpp
@@ -22,7 +22,7 @@
 
 #undef LOG
 #undef LOG_ENABLED
-PRLogModuleInfo *gCamerasChildLog;
+mozilla::LazyLogModule gCamerasChildLog("CamerasChild");
 #define LOG(args) MOZ_LOG(gCamerasChildLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gCamerasChildLog, mozilla::LogLevel::Debug)
 
@@ -56,9 +56,6 @@ class CamerasSingleton {
     : mCamerasMutex("CamerasSingleton::mCamerasMutex"),
       mCameras(nullptr),
       mCamerasChildThread(nullptr) {
-    if (!gCamerasChildLog) {
-      gCamerasChildLog = PR_NewLogModule("CamerasChild");
-    }
     LOG(("CamerasSingleton: %p", this));
   }
 
@@ -144,10 +141,6 @@ Cameras() {
   OffTheBooksMutexAutoLock lock(CamerasSingleton::Mutex());
   if (!CamerasSingleton::Child()) {
     MOZ_ASSERT(!NS_IsMainThread(), "Should not be on the main Thread");
-    if (!gCamerasChildLog) {
-      gCamerasChildLog = PR_NewLogModule("CamerasChild");
-    }
-
     MOZ_ASSERT(!CamerasSingleton::Thread());
     LOG(("No sCameras, setting up IPC Thread"));
     nsresult rv = NS_NewNamedThread("Cameras IPC",
@@ -706,10 +699,6 @@ CamerasChild::CamerasChild()
     mRequestMutex("mozilla::cameras::CamerasChild::mRequestMutex"),
     mReplyMonitor("mozilla::cameras::CamerasChild::mReplyMonitor")
 {
-  if (!gCamerasChildLog) {
-    gCamerasChildLog = PR_NewLogModule("CamerasChild");
-  }
-
   LOG(("CamerasChild: %p", this));
 
   MOZ_COUNT_CTOR(CamerasChild);
diff --git a/dom/media/systemservices/CamerasParent.cpp b/dom/media/systemservices/CamerasParent.cpp
index df1c1ea56b6738..e0e4ca1aa9aef1 100644
--- a/dom/media/systemservices/CamerasParent.cpp
+++ b/dom/media/systemservices/CamerasParent.cpp
@@ -18,7 +18,7 @@
 
 #undef LOG
 #undef LOG_ENABLED
-PRLogModuleInfo *gCamerasParentLog;
+mozilla::LazyLogModule gCamerasParentLog("CamerasParent");
 #define LOG(args) MOZ_LOG(gCamerasParentLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gCamerasParentLog, mozilla::LogLevel::Debug)
 
@@ -852,9 +852,6 @@ CamerasParent::CamerasParent()
     mDestroyed(false),
     mWebRTCAlive(true)
 {
-  if (!gCamerasParentLog) {
-    gCamerasParentLog = PR_NewLogModule("CamerasParent");
-  }
   LOG(("CamerasParent: %p", this));
 
   mPBackgroundThread = NS_GetCurrentThread();
diff --git a/dom/media/systemservices/LoadManager.cpp b/dom/media/systemservices/LoadManager.cpp
index 044af1f45f5290..55506bab8d4579 100644
--- a/dom/media/systemservices/LoadManager.cpp
+++ b/dom/media/systemservices/LoadManager.cpp
@@ -19,7 +19,7 @@
 #include "mozilla/ArrayUtils.h"
 
 // NSPR_LOG_MODULES=LoadManager:5
-PRLogModuleInfo *gLoadManagerLog = nullptr;
+mozilla::LazyLogModule gLoadManagerLog("LoadManager");
 #undef LOG
 #undef LOG_ENABLED
 #define LOG(args) MOZ_LOG(gLoadManagerLog, mozilla::LogLevel::Debug, args)
@@ -46,8 +46,6 @@ LoadManagerSingleton::LoadManagerSingleton(int aLoadMeasurementInterval,
     mHighLoadThreshold(aHighLoadThreshold),
     mLowLoadThreshold(aLowLoadThreshold)
 {
-  if (!gLoadManagerLog)
-    gLoadManagerLog = PR_NewLogModule("LoadManager");
   LOG(("LoadManager - Initializing (%dms x %d, %f, %f)",
        mLoadMeasurementInterval, mAveragingMeasurements,
        mHighLoadThreshold, mLowLoadThreshold));
diff --git a/dom/media/systemservices/LoadManager.h b/dom/media/systemservices/LoadManager.h
index 6088c73dce64a2..2ede35dbb2de92 100644
--- a/dom/media/systemservices/LoadManager.h
+++ b/dom/media/systemservices/LoadManager.h
@@ -16,7 +16,7 @@
 #include "webrtc/common_types.h"
 #include "webrtc/video_engine/include/vie_base.h"
 
-extern PRLogModuleInfo *gLoadManagerLog;
+extern mozilla::LazyLogModule gLoadManagerLog;
 
 namespace mozilla {
 
diff --git a/dom/media/systemservices/MediaChild.cpp b/dom/media/systemservices/MediaChild.cpp
index eb2d8a76e78638..0ff3ac081762e2 100644
--- a/dom/media/systemservices/MediaChild.cpp
+++ b/dom/media/systemservices/MediaChild.cpp
@@ -13,7 +13,7 @@
 #include "nsQueryObject.h"
 
 #undef LOG
-PRLogModuleInfo *gMediaChildLog;
+mozilla::LazyLogModule gMediaChildLog("MediaChild");
 #define LOG(args) MOZ_LOG(gMediaChildLog, mozilla::LogLevel::Debug, args)
 
 namespace mozilla {
@@ -68,9 +68,6 @@ Child* Child::Get()
 Child::Child()
   : mActorDestroyed(false)
 {
-  if (!gMediaChildLog) {
-    gMediaChildLog = PR_NewLogModule("MediaChild");
-  }
   LOG(("media::Child: %p", this));
   MOZ_COUNT_CTOR(Child);
 }
diff --git a/dom/media/systemservices/MediaParent.cpp b/dom/media/systemservices/MediaParent.cpp
index 84a32d41d501d4..4704c0ef5c7ca8 100644
--- a/dom/media/systemservices/MediaParent.cpp
+++ b/dom/media/systemservices/MediaParent.cpp
@@ -24,7 +24,7 @@
 #include "mozilla/Logging.h"
 
 #undef LOG
-PRLogModuleInfo *gMediaParentLog;
+mozilla::LazyLogModule gMediaParentLog("MediaParent");
 #define LOG(args) MOZ_LOG(gMediaParentLog, mozilla::LogLevel::Debug, args)
 
 // A file in the profile dir is used to persist mOriginKeys used to anonymize
@@ -511,8 +511,6 @@ Parent<Super>::Parent(bool aSameProcess)
   , mDestroyed(false)
   , mSameProcess(aSameProcess)
 {
-  if (!gMediaParentLog)
-    gMediaParentLog = PR_NewLogModule("MediaParent");
   LOG(("media::Parent: %p", this));
 }
 
diff --git a/dom/media/systemservices/OpenSLESProvider.cpp b/dom/media/systemservices/OpenSLESProvider.cpp
index c15d71a22f7806..8b417884e8f2b5 100644
--- a/dom/media/systemservices/OpenSLESProvider.cpp
+++ b/dom/media/systemservices/OpenSLESProvider.cpp
@@ -14,7 +14,7 @@
 // NSPR_LOG_MODULES=OpenSLESProvider:5
 #undef LOG
 #undef LOG_ENABLED
-PRLogModuleInfo *gOpenSLESProviderLog;
+mozilla::LazyLogModule gOpenSLESProviderLog("OpenSLESProvider");
 #define LOG(args) MOZ_LOG(gOpenSLESProviderLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gOpenSLESProviderLog, mozilla::LogLevel::Debug)
 
@@ -27,8 +27,6 @@ OpenSLESProvider::OpenSLESProvider()
     mIsRealized(false),
     mOpenSLESLib(nullptr)
 {
-  if (!gOpenSLESProviderLog)
-    gOpenSLESProviderLog = PR_NewLogModule("OpenSLESProvider");
   LOG(("OpenSLESProvider being initialized"));
 }
 
diff --git a/dom/media/systemservices/OpenSLESProvider.h b/dom/media/systemservices/OpenSLESProvider.h
index 2316dd862137fd..6253e9519ed45c 100644
--- a/dom/media/systemservices/OpenSLESProvider.h
+++ b/dom/media/systemservices/OpenSLESProvider.h
@@ -28,7 +28,7 @@ SLresult mozilla_realize_sles_engine(SLObjectItf aObjectm);
 #ifdef __cplusplus
 #include "mozilla/Mutex.h"
 
-extern PRLogModuleInfo *gOpenSLESProviderLog;
+extern mozilla::LazyLogModule gOpenSLESProviderLog;
 
 namespace mozilla {
 
diff --git a/dom/media/systemservices/ShmemPool.cpp b/dom/media/systemservices/ShmemPool.cpp
index cd5e13e86f5649..e4d3a054ffbf01 100644
--- a/dom/media/systemservices/ShmemPool.cpp
+++ b/dom/media/systemservices/ShmemPool.cpp
@@ -11,7 +11,7 @@
 
 #undef LOG
 #undef LOG_ENABLED
-extern PRLogModuleInfo *gCamerasParentLog;
+extern mozilla::LazyLogModule gCamerasParentLog;
 #define LOG(args) MOZ_LOG(gCamerasParentLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gCamerasParentLog, mozilla::LogLevel::Debug)
 
diff --git a/dom/media/wave/WaveReader.cpp b/dom/media/wave/WaveReader.cpp
index 9cb7d7855bdc76..ec820c73ee4241 100644
--- a/dom/media/wave/WaveReader.cpp
+++ b/dom/media/wave/WaveReader.cpp
@@ -23,7 +23,7 @@ namespace mozilla {
 // Un-comment to enable logging of seek bisections.
 //#define SEEK_LOGGING
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 #define LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
 #ifdef SEEK_LOGGING
 #define SEEK_LOG(type, msg) MOZ_LOG(gMediaDecoderLog, type, msg)
diff --git a/dom/media/webm/AudioDecoder.cpp b/dom/media/webm/AudioDecoder.cpp
index ac3fceca28f23d..cd2bd03423183b 100644
--- a/dom/media/webm/AudioDecoder.cpp
+++ b/dom/media/webm/AudioDecoder.cpp
@@ -28,7 +28,7 @@
 
 namespace mozilla {
 
-extern PRLogModuleInfo* gMediaDecoderLog;
+extern LazyLogModule gMediaDecoderLog;
 
 ogg_packet InitOggPacket(const unsigned char* aData, size_t aLength,
                          bool aBOS, bool aEOS,
diff --git a/dom/media/webm/WebMDemuxer.cpp b/dom/media/webm/WebMDemuxer.cpp
index d8687e094c25c7..80e75eb1d40c00 100644
--- a/dom/media/webm/WebMDemuxer.cpp
+++ b/dom/media/webm/WebMDemuxer.cpp
@@ -32,8 +32,8 @@ namespace mozilla {
 
 using namespace gfx;
 
-PRLogModuleInfo* gWebMDemuxerLog = nullptr;
-extern PRLogModuleInfo* gNesteggLog;
+LazyLogModule gWebMDemuxerLog("WebMDemuxer");
+extern LazyLogModule gNesteggLog;
 
 // How far ahead will we look when searching future keyframe. In microseconds.
 // This value is based on what appears to be a reasonable value as most webm
@@ -145,12 +145,6 @@ WebMDemuxer::WebMDemuxer(MediaResource* aResource, bool aIsMediaSource)
   , mLastWebMBlockOffset(-1)
   , mIsMediaSource(aIsMediaSource)
 {
-  if (!gNesteggLog) {
-    gNesteggLog = PR_NewLogModule("Nestegg");
-  }
-  if (!gWebMDemuxerLog) {
-    gWebMDemuxerLog = PR_NewLogModule("WebMDemuxer");
-  }
 }
 
 WebMDemuxer::~WebMDemuxer()
diff --git a/dom/media/webm/WebMReader.cpp b/dom/media/webm/WebMReader.cpp
index 9095b5d1c3281a..4083d49483f33c 100644
--- a/dom/media/webm/WebMReader.cpp
+++ b/dom/media/webm/WebMReader.cpp
@@ -39,8 +39,8 @@ using namespace gfx;
 using namespace layers;
 using namespace media;
 
-extern PRLogModuleInfo* gMediaDecoderLog;
-PRLogModuleInfo* gNesteggLog;
+extern LazyLogModule gMediaDecoderLog;
+LazyLogModule gNesteggLog("Nestegg");
 
 // Functions for reading and seeking using MediaResource required for
 // nestegg_io. The 'user data' passed to these functions is the
@@ -137,9 +137,6 @@ WebMReader::WebMReader(AbstractMediaDecoder* aDecoder)
   , mResource(aDecoder->GetResource())
 {
   MOZ_COUNT_CTOR(WebMReader);
-  if (!gNesteggLog) {
-    gNesteggLog = PR_NewLogModule("Nestegg");
-  }
 }
 
 WebMReader::~WebMReader()
diff --git a/dom/media/webrtc/MediaEngineCameraVideoSource.cpp b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
index 789e67a9fd5421..40c38f56990abc 100644
--- a/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineCameraVideoSource.cpp
@@ -11,7 +11,7 @@ namespace mozilla {
 using namespace mozilla::gfx;
 using namespace mozilla::dom;
 
-extern PRLogModuleInfo* GetMediaManagerLog();
+extern LogModule* GetMediaManagerLog();
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
 #define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Verbose, msg)
 
diff --git a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
index 22fe90c1f253e6..33c565add98108 100644
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
@@ -25,7 +25,7 @@ using namespace mozilla::gfx;
 using namespace android;
 
 #undef LOG
-extern PRLogModuleInfo* GetMediaManagerLog();
+extern LogModule* GetMediaManagerLog();
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
 #define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Verbose, msg)
 
diff --git a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
index e2d898740dbf71..319f8a2d1f384a 100644
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
@@ -11,7 +11,7 @@
 #include "MediaTrackConstraints.h"
 #include "CamerasChild.h"
 
-extern PRLogModuleInfo* GetMediaManagerLog();
+extern mozilla::LogModule* GetMediaManagerLog();
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
 #define LOGFRAME(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Verbose, msg)
 
diff --git a/dom/media/webrtc/MediaEngineWebRTC.cpp b/dom/media/webrtc/MediaEngineWebRTC.cpp
index bac98880c871a6..650656c5c032a2 100644
--- a/dom/media/webrtc/MediaEngineWebRTC.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTC.cpp
@@ -13,12 +13,10 @@
 
 #include "mozilla/Logging.h"
 
-static PRLogModuleInfo*
+static mozilla::LogModule*
 GetUserMediaLog()
 {
-  static PRLogModuleInfo *sLog;
-  if (!sLog)
-    sLog = PR_NewLogModule("GetUserMedia");
+  static mozilla::LazyLogModule sLog("GetUserMedia");
   return sLog;
 }
 
diff --git a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
index dd72ff0b37323e..57c5ad2aff7289 100644
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -35,7 +35,7 @@ namespace mozilla {
 #undef LOG
 #endif
 
-extern PRLogModuleInfo* GetMediaManagerLog();
+extern LogModule* GetMediaManagerLog();
 #define LOG(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Debug, msg)
 #define LOG_FRAMES(msg) MOZ_LOG(GetMediaManagerLog(), mozilla::LogLevel::Verbose, msg)
 
diff --git a/dom/media/webspeech/recognition/SpeechRecognition.cpp b/dom/media/webspeech/recognition/SpeechRecognition.cpp
index 96a97c75c0ed49..e53e749307a2a4 100644
--- a/dom/media/webspeech/recognition/SpeechRecognition.cpp
+++ b/dom/media/webspeech/recognition/SpeechRecognition.cpp
@@ -56,14 +56,10 @@ static const uint32_t kSPEECH_DETECTION_TIMEOUT_MS = 10000;
 // kSAMPLE_RATE frames = 1s, kESTIMATION_FRAMES frames = 300ms
 static const uint32_t kESTIMATION_SAMPLES = 300 * kSAMPLE_RATE / 1000;
 
-PRLogModuleInfo*
+LogModule*
 GetSpeechRecognitionLog()
 {
-  static PRLogModuleInfo* sLog;
-  if (!sLog) {
-    sLog = PR_NewLogModule("SpeechRecognition");
-  }
-
+  static LazyLogModule sLog("SpeechRecognition");
   return sLog;
 }
 #define SR_LOG(...) MOZ_LOG(GetSpeechRecognitionLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
diff --git a/dom/media/webspeech/recognition/SpeechRecognition.h b/dom/media/webspeech/recognition/SpeechRecognition.h
index bce648ea6b8a13..6fe4dc3bd98d29 100644
--- a/dom/media/webspeech/recognition/SpeechRecognition.h
+++ b/dom/media/webspeech/recognition/SpeechRecognition.h
@@ -46,7 +46,7 @@ namespace dom {
 class GlobalObject;
 class SpeechEvent;
 
-PRLogModuleInfo* GetSpeechRecognitionLog();
+LogModule* GetSpeechRecognitionLog();
 #define SR_LOG(...) MOZ_LOG(GetSpeechRecognitionLog(), mozilla::LogLevel::Debug, (__VA_ARGS__))
 
 class SpeechRecognition final : public DOMEventTargetHelper,
diff --git a/dom/media/webspeech/synth/SpeechSynthesis.cpp b/dom/media/webspeech/synth/SpeechSynthesis.cpp
index 1d988884113079..f0942b25becfb0 100644
--- a/dom/media/webspeech/synth/SpeechSynthesis.cpp
+++ b/dom/media/webspeech/synth/SpeechSynthesis.cpp
@@ -16,14 +16,10 @@
 #include "nsIDocument.h"
 
 #undef LOG
-PRLogModuleInfo*
+mozilla::LogModule*
 GetSpeechSynthLog()
 {
-  static PRLogModuleInfo* sLog = nullptr;
-
-  if (!sLog) {
-    sLog = PR_NewLogModule("SpeechSynthesis");
-  }
+  static mozilla::LazyLogModule sLog("SpeechSynthesis");
 
   return sLog;
 }
diff --git a/dom/media/webspeech/synth/nsSpeechTask.cpp b/dom/media/webspeech/synth/nsSpeechTask.cpp
index 149f1c5bd76c36..01f56216f87a4a 100644
--- a/dom/media/webspeech/synth/nsSpeechTask.cpp
+++ b/dom/media/webspeech/synth/nsSpeechTask.cpp
@@ -18,7 +18,7 @@
 #endif
 
 #undef LOG
-extern PRLogModuleInfo* GetSpeechSynthLog();
+extern mozilla::LogModule* GetSpeechSynthLog();
 #define LOG(type, msg) MOZ_LOG(GetSpeechSynthLog(), type, msg)
 
 #define AUDIO_TRACK 1
diff --git a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
index 3cf59f72e3214f..f1f5442deeb867 100644
--- a/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
+++ b/dom/media/webspeech/synth/nsSynthVoiceRegistry.cpp
@@ -24,7 +24,7 @@
 #include "SpeechSynthesisParent.h"
 
 #undef LOG
-extern PRLogModuleInfo* GetSpeechSynthLog();
+extern mozilla::LogModule* GetSpeechSynthLog();
 #define LOG(type, msg) MOZ_LOG(GetSpeechSynthLog(), type, msg)
 
 namespace {
diff --git a/dom/requestsync/RequestSyncService.jsm b/dom/requestsync/RequestSyncService.jsm
index 77f87d4a267c97..835010922ab078 100644
--- a/dom/requestsync/RequestSyncService.jsm
+++ b/dom/requestsync/RequestSyncService.jsm
@@ -46,6 +46,10 @@ XPCOMUtils.defineLazyServiceGetter(this, "secMan",
                                    "@mozilla.org/scriptsecuritymanager;1",
                                    "nsIScriptSecurityManager");
 
+XPCOMUtils.defineLazyServiceGetter(this, "powerManagerService",
+                                   "@mozilla.org/power/powermanagerservice;1",
+                                   "nsIPowerManagerService");
+
 XPCOMUtils.defineLazyModuleGetter(this, "AlarmService",
                                   "resource://gre/modules/AlarmService.jsm");
 
@@ -595,7 +599,7 @@ this.RequestSyncService = {
 
     // Storing the requestID into the task for the callback.
     this.storePendingRequest(task, aTarget, aData.requestID);
-    this.timeout(task);
+    this.timeout(task, null);
   },
 
   // We cannot expose the full internal object to content but just a subset.
@@ -681,7 +685,7 @@ this.RequestSyncService = {
     this._afterSchedulingTasks.push(aCb);
   },
 
-  timeout: function(aObj) {
+  timeout: function(aObj, aWakeLock) {
     debug("timeout");
 
     if (this._activeTask) {
@@ -690,6 +694,7 @@ this.RequestSyncService = {
       if (this._queuedTasks.indexOf(aObj) == -1) {
         this._queuedTasks.push(aObj);
       }
+      this.maybeReleaseWakeLock(aWakeLock);
       return;
     }
 
@@ -697,7 +702,9 @@ this.RequestSyncService = {
     if (!app) {
       dump("ERROR!! RequestSyncService - Failed to retrieve app data from a principal.\n");
       aObj.active = false;
-      this.updateObjectInDB(aObj);
+      this.updateObjectInDB(aObj, () => {
+        this.maybeReleaseWakeLock(aWakeLock);
+      });
       return;
     }
 
@@ -706,20 +713,25 @@ this.RequestSyncService = {
 
     // Maybe need to be rescheduled?
     if (this.hasPendingMessages('request-sync', manifestURL, pageURL)) {
-      this.scheduleTimer(aObj);
+      this.scheduleTimer(aObj, () => {
+        this.maybeReleaseWakeLock(aWakeLock);
+      });
       return;
     }
 
     this.removeTimer(aObj);
-    this._activeTask = aObj;
 
     if (!manifestURL || !pageURL) {
       dump("ERROR!! RequestSyncService - Failed to create URI for the page or the manifest\n");
       aObj.active = false;
-      this.updateObjectInDB(aObj);
+      this.updateObjectInDB(aObj, () => {
+        this.maybeReleaseWakeLock(aWakeLock);
+      });
       return;
     }
 
+    this._activeTask = aObj;
+
     // We don't want to run more than 1 task at the same time. We do this using
     // the promise created by sendMessage(). But if the task takes more than
     // RSYNC_OPERATION_TIMEOUT millisecs, we have to ignore the promise and
@@ -727,6 +739,14 @@ this.RequestSyncService = {
 
     let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
 
+    // We need a wakelock to keep the device alive and we want to release it
+    // only when all the steps are fully completely. This can involve calling
+    // timeout() again if we have something in _queuedTasks. In this scenario
+    // we want to reuse the same wakelock and we receive it as param.
+    // The Wakelock is passed to operationCompleted() because we want to wait
+    // until the data is written into IDB and maybe until all the pending next
+    // tasks are executed too.
+    let wakeLock = aWakeLock ? aWakeLock : powerManagerService.newWakeLock("cpu");
     let done = false;
     let self = this;
     function taskCompleted() {
@@ -734,7 +754,7 @@ this.RequestSyncService = {
 
       if (!done) {
         done = true;
-        self.operationCompleted();
+        self.operationCompleted(wakeLock);
       }
 
       timer.cancel();
@@ -768,11 +788,12 @@ this.RequestSyncService = {
     });
   },
 
-  operationCompleted: function() {
+  operationCompleted: function(aWakeLock) {
     debug("operationCompleted");
 
     if (!this._activeTask) {
       dump("ERROR!! RequestSyncService - OperationCompleted called without an active task\n");
+      aWakeLock.unlock();
       return;
     }
 
@@ -790,25 +811,26 @@ this.RequestSyncService = {
     this.updateObjectInDB(this._activeTask, function() {
       if (!this._activeTask.data.oneShot) {
         this.scheduleTimer(this._activeTask, function() {
-          this.processNextTask();
+          this.processNextTask(aWakeLock);
         }.bind(this));
       } else {
-        this.processNextTask();
+        this.processNextTask(aWakeLock);
       }
     }.bind(this));
   },
 
-  processNextTask: function() {
+  processNextTask: function(aWakeLock) {
     debug("processNextTask");
 
     this._activeTask = null;
 
     if (this._queuedTasks.length == 0) {
+      aWakeLock.unlock();
       return;
     }
 
     let task = this._queuedTasks.shift();
-    this.timeout(task);
+    this.timeout(task, aWakeLock);
   },
 
   hasPendingMessages: function(aMessageName, aManifestURL, aPageURL) {
@@ -932,7 +954,7 @@ this.RequestSyncService = {
     AlarmService.add(
       { date: new Date(Date.now() + interval * 1000),
         ignoreTimezone: false },
-      () => this.timeout(aObj),
+      () => this.timeout(aObj, null),
       function(aTimerId) {
         this._timers[aObj.dbKey] = aTimerId;
         aCb();
@@ -968,6 +990,12 @@ this.RequestSyncService = {
     let requests = this._pendingRequests[aObj.dbKey];
     delete this._pendingRequests[aObj.dbKey];
     return requests;
+  },
+
+  maybeReleaseWakeLock: function(aWakeLock) {
+    if (aWakeLock) {
+      aWakeLock.unlock();
+    }
   }
 }
 
diff --git a/dom/speakermanager/SpeakerManagerService.cpp b/dom/speakermanager/SpeakerManagerService.cpp
index 4d720a4bddff56..ebc4675ab38809 100644
--- a/dom/speakermanager/SpeakerManagerService.cpp
+++ b/dom/speakermanager/SpeakerManagerService.cpp
@@ -184,7 +184,9 @@ SpeakerManagerService::Observe(nsISupports* aSubject,
     // AudioChannelService cannot be used past that point.
     RefPtr<AudioChannelService> audioChannelService =
       AudioChannelService::GetOrCreate();
-    audioChannelService->UnregisterSpeakerManager(this);
+    if (audioChannelService) {
+      audioChannelService->UnregisterSpeakerManager(this);
+    }
 
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
     if (obs) {
@@ -211,7 +213,9 @@ SpeakerManagerService::SpeakerManagerService()
   }
   RefPtr<AudioChannelService> audioChannelService =
     AudioChannelService::GetOrCreate();
-  audioChannelService->RegisterSpeakerManager(this);
+  if (audioChannelService) {
+    audioChannelService->RegisterSpeakerManager(this);
+  }
 }
 
 SpeakerManagerService::~SpeakerManagerService()
diff --git a/dom/system/gonk/AudioChannelManager.cpp b/dom/system/gonk/AudioChannelManager.cpp
index f23ad5c30f3fbd..4bccace28fed22 100644
--- a/dom/system/gonk/AudioChannelManager.cpp
+++ b/dom/system/gonk/AudioChannelManager.cpp
@@ -131,6 +131,10 @@ AudioChannelManager::NotifyVolumeControlChannelChanged()
   docshell->GetIsActive(&isActive);
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
+  if (!service) {
+    return;
+  }
+
   if (isActive) {
     service->SetDefaultVolumeControlChannel(mVolumeChannel, isActive);
   } else {
diff --git a/dom/system/gonk/AudioManager.cpp b/dom/system/gonk/AudioManager.cpp
index 83cf1ddc9620a1..94bc4240c61ca0 100644
--- a/dom/system/gonk/AudioManager.cpp
+++ b/dom/system/gonk/AudioManager.cpp
@@ -551,9 +551,7 @@ AudioManager::HandleAudioChannelProcessChanged()
   }
 
   RefPtr<AudioChannelService> service = AudioChannelService::GetOrCreate();
-  MOZ_ASSERT(service);
-
-  bool telephonyChannelIsActive = service->TelephonyChannelIsActive();
+  bool telephonyChannelIsActive = service && service->TelephonyChannelIsActive();
   telephonyChannelIsActive ? SetPhoneState(PHONE_STATE_IN_COMMUNICATION) :
                              SetPhoneState(PHONE_STATE_NORMAL);
 }
diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini
index e5c63352cd14a1..c2ee19f88ac3e2 100644
--- a/dom/tests/mochitest/general/mochitest.ini
+++ b/dom/tests/mochitest/general/mochitest.ini
@@ -73,6 +73,7 @@ skip-if = buildapp == 'mulet'
 skip-if = e10s || buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
 [test_for_of.html]
 [test_frameElementWrapping.html]
+[test_pointerPreserves3D.html]
 [test_framedhistoryframes.html]
 [test_idleapi_permissions.html]
 skip-if = e10s || buildapp == 'b2g' || buildapp == 'mulet'
diff --git a/dom/tests/mochitest/general/test_pointerPreserves3D.html b/dom/tests/mochitest/general/test_pointerPreserves3D.html
new file mode 100644
index 00000000000000..b9826a18576c76
--- /dev/null
+++ b/dom/tests/mochitest/general/test_pointerPreserves3D.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for pointer events with preserve-3d</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<div>
+  <div>
+    <div style="transform-style: preserve-3d; transform: rotateX(90deg);">
+      <div id="color" style="transform: rotateX(-90deg); display: block; background-color: blue; width: 200px; height: 200px;"></div>
+    </div>
+  </div>
+</div>
+<script class="testbody" type="text/javascript">
+function runTest() {
+    var target = document.elementFromPoint(100, 110);
+    ok(target == document.getElementById("color"), "Find the right target.");
+}
+
+runTest();
+</script>
+</body>
+</html>
diff --git a/dom/tv/TVServiceFactory.cpp b/dom/tv/TVServiceFactory.cpp
index 49cb4157d83883..70979505b36a41 100644
--- a/dom/tv/TVServiceFactory.cpp
+++ b/dom/tv/TVServiceFactory.cpp
@@ -28,7 +28,7 @@ TVServiceFactory::AutoCreateTVService()
   nsresult rv;
   nsCOMPtr<nsITVService> service = do_CreateInstance(TV_SERVICE_CONTRACTID);
   if (!service) {
-    if (Preferences::GetBool("dom.testing.tv_enabled_for_hosted_apps", false)) {
+    if (Preferences::GetBool("dom.ignore_webidl_scope_checks", false)) {
       // Fallback to the fake service.
       service = do_CreateInstance(FAKE_TV_SERVICE_CONTRACTID, &rv);
     } else {
diff --git a/dom/tv/test/mochitest/file_app.sjs b/dom/tv/test/mochitest/file_app.sjs
deleted file mode 100644
index 506b679f3ac7ab..00000000000000
--- a/dom/tv/test/mochitest/file_app.sjs
+++ /dev/null
@@ -1,55 +0,0 @@
-var gBasePath = "tests/dom/tv/test/mochitest/";
-
-function handleRequest(request, response) {
-  var query = getQuery(request);
-
-  var testToken = '';
-  if ('testToken' in query) {
-    testToken = query.testToken;
-  }
-
-  var template = '';
-  if ('template' in query) {
-    template = query.template;
-  }
-  var template = gBasePath + template;
-  response.setHeader("Content-Type", "application/x-web-app-manifest+json", false);
-  response.write(readTemplate(template).replace(/TESTTOKEN/g, testToken));
-}
-
-// Copy-pasted incantations. There ought to be a better way to synchronously read
-// a file into a string, but I guess we're trying to discourage that.
-function readTemplate(path) {
-  var file = Components.classes["@mozilla.org/file/directory_service;1"].
-                        getService(Components.interfaces.nsIProperties).
-                        get("CurWorkD", Components.interfaces.nsILocalFile);
-  var fis  = Components.classes['@mozilla.org/network/file-input-stream;1'].
-                        createInstance(Components.interfaces.nsIFileInputStream);
-  var cis = Components.classes["@mozilla.org/intl/converter-input-stream;1"].
-                       createInstance(Components.interfaces.nsIConverterInputStream);
-  var split = path.split("/");
-  for(var i = 0; i < split.length; ++i) {
-    file.append(split[i]);
-  }
-  fis.init(file, -1, -1, false);
-  cis.init(fis, "UTF-8", 0, 0);
-
-  var data = "";
-  let str = {};
-  let read = 0;
-  do {
-    read = cis.readString(0xffffffff, str); // read as much as we can and put it in str.value
-    data += str.value;
-  } while (read != 0);
-  cis.close();
-  return data;
-}
-
-function getQuery(request) {
-  var query = {};
-  request.queryString.split('&').forEach(function (val) {
-    var [name, value] = val.split('=');
-    query[name] = unescape(value);
-  });
-  return query;
-}
diff --git a/dom/tv/test/mochitest/file_app.template.webapp b/dom/tv/test/mochitest/file_app.template.webapp
deleted file mode 100644
index 9e087fd80d63fc..00000000000000
--- a/dom/tv/test/mochitest/file_app.template.webapp
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "name": "TV Test App (hosted)",
-  "description": "Hosted TV test app used for mochitest.",
-  "launch_path": "/tests/dom/tv/test/mochitest/TESTTOKEN",
-  "icons": { "128": "default_icon" }
-}
diff --git a/dom/tv/test/mochitest/file_tv_get_channels.html b/dom/tv/test/mochitest/file_tv_get_channels.html
deleted file mode 100644
index c0d85be6bb0b31..00000000000000
--- a/dom/tv/test/mochitest/file_tv_get_channels.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test GetChannels for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-
-          aSources[0].getChannels().then(
-            function(aChannels) {
-              ok(aChannels.length > 0, "Got at least 1 channel.");
-
-              for (var i = 0; i < aChannels.length; i++) {
-                var channel = aChannels[i];
-                ok(channel instanceof TVChannel, "Channel " + i + " should be in right type.")
-                ok('source' in channel, "Channel " + i + " should have a source.");
-                ok('networkId' in channel, "Channel " + i + " should have a network ID.");
-                ok('transportStreamId' in channel, "Channel " + i + " should have a transport stream ID.");
-                ok('serviceId' in channel, "Channel " + i + " should have a service ID.");
-                ok('type' in channel, "Channel " + i + " should have a type.");
-                ok('name' in channel, "Channel " + i + " should have a name.");
-                ok('number' in channel, "Channel " + i + " should have a number.");
-              }
-
-              finish();
-            },
-            function(aError) {
-              ok(false, "Error occurred when getting channels: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_get_channels_during_scanning.html b/dom/tv/test/mochitest/file_tv_get_channels_during_scanning.html
deleted file mode 100644
index a0332812e083ac..00000000000000
--- a/dom/tv/test/mochitest/file_tv_get_channels_during_scanning.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test an error case for GetChannels during scanning for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-  function(aTuners) {
-    ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-    aTuners[0].getSources().then(
-      function(aSources) {
-        ok(aSources.length > 0, "Got at least 1 source.");
-        var source = aSources[0];
-
-        // TODO Bug 1088818 - Modify the behavior of channel scanning.
-        source.startScanning({}).then(
-          function() {
-            source.getChannels().then(
-              function() {
-                ok(false, "Getting channels during scanning should get error.");
-                  finish();
-                },
-                function(aError) {
-                  is(aError.name, "InvalidStateError",
-                     "InvalidStateError should be expected.");
-                  finish();
-                }
-              );
-            },
-            function(aError) {
-              ok(false, "Error occurred when starting scanning: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_get_current_program.html b/dom/tv/test/mochitest/file_tv_get_current_program.html
deleted file mode 100644
index f3a361c5964d00..00000000000000
--- a/dom/tv/test/mochitest/file_tv_get_current_program.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test GetCurrentProgram for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-
-          aSources[0].getChannels().then(
-            function(aChannels) {
-              ok(aChannels.length > 0, "Got at least 1 channel.");
-
-              aChannels[0].getCurrentProgram().then(
-                function(aCurrentProgram) {
-                  ok(aCurrentProgram, "Got the current program.");
-                  ok(aCurrentProgram instanceof TVProgram, "The current program should be in the right type.")
-                  ok('channel' in aCurrentProgram, "The current program should have a channel.");
-                  ok('eventId' in aCurrentProgram, "The current program should have an event ID.");
-                  ok('title' in aCurrentProgram, "The current program should have a title.");
-                  ok('startTime' in aCurrentProgram, "The current program should have start time.");
-                  ok('duration' in aCurrentProgram, "The current program should have duration.");
-                  ok(aCurrentProgram.getAudioLanguages().length >= 0,
-                     "The current program may have audio language(s).");
-                  ok(aCurrentProgram.getSubtitleLanguages().length >= 0,
-                     "The current program may have subtitle language(s).");
-
-                  finish();
-                },
-                function(aError) {
-                  ok(false, "Error occurred when getting programs: " + aError);
-                  finish();
-                }
-              );
-            },
-            function(aError) {
-              ok(false, "Error occurred when getting channels: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_get_programs.html b/dom/tv/test/mochitest/file_tv_get_programs.html
deleted file mode 100644
index b4585cd3b91604..00000000000000
--- a/dom/tv/test/mochitest/file_tv_get_programs.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test GetPrograms for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-
-          aSources[0].getChannels().then(
-            function(aChannels) {
-              ok(aChannels.length > 0, "Got at least 1 channel.");
-
-              aChannels[0].getPrograms().then(
-                function(aPrograms) {
-                  ok(aPrograms.length > 0, "Got at least 1 program.");
-
-                  for (var i = 0; i < aPrograms.length; i++) {
-                    var program = aPrograms[i];
-                    ok(program instanceof TVProgram, "Program " + i + " should be in the right type.")
-                    ok('channel' in program, "Program " + i + " should have a channel.");
-                    ok('eventId' in program, "Program " + i + " should have an event ID.");
-                    ok('title' in program, "Program " + i + " should have a title.");
-                    ok('startTime' in program, "Program " + i + " should have start time.");
-                    ok('duration' in program, "Program " + i + " should have duration.");
-                    ok(program.getAudioLanguages().length >= 0,
-                       "Program " + i + " may have audio language(s).");
-                    ok(program.getSubtitleLanguages().length >= 0,
-                       "Program " + i + " may have subtitle language(s).");
-                  }
-
-                  finish();
-                },
-                function(aError) {
-                  ok(false, "Error occurred when getting programs: " + aError);
-                  finish();
-                }
-              );
-            },
-            function(aError) {
-              ok(false, "Error occurred when getting channels: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_get_sources.html b/dom/tv/test/mochitest/file_tv_get_sources.html
deleted file mode 100644
index dd8010b8c946d2..00000000000000
--- a/dom/tv/test/mochitest/file_tv_get_sources.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test GetSources for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-          for (var i = 0; i < aSources.length; i++) {
-            var source = aSources[i];
-            ok(source instanceof TVSource, "Source " + i + " should be in the right type.");
-            ok('tuner' in source, "Source " + i + " should have a tuner.");
-            ok('type' in source, "Source " + i + " should have a type.");
-            ok('isScanning' in source, "Source " + i + " should have isScanning.");
-            ok(!source.isScanning,
-               "Source " + i + " should not be scanning by default.");
-            ok(!source.currentChannel,
-               "Source " + i + " should have no current channel by default.");
-          }
-
-          finish();
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_get_tuners.html b/dom/tv/test/mochitest/file_tv_get_tuners.html
deleted file mode 100644
index 1b10693ab31f86..00000000000000
--- a/dom/tv/test/mochitest/file_tv_get_tuners.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test GetTuners for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-      for (var i = 0; i < aTuners.length; i++) {
-        var tuner = aTuners[i];
-        ok(tuner instanceof TVTuner, "Tuner " + i + " should be in the right type.");
-        ok('id' in tuner, "Tuner " + i + " should have an ID.");
-        ok(tuner.getSupportedSourceTypes().length > 0,
-           "Tuner " + i + " should have supported source type(s).");
-        ok(!tuner.currentSource,
-           "Tuner " + i + " should have no current source by default.");
-        ok(!tuner.stream, "Tuner " + i + " should have no stream by default.");
-      }
-
-      finish();
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_non_permitted_app.html b/dom/tv/test/mochitest/file_tv_non_permitted_app.html
deleted file mode 100644
index 75e6be982cdb46..00000000000000
--- a/dom/tv/test/mochitest/file_tv_non_permitted_app.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test the availability of TV Manager API for non-permitted Apps</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok(!('tv' in navigator),
-     "navigator.tv should not exist for non-permitted app.");
-  finish();
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_permitted_app.html b/dom/tv/test/mochitest/file_tv_permitted_app.html
deleted file mode 100644
index c1c924a976ac47..00000000000000
--- a/dom/tv/test/mochitest/file_tv_permitted_app.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test the availability of TV Manager API for permitted Apps</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist for permitted app.");
-  finish();
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_scan_channels_completed.html b/dom/tv/test/mochitest/file_tv_scan_channels_completed.html
deleted file mode 100644
index a77ad5d7d4c291..00000000000000
--- a/dom/tv/test/mochitest/file_tv_scan_channels_completed.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test channel scanning complete for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  var isScannedEventFired = false;
-  
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-          var source = aSources[0];
-
-          source.oneitbroadcasted = function(aEvent) {
-            info("Received EIT broadcasted event.");
-
-            var programs = aEvent.programs;
-            for (var i = 0; i < programs.length; i++) {
-              ok(programs[i], "Program " + i + " should be set.")
-            }
-          };
-
-          source.onscanningstatechanged = function(aEvent) {
-            if (aEvent.state === 'scanned') {
-              isScannedEventFired = true;
-              info("Received channel scanned event.");
-              ok(aEvent.channel, "Scanned channel should be set.");
-            } else if (aEvent.state === 'completed') {
-              ok(isScannedEventFired, "Received channel scanning completed event after channel scanned event.");
-              finish();
-            }
-          };
-
-          // TODO Bug 1088818 - Modify the behavior of channel scanning.
-          source.startScanning({}).then(
-            function() {},
-            function(aError) {
-              ok(false, "Error occurred when starting scanning: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_scan_channels_stopped.html b/dom/tv/test/mochitest/file_tv_scan_channels_stopped.html
deleted file mode 100644
index b8ab6883b89460..00000000000000
--- a/dom/tv/test/mochitest/file_tv_scan_channels_stopped.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test StartScanning and StopScanning for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  var isClearedEventFired = false;
-  
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-          var source = aSources[0];
-
-          source.onscanningstatechanged = function(aEvent) {
-            if (aEvent.state === 'cleared') {
-              isClearedEventFired = true;
-              info("Received channel cache cleared event.");
-            } else if (aEvent.state === 'stopped') {
-              ok(isClearedEventFired, "Received channel scanning stopped event after cleared event.");
-              finish();
-            }
-          };
-
-          // TODO Bug 1088818 - Modify the behavior of channel scanning.
-          source.startScanning({ isRescanned: true }).then(
-            function() {
-              source.stopScanning().then(
-                function() {},
-                function(aError) {
-                  ok(false, "Error occurred when stopping scanning: " + aError);
-                  finish();
-                }
-              );
-            },
-            function(aError) {
-              ok(false, "Error occurred when starting scanning: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_set_current_channel.html b/dom/tv/test/mochitest/file_tv_set_current_channel.html
deleted file mode 100644
index 7dc5199a6d9035..00000000000000
--- a/dom/tv/test/mochitest/file_tv_set_current_channel.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test SetCurrentChannel for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-      var tuner = aTuners[0];
-      var selectedSourceType = tuner.getSupportedSourceTypes()[0];
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-          var source = aSources[0];
-
-          source.getChannels().then(
-            function(aChannels) {
-              ok(aChannels.length > 0, "Got at least 1 channel.");
-              var selectedChannelNumber = aChannels[0].number;
-
-              source.oncurrentchannelchanged = function(aEvent) {
-                ok(aEvent instanceof TVCurrentChannelChangedEvent,
-                   "The event is in the right type");
-                ok(aEvent.channel instanceof TVChannel,
-                   "The channel is in the right type.");
-                is(aEvent.channel, source.currentChannel,
-                  "The current channel is set.");
-                is(source.currentChannel.number, selectedChannelNumber,
-                   "The current channel number is correct.");
-                finish();
-              };
-
-              source.setCurrentChannel(selectedChannelNumber).then(
-                function() {},
-                function(aError) {
-                  ok(false, "Error occurred when setting current channel: " + aError);
-                  finish();
-                }
-              );
-            },
-            function(aError) {
-              ok(false, "Error occurred when getting channels: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_set_current_channel_during_scanning.html b/dom/tv/test/mochitest/file_tv_set_current_channel_during_scanning.html
deleted file mode 100644
index 9377fe97fd2716..00000000000000
--- a/dom/tv/test/mochitest/file_tv_set_current_channel_during_scanning.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test an error case for SetCurrentChannel during scanning for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners){
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-          var source = aSources[0];
-
-          // TODO Bug 1088818 - Modify the behavior of channel scanning.
-          source.startScanning({}).then(
-            function() {
-              source.setCurrentChannel("1").then(
-                function() {
-                  ok(false, "Setting current channel during scanning should get error.");
-                  finish();
-                },
-                function(aError) {
-                  is(aError.name, "InvalidStateError",
-                     "InvalidStateError should be expected.");
-                  finish();
-                }
-              );
-            },
-            function(aError) {
-              ok(false, "Error occurred when starting scanning: " + aError);
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_set_current_source.html b/dom/tv/test/mochitest/file_tv_set_current_source.html
deleted file mode 100644
index b8307c7bd38aab..00000000000000
--- a/dom/tv/test/mochitest/file_tv_set_current_source.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test SetCurrentSource for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-      var tuner = aTuners[0];
-      var selectedSourceType = tuner.getSupportedSourceTypes()[0];
-
-      tuner.oncurrentsourcechanged = function(aEvent) {
-        ok(aEvent instanceof TVCurrentSourceChangedEvent,
-           "The event is in the right type");
-        ok(aEvent.source instanceof TVSource,
-           "The source is in the right type.");
-        is(aEvent.source, tuner.currentSource,
-           "The current source is set.");
-        is(tuner.currentSource.type, selectedSourceType,
-           "The current source type is correct.");
-        finish();
-      };
-
-      tuner.setCurrentSource(selectedSourceType).then(
-        function() {},
-        function(aError) {
-          ok(false, "Error occurred when setting current source: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_set_invalid_current_channel.html b/dom/tv/test/mochitest/file_tv_set_invalid_current_channel.html
deleted file mode 100644
index 60ccae4ff265f8..00000000000000
--- a/dom/tv/test/mochitest/file_tv_set_invalid_current_channel.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test an error case for SetCurrentChannel for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-      var tuner = aTuners[0];
-      var selectedSourceType = tuner.getSupportedSourceTypes()[0];
-
-      aTuners[0].getSources().then(
-        function(aSources) {
-          ok(aSources.length > 0, "Got at least 1 source.");
-
-          aSources[0].setCurrentChannel("NonExistentChannelNumber").then(
-            function() {
-              ok(false, "Setting an invalid current channel should get error.");
-              finish();
-            },
-            function(aError) {
-              is(aError.name, "AbortError", "AbortError should be expected.");
-              finish();
-            }
-          );
-        },
-        function(aError) {
-          ok(false, "Error occurred when getting sources: " + aError);
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/file_tv_set_invalid_current_source.html b/dom/tv/test/mochitest/file_tv_set_invalid_current_source.html
deleted file mode 100644
index a44b867e2259b7..00000000000000
--- a/dom/tv/test/mochitest/file_tv_set_invalid_current_source.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test an error case for SetCurrentSource for TV API</title>
-</head>
-<body>
-<div id="content"></div>
-  <script type="application/javascript" src="./test_helpers.js"></script>
-  <script type="application/javascript;version=1.7">
-
-  ok('tv' in navigator, "navigator.tv should exist.");
-
-  navigator.tv.getTuners().then(
-    function(aTuners) {
-      ok(aTuners.length > 0, "Got at least 1 tuner.");
-
-      aTuners[0].setCurrentSource("InvalidSourceType").then(
-        function() {
-          ok(false, "Setting an invalid current source should get error.");
-          finish();
-        },
-        function(aError) {
-          is(aError.name, "TypeError", "TypeError should be expected.");
-          finish();
-        }
-      );
-    },
-    function(aError) {
-      ok(false, "Error occurred when getting tuners: " + aError);
-      finish();
-    }
-  );
-  </script>
-</body>
-</html>
diff --git a/dom/tv/test/mochitest/head.js b/dom/tv/test/mochitest/head.js
index 78f65a1437cb69..3afe89296c626b 100644
--- a/dom/tv/test/mochitest/head.js
+++ b/dom/tv/test/mochitest/head.js
@@ -1,98 +1,28 @@
 "use strict";
 
-var gAppsService = SpecialPowers.Cc["@mozilla.org/AppsService;1"]
-                   .getService(SpecialPowers.Ci.nsIAppsService);
-
-
-var gApp;
-
-function cbError(e) {
-  ok(false, "Error callback invoked: " + this.error.name);
-  SimpleTest.finish();
-}
-
-function installApp(aTestToken, aTemplate) {
-  var hostedManifestURL = window.location.origin +
-                          '/tests/dom/tv/test/mochitest/file_app.sjs?testToken='
-                          + aTestToken + '&template=' + aTemplate;
-  var request = navigator.mozApps.install(hostedManifestURL);
-  request.onerror = cbError;
-  request.onsuccess = function() {
-    gApp = request.result;
-
-    var appId = gAppsService.getAppLocalIdByManifestURL(gApp.manifestURL);
-    SpecialPowers.addPermission("tv", true, { url: gApp.origin,
-                                              originAttributes: {
-                                                appId: appId
-                                              }});
-
-    runTest();
-  }
-}
-
-function uninstallApp() {
-  var request = navigator.mozApps.mgmt.uninstall(gApp);
-  request.onerror = cbError;
-  request.onsuccess = function() {
-    // All done.
-    info("All done");
-    runTest();
-  }
+function setupPrefsAndPermissions(callback) {
+  setupPrefs(function() {
+      SpecialPowers.pushPermissions([
+        {"type":"tv", "allow":1, "context":document}
+      ], callback);
+  });
 }
 
-function testApp() {
-  var ifr = document.createElement('iframe');
-  ifr.setAttribute('mozbrowser', 'true');
-  ifr.setAttribute('mozapp', gApp.manifestURL);
-  ifr.setAttribute('src', gApp.manifest.launch_path);
-  var domParent = document.getElementById('content');
-
-  // Set us up to listen for messages from the app.
-  var listener = function(e) {
-    var message = e.detail.message;
-    if (/^OK/.exec(message)) {
-      ok(true, "Message from app: " + message);
-    } else if (/KO/.exec(message)) {
-      ok(false, "Message from app: " + message);
-    } else if (/^INFO/.exec(message)) {
-      info("Message from app: " + message);
-    } else if (/DONE/.exec(message)) {
-      ok(true, "Messaging from app complete");
-      ifr.removeEventListener('mozbrowsershowmodalprompt', listener);
-      domParent.removeChild(ifr);
-      runTest();
-    }
-  }
-
-  // This event is triggered when the app calls "alert".
-  ifr.addEventListener('mozbrowsershowmodalprompt', listener, false);
-  domParent.appendChild(ifr);
+function setupPrefs(callback) {
+  SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true],
+                                     ["dom.ignore_webidl_scope_checks", true]]}, function() {
+    callback();
+  });
 }
 
-function runTest() {
-  if (!tests.length) {
-    SimpleTest.finish();
-    return;
-  }
-
-  var test = tests.shift();
-  test();
+function removePrefsAndPermissions(callback) {
+  SpecialPowers.popPrefEnv(function() {
+    SpecialPowers.popPermissions(callback);
+  });
 }
 
-function setupPrefsAndPermissions() {
-  SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true],
-                                     ["dom.testing.tv_enabled_for_hosted_apps", true]]}, function() {
-    SpecialPowers.pushPermissions(
-      [{ "type": "browser", "allow": true, "context": document },
-       { "type": "embed-apps", "allow": true, "context": document },
-       { "type": "webapps-manage", "allow": true, "context": document }],
-      function() {
-        SpecialPowers.setAllAppsLaunchable(true);
-        SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
-        // No confirmation needed when an app is installed and uninstalled.
-        SpecialPowers.autoConfirmAppInstall(() => {
-          SpecialPowers.autoConfirmAppUninstall(runTest);
-        });
-      });
+function prepareTest(callback) {
+  removePrefsAndPermissions(function() {
+    setupPrefsAndPermissions(callback);
   });
 }
diff --git a/dom/tv/test/mochitest/mochitest.ini b/dom/tv/test/mochitest/mochitest.ini
index fe32ebfca3a126..8b58db1f904884 100644
--- a/dom/tv/test/mochitest/mochitest.ini
+++ b/dom/tv/test/mochitest/mochitest.ini
@@ -1,26 +1,6 @@
 [DEFAULT]
-skip-if = e10s || toolkit == 'gonk' # Bug 1125477
-support-files =
-  file_app.sjs
-  file_app.template.webapp
-  file_tv_non_permitted_app.html
-  file_tv_permitted_app.html
-  file_tv_get_tuners.html
-  file_tv_get_sources.html
-  file_tv_get_channels.html
-  file_tv_get_channels_during_scanning.html
-  file_tv_get_programs.html
-  file_tv_get_current_program.html
-  file_tv_set_current_source.html
-  file_tv_set_invalid_current_source.html
-  file_tv_set_current_channel.html
-  file_tv_set_current_channel_during_scanning.html
-  file_tv_set_invalid_current_channel.html
-  file_tv_scan_channels_stopped.html
-  file_tv_scan_channels_completed.html
-  head.js
-  test_helpers.js
-
+support-files = head.js
+skip-if = (os == 'mac' && debug) || asan # Bug 1125477
 [test_tv_non_permitted_app.html]
 [test_tv_permitted_app.html]
 [test_tv_get_tuners.html]
diff --git a/dom/tv/test/mochitest/test_helpers.js b/dom/tv/test/mochitest/test_helpers.js
deleted file mode 100644
index b08a86e8c754d6..00000000000000
--- a/dom/tv/test/mochitest/test_helpers.js
+++ /dev/null
@@ -1,17 +0,0 @@
-"use strict";
-
-function is(a, b, msg) {
-  alert((a === b ? 'OK' : 'KO') + ' ' + msg);
-}
-
-function ok(a, msg) {
-  alert((a ? 'OK' : 'KO')+ ' ' + msg);
-}
-
-function info(msg) {
-  alert('INFO ' + msg);
-}
-
-function finish() {
-  alert('DONE');
-}
diff --git a/dom/tv/test/mochitest/test_tv_get_channels.html b/dom/tv/test/mochitest/test_tv_get_channels.html
index 4c1c5b02261820..96b987083d72b0 100644
--- a/dom/tv/test/mochitest/test_tv_get_channels.html
+++ b/dom/tv/test/mochitest/test_tv_get_channels.html
@@ -12,22 +12,57 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
 
-  // Installing the app
-  installApp.bind(this, "file_tv_get_channels.html", "file_app.template.webapp"),
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Run tests in app
-  testApp,
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Uninstall the app
-  uninstallApp
-];
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
+
+          aSources[0].getChannels().then(
+            function(aChannels) {
+              ok(aChannels.length > 0, "Got at least 1 channel.");
+
+              for (var i = 0; i < aChannels.length; i++) {
+                var channel = aChannels[i];
+                ok(channel instanceof TVChannel, "Channel " + i + " should be in right type.")
+                ok('source' in channel, "Channel " + i + " should have a source.");
+                ok('networkId' in channel, "Channel " + i + " should have a network ID.");
+                ok('transportStreamId' in channel, "Channel " + i + " should have a transport stream ID.");
+                ok('serviceId' in channel, "Channel " + i + " should have a service ID.");
+                ok('type' in channel, "Channel " + i + " should have a type.");
+                ok('name' in channel, "Channel " + i + " should have a name.");
+                ok('number' in channel, "Channel " + i + " should have a number.");
+              }
+
+              SimpleTest.finish();
+            },
+            function(aError) {
+              ok(false, "Error occurred when getting channels: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html b/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html
index 6c810deac377da..6d5d31d3c20ccc 100644
--- a/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html
+++ b/dom/tv/test/mochitest/test_tv_get_channels_during_scanning.html
@@ -12,22 +12,54 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_get_channels_during_scanning.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+  function(aTuners) {
+    ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
+    aTuners[0].getSources().then(
+      function(aSources) {
+        ok(aSources.length > 0, "Got at least 1 source.");
+        var source = aSources[0];
 
-  // Uninstall the app
-  uninstallApp
-];
+        // TODO Bug 1088818 - Modify the behavior of channel scanning.
+        source.startScanning({}).then(
+          function() {
+            source.getChannels().then(
+              function() {
+                ok(false, "Getting channels during scanning should get error.");
+                  SimpleTest.finish();
+                },
+                function(aError) {
+                  is(aError.name, "InvalidStateError",
+                     "InvalidStateError should be expected.");
+                  SimpleTest.finish();
+                }
+              );
+            },
+            function(aError) {
+              ok(false, "Error occurred when starting scanning: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_get_current_program.html b/dom/tv/test/mochitest/test_tv_get_current_program.html
index fe8343309b774a..ff82e9fc5baa35 100644
--- a/dom/tv/test/mochitest/test_tv_get_current_program.html
+++ b/dom/tv/test/mochitest/test_tv_get_current_program.html
@@ -12,22 +12,64 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_get_current_program.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
 
-  // Uninstall the app
-  uninstallApp
-];
+          aSources[0].getChannels().then(
+            function(aChannels) {
+              ok(aChannels.length > 0, "Got at least 1 channel.");
+
+              aChannels[0].getCurrentProgram().then(
+                function(aCurrentProgram) {
+                  ok(aCurrentProgram, "Got the current program.");
+                  ok(aCurrentProgram instanceof TVProgram, "The current program should be in the right type.")
+                  ok('channel' in aCurrentProgram, "The current program should have a channel.");
+                  ok('eventId' in aCurrentProgram, "The current program should have an event ID.");
+                  ok('title' in aCurrentProgram, "The current program should have a title.");
+                  ok('startTime' in aCurrentProgram, "The current program should have start time.");
+                  ok('duration' in aCurrentProgram, "The current program should have duration.");
+                  ok(aCurrentProgram.getAudioLanguages().length >= 0,
+                     "The current program may have audio language(s).");
+                  ok(aCurrentProgram.getSubtitleLanguages().length >= 0,
+                     "The current program may have subtitle language(s).");
+
+                  SimpleTest.finish();
+                },
+                function(aError) {
+                  ok(false, "Error occurred when getting programs: " + aError);
+                  SimpleTest.finish();
+                }
+              );
+            },
+            function(aError) {
+              ok(false, "Error occurred when getting channels: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_get_programs.html b/dom/tv/test/mochitest/test_tv_get_programs.html
index 9cfd9bfbb0a9e0..2754334cf8ace1 100644
--- a/dom/tv/test/mochitest/test_tv_get_programs.html
+++ b/dom/tv/test/mochitest/test_tv_get_programs.html
@@ -12,22 +12,68 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_get_programs.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
 
-  // Uninstall the app
-  uninstallApp
-];
+          aSources[0].getChannels().then(
+            function(aChannels) {
+              ok(aChannels.length > 0, "Got at least 1 channel.");
+
+              aChannels[0].getPrograms().then(
+                function(aPrograms) {
+                  ok(aPrograms.length > 0, "Got at least 1 program.");
+
+                  for (var i = 0; i < aPrograms.length; i++) {
+                    var program = aPrograms[i];
+                    ok(program instanceof TVProgram, "Program " + i + " should be in the right type.")
+                    ok('channel' in program, "Program " + i + " should have a channel.");
+                    ok('eventId' in program, "Program " + i + " should have an event ID.");
+                    ok('title' in program, "Program " + i + " should have a title.");
+                    ok('startTime' in program, "Program " + i + " should have start time.");
+                    ok('duration' in program, "Program " + i + " should have duration.");
+                    ok(program.getAudioLanguages().length >= 0,
+                       "Program " + i + " may have audio language(s).");
+                    ok(program.getSubtitleLanguages().length >= 0,
+                       "Program " + i + " may have subtitle language(s).");
+                  }
+
+                  SimpleTest.finish();
+                },
+                function(aError) {
+                  ok(false, "Error occurred when getting programs: " + aError);
+                  SimpleTest.finish();
+                }
+              );
+            },
+            function(aError) {
+              ok(false, "Error occurred when getting channels: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_get_sources.html b/dom/tv/test/mochitest/test_tv_get_sources.html
index 0af43fd90f891e..bbf72c196abd12 100644
--- a/dom/tv/test/mochitest/test_tv_get_sources.html
+++ b/dom/tv/test/mochitest/test_tv_get_sources.html
@@ -12,24 +12,45 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-"use strict";
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_get_sources.html", "file_app.template.webapp"),
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
+          for (var i = 0; i < aSources.length; i++) {
+            var source = aSources[i];
+            ok(source instanceof TVSource, "Source " + i + " should be in the right type.");
+            ok('tuner' in source, "Source " + i + " should have a tuner.");
+            ok('type' in source, "Source " + i + " should have a type.");
+            ok('isScanning' in source, "Source " + i + " should have isScanning.");
+            ok(!source.isScanning,
+               "Source " + i + " should not be scanning by default.");
+            ok(!source.currentChannel,
+               "Source " + i + " should have no current channel by default.");
+          }
 
-  // Run tests in app
-  testApp,
-
-  // Uninstall the app
-  uninstallApp
-];
+          SimpleTest.finish();
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_get_tuners.html b/dom/tv/test/mochitest/test_tv_get_tuners.html
index e4ea6a1ff1548b..9287cb49756d1f 100644
--- a/dom/tv/test/mochitest/test_tv_get_tuners.html
+++ b/dom/tv/test/mochitest/test_tv_get_tuners.html
@@ -12,22 +12,34 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_get_tuners.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
+      for (var i = 0; i < aTuners.length; i++) {
+        var tuner = aTuners[i];
+        ok(tuner instanceof TVTuner, "Tuner " + i + " should be in the right type.");
+        ok('id' in tuner, "Tuner " + i + " should have an ID.");
+        ok(tuner.getSupportedSourceTypes().length > 0,
+           "Tuner " + i + " should have supported source type(s).");
+        ok(!tuner.currentSource,
+           "Tuner " + i + " should have no current source by default.");
+        ok(!tuner.stream, "Tuner " + i + " should have no stream by default.");
+      }
 
-  // Run tests in app
-  testApp,
-
-  // Uninstall the app
-  uninstallApp
-];
+      SimpleTest.finish();
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_non_permitted_app.html b/dom/tv/test/mochitest/test_tv_non_permitted_app.html
index 83c489ab5345db..8c2170277794ae 100644
--- a/dom/tv/test/mochitest/test_tv_non_permitted_app.html
+++ b/dom/tv/test/mochitest/test_tv_non_permitted_app.html
@@ -12,35 +12,14 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  function() {
-    SpecialPowers.pushPrefEnv({"set": [["dom.tv.enabled", true],["dom.mozBrowserFramesEnabled", true]]}, function() {
-      SpecialPowers.pushPermissions(
-        [{ "type": "browser", "allow": true, "context": document },
-         { "type": "embed-apps", "allow": true, "context": document },
-         { "type": "webapps-manage", "allow": true, "context": document }],
-        function() {
-          SpecialPowers.setAllAppsLaunchable(true);
-          // No confirmation needed when an app is installed and uninstalled.
-          SpecialPowers.autoConfirmAppInstall(() => {
-            SpecialPowers.autoConfirmAppUninstall(runTest);
-          });
-        });
-    });
-  },
-
-  // Installing the app
-  installApp.bind(this, "file_tv_non_permitted_app.html", "file_app.template.webapp"),
-
-  // Run tests in app
-  testApp,
-
-  // Uninstall the app
-  uninstallApp
-];
+function runTest() {
+  ok(!('tv' in navigator),
+     "navigator.tv should not exist for non-permitted app.");
+  SimpleTest.finish();
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+setupPrefs(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_permitted_app.html b/dom/tv/test/mochitest/test_tv_permitted_app.html
index 58859b795a7d99..24d76c6b069621 100644
--- a/dom/tv/test/mochitest/test_tv_permitted_app.html
+++ b/dom/tv/test/mochitest/test_tv_permitted_app.html
@@ -12,22 +12,13 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
-
-  // Installing the app
-  installApp.bind(this, "file_tv_permitted_app.html", "file_app.template.webapp"),
-
-  // Run tests in app
-  testApp,
-
-  // Uninstall the app
-  uninstallApp
-];
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist for permitted app.");
+  SimpleTest.finish();
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_scan_channels_completed.html b/dom/tv/test/mochitest/test_tv_scan_channels_completed.html
index 529f8b3d1dd2ec..3e3cdb474a844a 100644
--- a/dom/tv/test/mochitest/test_tv_scan_channels_completed.html
+++ b/dom/tv/test/mochitest/test_tv_scan_channels_completed.html
@@ -12,23 +12,65 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_scan_channels_completed.html", "file_app.template.webapp"),
+  var isScannedEventFired = false;
+  
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
+          var source = aSources[0];
 
-  // Uninstall the app
-  uninstallApp
-];
+          source.oneitbroadcasted = function(aEvent) {
+            info("Received EIT broadcasted event.");
+
+            var programs = aEvent.programs;
+            for (var i = 0; i < programs.length; i++) {
+              ok(programs[i], "Program " + i + " should be set.")
+            }
+          };
+
+          source.onscanningstatechanged = function(aEvent) {
+            if (aEvent.state === 'scanned') {
+              isScannedEventFired = true;
+              info("Received channel scanned event.");
+              ok(aEvent.channel, "Scanned channel should be set.");
+            } else if (aEvent.state === 'completed') {
+              ok(isScannedEventFired, "Received channel scanning completed event after channel scanned event.");
+              SimpleTest.finish();
+            }
+          };
+
+          // TODO Bug 1088818 - Modify the behavior of channel scanning.
+          source.startScanning({}).then(
+            function() {},
+            function(aError) {
+              ok(false, "Error occurred when starting scanning: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.expectAssertions(0, 2);
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html b/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html
index 8c5dabb171d36a..186280c0f4a813 100644
--- a/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html
+++ b/dom/tv/test/mochitest/test_tv_scan_channels_stopped.html
@@ -12,22 +12,62 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_scan_channels_stopped.html", "file_app.template.webapp"),
+  var isClearedEventFired = false;
+  
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
+          var source = aSources[0];
 
-  // Uninstall the app
-  uninstallApp
-];
+          source.onscanningstatechanged = function(aEvent) {
+            if (aEvent.state === 'cleared') {
+              isClearedEventFired = true;
+              info("Received channel cache cleared event.");
+            } else if (aEvent.state === 'stopped') {
+              ok(isClearedEventFired, "Received channel scanning stopped event after cleared event.");
+              SimpleTest.finish();
+            }
+          };
+
+          // TODO Bug 1088818 - Modify the behavior of channel scanning.
+          source.startScanning({ isRescanned: true }).then(
+            function() {
+              source.stopScanning().then(
+                function() {},
+                function(aError) {
+                  ok(false, "Error occurred when stopping scanning: " + aError);
+                  SimpleTest.finish();
+                }
+              );
+            },
+            function(aError) {
+              ok(false, "Error occurred when starting scanning: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_set_current_channel.html b/dom/tv/test/mochitest/test_tv_set_current_channel.html
index 4fc542ff6be8b4..5dddb2070cd283 100644
--- a/dom/tv/test/mochitest/test_tv_set_current_channel.html
+++ b/dom/tv/test/mochitest/test_tv_set_current_channel.html
@@ -12,22 +12,66 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_set_current_channel.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
+      var tuner = aTuners[0];
+      var selectedSourceType = tuner.getSupportedSourceTypes()[0];
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
+          var source = aSources[0];
 
-  // Uninstall the app
-  uninstallApp
-];
+          source.getChannels().then(
+            function(aChannels) {
+              ok(aChannels.length > 0, "Got at least 1 channel.");
+              var selectedChannelNumber = aChannels[0].number;
+
+              source.oncurrentchannelchanged = function(aEvent) {
+                ok(aEvent instanceof TVCurrentChannelChangedEvent,
+                   "The event is in the right type");
+                ok(aEvent.channel instanceof TVChannel,
+                   "The channel is in the right type.");
+                is(aEvent.channel, source.currentChannel,
+                  "The current channel is set.");
+                is(source.currentChannel.number, selectedChannelNumber,
+                   "The current channel number is correct.");
+                SimpleTest.finish();
+              };
+
+              source.setCurrentChannel(selectedChannelNumber).then(
+                function() {},
+                function(aError) {
+                  ok(false, "Error occurred when setting current channel: " + aError);
+                  SimpleTest.finish();
+                }
+              );
+            },
+            function(aError) {
+              ok(false, "Error occurred when getting channels: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html b/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html
index 54a987bfabeb07..999402d5bc9280 100644
--- a/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html
+++ b/dom/tv/test/mochitest/test_tv_set_current_channel_during_scanning.html
@@ -12,22 +12,54 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_set_current_channel_during_scanning.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners){
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
+          var source = aSources[0];
 
-  // Uninstall the app
-  uninstallApp
-];
+          // TODO Bug 1088818 - Modify the behavior of channel scanning.
+          source.startScanning({}).then(
+            function() {
+              source.setCurrentChannel("1").then(
+                function() {
+                  ok(false, "Setting current channel during scanning should get error.");
+                  SimpleTest.finish();
+                },
+                function(aError) {
+                  is(aError.name, "InvalidStateError",
+                     "InvalidStateError should be expected.");
+                  SimpleTest.finish();
+                }
+              );
+            },
+            function(aError) {
+              ok(false, "Error occurred when starting scanning: " + aError);
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_set_current_source.html b/dom/tv/test/mochitest/test_tv_set_current_source.html
index d5c3922928cea8..ebafc89ad29ad1 100644
--- a/dom/tv/test/mochitest/test_tv_set_current_source.html
+++ b/dom/tv/test/mochitest/test_tv_set_current_source.html
@@ -12,22 +12,44 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_set_current_source.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
+      var tuner = aTuners[0];
+      var selectedSourceType = tuner.getSupportedSourceTypes()[0];
 
-  // Run tests in app
-  testApp,
+      tuner.oncurrentsourcechanged = function(aEvent) {
+        ok(aEvent instanceof TVCurrentSourceChangedEvent,
+           "The event is in the right type");
+        ok(aEvent.source instanceof TVSource,
+           "The source is in the right type.");
+        is(aEvent.source, tuner.currentSource,
+           "The current source is set.");
+        is(tuner.currentSource.type, selectedSourceType,
+           "The current source type is correct.");
+        SimpleTest.finish();
+      };
 
-  // Uninstall the app
-  uninstallApp
-];
+      tuner.setCurrentSource(selectedSourceType).then(
+        function() {},
+        function(aError) {
+          ok(false, "Error occurred when setting current source: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html b/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html
index eb72424fc80fa5..680354140dc735 100644
--- a/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html
+++ b/dom/tv/test/mochitest/test_tv_set_invalid_current_channel.html
@@ -12,22 +12,45 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_set_invalid_current_channel.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
+      var tuner = aTuners[0];
+      var selectedSourceType = tuner.getSupportedSourceTypes()[0];
 
-  // Run tests in app
-  testApp,
+      aTuners[0].getSources().then(
+        function(aSources) {
+          ok(aSources.length > 0, "Got at least 1 source.");
 
-  // Uninstall the app
-  uninstallApp
-];
+          aSources[0].setCurrentChannel("NonExistentChannelNumber").then(
+            function() {
+              ok(false, "Setting an invalid current channel should get error.");
+              SimpleTest.finish();
+            },
+            function(aError) {
+              is(aError.name, "AbortError", "AbortError should be expected.");
+              SimpleTest.finish();
+            }
+          );
+        },
+        function(aError) {
+          ok(false, "Error occurred when getting sources: " + aError);
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html b/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html
index 5582b4639bdbd3..6836e75ce4c180 100644
--- a/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html
+++ b/dom/tv/test/mochitest/test_tv_set_invalid_current_source.html
@@ -12,22 +12,33 @@
 <script type="application/javascript" src="./head.js"></script>
 <script type="application/javascript">
 
-var tests = [
-  // Setup preferences and permissions
-  setupPrefsAndPermissions,
+function runTest() {
+  ok('tv' in navigator, "navigator.tv should exist.");
 
-  // Installing the app
-  installApp.bind(this, "file_tv_set_invalid_current_source.html", "file_app.template.webapp"),
+  navigator.tv.getTuners().then(
+    function(aTuners) {
+      ok(aTuners.length > 0, "Got at least 1 tuner.");
 
-  // Run tests in app
-  testApp,
-
-  // Uninstall the app
-  uninstallApp
-];
+      aTuners[0].setCurrentSource("InvalidSourceType").then(
+        function() {
+          ok(false, "Setting an invalid current source should get error.");
+          SimpleTest.finish();
+        },
+        function(aError) {
+          is(aError.name, "TypeError", "TypeError should be expected.");
+          SimpleTest.finish();
+        }
+      );
+    },
+    function(aError) {
+      ok(false, "Error occurred when getting tuners: " + aError);
+      SimpleTest.finish();
+    }
+  );
+}
 
 SimpleTest.waitForExplicitFinish();
-runTest();
+prepareTest(runTest);
 
 </script>
 </pre>
diff --git a/dom/webidl/AnonymousContent.webidl b/dom/webidl/AnonymousContent.webidl
index 8aa44e19df89c7..65b4d79f1f8fe4 100644
--- a/dom/webidl/AnonymousContent.webidl
+++ b/dom/webidl/AnonymousContent.webidl
@@ -53,4 +53,12 @@ interface AnonymousContent {
   [Throws]
   void removeAttributeForElement(DOMString elementId,
                                  DOMString attributeName);
+
+  /**
+   * Get the canvas' context for the element specified if it's a <canvas>
+   * node, `null` otherwise.
+   */
+  [Throws]
+  nsISupports? getCanvasContext(DOMString elementId,
+                                DOMString contextId);
 };
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
index ef76948cf22cc8..e0ca51c4e43d89 100644
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@@ -423,7 +423,7 @@ partial interface Navigator {
 };
 
 partial interface Navigator {
-  [Pref="dom.tv.enabled", CheckAnyPermissions="tv", Func="Navigator::HasTVSupport"]
+  [Pref="dom.tv.enabled", CheckAnyPermissions="tv", AvailableIn=CertifiedApps]
   readonly attribute TVManager? tv;
 };
 
diff --git a/dom/webidl/TVChannel.webidl b/dom/webidl/TVChannel.webidl
index 285298212014d6..c95318037472fd 100644
--- a/dom/webidl/TVChannel.webidl
+++ b/dom/webidl/TVChannel.webidl
@@ -18,7 +18,7 @@ dictionary TVGetProgramsOptions {
   unsigned long long duration;
 };
 
-[Pref="dom.tv.enabled", CheckAnyPermissions="tv", Func="Navigator::HasTVSupport"]
+[Pref="dom.tv.enabled", CheckAnyPermissions="tv", AvailableIn=CertifiedApps]
 interface TVChannel : EventTarget {
   [Throws]
   Promise<sequence<TVProgram>> getPrograms(optional TVGetProgramsOptions options);
diff --git a/dom/webidl/TVCurrentChannelChangedEvent.webidl b/dom/webidl/TVCurrentChannelChangedEvent.webidl
index 39aa72184bde73..1394052316b129 100644
--- a/dom/webidl/TVCurrentChannelChangedEvent.webidl
+++ b/dom/webidl/TVCurrentChannelChangedEvent.webidl
@@ -13,7 +13,7 @@ dictionary TVCurrentChannelChangedEventInit : EventInit {
 
 [Pref="dom.tv.enabled",
  CheckAnyPermissions="tv",
- Func="Navigator::HasTVSupport",
+ AvailableIn=CertifiedApps,
  Constructor(DOMString type, optional TVCurrentChannelChangedEventInit eventInitDict)]
 interface TVCurrentChannelChangedEvent : Event {
   readonly attribute TVChannel? channel;
diff --git a/dom/webidl/TVCurrentSourceChangedEvent.webidl b/dom/webidl/TVCurrentSourceChangedEvent.webidl
index 6386c02ea18811..f88a366ba1404b 100644
--- a/dom/webidl/TVCurrentSourceChangedEvent.webidl
+++ b/dom/webidl/TVCurrentSourceChangedEvent.webidl
@@ -13,7 +13,7 @@ dictionary TVCurrentSourceChangedEventInit : EventInit {
 
 [Pref="dom.tv.enabled",
  CheckAnyPermissions="tv",
- Func="Navigator::HasTVSupport",
+ AvailableIn=CertifiedApps,
  Constructor(DOMString type, optional TVCurrentSourceChangedEventInit eventInitDict)]
 interface TVCurrentSourceChangedEvent : Event {
   readonly attribute TVSource? source;
diff --git a/dom/webidl/TVEITBroadcastedEvent.webidl b/dom/webidl/TVEITBroadcastedEvent.webidl
index 72b509d492e5fe..6d6c02fd873484 100644
--- a/dom/webidl/TVEITBroadcastedEvent.webidl
+++ b/dom/webidl/TVEITBroadcastedEvent.webidl
@@ -13,7 +13,7 @@ dictionary TVEITBroadcastedEventInit : EventInit {
 
 [Pref="dom.tv.enabled",
  CheckAnyPermissions="tv",
- Func="Navigator::HasTVSupport",
+ AvailableIn=CertifiedApps,
  Constructor(DOMString type, optional TVEITBroadcastedEventInit eventInitDict)]
 interface TVEITBroadcastedEvent : Event {
   [Pure, Cached] readonly attribute sequence<TVProgram> programs;
diff --git a/dom/webidl/TVManager.webidl b/dom/webidl/TVManager.webidl
index 7cafbc700b8bf0..587e83cdb5c1c1 100644
--- a/dom/webidl/TVManager.webidl
+++ b/dom/webidl/TVManager.webidl
@@ -7,7 +7,7 @@
  * http://seanyhlin.github.io/TV-Manager-API/
  */
 
-[Pref="dom.tv.enabled", CheckAnyPermissions="tv", Func="Navigator::HasTVSupport"]
+[Pref="dom.tv.enabled", CheckAnyPermissions="tv", AvailableIn=CertifiedApps]
 interface TVManager : EventTarget {
   [Throws]
   Promise<sequence<TVTuner>> getTuners();
diff --git a/dom/webidl/TVProgram.webidl b/dom/webidl/TVProgram.webidl
index 716c4404e05b63..7a6adce040c6c6 100644
--- a/dom/webidl/TVProgram.webidl
+++ b/dom/webidl/TVProgram.webidl
@@ -7,7 +7,7 @@
  * http://seanyhlin.github.io/TV-Manager-API/
  */
 
-[Pref="dom.tv.enabled", CheckAnyPermissions="tv", Func="Navigator::HasTVSupport"]
+[Pref="dom.tv.enabled", CheckAnyPermissions="tv", AvailableIn=CertifiedApps]
 interface TVProgram {
   sequence<DOMString> getAudioLanguages();
 
diff --git a/dom/webidl/TVScanningStateChangedEvent.webidl b/dom/webidl/TVScanningStateChangedEvent.webidl
index 5bc06c40fbbc7b..bd841f42cdf3c1 100644
--- a/dom/webidl/TVScanningStateChangedEvent.webidl
+++ b/dom/webidl/TVScanningStateChangedEvent.webidl
@@ -21,7 +21,7 @@ dictionary TVScanningStateChangedEventInit : EventInit {
 
 [Pref="dom.tv.enabled",
  CheckAnyPermissions="tv",
- Func="Navigator::HasTVSupport",
+ AvailableIn=CertifiedApps,
  Constructor(DOMString type, optional TVScanningStateChangedEventInit eventInitDict)]
 interface TVScanningStateChangedEvent : Event {
   readonly attribute TVScanningState state;
diff --git a/dom/webidl/TVSource.webidl b/dom/webidl/TVSource.webidl
index 021e80528c0df3..60ad31400197fd 100644
--- a/dom/webidl/TVSource.webidl
+++ b/dom/webidl/TVSource.webidl
@@ -33,7 +33,7 @@ dictionary TVStartScanningOptions {
   boolean isRescanned;
 };
 
-[Pref="dom.tv.enabled", CheckAnyPermissions="tv", Func="Navigator::HasTVSupport"]
+[Pref="dom.tv.enabled", CheckAnyPermissions="tv", AvailableIn=CertifiedApps]
 interface TVSource : EventTarget {
   [Throws]
   Promise<sequence<TVChannel>> getChannels();
diff --git a/dom/webidl/TVTuner.webidl b/dom/webidl/TVTuner.webidl
index 48dd42ff691c8b..25c8bd43ee92e5 100644
--- a/dom/webidl/TVTuner.webidl
+++ b/dom/webidl/TVTuner.webidl
@@ -7,7 +7,7 @@
  * http://seanyhlin.github.io/TV-Manager-API/
  */
 
-[Pref="dom.tv.enabled", CheckAnyPermissions="tv", Func="Navigator::HasTVSupport"]
+[Pref="dom.tv.enabled", CheckAnyPermissions="tv", AvailableIn=CertifiedApps]
 interface TVTuner : EventTarget {
   [Throws]
   sequence<TVSourceType> getSupportedSourceTypes();
diff --git a/dom/workers/ServiceWorkerManager.cpp b/dom/workers/ServiceWorkerManager.cpp
index e9816149a1b361..116646b497d956 100644
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -8,6 +8,7 @@
 
 #include "mozIApplication.h"
 #include "nsIAppsService.h"
+#include "nsIConsoleService.h"
 #include "nsIDOMEventTarget.h"
 #include "nsIDocument.h"
 #include "nsIScriptSecurityManager.h"
@@ -18,9 +19,11 @@
 #include "nsIJARChannel.h"
 #include "nsINetworkInterceptController.h"
 #include "nsIMutableArray.h"
+#include "nsIScriptError.h"
 #include "nsIUploadChannel2.h"
 #include "nsPIDOMWindow.h"
 #include "nsScriptLoader.h"
+#include "nsServiceManagerUtils.h"
 #include "nsDebug.h"
 
 #include "jsapi.h"
@@ -636,46 +639,10 @@ class ServiceWorkerResolveWindowPromiseOnUpdateCallback final : public ServiceWo
   }
 
   void
-  UpdateFailed(nsresult aStatus) override
+  UpdateFailed(ErrorResult& aStatus) override
   {
     mPromise->MaybeReject(aStatus);
   }
-
-  void
-  UpdateFailed(JSExnType aExnType, const ErrorEventInit& aErrorDesc) override
-  {
-    AutoJSAPI jsapi;
-    jsapi.Init(mWindow);
-
-    JSContext* cx = jsapi.cx();
-
-    JS::Rooted<JS::Value> fnval(cx);
-    if (!ToJSValue(cx, aErrorDesc.mFilename, &fnval)) {
-      JS_ClearPendingException(cx);
-      mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
-      return;
-    }
-    JS::Rooted<JSString*> fn(cx, fnval.toString());
-
-    JS::Rooted<JS::Value> msgval(cx);
-    if (!ToJSValue(cx, aErrorDesc.mMessage, &msgval)) {
-      JS_ClearPendingException(cx);
-      mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
-      return;
-    }
-    JS::Rooted<JSString*> msg(cx, msgval.toString());
-
-    JS::Rooted<JS::Value> error(cx);
-    if ((aExnType < JSEXN_ERR) ||
-        !JS::CreateError(cx, aExnType, nullptr, fn, aErrorDesc.mLineno,
-                         aErrorDesc.mColno, nullptr, msg, &error)) {
-      JS_ClearPendingException(cx);
-      mPromise->MaybeReject(NS_ERROR_DOM_ABORT_ERR);
-      return;
-    }
-
-    mPromise->MaybeReject(cx, error);
-  }
 };
 
 class ContinueUpdateRunnable final : public nsRunnable
@@ -1016,16 +983,12 @@ class ServiceWorkerRegisterJob final : public ServiceWorkerJob,
   {
     RefPtr<ServiceWorkerRegisterJob> kungFuDeathGrip = this;
     if (NS_WARN_IF(mCanceled)) {
-      Fail(NS_ERROR_DOM_TYPE_ERR);
+      Fail(NS_ERROR_DOM_ABORT_ERR);
       return;
     }
 
     if (NS_WARN_IF(NS_FAILED(aStatus))) {
-      if (aStatus == NS_ERROR_DOM_SECURITY_ERR) {
-        Fail(aStatus);
-      } else {
-        Fail(NS_ERROR_DOM_TYPE_ERR);
-      }
+      Fail(aStatus);
       return;
     }
 
@@ -1131,21 +1094,73 @@ class ServiceWorkerRegisterJob final : public ServiceWorkerJob,
     Fail(NS_ERROR_DOM_ABORT_ERR);
   }
 
-  // Public so our error handling code can use it.
+  // This MUST only be called when the job is still performing actions related
+  // to registration or update. After the spec resolves the update promise, use
+  // Done() with the failure code instead.
   // Callers MUST hold a strong ref before calling this!
   void
-  Fail(JSExnType aExnType, const ErrorEventInit& aError)
+  Fail(ErrorResult& aRv)
   {
     MOZ_ASSERT(mCallback);
     RefPtr<ServiceWorkerUpdateFinishCallback> callback = mCallback.forget();
     // With cancellation support, we may only be running with one reference
     // from another object like a stream loader or something.
-    // UpdateFailed may do something with that, so hold a ref to ourself since
-    // FailCommon relies on it.
-    // FailCommon does check for cancellation, but let's be safe here.
     RefPtr<ServiceWorkerRegisterJob> kungFuDeathGrip = this;
-    callback->UpdateFailed(aExnType, aError);
-    FailCommon(NS_ERROR_DOM_JS_EXCEPTION);
+
+    // Save off the plain error code to pass to Done() where its logged to
+    // stderr as a warning.
+    nsresult origStatus = static_cast<nsresult>(aRv.ErrorCodeAsInt());
+
+    // Ensure that we only surface SecurityErr or TypeErr to script.
+    if (aRv.Failed() && !aRv.ErrorCodeIs(NS_ERROR_DOM_SECURITY_ERR) &&
+                        !aRv.ErrorCodeIs(NS_ERROR_DOM_TYPE_ERR)) {
+
+      // Remove the old error code so we can replace it with a TypeError.
+      aRv.SuppressException();
+
+      // Depending on how the job was created and where we are in the
+      // state machine the spec and scope may be stored in different ways.
+      // Extract the current scope and script spec.
+      nsString scriptSpec;
+      nsString scope;
+      if (mRegistration) {
+        CopyUTF8toUTF16(mRegistration->mScriptSpec, scriptSpec);
+        CopyUTF8toUTF16(mRegistration->mScope, scope);
+      } else {
+        CopyUTF8toUTF16(mScriptSpec, scriptSpec);
+        CopyUTF8toUTF16(mScope, scope);
+      }
+
+      // Throw the type error with a generic error message.
+      aRv.ThrowTypeError<MSG_SW_INSTALL_ERROR>(&scriptSpec, &scope);
+    }
+
+    callback->UpdateFailed(aRv);
+
+    // In case the callback does not consume the exception
+    aRv.SuppressException();
+
+    mUpdateAndInstallInfo = nullptr;
+    if (mRegistration->mInstallingWorker) {
+      nsresult rv = serviceWorkerScriptCache::PurgeCache(mRegistration->mPrincipal,
+                                                         mRegistration->mInstallingWorker->CacheName());
+      if (NS_FAILED(rv)) {
+        NS_WARNING("Failed to purge the installing worker cache.");
+      }
+    }
+
+    RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+    swm->MaybeRemoveRegistration(mRegistration);
+    // Ensures that the job can't do anything useful from this point on.
+    mRegistration = nullptr;
+    Done(origStatus);
+  }
+
+  void
+  Fail(nsresult aRv)
+  {
+    ErrorResult rv(aRv);
+    Fail(rv);
   }
 
   // Public so our error handling code can continue with a successful worker.
@@ -1284,45 +1299,6 @@ class ServiceWorkerRegisterJob final : public ServiceWorkerJob,
     mCallback = nullptr;
   }
 
-  void
-  FailCommon(nsresult aRv)
-  {
-    mUpdateAndInstallInfo = nullptr;
-    if (mRegistration->mInstallingWorker) {
-      nsresult rv = serviceWorkerScriptCache::PurgeCache(mRegistration->mPrincipal,
-                                                         mRegistration->mInstallingWorker->CacheName());
-      if (NS_FAILED(rv)) {
-        NS_WARNING("Failed to purge the installing worker cache.");
-      }
-    }
-
-    RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
-    swm->MaybeRemoveRegistration(mRegistration);
-    // Ensures that the job can't do anything useful from this point on.
-    mRegistration = nullptr;
-    Unused << NS_WARN_IF(NS_FAILED(aRv));
-    Done(aRv);
-  }
-
-  // This MUST only be called when the job is still performing actions related
-  // to registration or update. After the spec resolves the update promise, use
-  // Done() with the failure code instead.
-  // Callers MUST hold a strong ref before calling this!
-  void
-  Fail(nsresult aRv)
-  {
-    MOZ_ASSERT(mCallback);
-    RefPtr<ServiceWorkerUpdateFinishCallback> callback = mCallback.forget();
-    // With cancellation support, we may only be running with one reference
-    // from another object like a stream loader or something.
-    // UpdateFailed may do something with that, so hold a ref to ourself since
-    // FailCommon relies on it.
-    // FailCommon does check for cancellation, but let's be safe here.
-    RefPtr<ServiceWorkerRegisterJob> kungFuDeathGrip = this;
-    callback->UpdateFailed(aRv);
-    FailCommon(aRv);
-  }
-
   void
   ContinueAfterInstallEvent(bool aInstallEventSuccess)
   {
@@ -1577,6 +1553,8 @@ ServiceWorkerManager::Register(nsIDOMWindow* aWindow,
     return rv;
   }
 
+  AddRegisteringDocument(cleanedScope, doc);
+
   ServiceWorkerJobQueue* queue = GetOrCreateJobQueue(originSuffix, cleanedScope);
   MOZ_ASSERT(queue);
 
@@ -2399,14 +2377,161 @@ ServiceWorkerManager::FinishFetch(ServiceWorkerRegistrationInfo* aRegistration)
 {
 }
 
-bool
+void
+ServiceWorkerManager::ReportToAllClients(const nsCString& aScope,
+                                         const nsString& aMessage,
+                                         const nsString& aFilename,
+                                         const nsString& aLine,
+                                         uint32_t aLineNumber,
+                                         uint32_t aColumnNumber,
+                                         uint32_t aFlags)
+{
+  nsCOMPtr<nsIURI> uri;
+  nsresult rv = NS_NewURI(getter_AddRefs(uri), aFilename);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return;
+  }
+
+  nsAutoTArray<uint64_t, 16> windows;
+
+  // Report errors to every controlled document.
+  for (auto iter = mControlledDocuments.Iter(); !iter.Done(); iter.Next()) {
+    ServiceWorkerRegistrationInfo* reg = iter.UserData();
+    MOZ_ASSERT(reg);
+    if (!reg->mScope.Equals(aScope)) {
+      continue;
+    }
+
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(iter.Key());
+    if (!doc || !doc->IsCurrentActiveDocument() || !doc->GetWindow()) {
+      continue;
+    }
+
+    windows.AppendElement(doc->InnerWindowID());
+
+    nsContentUtils::ReportToConsoleNonLocalized(aMessage,
+                                                aFlags,
+                                                NS_LITERAL_CSTRING("Service Workers"),
+                                                doc,
+                                                uri,
+                                                aLine,
+                                                aLineNumber,
+                                                aColumnNumber);
+  }
+
+  // Report to any documents that have called .register() for this scope.  They
+  // may not be controlled, but will still want to see error reports.
+  WeakDocumentList* regList = mRegisteringDocuments.Get(aScope);
+  if (regList) {
+    for (int32_t i = regList->Length() - 1; i >= 0; --i) {
+      nsCOMPtr<nsIDocument> doc = do_QueryReferent(regList->ElementAt(i));
+      if (!doc) {
+        regList->RemoveElementAt(i);
+        continue;
+      }
+
+      if (!doc->IsCurrentActiveDocument()) {
+        continue;
+      }
+
+      uint64_t innerWindowId = doc->InnerWindowID();
+      if (windows.Contains(innerWindowId)) {
+        continue;
+      }
+
+      windows.AppendElement(innerWindowId);
+
+      nsContentUtils::ReportToConsoleNonLocalized(aMessage,
+                                                  aFlags,
+                                                  NS_LITERAL_CSTRING("Service Workers"),
+                                                  doc,
+                                                  uri,
+                                                  aLine,
+                                                  aLineNumber,
+                                                  aColumnNumber);
+    }
+
+    if (regList->IsEmpty()) {
+      regList = nullptr;
+      nsAutoPtr<WeakDocumentList> doomed;
+      mRegisteringDocuments.RemoveAndForget(aScope, doomed);
+    }
+  }
+
+  InterceptionList* intList = mNavigationInterceptions.Get(aScope);
+  if (intList) {
+    nsIConsoleService* consoleService = nullptr;
+    for (uint32_t i = 0; i < intList->Length(); ++i) {
+      nsCOMPtr<nsIInterceptedChannel> channel = intList->ElementAt(i);
+
+      nsCOMPtr<nsIChannel> inner;
+      rv = channel->GetChannel(getter_AddRefs(inner));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        continue;
+      }
+
+      uint64_t innerWindowId = nsContentUtils::GetInnerWindowID(inner);
+      if (innerWindowId == 0 || windows.Contains(innerWindowId)) {
+        continue;
+      }
+
+      windows.AppendElement(innerWindowId);
+
+      // Unfortunately the nsContentUtils helpers don't provide a convenient
+      // way to log to a window ID without a document.  Use console service
+      // directly.
+      nsCOMPtr<nsIScriptError> errorObject =
+        do_CreateInstance(NS_SCRIPTERROR_CONTRACTID, &rv);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+      }
+
+      rv = errorObject->InitWithWindowID(aMessage,
+                                         aFilename,
+                                         aLine,
+                                         aLineNumber,
+                                         aColumnNumber,
+                                         aFlags,
+                                         NS_LITERAL_CSTRING("Service Workers"),
+                                         innerWindowId);
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        return;
+      }
+
+      if (!consoleService) {
+        rv = CallGetService(NS_CONSOLESERVICE_CONTRACTID, &consoleService);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return;
+        }
+      }
+
+      consoleService->LogMessage(errorObject);
+    }
+  }
+
+  // If there are no documents to report to, at least report something to the
+  // browser console.
+  if (windows.IsEmpty()) {
+    nsContentUtils::ReportToConsoleNonLocalized(aMessage,
+                                                aFlags,
+                                                NS_LITERAL_CSTRING("Service Workers"),
+                                                nullptr,  // document
+                                                uri,
+                                                aLine,
+                                                aLineNumber,
+                                                aColumnNumber);
+    return;
+  }
+}
+
+void
 ServiceWorkerManager::HandleError(JSContext* aCx,
                                   nsIPrincipal* aPrincipal,
                                   const nsCString& aScope,
                                   const nsString& aWorkerURL,
-                                  nsString aMessage,
-                                  nsString aFilename,
-                                  nsString aLine,
+                                  const nsString& aMessage,
+                                  const nsString& aFilename,
+                                  const nsString& aLine,
                                   uint32_t aLineNumber,
                                   uint32_t aColumnNumber,
                                   uint32_t aFlags,
@@ -2414,46 +2539,44 @@ ServiceWorkerManager::HandleError(JSContext* aCx,
 {
   AssertIsOnMainThread();
   MOZ_ASSERT(aPrincipal);
-  MOZ_ASSERT(!JSREPORT_IS_WARNING(aFlags));
 
   nsAutoCString scopeKey;
   nsresult rv = PrincipalToScopeKey(aPrincipal, scopeKey);
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return false;
+    return;
   }
 
   ServiceWorkerManager::RegistrationDataPerPrincipal* data;
-  if (!mRegistrationInfos.Get(scopeKey, &data)) {
-    return false;
+  if (NS_WARN_IF(!mRegistrationInfos.Get(scopeKey, &data))) {
+    return;
   }
 
-  if (!data->mSetOfScopesBeingUpdated.Contains(aScope)) {
-    return false;
-  }
+  // If this is a failure, we may need to cancel an in-progress registration.
+  if (!JSREPORT_IS_WARNING(aFlags) &&
+      data->mSetOfScopesBeingUpdated.Contains(aScope)) {
 
-  data->mSetOfScopesBeingUpdated.Remove(aScope);
+    data->mSetOfScopesBeingUpdated.Remove(aScope);
 
-  ServiceWorkerJobQueue* queue = data->mJobQueues.Get(aScope);
-  MOZ_ASSERT(queue);
-  ServiceWorkerJob* job = queue->Peek();
-  if (job) {
-    MOZ_ASSERT(job->IsRegisterJob());
-    RefPtr<ServiceWorkerRegisterJob> regJob = static_cast<ServiceWorkerRegisterJob*>(job);
+    ServiceWorkerJobQueue* queue = data->mJobQueues.Get(aScope);
+    MOZ_ASSERT(queue);
 
-    RootedDictionary<ErrorEventInit> init(aCx);
-    init.mMessage = aMessage;
-    init.mFilename = aFilename;
-    init.mLineno = aLineNumber;
-    init.mColno = aColumnNumber;
+    ServiceWorkerJob* job = queue->Peek();
+    if (job) {
+      MOZ_ASSERT(job->IsRegisterJob());
+      RefPtr<ServiceWorkerRegisterJob> regJob =
+        static_cast<ServiceWorkerRegisterJob*>(job);
 
-  NS_WARNING(nsPrintfCString(
-              "Script error caused ServiceWorker registration to fail: %s:%u '%s'",
-              NS_ConvertUTF16toUTF8(aFilename).get(), aLineNumber,
-              NS_ConvertUTF16toUTF8(aMessage).get()).get());
-    regJob->Fail(aExnType, init);
+      ErrorResult rv;
+      NS_ConvertUTF8toUTF16 scope(aScope);
+      rv.ThrowTypeError<MSG_SW_SCRIPT_THREW>(&aWorkerURL, &scope);
+      regJob->Fail(rv);
+    }
   }
 
-  return true;
+  // Always report any uncaught exceptions or errors to the console of
+  // each client.
+  ReportToAllClients(aScope, aMessage, aFilename, aLine, aLineNumber,
+                     aColumnNumber, aFlags);
 }
 
 void
@@ -3181,6 +3304,8 @@ ServiceWorkerManager::PrepareFetchEvent(const OriginAttributes& aOriginAttribute
     // This should only happen if IsAvailable() returned true.
     MOZ_ASSERT(registration->mActiveWorker);
     serviceWorker = registration->mActiveWorker;
+
+    AddNavigationInterception(serviceWorker->Scope(), aChannel);
   }
 
   if (NS_WARN_IF(aRv.Failed()) || !serviceWorker) {
@@ -3374,6 +3499,23 @@ ServiceWorkerManager::SoftUpdate(const OriginAttributes& aOriginAttributes,
   SoftUpdate(scopeKey, aScope, aCallback);
 }
 
+namespace {
+
+// Empty callback.  Only use when you really want to ignore errors.
+class EmptyUpdateFinishCallback final : public ServiceWorkerUpdateFinishCallback
+{
+public:
+  void
+  UpdateSucceeded(ServiceWorkerRegistrationInfo* aInfo) override
+  { }
+
+  void
+  UpdateFailed(ErrorResult& aStatus) override
+  { }
+};
+
+} // anonymous namespace
+
 void
 ServiceWorkerManager::SoftUpdate(const nsACString& aScopeKey,
                                  const nsACString& aScope,
@@ -3412,7 +3554,7 @@ ServiceWorkerManager::SoftUpdate(const nsACString& aScopeKey,
 
   RefPtr<ServiceWorkerUpdateFinishCallback> cb(aCallback);
   if (!cb) {
-    cb = new ServiceWorkerUpdateFinishCallback();
+    cb = new EmptyUpdateFinishCallback();
   }
 
   // "Invoke Update algorithm, or its equivalent, with client, registration as
@@ -3431,8 +3573,17 @@ FireControllerChangeOnDocument(nsIDocument* aDocument)
   MOZ_ASSERT(aDocument);
 
   nsCOMPtr<nsPIDOMWindow> w = aDocument->GetWindow();
-  MOZ_ASSERT(w);
+  if (!w) {
+    NS_WARNING("Failed to dispatch controllerchange event");
+    return;
+  }
+
   w = w->GetCurrentInnerWindow();
+  if (!w) {
+    NS_WARNING("Failed to dispatch controllerchange event");
+    return;
+  }
+
   auto* window = static_cast<nsGlobalWindow*>(w.get());
 
   ErrorResult result;
@@ -3949,6 +4100,125 @@ ServiceWorkerManager::RemoveListener(nsIServiceWorkerManagerListener* aListener)
   return NS_OK;
 }
 
+NS_IMETHODIMP
+ServiceWorkerManager::ShouldReportToWindow(nsIDOMWindow* aWindow,
+                                           const nsACString& aScope,
+                                           bool* aResult)
+{
+  AssertIsOnMainThread();
+  MOZ_ASSERT(aResult);
+
+  *aResult = false;
+
+  // Get the inner window ID to compare to our document windows below.
+  nsCOMPtr<nsPIDOMWindow> targetWin = do_QueryInterface(aWindow);
+  if (NS_WARN_IF(!targetWin)) {
+    return NS_OK;
+  }
+
+  targetWin = targetWin->GetScriptableTop();
+  uint64_t winId = targetWin->WindowID();
+
+  // Check our weak registering document references first.  This way we clear
+  // out as many dead weak references as possible when this method is called.
+  WeakDocumentList* list = mRegisteringDocuments.Get(aScope);
+  if (list) {
+    for (int32_t i = list->Length() - 1; i >= 0; --i) {
+      nsCOMPtr<nsIDocument> doc = do_QueryReferent(list->ElementAt(i));
+      if (!doc) {
+        list->RemoveElementAt(i);
+        continue;
+      }
+
+      if (!doc->IsCurrentActiveDocument()) {
+        continue;
+      }
+
+      nsCOMPtr<nsPIDOMWindow> win = doc->GetWindow();
+      if (!win) {
+        continue;
+      }
+
+      win = win->GetScriptableTop();
+
+      // Match.  We should report to this window.
+      if (win && winId == win->WindowID()) {
+        *aResult = true;
+        return NS_OK;
+      }
+    }
+
+    if (list->IsEmpty()) {
+      list = nullptr;
+      nsAutoPtr<WeakDocumentList> doomed;
+      mRegisteringDocuments.RemoveAndForget(aScope, doomed);
+    }
+  }
+
+  // Examine any windows performing a navigation that we are currently
+  // intercepting.
+  InterceptionList* intList = mNavigationInterceptions.Get(aScope);
+  if (intList) {
+    for (uint32_t i = 0; i < intList->Length(); ++i) {
+      nsCOMPtr<nsIInterceptedChannel> channel = intList->ElementAt(i);
+
+      nsCOMPtr<nsIChannel> inner;
+      nsresult rv = channel->GetChannel(getter_AddRefs(inner));
+      if (NS_WARN_IF(NS_FAILED(rv))) {
+        continue;
+      }
+
+      uint64_t id = nsContentUtils::GetInnerWindowID(inner);
+      if (id == 0) {
+        continue;
+      }
+
+      nsCOMPtr<nsPIDOMWindow> win = nsGlobalWindow::GetInnerWindowWithId(id);
+      if (!win) {
+        continue;
+      }
+
+      win = win->GetScriptableTop();
+
+      // Match.  We should report to this window.
+      if (win && winId == win->WindowID()) {
+        *aResult = true;
+        return NS_OK;
+      }
+    }
+  }
+
+  // Next examine controlled documents to see if the windows match.
+  for (auto iter = mControlledDocuments.Iter(); !iter.Done(); iter.Next()) {
+    ServiceWorkerRegistrationInfo* reg = iter.UserData();
+    MOZ_ASSERT(reg);
+    if (!reg->mScope.Equals(aScope)) {
+      continue;
+    }
+
+    nsCOMPtr<nsIDocument> doc = do_QueryInterface(iter.Key());
+    if (!doc || !doc->IsCurrentActiveDocument()) {
+      continue;
+    }
+
+    nsCOMPtr<nsPIDOMWindow> win = doc->GetWindow();
+    if (!win) {
+      continue;
+    }
+
+    win = win->GetScriptableTop();
+
+    // Match.  We should report to this window.
+    if (win && winId == win->WindowID()) {
+      *aResult = true;
+      return NS_OK;
+    }
+  }
+
+  // No match.  We should not report to this window.
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 ServiceWorkerManager::Observe(nsISupports* aSubject,
                               const char* aTopic,
@@ -4089,6 +4359,101 @@ ServiceWorkerManager::NotifyListenersOnUnregister(
   }
 }
 
+void
+ServiceWorkerManager::AddRegisteringDocument(const nsACString& aScope,
+                                             nsIDocument* aDoc)
+{
+  AssertIsOnMainThread();
+  MOZ_ASSERT(!aScope.IsEmpty());
+  MOZ_ASSERT(aDoc);
+
+  WeakDocumentList* list = mRegisteringDocuments.LookupOrAdd(aScope);
+  MOZ_ASSERT(list);
+
+  for (int32_t i = list->Length() - 1; i >= 0; --i) {
+    nsCOMPtr<nsIDocument> existing = do_QueryReferent(list->ElementAt(i));
+    if (!existing) {
+      list->RemoveElementAt(i);
+      continue;
+    }
+    if (existing == aDoc) {
+      return;
+    }
+  }
+
+  list->AppendElement(do_GetWeakReference(aDoc));
+}
+
+class ServiceWorkerManager::InterceptionReleaseHandle final : public nsISupports
+{
+  const nsCString mScope;
+
+  // Weak reference to channel is safe, because the channel holds a
+  // reference to this object.  Also, the pointer is only used for
+  // comparison purposes.
+  nsIInterceptedChannel* mChannel;
+
+  ~InterceptionReleaseHandle()
+  {
+    RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+    swm->RemoveNavigationInterception(mScope, mChannel);
+  }
+
+public:
+  InterceptionReleaseHandle(const nsACString& aScope,
+                            nsIInterceptedChannel* aChannel)
+    : mScope(aScope)
+    , mChannel(aChannel)
+  {
+    MOZ_ASSERT(NS_IsMainThread());
+    MOZ_ASSERT(!aScope.IsEmpty());
+    MOZ_ASSERT(mChannel);
+  }
+
+  NS_DECL_ISUPPORTS
+};
+
+NS_IMPL_ISUPPORTS0(ServiceWorkerManager::InterceptionReleaseHandle);
+
+void
+ServiceWorkerManager::AddNavigationInterception(const nsACString& aScope,
+                                                nsIInterceptedChannel* aChannel)
+{
+  AssertIsOnMainThread();
+  MOZ_ASSERT(!aScope.IsEmpty());
+  MOZ_ASSERT(aChannel);
+
+  InterceptionList* list =
+    mNavigationInterceptions.LookupOrAdd(aScope);
+  MOZ_ASSERT(list);
+  MOZ_ASSERT(!list->Contains(aChannel));
+
+  nsCOMPtr<nsISupports> releaseHandle =
+    new InterceptionReleaseHandle(aScope, aChannel);
+  aChannel->SetReleaseHandle(releaseHandle);
+
+  list->AppendElement(aChannel);
+}
+
+void
+ServiceWorkerManager::RemoveNavigationInterception(const nsACString& aScope,
+                                                   nsIInterceptedChannel* aChannel)
+{
+  AssertIsOnMainThread();
+  MOZ_ASSERT(aChannel);
+  InterceptionList* list =
+    mNavigationInterceptions.Get(aScope);
+  if (list) {
+    MOZ_ALWAYS_TRUE(list->RemoveElement(aChannel));
+    MOZ_ASSERT(!list->Contains(aChannel));
+    if (list->IsEmpty()) {
+      list = nullptr;
+      nsAutoPtr<InterceptionList> doomed;
+      mNavigationInterceptions.RemoveAndForget(aScope, doomed);
+    }
+  }
+}
+
 NS_IMPL_ISUPPORTS(ServiceWorkerInfo, nsIServiceWorkerInfo)
 
 NS_IMETHODIMP
diff --git a/dom/workers/ServiceWorkerManager.h b/dom/workers/ServiceWorkerManager.h
index 217aeb0d9809f3..c51822f973a807 100644
--- a/dom/workers/ServiceWorkerManager.h
+++ b/dom/workers/ServiceWorkerManager.h
@@ -155,16 +155,10 @@ class ServiceWorkerUpdateFinishCallback
   NS_INLINE_DECL_REFCOUNTING(ServiceWorkerUpdateFinishCallback)
 
   virtual
-  void UpdateSucceeded(ServiceWorkerRegistrationInfo* aInfo)
-  { }
+  void UpdateSucceeded(ServiceWorkerRegistrationInfo* aInfo) = 0;
 
   virtual
-  void UpdateFailed(nsresult aStatus)
-  { }
-
-  virtual
-  void UpdateFailed(JSExnType aExnType, const ErrorEventInit& aDesc)
-  { }
+  void UpdateFailed(ErrorResult& aStatus) = 0;
 };
 
 /*
@@ -329,6 +323,23 @@ class ServiceWorkerManager final
   // Set of all documents that may be controlled by a service worker.
   nsTHashtable<nsISupportsHashKey> mAllDocuments;
 
+  // Track all documents that have attempted to register a service worker for a
+  // given scope.
+  typedef nsTArray<nsCOMPtr<nsIWeakReference>> WeakDocumentList;
+  nsClassHashtable<nsCStringHashKey, WeakDocumentList> mRegisteringDocuments;
+
+  // Track all intercepted navigation channels for a given scope.  Channels are
+  // placed in the appropriate list before dispatch the FetchEvent to the worker
+  // thread and removed once FetchEvent processing dispatches back to the main
+  // thread.
+  //
+  // Note: Its safe to use weak references here because a RAII-style callback
+  //       is registered with the channel before its added to this list.  We
+  //       are guaranteed the callback will fire before and remove the ref
+  //       from this list before the channel is destroyed.
+  typedef nsTArray<nsIInterceptedChannel*> InterceptionList;
+  nsClassHashtable<nsCStringHashKey, InterceptionList> mNavigationInterceptions;
+
   bool
   IsAvailable(const OriginAttributes& aOriginAttributes, nsIURI* aURI);
 
@@ -389,16 +400,25 @@ class ServiceWorkerManager final
   void
   FinishFetch(ServiceWorkerRegistrationInfo* aRegistration);
 
-  // Returns true if the error was handled, false if normal worker error
-  // handling should continue.
-  bool
+  void
+  ReportToAllClients(const nsCString& aScope,
+                     const nsString& aMessage,
+                     const nsString& aFilename,
+                     const nsString& aLine,
+                     uint32_t aLineNumber,
+                     uint32_t aColumnNumber,
+                     uint32_t aFlags);
+
+  // Always consumes the error by reporting to consoles of all controlled
+  // documents.
+  void
   HandleError(JSContext* aCx,
               nsIPrincipal* aPrincipal,
               const nsCString& aScope,
               const nsString& aWorkerURL,
-              nsString aMessage,
-              nsString aFilename,
-              nsString aLine,
+              const nsString& aMessage,
+              const nsString& aFilename,
+              const nsString& aLine,
               uint32_t aLineNumber,
               uint32_t aColumnNumber,
               uint32_t aFlags,
@@ -611,6 +631,19 @@ class ServiceWorkerManager final
 
   void
   NotifyListenersOnUnregister(nsIServiceWorkerRegistrationInfo* aRegistration);
+
+  void
+  AddRegisteringDocument(const nsACString& aScope, nsIDocument* aDoc);
+
+  class InterceptionReleaseHandle;
+
+  void
+  AddNavigationInterception(const nsACString& aScope,
+                            nsIInterceptedChannel* aChannel);
+
+  void
+  RemoveNavigationInterception(const nsACString& aScope,
+                               nsIInterceptedChannel* aChannel);
 };
 
 } // namespace workers
diff --git a/dom/workers/ServiceWorkerPrivate.cpp b/dom/workers/ServiceWorkerPrivate.cpp
index c352691e2b8b3f..d1a8d055436527 100644
--- a/dom/workers/ServiceWorkerPrivate.cpp
+++ b/dom/workers/ServiceWorkerPrivate.cpp
@@ -1173,6 +1173,10 @@ class FetchEventRunnable : public ExtendableFunctionalEventWorkerRunnable
         event->ReportCanceled();
         runnable = new CancelChannelRunnable(mInterceptedChannel,
                                              NS_ERROR_INTERCEPTION_FAILED);
+      } else if (event->GetInternalNSEvent()->mFlags.mExceptionHasBeenRisen) {
+        // Exception logged via the WorkerPrivate ErrorReporter
+        runnable = new CancelChannelRunnable(mInterceptedChannel,
+                                             NS_ERROR_INTERCEPTION_FAILED);
       } else {
         runnable = new ResumeRequest(mInterceptedChannel);
       }
diff --git a/dom/workers/ServiceWorkerRegistration.cpp b/dom/workers/ServiceWorkerRegistration.cpp
index 5e11aa27e63b68..5178b434d5b0a4 100644
--- a/dom/workers/ServiceWorkerRegistration.cpp
+++ b/dom/workers/ServiceWorkerRegistration.cpp
@@ -290,10 +290,8 @@ class MainThreadUpdateCallback final : public ServiceWorkerUpdateFinishCallback
     mPromise->MaybeResolve(JS::UndefinedHandleValue);
   }
 
-  using ServiceWorkerUpdateFinishCallback::UpdateFailed;
-
   void
-  UpdateFailed(nsresult aStatus) override
+  UpdateFailed(ErrorResult& aStatus) override
   {
     mPromise->MaybeReject(aStatus);
   }
@@ -302,27 +300,28 @@ class MainThreadUpdateCallback final : public ServiceWorkerUpdateFinishCallback
 class UpdateResultRunnable final : public WorkerRunnable
 {
   RefPtr<PromiseWorkerProxy> mPromiseProxy;
-  nsresult mStatus;
+  ErrorResult mStatus;
 
   ~UpdateResultRunnable()
   {}
 
 public:
-  UpdateResultRunnable(PromiseWorkerProxy* aPromiseProxy, nsresult aStatus)
+  UpdateResultRunnable(PromiseWorkerProxy* aPromiseProxy, ErrorResult& aStatus)
     : WorkerRunnable(aPromiseProxy->GetWorkerPrivate(), WorkerThreadModifyBusyCount)
     , mPromiseProxy(aPromiseProxy)
-    , mStatus(aStatus)
+    , mStatus(Move(aStatus))
   { }
 
   bool
   WorkerRun(JSContext* aCx, WorkerPrivate* aWorkerPrivate) override
   {
     Promise* promise = mPromiseProxy->WorkerPromise();
-    if (NS_SUCCEEDED(mStatus)) {
-      promise->MaybeResolve(JS::UndefinedHandleValue);
-    } else {
+    if (mStatus.Failed()) {
       promise->MaybeReject(mStatus);
+    } else {
+      promise->MaybeResolve(JS::UndefinedHandleValue);
     }
+    mStatus.SuppressException();
     mPromiseProxy->CleanUp(aCx);
     return true;
   }
@@ -346,19 +345,18 @@ class WorkerThreadUpdateCallback final : public ServiceWorkerUpdateFinishCallbac
   void
   UpdateSucceeded(ServiceWorkerRegistrationInfo* aRegistration) override
   {
-    Finish(NS_OK);
+    ErrorResult rv(NS_OK);
+    Finish(rv);
   }
 
-  using ServiceWorkerUpdateFinishCallback::UpdateFailed;
-
   void
-  UpdateFailed(nsresult aStatus) override
+  UpdateFailed(ErrorResult& aStatus) override
   {
     Finish(aStatus);
   }
 
   void
-  Finish(nsresult aStatus)
+  Finish(ErrorResult& aStatus)
   {
     if (!mPromiseProxy) {
       return;
diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp
index 2a9caedd0cce60..07df00af530197 100644
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -1070,27 +1070,28 @@ class ReportErrorRunnable final : public WorkerRunnable
         return true;
       }
 
-      if (aWorkerPrivate->IsServiceWorker() || aWorkerPrivate->IsSharedWorker()) {
-        if (aWorkerPrivate->IsServiceWorker() && !JSREPORT_IS_WARNING(mFlags)) {
-          RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
-          MOZ_ASSERT(swm);
-          bool handled = swm->HandleError(aCx, aWorkerPrivate->GetPrincipal(),
-                                          aWorkerPrivate->WorkerName(),
-                                          aWorkerPrivate->ScriptURL(),
-                                          mMessage,
-                                          mFilename, mLine, mLineNumber,
-                                          mColumnNumber, mFlags, mExnType);
-          if (handled) {
-            return true;
-          }
-        }
-
+      if (aWorkerPrivate->IsSharedWorker()) {
         aWorkerPrivate->BroadcastErrorToSharedWorkers(aCx, mMessage, mFilename,
                                                       mLine, mLineNumber,
                                                       mColumnNumber, mFlags);
         return true;
       }
 
+      // Service workers do not have a main thread parent global, so normal
+      // worker error reporting will crash.  Instead, pass the error to
+      // the ServiceWorkerManager to report on any controlled documents.
+      if (aWorkerPrivate->IsServiceWorker()) {
+        RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
+        MOZ_ASSERT(swm);
+        swm->HandleError(aCx, aWorkerPrivate->GetPrincipal(),
+                         aWorkerPrivate->WorkerName(),
+                         aWorkerPrivate->ScriptURL(),
+                         mMessage,
+                         mFilename, mLine, mLineNumber,
+                         mColumnNumber, mFlags, mExnType);
+        return true;
+      }
+
       // The innerWindowId is only required if we are going to ReportError
       // below, which is gated on this condition. The inner window correctness
       // check is only going to succeed when the worker is accepting events.
diff --git a/dom/workers/test/serviceworkers/test_notification_constructor_error.html b/dom/workers/test/serviceworkers/test_notification_constructor_error.html
index b2fae30c576480..6a8ecf8c05366c 100644
--- a/dom/workers/test/serviceworkers/test_notification_constructor_error.html
+++ b/dom/workers/test/serviceworkers/test_notification_constructor_error.html
@@ -21,7 +21,7 @@
     return navigator.serviceWorker.register("notification_constructor_error.js", { scope: "notification_constructor_error/" }).then(function(swr) {
       ok(false, "Registration should fail.");
     }, function(e) {
-      ok(e.message.indexOf("Notification") != -1, "Registration should fail.");
+      is(e.name, 'TypeError', "Registration should fail with a TypeError.");
     });
   }
 
diff --git a/gfx/2d/Matrix.cpp b/gfx/2d/Matrix.cpp
index 6b7804ad65feb7..652b5247eaa6a8 100644
--- a/gfx/2d/Matrix.cpp
+++ b/gfx/2d/Matrix.cpp
@@ -185,8 +185,10 @@ Matrix4x4::TransformBounds(const RectTyped<UnknownUnits, F>& aRect) const
   return RectTyped<UnknownUnits, F>(min_x, min_y, max_x - min_x, max_y - min_y);
 }
 
-Point4D ComputePerspectivePlaneIntercept(const Point4D& aFirst,
-                                         const Point4D& aSecond)
+template<class F>
+Point4DTyped<UnknownUnits, F>
+ComputePerspectivePlaneIntercept(const Point4DTyped<UnknownUnits, F>& aFirst,
+                                 const Point4DTyped<UnknownUnits, F>& aSecond)
 {
   // This function will always return a point with a w value of 0.
   // The X, Y, and Z components will point towards an infinite vanishing
@@ -203,7 +205,9 @@ Point4D ComputePerspectivePlaneIntercept(const Point4D& aFirst,
   return aFirst + (aSecond - aFirst) * t;
 }
 
-Rect Matrix4x4::ProjectRectBounds(const Rect& aRect, const Rect &aClip) const
+template <class F>
+RectTyped<UnknownUnits, F>
+Matrix4x4::ProjectRectBounds(const RectTyped<UnknownUnits, F>& aRect, const RectTyped<UnknownUnits, F>& aClip) const
 {
   // This function must never return std::numeric_limits<Float>::max() or any
   // other arbitrary large value in place of inifinity.  This often occurs when
@@ -229,26 +233,26 @@ Rect Matrix4x4::ProjectRectBounds(const Rect& aRect, const Rect &aClip) const
 
   // Callers should pass an aClip value that represents the extents to clip
   // the result to, in the same coordinate system as aRect.
-  Point4D points[4];
+  Point4DTyped<UnknownUnits, F> points[4];
 
   points[0] = ProjectPoint(aRect.TopLeft());
   points[1] = ProjectPoint(aRect.TopRight());
   points[2] = ProjectPoint(aRect.BottomRight());
   points[3] = ProjectPoint(aRect.BottomLeft());
 
-  Float min_x = std::numeric_limits<Float>::max();
-  Float min_y = std::numeric_limits<Float>::max();
-  Float max_x = -std::numeric_limits<Float>::max();
-  Float max_y = -std::numeric_limits<Float>::max();
+  F min_x = std::numeric_limits<F>::max();
+  F min_y = std::numeric_limits<F>::max();
+  F max_x = -std::numeric_limits<F>::max();
+  F max_y = -std::numeric_limits<F>::max();
 
   for (int i=0; i<4; i++) {
     // Only use points that exist above the w=0 plane
     if (points[i].HasPositiveWCoord()) {
-      Point point2d = aClip.ClampPoint(points[i].As2DPoint());
-      min_x = std::min<Float>(point2d.x, min_x);
-      max_x = std::max<Float>(point2d.x, max_x);
-      min_y = std::min<Float>(point2d.y, min_y);
-      max_y = std::max<Float>(point2d.y, max_y);
+      PointTyped<UnknownUnits, F> point2d = aClip.ClampPoint(points[i].As2DPoint());
+      min_x = std::min<F>(point2d.x, min_x);
+      max_x = std::max<F>(point2d.x, max_x);
+      min_y = std::min<F>(point2d.y, min_y);
+      max_y = std::max<F>(point2d.y, max_y);
     }
 
     int next = (i == 3) ? 0 : i + 1;
@@ -256,7 +260,8 @@ Rect Matrix4x4::ProjectRectBounds(const Rect& aRect, const Rect &aClip) const
       // If the line between two points crosses the w=0 plane, then interpolate
       // to find the point of intersection with the w=0 plane and use that
       // instead.
-      Point4D intercept = ComputePerspectivePlaneIntercept(points[i], points[next]);
+      Point4DTyped<UnknownUnits, F> intercept =
+        ComputePerspectivePlaneIntercept(points[i], points[next]);
       // Since intercept.w will always be 0 here, we interpret x,y,z as a
       // direction towards an infinite vanishing point.
       if (intercept.x < 0.0f) {
@@ -273,10 +278,10 @@ Rect Matrix4x4::ProjectRectBounds(const Rect& aRect, const Rect &aClip) const
   }
 
   if (max_x < min_x || max_y < min_y) {
-    return Rect(0, 0, 0, 0);
+    return RectTyped<UnknownUnits, F>(0, 0, 0, 0);
   }
 
-  return Rect(min_x, min_y, max_x - min_x, max_y - min_y);
+  return RectTyped<UnknownUnits, F>(min_x, min_y, max_x - min_x, max_y - min_y);
 }
 
 template<class F>
@@ -637,5 +642,14 @@ template
 RectDouble
 Matrix4x4::TransformBounds(const RectDouble& aRect) const;
 
+template
+Rect
+Matrix4x4::ProjectRectBounds(const Rect& aRect, const Rect& aClip) const;
+
+template
+RectDouble
+Matrix4x4::ProjectRectBounds(const RectDouble& aRect, const RectDouble& aClip) const;
+
+
 } // namespace gfx
 } // namespace mozilla
diff --git a/gfx/2d/Matrix.h b/gfx/2d/Matrix.h
index 7566333ff18d76..13ec232ec8affa 100644
--- a/gfx/2d/Matrix.h
+++ b/gfx/2d/Matrix.h
@@ -507,20 +507,24 @@ class Matrix4x4
     return *this;
   }
 
-  Point4D ProjectPoint(const Point& aPoint) const {
+  template<class F>
+  Point4DTyped<UnknownUnits, F>
+  ProjectPoint(const PointTyped<UnknownUnits, F>& aPoint) const {
     // Find a value for z that will transform to 0.
 
     // The transformed value of z is computed as:
     // z' = aPoint.x * _13 + aPoint.y * _23 + z * _33 + _43;
 
     // Solving for z when z' = 0 gives us:
-    float z = -(aPoint.x * _13 + aPoint.y * _23 + _43) / _33;
+    F z = -(aPoint.x * _13 + aPoint.y * _23 + _43) / _33;
 
     // Compute the transformed point
-    return *this * Point4D(aPoint.x, aPoint.y, z, 1);
+    return *this * Point4DTyped<UnknownUnits, F>(aPoint.x, aPoint.y, z, 1);
   }
 
-  Rect ProjectRectBounds(const Rect& aRect, const Rect &aClip) const;
+  template<class F>
+  RectTyped<UnknownUnits, F>
+  ProjectRectBounds(const RectTyped<UnknownUnits, F>& aRect, const RectTyped<UnknownUnits, F>& aClip) const;
 
   /**
    * TransformAndClipBounds transforms aRect as a bounding box, while clipping
diff --git a/gfx/layers/basic/BasicCompositor.cpp b/gfx/layers/basic/BasicCompositor.cpp
index a68fc580602a3a..ae5761e8f5c860 100644
--- a/gfx/layers/basic/BasicCompositor.cpp
+++ b/gfx/layers/basic/BasicCompositor.cpp
@@ -506,7 +506,7 @@ BasicCompositor::BeginFrame(const nsIntRegion& aInvalidRegion,
                             gfx::Rect *aClipRectOut /* = nullptr */,
                             gfx::Rect *aRenderBoundsOut /* = nullptr */)
 {
-  mWidgetSize = mWidget->GetClientSize();
+  mWidgetSize = mWidget->GetClientSize().ToUnknownSize();
   IntRect intRect = gfx::IntRect(IntPoint(), mWidgetSize);
   Rect rect = Rect(0, 0, intRect.width, intRect.height);
 
diff --git a/gfx/layers/client/ClientLayerManager.cpp b/gfx/layers/client/ClientLayerManager.cpp
index 7000d88449aaf7..ab29d18cb68d3a 100644
--- a/gfx/layers/client/ClientLayerManager.cpp
+++ b/gfx/layers/client/ClientLayerManager.cpp
@@ -203,9 +203,10 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
     hal::GetCurrentScreenConfiguration(&currentConfig);
     orientation = currentConfig.orientation();
   }
-  IntRect targetBounds = mWidget->GetNaturalBoundsUntyped();
+  LayoutDeviceIntRect targetBounds = mWidget->GetNaturalBounds();
   targetBounds.x = targetBounds.y = 0;
-  mForwarder->BeginTransaction(targetBounds, mTargetRotation, orientation);
+  mForwarder->BeginTransaction(targetBounds.ToUnknownRect(), mTargetRotation,
+                               orientation);
 
   // If we're drawing on behalf of a context with async pan/zoom
   // enabled, then the entire buffer of painted layers might be
diff --git a/gfx/src/nsRegion.h b/gfx/src/nsRegion.h
index 1643f83fde993b..ec4ca529bc00b7 100644
--- a/gfx/src/nsRegion.h
+++ b/gfx/src/nsRegion.h
@@ -477,6 +477,11 @@ class BaseIntRegion
 {
   friend class ::nsRegion;
 
+  // Give access to all specializations of IntRegionTyped, not just ones that
+  // derive from this specialization of BaseIntRegion.
+  template <typename units>
+  friend class IntRegionTyped;
+
 public:
   typedef Rect RectType;
   typedef Point PointType;
@@ -826,6 +831,11 @@ class IntRegionTyped :
     public BaseIntRegion<IntRegionTyped<units>, IntRectTyped<units>, IntPointTyped<units>, IntMarginTyped<units>>
 {
   typedef BaseIntRegion<IntRegionTyped<units>, IntRectTyped<units>, IntPointTyped<units>, IntMarginTyped<units>> Super;
+
+  // Make other specializations of IntRegionTyped friends.
+  template <typename OtherUnits>
+  friend class IntRegionTyped;
+
 public:
   // Forward constructors.
   IntRegionTyped() {}
@@ -844,10 +854,15 @@ class IntRegionTyped :
     return Super::operator=(mozilla::Move(aRegion));
   }
 
-  static IntRegionTyped FromUnknownRegion(const IntRegionTyped<UnknownUnits>& aRegion)
+  static IntRegionTyped FromUnknownRegion(const IntRegion& aRegion)
   {
     return IntRegionTyped(aRegion.Impl());
   }
+  IntRegion ToUnknownRegion() const
+  {
+    // Need |this->| because Impl() is defined in a dependent base class.
+    return IntRegion(this->Impl());
+  }
 private:
   // This is deliberately private, so calling code uses FromUnknownRegion().
   explicit IntRegionTyped(const nsRegion& aRegion) : Super(aRegion) {}
diff --git a/gfx/tests/gtest/TestCompositor.cpp b/gfx/tests/gtest/TestCompositor.cpp
index 61e4beb0c9d7e5..04eaa8ab65f947 100644
--- a/gfx/tests/gtest/TestCompositor.cpp
+++ b/gfx/tests/gtest/TestCompositor.cpp
@@ -34,12 +34,12 @@ class MockWidget : public nsBaseWidget
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  NS_IMETHOD GetClientBoundsUntyped(IntRect &aRect) override {
-    aRect = IntRect(0, 0, gCompWidth, gCompHeight);
+  NS_IMETHOD GetClientBounds(LayoutDeviceIntRect& aRect) override {
+    aRect = LayoutDeviceIntRect(0, 0, gCompWidth, gCompHeight);
     return NS_OK;
   }
-  NS_IMETHOD GetBoundsUntyped(IntRect &aRect) override {
-    return GetClientBoundsUntyped(aRect);
+  NS_IMETHOD GetBounds(LayoutDeviceIntRect& aRect) override {
+    return GetClientBounds(aRect);
   }
 
   void* GetNativeData(uint32_t aDataType) override {
diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp
index 7e005e5dff6a04..9e214004cce66f 100644
--- a/gfx/thebes/gfxFcPlatformFontList.cpp
+++ b/gfx/thebes/gfxFcPlatformFontList.cpp
@@ -12,6 +12,7 @@
 #include "gfxFT2Utils.h"
 #include "gfxPlatform.h"
 #include "mozilla/ArrayUtils.h"
+#include "mozilla/Preferences.h"
 #include "mozilla/TimeStamp.h"
 #include "nsGkAtoms.h"
 #include "nsILanguageAtomService.h"
@@ -20,6 +21,7 @@
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsAppDirectoryServiceDefs.h"
+#include "nsCharSeparatedTokenizer.h"
 
 #include "mozilla/gfx/HelpersCairo.h"
 
@@ -940,6 +942,7 @@ gfxFcPlatformFontList::gfxFcPlatformFontList()
     , mGenericMappings(32)
     , mFcSubstituteCache(64)
     , mLastConfig(nullptr)
+    , mAlwaysUseFontconfigGenerics(true)
 {
     // if the rescan interval is set, start the timer
     int rescanInterval = FcConfigGetRescanInterval(nullptr);
@@ -1064,12 +1067,12 @@ gfxFcPlatformFontList::InitFontList()
     gfxPlatformFontList::InitFontList();
 
     mLocalNames.Clear();
-    mGenericMappings.Clear();
     mFcSubstituteCache.Clear();
 
     // iterate over available fonts
     FcFontSet* systemFonts = FcConfigGetFonts(nullptr, FcSetSystem);
     AddFontSetFamilies(systemFonts);
+    mAlwaysUseFontconfigGenerics = PrefFontListsUseOnlyGenerics();
 
 #ifdef MOZ_BUNDLED_FONTS
     ActivateBundledFonts();
@@ -1180,8 +1183,13 @@ gfxFcPlatformFontList::GetDefaultFont(const gfxFontStyle* aStyle)
 {
     // Get the default font by using a fake name to retrieve the first
     // scalable font that fontconfig suggests for the given language.
-    return FindGenericFamily(NS_LITERAL_STRING("-moz-default"),
-                             aStyle->language);
+    PrefFontList* prefFonts =
+        FindGenericFamilies(NS_LITERAL_STRING("-moz-default"), aStyle->language);
+    NS_ASSERTION(prefFonts, "null list of generic fonts");
+    if (prefFonts && !prefFonts->IsEmpty()) {
+        return (*prefFonts)[0];
+    }
+    return nullptr;
 }
 
 gfxFontEntry*
@@ -1251,7 +1259,11 @@ gfxFcPlatformFontList::FindFamily(const nsAString& aFamily, gfxFontStyle* aStyle
     // fontconfig generics? use fontconfig to determine the family for lang
     if (isDeprecatedGeneric ||
         mozilla::FontFamilyName::Convert(familyName).IsGeneric()) {
-        return FindGenericFamily(familyName, language);
+        PrefFontList* prefFonts = FindGenericFamilies(familyName, language);
+        if (prefFonts && !prefFonts->IsEmpty()) {
+            return (*prefFonts)[0];
+        }
+        return nullptr;
     }
 
     // fontconfig allows conditional substitutions in such a way that it's
@@ -1318,6 +1330,8 @@ bool
 gfxFcPlatformFontList::GetStandardFamilyName(const nsAString& aFontName,
                                              nsAString& aFamilyName)
 {
+    aFamilyName.Truncate();
+
     // The fontconfig list of fonts includes generic family names in the
     // font list. For these, just use the generic name.
     if (aFontName.EqualsLiteral("serif") ||
@@ -1327,13 +1341,155 @@ gfxFcPlatformFontList::GetStandardFamilyName(const nsAString& aFontName,
         return true;
     }
 
-    gfxFontFamily *family = FindFamily(aFontName);
-    if (family) {
-        family->LocalizedName(aFamilyName);
+    nsAutoRef<FcPattern> pat(FcPatternCreate());
+    if (!pat) {
         return true;
     }
 
-    return false;
+    nsAutoRef<FcObjectSet> os(FcObjectSetBuild(FC_FAMILY, nullptr));
+    if (!os) {
+        return true;
+    }
+
+    // ignore size-specific fonts
+    FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
+
+    // add the family name to the pattern
+    NS_ConvertUTF16toUTF8 familyName(aFontName);
+    FcPatternAddString(pat, FC_FAMILY, ToFcChar8Ptr(familyName.get()));
+
+    nsAutoRef<FcFontSet> givenFS(FcFontList(nullptr, pat, os));
+    if (!givenFS) {
+        return true;
+    }
+
+    // See if there is a font face with first family equal to the given family
+    // (needs to be in sync with names coming from GetFontList())
+    nsTArray<nsCString> candidates;
+    for (int i = 0; i < givenFS->nfont; i++) {
+        char* firstFamily;
+
+        if (FcPatternGetString(givenFS->fonts[i], FC_FAMILY, 0,
+                               (FcChar8 **) &firstFamily) != FcResultMatch)
+        {
+            continue;
+        }
+
+        nsDependentCString first(firstFamily);
+        if (!candidates.Contains(first)) {
+            candidates.AppendElement(first);
+
+            if (familyName.Equals(first)) {
+                aFamilyName.Assign(aFontName);
+                return true;
+            }
+        }
+    }
+
+    // Because fontconfig conflates different family name types, need to
+    // double check that the candidate name is not simply a different
+    // name type. For example, if a font with nameID=16 "Minion Pro" and
+    // nameID=21 "Minion Pro Caption" exists, calling FcFontList with
+    // family="Minion Pro" will return a set of patterns some of which
+    // will have a first family of "Minion Pro Caption". Ignore these
+    // patterns and use the first candidate that maps to a font set with
+    // the same number of faces and an identical set of patterns.
+    for (uint32_t j = 0; j < candidates.Length(); ++j) {
+        FcPatternDel(pat, FC_FAMILY);
+        FcPatternAddString(pat, FC_FAMILY, (FcChar8 *)candidates[j].get());
+
+        nsAutoRef<FcFontSet> candidateFS(FcFontList(nullptr, pat, os));
+        if (!candidateFS) {
+            return true;
+        }
+
+        if (candidateFS->nfont != givenFS->nfont) {
+            continue;
+        }
+
+        bool equal = true;
+        for (int i = 0; i < givenFS->nfont; ++i) {
+            if (!FcPatternEqual(candidateFS->fonts[i], givenFS->fonts[i])) {
+                equal = false;
+                break;
+            }
+        }
+        if (equal) {
+            AppendUTF8toUTF16(candidates[j], aFamilyName);
+            return true;
+        }
+    }
+
+    // didn't find localized name, leave family name blank
+    return true;
+}
+
+static const char kFontNamePrefix[] = "font.name.";
+
+void
+gfxFcPlatformFontList::AddGenericFonts(mozilla::FontFamilyType aGenericType,
+                                       nsIAtom* aLanguage,
+                                       nsTArray<gfxFontFamily*>& aFamilyList)
+{
+    bool usePrefFontList = false;
+
+    // treat -moz-fixed as monospace
+    if (aGenericType == eFamily_moz_fixed) {
+        aGenericType = eFamily_monospace;
+    }
+
+    const char* generic = GetGenericName(aGenericType);
+    NS_ASSERTION(generic, "weird generic font type");
+    if (!generic) {
+        return;
+    }
+
+    // By default, most font prefs on Linux map to "use fontconfig"
+    // keywords. So only need to explicitly lookup font pref if
+    // non-default settings exist
+    NS_ConvertASCIItoUTF16 genericToLookup(generic);
+    if ((!mAlwaysUseFontconfigGenerics && aLanguage) ||
+        aLanguage == nsGkAtoms::x_math) {
+        nsIAtom* langGroup = GetLangGroup(aLanguage);
+        nsAutoCString langGroupStr;
+        if (langGroup) {
+            langGroup->ToUTF8String(langGroupStr);
+        }
+        nsAutoCString prefFontName(kFontNamePrefix);
+        prefFontName.Append(generic);
+        prefFontName.Append('.');
+        prefFontName.Append(langGroupStr);
+        nsAdoptingString fontlistValue = Preferences::GetString(prefFontName.get());
+        if (fontlistValue) {
+            if (!fontlistValue.EqualsLiteral("serif") &&
+                !fontlistValue.EqualsLiteral("sans-serif") &&
+                !fontlistValue.EqualsLiteral("monospace")) {
+                usePrefFontList = true;
+            } else {
+                // serif, sans-serif or monospace was specified
+                genericToLookup.Assign(fontlistValue);
+            }
+        }
+    }
+
+    // when pref fonts exist, use standard pref font lookup
+    if (usePrefFontList) {
+        return gfxPlatformFontList::AddGenericFonts(aGenericType,
+                                                    aLanguage,
+                                                    aFamilyList);
+    }
+
+    PrefFontList* prefFonts = FindGenericFamilies(genericToLookup, aLanguage);
+    NS_ASSERTION(prefFonts, "null generic font list");
+    aFamilyList.AppendElements(*prefFonts);
+}
+
+void
+gfxFcPlatformFontList::ClearLangGroupPrefFonts()
+{
+    mGenericMappings.Clear();
+    gfxPlatformFontList::ClearLangGroupPrefFonts();
+    mAlwaysUseFontconfigGenerics = PrefFontListsUseOnlyGenerics();
 }
 
 /* static */ FT_Library
@@ -1376,23 +1532,30 @@ gfxFcPlatformFontList::GetFTLibrary()
     return sCairoFTLibrary;
 }
 
-gfxFontFamily*
-gfxFcPlatformFontList::FindGenericFamily(const nsAString& aGeneric,
-                                         nsIAtom* aLanguage)
+// a given generic will map to at most this many families
+const uint32_t kMaxGenericFamilies = 3;
+
+gfxPlatformFontList::PrefFontList*
+gfxFcPlatformFontList::FindGenericFamilies(const nsAString& aGeneric,
+                                           nsIAtom* aLanguage)
 {
     // set up name
     NS_ConvertUTF16toUTF8 generic(aGeneric);
 
     nsAutoCString fcLang;
     GetSampleLangForGroup(aLanguage, fcLang);
+    ToLowerCase(fcLang);
 
     nsAutoCString genericLang(generic);
+    if (fcLang.Length() > 0) {
+        genericLang.Append('-');
+    }
     genericLang.Append(fcLang);
 
     // try to get the family from the cache
-    gfxFontFamily *genericFamily = mGenericMappings.GetWeak(genericLang);
-    if (genericFamily) {
-        return genericFamily;
+    PrefFontList* prefFonts = mGenericMappings.Get(genericLang);
+    if (prefFonts) {
+        return prefFonts;
     }
 
     // if not found, ask fontconfig to pick the appropriate font
@@ -1422,7 +1585,8 @@ gfxFcPlatformFontList::FindGenericFamily(const nsAString& aGeneric,
       return nullptr;
     }
 
-    // -- pick the first font for which a font family exists
+    // -- select the fonts to be used for the generic
+    prefFonts = new PrefFontList; // can be empty but in practice won't happen
     for (int i = 0; i < faces->nfont; i++) {
         FcPattern* font = faces->fonts[i];
         FcChar8* mappedGeneric = nullptr;
@@ -1437,16 +1601,53 @@ gfxFcPlatformFontList::FindGenericFamily(const nsAString& aGeneric,
         FcPatternGetString(font, FC_FAMILY, 0, &mappedGeneric);
         if (mappedGeneric) {
             NS_ConvertUTF8toUTF16 mappedGenericName(ToCharPtr(mappedGeneric));
-            genericFamily = gfxPlatformFontList::FindFamily(mappedGenericName);
-            if (genericFamily) {
+            gfxFontFamily* genericFamily =
+                gfxPlatformFontList::FindFamily(mappedGenericName);
+            if (genericFamily && !prefFonts->Contains(genericFamily)) {
                 //printf("generic %s ==> %s\n", genericLang.get(), (const char*)mappedGeneric);
-                mGenericMappings.Put(genericLang, genericFamily);
-                break;
+                prefFonts->AppendElement(genericFamily);
+                if (prefFonts->Length() >= kMaxGenericFamilies) {
+                    break;
+                }
             }
         }
     }
+    mGenericMappings.Put(genericLang, prefFonts);
+    return prefFonts;
+}
 
-    return genericFamily;
+bool
+gfxFcPlatformFontList::PrefFontListsUseOnlyGenerics()
+{
+    bool prefFontsUseOnlyGenerics = true;
+    uint32_t count;
+    char** names;
+    nsresult rv = Preferences::GetRootBranch()->
+        GetChildList(kFontNamePrefix, &count, &names);
+    if (NS_SUCCEEDED(rv) && count) {
+        for (size_t i = 0; i < count; i++) {
+            // Check whether all font.name prefs map to generic keywords
+            // and that the pref name and keyword match.
+            //   Ex: font.name.serif.ar ==> "serif" (ok)
+            //   Ex: font.name.serif.ar ==> "monospace" (return false)
+            //   Ex: font.name.serif.ar ==> "DejaVu Serif" (return false)
+
+            nsDependentCString prefName(names[i] +
+                                        ArrayLength(kFontNamePrefix) - 1);
+            nsCCharSeparatedTokenizer tokenizer(prefName, '.');
+            const nsDependentCSubstring& generic = tokenizer.nextToken();
+            const nsDependentCSubstring& langGroup = tokenizer.nextToken();
+            nsAdoptingCString fontPrefValue = Preferences::GetCString(names[i]);
+
+            if (!langGroup.EqualsLiteral("x-math") &&
+                !generic.Equals(fontPrefValue)) {
+                prefFontsUseOnlyGenerics = false;
+                break;
+            }
+        }
+        NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(count, names);
+    }
+    return prefFontsUseOnlyGenerics;
 }
 
 /* static */ void
diff --git a/gfx/thebes/gfxFcPlatformFontList.h b/gfx/thebes/gfxFcPlatformFontList.h
index 4f5ec324a091e8..735a35579fefdf 100644
--- a/gfx/thebes/gfxFcPlatformFontList.h
+++ b/gfx/thebes/gfxFcPlatformFontList.h
@@ -226,6 +226,13 @@ class gfxFcPlatformFontList : public gfxPlatformFontList {
 
     FcConfig* GetLastConfig() const { return mLastConfig; }
 
+    // override to use fontconfig lookup for generics
+    void AddGenericFonts(mozilla::FontFamilyType aGenericType,
+                         nsIAtom* aLanguage,
+                         nsTArray<gfxFontFamily*>& aFamilyList) override;
+
+    void ClearLangGroupPrefFonts() override;
+
     static FT_Library GetFTLibrary();
 
 protected:
@@ -234,10 +241,13 @@ class gfxFcPlatformFontList : public gfxPlatformFontList {
     // add all the font families found in a font set
     void AddFontSetFamilies(FcFontSet* aFontSet);
 
-    // figure out which family fontconfig maps a generic to
+    // figure out which families fontconfig maps a generic to
     // (aGeneric assumed already lowercase)
-    gfxFontFamily* FindGenericFamily(const nsAString& aGeneric,
-                                     nsIAtom* aLanguage);
+    PrefFontList* FindGenericFamilies(const nsAString& aGeneric,
+                                      nsIAtom* aLanguage);
+
+    // are all pref font settings set to use fontconfig generics?
+    bool PrefFontListsUseOnlyGenerics();
 
     static void CheckFontUpdates(nsITimer *aTimer, void *aThis);
 
@@ -253,8 +263,10 @@ class gfxFcPlatformFontList : public gfxPlatformFontList {
                     nsCountedRef<FcPattern>,
                     FcPattern*> mLocalNames;
 
-    // caching generic/lang ==> font family
-    nsRefPtrHashtable<nsCStringHashKey, gfxFontFamily> mGenericMappings;
+    // caching generic/lang ==> font family list
+    nsBaseHashtable<nsCStringHashKey,
+                    nsAutoPtr<PrefFontList>,
+                    PrefFontList*> mGenericMappings;
 
     // caching family lookups as found by FindFamily after resolving substitutions
     nsRefPtrHashtable<nsCStringHashKey, gfxFontFamily> mFcSubstituteCache;
@@ -262,6 +274,13 @@ class gfxFcPlatformFontList : public gfxPlatformFontList {
     nsCOMPtr<nsITimer> mCheckFontUpdatesTimer;
     nsCountedRef<FcConfig> mLastConfig;
 
+    // By default, font prefs under Linux are set to simply lookup
+    // via fontconfig the appropriate font for serif/sans-serif/monospace.
+    // Rather than check each time a font pref is used, check them all at startup
+    // and set a boolean to flag the case that non-default user font prefs exist
+    // Note: langGroup == x-math is handled separately
+    bool mAlwaysUseFontconfigGenerics;
+
     static FT_Library sCairoFTLibrary;
 };
 
diff --git a/gfx/thebes/gfxPlatformFontList.cpp b/gfx/thebes/gfxPlatformFontList.cpp
index 7b6de611d65907..e232e5050a847d 100644
--- a/gfx/thebes/gfxPlatformFontList.cpp
+++ b/gfx/thebes/gfxPlatformFontList.cpp
@@ -786,39 +786,7 @@ gfxPlatformFontList::ResolveGenericFontNames(
 )
 {
     const char* langGroupStr = GetPrefLangName(aPrefLang);
-
-    static const char kGeneric_serif[] = "serif";
-    static const char kGeneric_sans_serif[] = "sans-serif";
-    static const char kGeneric_monospace[] = "monospace";
-    static const char kGeneric_cursive[] = "cursive";
-    static const char kGeneric_fantasy[] = "fantasy";
-
-    // type should be standard generic type at this point
-    NS_ASSERTION(aGenericType >= eFamily_serif &&
-                 aGenericType <= eFamily_fantasy,
-                 "standard generic font family type required");
-
-    // map generic type to string
-    const char *generic = nullptr;
-    switch (aGenericType) {
-        case eFamily_serif:
-            generic = kGeneric_serif;
-            break;
-        case eFamily_sans_serif:
-            generic = kGeneric_sans_serif;
-            break;
-        case eFamily_monospace:
-            generic = kGeneric_monospace;
-            break;
-        case eFamily_cursive:
-            generic = kGeneric_cursive;
-            break;
-        case eFamily_fantasy:
-            generic = kGeneric_fantasy;
-            break;
-        default:
-            break;
-    }
+    const char* generic = GetGenericName(aGenericType);
 
     if (!generic) {
         return;
@@ -898,19 +866,7 @@ gfxPlatformFontList::AddGenericFonts(mozilla::FontFamilyType aGenericType,
                                      nsTArray<gfxFontFamily*>& aFamilyList)
 {
     // map lang ==> langGroup
-    nsIAtom *langGroup = nullptr;
-    if (aLanguage) {
-        if (!mLangService) {
-            mLangService = do_GetService(NS_LANGUAGEATOMSERVICE_CONTRACTID);
-        }
-        if (mLangService) {
-            nsresult rv;
-            langGroup = mLangService->GetLanguageGroup(aLanguage, &rv);
-        }
-    }
-    if (!langGroup) {
-        langGroup = nsGkAtoms::Unicode;
-    }
+    nsIAtom* langGroup = GetLangGroup(aLanguage);
 
     // langGroup ==> prefLang
     eFontPrefLang prefLang = GetFontPrefLangFor(langGroup);
@@ -1203,6 +1159,65 @@ gfxPlatformFontList::GetFontFamilyNames(nsTArray<nsString>& aFontFamilyNames)
     }
 }
 
+nsIAtom*
+gfxPlatformFontList::GetLangGroup(nsIAtom* aLanguage)
+{
+    // map lang ==> langGroup
+    nsIAtom *langGroup = nullptr;
+    if (aLanguage) {
+        if (!mLangService) {
+            mLangService = do_GetService(NS_LANGUAGEATOMSERVICE_CONTRACTID);
+        }
+        if (mLangService) {
+            nsresult rv;
+            langGroup = mLangService->GetLanguageGroup(aLanguage, &rv);
+        }
+    }
+    if (!langGroup) {
+        langGroup = nsGkAtoms::Unicode;
+    }
+    return langGroup;
+}
+
+/* static */ const char*
+gfxPlatformFontList::GetGenericName(FontFamilyType aGenericType)
+{
+    static const char kGeneric_serif[] = "serif";
+    static const char kGeneric_sans_serif[] = "sans-serif";
+    static const char kGeneric_monospace[] = "monospace";
+    static const char kGeneric_cursive[] = "cursive";
+    static const char kGeneric_fantasy[] = "fantasy";
+
+    // type should be standard generic type at this point
+    NS_ASSERTION(aGenericType >= eFamily_serif &&
+                 aGenericType <= eFamily_fantasy,
+                 "standard generic font family type required");
+
+    // map generic type to string
+    const char *generic = nullptr;
+    switch (aGenericType) {
+        case eFamily_serif:
+            generic = kGeneric_serif;
+            break;
+        case eFamily_sans_serif:
+            generic = kGeneric_sans_serif;
+            break;
+        case eFamily_monospace:
+            generic = kGeneric_monospace;
+            break;
+        case eFamily_cursive:
+            generic = kGeneric_cursive;
+            break;
+        case eFamily_fantasy:
+            generic = kGeneric_fantasy;
+            break;
+        default:
+            break;
+    }
+
+    return generic;
+}
+
 void
 gfxPlatformFontList::InitLoader()
 {
diff --git a/gfx/thebes/gfxPlatformFontList.h b/gfx/thebes/gfxPlatformFontList.h
index fccb6e08b3b67b..09a6e597880841 100644
--- a/gfx/thebes/gfxPlatformFontList.h
+++ b/gfx/thebes/gfxPlatformFontList.h
@@ -120,7 +120,7 @@ class gfxPlatformFontList : public gfxFontInfoLoader
 
     void UpdateFontList();
 
-    void ClearLangGroupPrefFonts();
+    virtual void ClearLangGroupPrefFonts();
 
     virtual void GetFontFamilyList(nsTArray<RefPtr<gfxFontFamily> >& aFamilyArray);
 
@@ -314,6 +314,11 @@ class gfxPlatformFontList : public gfxFontInfoLoader
 
     virtual void GetFontFamilyNames(nsTArray<nsString>& aFontFamilyNames);
 
+    // helper function to map lang to lang group
+    nsIAtom* GetLangGroup(nsIAtom* aLanguage);
+
+    static const char* GetGenericName(mozilla::FontFamilyType aGenericType);
+
     // gfxFontInfoLoader overrides, used to load in font cmaps
     virtual void InitLoader();
     virtual bool LoadFontInfo();
diff --git a/image/decoders/nsBMPDecoder.cpp b/image/decoders/nsBMPDecoder.cpp
index f0639417695bbe..877fb6e599bbfc 100644
--- a/image/decoders/nsBMPDecoder.cpp
+++ b/image/decoders/nsBMPDecoder.cpp
@@ -240,6 +240,17 @@ nsBMPDecoder::FinishInternal()
   // Send notifications if appropriate.
   if (!IsMetadataDecode() && HasSize()) {
 
+    // If it was truncated, fill in the missing pixels as black.
+    while (mCurrentRow > 0) {
+      uint32_t* dst = RowBuffer();
+      while (mCurrentPos < mH.mWidth) {
+        SetPixel(dst, 0, 0, 0);
+        mCurrentPos++;
+      }
+      mCurrentPos = 0;
+      FinishRow();
+    }
+
     // Invalidate.
     nsIntRect r(0, 0, mH.mWidth, AbsoluteHeight());
     PostInvalidation(r);
diff --git a/image/decoders/nsBMPDecoder.h b/image/decoders/nsBMPDecoder.h
index 1a0d3af1c1bc7b..bcb6937bff084d 100644
--- a/image/decoders/nsBMPDecoder.h
+++ b/image/decoders/nsBMPDecoder.h
@@ -230,8 +230,9 @@ class nsBMPDecoder : public Decoder
 
   int32_t mCurrentRow;      // Index of the row of the image that's currently
                             // being decoded: [height,1].
-  int32_t mCurrentPos;      // Index into the current line; only used when
-                            // doing RLE decoding.
+  int32_t mCurrentPos;      // Index into the current line. Used when
+                            // doing RLE decoding and when filling in pixels
+                            // for truncated files.
 
   // Only used in RLE_ABSOLUTE state: the number of pixels to read.
   uint32_t mAbsoluteModeNumPixels;
diff --git a/intl/unicharutil/nsISaveAsCharset.idl b/intl/unicharutil/nsISaveAsCharset.idl
index e9571a1b66879c..c32960177d1621 100644
--- a/intl/unicharutil/nsISaveAsCharset.idl
+++ b/intl/unicharutil/nsISaveAsCharset.idl
@@ -11,7 +11,10 @@
 #define NS_SAVEASCHARSET_CONTRACTID "@mozilla.org/intl/saveascharset;1"
 %}
 
-[scriptable, uuid(33B87F70-7A9C-11d3-915C-006008A6EDF6)]
+/**
+ * DO NOT USE! For compat with legacy extension code only.
+ */
+[scriptable, uuid(b3b8124f-0abb-460e-88ac-3cf1a0134b2d)]
 interface nsISaveAsCharset : nsISupports
 {
   // attributes
@@ -19,17 +22,17 @@ interface nsISaveAsCharset : nsISupports
   const unsigned long mask_Entity                  = 0x00000300; // mask for entity (2bits)
   const unsigned long mask_CharsetFallback         = 0x00000400; // mask for charset fallback (1bit)
 
-  const unsigned long attr_FallbackNone = 0;                   // no fall back for unconverted chars (skipped)
-  const unsigned long attr_FallbackQuestionMark = 1;           // unconverted chars are replaced by '?'
-  const unsigned long attr_FallbackEscapeU = 2;                // unconverted chars are escaped as \uxxxx
-  const unsigned long attr_FallbackDecimalNCR = 3;             // unconverted chars are replaced by decimal NCR
-  const unsigned long attr_FallbackHexNCR = 4;                 // unconverted chars are replaced by hex NCR
+  const unsigned long attr_FallbackNone = 0;                   // IGNORED
+  const unsigned long attr_FallbackQuestionMark = 1;           // IGNORED
+  const unsigned long attr_FallbackEscapeU = 2;                // IGNORED
+  const unsigned long attr_FallbackDecimalNCR = 3;             // IGNORED
+  const unsigned long attr_FallbackHexNCR = 4;                 // IGNORED
 
-  const unsigned long attr_EntityNone = 0;                       // generate no Named Entity
-  const unsigned long attr_EntityBeforeCharsetConv = 0x00000100; // generate Named Entity before charset conversion
-  const unsigned long attr_EntityAfterCharsetConv =  0x00000200; // generate Named Entity after charset conversion
+  const unsigned long attr_EntityNone = 0;                       // IGNORED
+  const unsigned long attr_EntityBeforeCharsetConv = 0x00000100; // IGNORED
+  const unsigned long attr_EntityAfterCharsetConv =  0x00000200; // IGNORED
 
-  const unsigned long attr_CharsetFallback        =  0x00000400; // fallback to other charset and restart the convesion
+  const unsigned long attr_CharsetFallback        =  0x00000400; // IGNORED
 
 
                                                                // default attribute for plain text
@@ -39,14 +42,9 @@ interface nsISaveAsCharset : nsISupports
                                                                // generate entity before charset conversion, use decimal NCR
   const unsigned long attr_htmlTextDefault = attr_FallbackDecimalNCR + attr_EntityBeforeCharsetConv;
 
-  readonly attribute string charset;                           // charset used for the conversion
+  readonly attribute AUTF8String charset;                      // charset used for the conversion
 
-  // set up charset, attribute and entity version 
-  // see nsIEntityConverter.idl for possible value of entityVersion (entityNone for plain text).
-  void Init(in string charset, in unsigned long attr, in unsigned long entityVersion);
+  void Init(in AUTF8String charset, in unsigned long ignored, in unsigned long alsoIgnored);
 
-  // convert UCS-2 html to target charset
-  // may return the result code of the unicode converter (NS_ERROR_UENC_NOMAPPING)
-  // if the attribute does not specify any fall back (e.g. attrPlainTextDefault)
-	string Convert(in wstring inString);
+  ACString Convert(in AString inString);
 };
diff --git a/intl/unicharutil/nsSaveAsCharset.cpp b/intl/unicharutil/nsSaveAsCharset.cpp
index 659bbfcfdb2c16..2b05c9677318cd 100644
--- a/intl/unicharutil/nsSaveAsCharset.cpp
+++ b/intl/unicharutil/nsSaveAsCharset.cpp
@@ -4,16 +4,8 @@
  * 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 "prmem.h"
-#include "mozilla/Snprintf.h"
 #include "nsSaveAsCharset.h"
-#include "nsWhitespaceTokenizer.h"
-#include "nsIUnicodeEncoder.h"
 #include "mozilla/dom/EncodingUtils.h"
-#include "nsComponentManagerUtils.h"
-
-using mozilla::dom::EncodingUtils;
 
 //
 // nsISupports methods
@@ -25,9 +17,6 @@ NS_IMPL_ISUPPORTS(nsSaveAsCharset, nsISaveAsCharset)
 //
 nsSaveAsCharset::nsSaveAsCharset()
 {
-  mAttribute = attr_htmlTextDefault;
-  mEntityVersion = 0;
-  mCharsetListIndex = -1;
 }
 
 nsSaveAsCharset::~nsSaveAsCharset()
@@ -35,340 +24,33 @@ nsSaveAsCharset::~nsSaveAsCharset()
 }
 
 NS_IMETHODIMP
-nsSaveAsCharset::Init(const char *charset, uint32_t attr, uint32_t entityVersion)
-{
-  nsresult rv = NS_OK;
-
-  mAttribute = attr;
-  mEntityVersion = entityVersion;
-
-  rv = SetupCharsetList(charset);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // set up unicode encoder
-  rv = SetupUnicodeEncoder(GetNextCharset());
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // set up entity converter
-  if (attr_EntityNone != MASK_ENTITY(mAttribute) && !mEntityConverter)
-    mEntityConverter = do_CreateInstance(NS_ENTITYCONVERTER_CONTRACTID, &rv);
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsSaveAsCharset::Convert(const char16_t *inString, char **_retval)
-{
-  NS_ENSURE_ARG_POINTER(_retval);
-  NS_ENSURE_ARG_POINTER(inString);
-  if (0 == *inString)
-    return NS_ERROR_ILLEGAL_VALUE;
-  nsresult rv = NS_OK;
-
-  NS_ASSERTION(mEncoder, "need to call Init() before Convert()");
-  NS_ENSURE_TRUE(mEncoder, NS_ERROR_FAILURE);
-
-  *_retval = nullptr;
-
-  // make sure to start from the first charset in the list
-  if (mCharsetListIndex > 0) {
-    mCharsetListIndex = -1;
-    rv = SetupUnicodeEncoder(GetNextCharset());
-    NS_ENSURE_SUCCESS(rv, rv);
-  }
-
-  do {
-    // fallback to the next charset in the list if the last conversion failed by an unmapped character
-    if (MASK_CHARSET_FALLBACK(mAttribute) && NS_ERROR_UENC_NOMAPPING == rv) {
-      const char * charset = GetNextCharset();
-      if (!charset)
-        break;
-      rv = SetupUnicodeEncoder(charset);
-      NS_ENSURE_SUCCESS(rv, rv);
-      PR_FREEIF(*_retval);
-    }
-
-    if (attr_EntityBeforeCharsetConv == MASK_ENTITY(mAttribute)) {
-      NS_ASSERTION(mEntityConverter, "need to call Init() before Convert()");
-      NS_ENSURE_TRUE(mEntityConverter, NS_ERROR_FAILURE);
-      char16_t *entity = nullptr;
-      // do the entity conversion first
-      rv = mEntityConverter->ConvertToEntities(inString, mEntityVersion, &entity);
-      if(NS_SUCCEEDED(rv)) {
-        rv = DoCharsetConversion(entity, _retval);
-        free(entity);
-      }
-    }
-    else
-      rv = DoCharsetConversion(inString, _retval);
-
-  } while (MASK_CHARSET_FALLBACK(mAttribute) && NS_ERROR_UENC_NOMAPPING == rv);
-
-  return rv;
-}
-
-NS_IMETHODIMP 
-nsSaveAsCharset::GetCharset(char * *aCharset)
+nsSaveAsCharset::Init(const nsACString& aCharset, uint32_t aIgnored, uint32_t aAlsoIgnored)
 {
-  NS_ENSURE_ARG(aCharset);
-  NS_ASSERTION(mCharsetListIndex >= 0, "need to call Init() first");
-  NS_ENSURE_TRUE(mCharsetListIndex >= 0, NS_ERROR_FAILURE);
-
-  const char* charset = mCharsetList[mCharsetListIndex].get();
-  if (!charset) {
-    *aCharset = nullptr;
-    NS_ASSERTION(charset, "make sure to call Init() with non empty charset list");
-    return NS_ERROR_FAILURE;
+  nsAutoCString encoding;
+  if (!mozilla::dom::EncodingUtils::FindEncodingForLabelNoReplacement(aCharset, encoding)) {
+    return NS_ERROR_DOM_ENCODING_NOT_SUPPORTED_ERR;
   }
-
-  *aCharset = strdup(charset);
-  return (*aCharset) ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
+  mEncoder = new nsNCRFallbackEncoderWrapper(encoding);
+  mCharset.Assign(encoding);
+  return NS_OK;
 }
 
-/////////////////////////////////////////////////////////////////////////////////////////
-
-#define RESERVE_FALLBACK_BYTES 512
-
-// do the fallback, reallocate the buffer if necessary
-// need to pass destination buffer info (size, current position and estimation of rest of the conversion)
 NS_IMETHODIMP
-nsSaveAsCharset::HandleFallBack(uint32_t character, char **outString, int32_t *bufferLength, 
-                                int32_t *currentPos, int32_t estimatedLength)
+nsSaveAsCharset::Convert(const nsAString& aIn, nsACString& aOut)
 {
-  NS_ENSURE_ARG_POINTER(outString);
-  NS_ENSURE_ARG_POINTER(bufferLength);
-  NS_ENSURE_ARG_POINTER(currentPos);
-
-  char fallbackStr[256];
-  nsresult rv = DoConversionFallBack(character, fallbackStr, 256);
-  if (NS_SUCCEEDED(rv)) {
-    int32_t tempLen = (int32_t) strlen(fallbackStr);
-
-    // reallocate if the buffer is not large enough
-    if ((tempLen + estimatedLength) >= (*bufferLength - *currentPos)) {
-      int32_t addLength = tempLen + RESERVE_FALLBACK_BYTES;
-      // + 1 is for the terminating NUL, don't add that to bufferLength
-      char *temp = (char *) PR_Realloc(*outString, *bufferLength + addLength + 1);
-      if (temp) {
-        // adjust length/pointer after realloc
-        *bufferLength += addLength;
-        *outString = temp;
-      } else {
-        *outString = nullptr;
-        *bufferLength = 0;
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-    }
-    memcpy((*outString + *currentPos), fallbackStr, tempLen);
-    *currentPos += tempLen;
+  if (!mEncoder) {
+    return NS_ERROR_DOM_ENCODING_NOT_SUPPORTED_ERR;
   }
-  return rv;
-}
 
-NS_IMETHODIMP
-nsSaveAsCharset::DoCharsetConversion(const char16_t *inString, char **outString)
-{
-  NS_ENSURE_ARG_POINTER(outString);
-
-  *outString = nullptr;
-
-  nsresult rv;
-  int32_t inStringLength = NS_strlen(inString);       // original input string length
-  int32_t bufferLength;                               // allocated buffer length
-  int32_t srcLength = inStringLength;
-  int32_t dstLength;
-  int32_t pos1, pos2;
-  nsresult saveResult = NS_OK;                         // to remember NS_ERROR_UENC_NOMAPPING
-
-  // estimate and allocate the target buffer (reserve extra memory for fallback)
-  rv = mEncoder->GetMaxLength(inString, inStringLength, &dstLength);
-  if (NS_FAILED(rv)) return rv;
-
-  bufferLength = dstLength + RESERVE_FALLBACK_BYTES; // extra bytes for fallback
-  // + 1 is for the terminating NUL -- we don't add that to bufferLength so that
-  // we can always write dstPtr[pos2] = '\0' even when the encoder filled the
-  // buffer.
-  char *dstPtr = (char *) PR_Malloc(bufferLength + 1);
-  if (!dstPtr) {
+  if (!mEncoder->Encode(aIn, aOut)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
-  
-  for (pos1 = 0, pos2 = 0; pos1 < inStringLength;) {
-    // convert from unicode
-    dstLength = bufferLength - pos2;
-    NS_ASSERTION(dstLength >= 0, "out of bounds write");
-    rv = mEncoder->Convert(&inString[pos1], &srcLength, &dstPtr[pos2], &dstLength);
-
-    pos1 += srcLength ? srcLength : 1;
-    pos2 += dstLength;
-    dstPtr[pos2] = '\0';
-
-    // break: this is usually the case (no error) OR unrecoverable error
-    if (NS_ERROR_UENC_NOMAPPING != rv) break;
-
-    // remember this happened and reset the result
-    saveResult = rv;
-    rv = NS_OK;
-
-    // finish encoder, give it a chance to write extra data like escape sequences
-    dstLength = bufferLength - pos2;
-    rv = mEncoder->Finish(&dstPtr[pos2], &dstLength);
-    if (NS_SUCCEEDED(rv)) {
-      pos2 += dstLength;
-      dstPtr[pos2] = '\0';
-    }
-
-    srcLength = inStringLength - pos1;
-
-    // do the fallback
-    if (!ATTR_NO_FALLBACK(mAttribute)) {
-      uint32_t unMappedChar;
-      if (NS_IS_HIGH_SURROGATE(inString[pos1-1]) && 
-          inStringLength > pos1 && NS_IS_LOW_SURROGATE(inString[pos1])) {
-        unMappedChar = SURROGATE_TO_UCS4(inString[pos1-1], inString[pos1]);
-        pos1++;
-      } else {
-        unMappedChar = inString[pos1-1];
-      }
-
-      rv = mEncoder->GetMaxLength(inString+pos1, inStringLength-pos1, &dstLength);
-      if (NS_FAILED(rv)) 
-        break;
-
-      rv = HandleFallBack(unMappedChar, &dstPtr, &bufferLength, &pos2, dstLength);
-      if (NS_FAILED(rv)) 
-        break;
-      dstPtr[pos2] = '\0';
-    }
-  }
-
-  if (NS_SUCCEEDED(rv)) {
-    // finish encoder, give it a chance to write extra data like escape sequences
-    dstLength = bufferLength - pos2;
-    rv = mEncoder->Finish(&dstPtr[pos2], &dstLength);
-    if (NS_SUCCEEDED(rv)) {
-      pos2 += dstLength;
-      dstPtr[pos2] = '\0';
-    }
-  }
-
-  if (NS_FAILED(rv)) {
-    PR_FREEIF(dstPtr);
-    return rv;
-  }
-
-  *outString = dstPtr;      // set the result string
-
-  // set error code so that the caller can do own fall back
-  if (NS_ERROR_UENC_NOMAPPING == saveResult) {
-    rv = NS_ERROR_UENC_NOMAPPING;
-  }
-
-  return rv;
-}
-
-NS_IMETHODIMP
-nsSaveAsCharset::DoConversionFallBack(uint32_t inUCS4, char *outString, int32_t bufferLength)
-{
-  NS_ENSURE_ARG_POINTER(outString);
-
-  *outString = '\0';
-
-  nsresult rv = NS_OK;
-
-  if (ATTR_NO_FALLBACK(mAttribute)) {
-    return NS_OK;
-  }
-  if (attr_EntityAfterCharsetConv == MASK_ENTITY(mAttribute)) {
-    char *entity = nullptr;
-    rv = mEntityConverter->ConvertUTF32ToEntity(inUCS4, mEntityVersion, &entity);
-    if (NS_SUCCEEDED(rv)) {
-      if (!entity || (int32_t)strlen(entity) > bufferLength) {
-        return NS_ERROR_OUT_OF_MEMORY;
-      }
-      PL_strcpy(outString, entity);
-      free(entity);
-      return rv;
-    }
-  }
-
-  switch (MASK_FALLBACK(mAttribute)) {
-  case attr_FallbackQuestionMark:
-    if(bufferLength>=2) {
-      *outString++='?';
-      *outString='\0';
-      rv = NS_OK;
-    } else {
-      rv = NS_ERROR_FAILURE;
-    }
-    break;
-  case attr_FallbackEscapeU:
-    if (inUCS4 & 0xff0000)
-      rv = (snprintf(outString, bufferLength, "\\u%.6x", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
-    else
-      rv = (snprintf(outString, bufferLength, "\\u%.4x", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
-    break;
-  case attr_FallbackDecimalNCR:
-    rv = (snprintf(outString, bufferLength, "&#%u;", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
-    break;
-  case attr_FallbackHexNCR:
-    rv = (snprintf(outString, bufferLength, "&#x%x;", inUCS4) > 0) ? NS_OK : NS_ERROR_FAILURE;
-    break;
-  case attr_FallbackNone:
-    rv = NS_OK;
-    break;
-  default:
-    rv = NS_ERROR_ILLEGAL_VALUE;
-    break;
-  }
-
-	return rv;
-}
-
-nsresult nsSaveAsCharset::SetupUnicodeEncoder(const char* charset)
-{
-  NS_ENSURE_ARG(charset);
-  nsDependentCString label(charset);
-  if (label.EqualsLiteral("replacement")) {
-    // Internal caller. "replacement" doesn't survive another label resolution.
-    mEncoder = EncodingUtils::EncoderForEncoding(label);
-    return NS_OK;
-  }
-  nsAutoCString encoding;
-  if (!EncodingUtils::FindEncodingForLabelNoReplacement(label,
-                                                        encoding)) {
-    return NS_ERROR_UCONV_NOCONV;
-  }
-  mEncoder = EncodingUtils::EncoderForEncoding(encoding);
   return NS_OK;
 }
 
-nsresult nsSaveAsCharset::SetupCharsetList(const char *charsetList)
+NS_IMETHODIMP 
+nsSaveAsCharset::GetCharset(nsACString& aCharset)
 {
-  NS_ENSURE_ARG(charsetList);
-
-  NS_ASSERTION(charsetList[0], "charsetList should not be empty");
-  if (!charsetList[0])
-    return NS_ERROR_INVALID_ARG;
-
-  if (mCharsetListIndex >= 0) {
-    mCharsetList.Clear();
-    mCharsetListIndex = -1;
-  }
-
-  nsCWhitespaceTokenizer tokenizer((nsDependentCString(charsetList)));
-  while (tokenizer.hasMoreTokens()) {
-    ParseString(tokenizer.nextToken(), ',', mCharsetList);
-  }
-
+  aCharset.Assign(mCharset);
   return NS_OK;
 }
-
-const char * nsSaveAsCharset::GetNextCharset()
-{
-  if ((mCharsetListIndex + 1) >= int32_t(mCharsetList.Length()))
-    return nullptr;
-
-  // bump the index and return the next charset
-  return mCharsetList[++mCharsetListIndex].get();
-}
diff --git a/intl/unicharutil/nsSaveAsCharset.h b/intl/unicharutil/nsSaveAsCharset.h
index be9cbc4649978c..63c9e842dbe7e3 100644
--- a/intl/unicharutil/nsSaveAsCharset.h
+++ b/intl/unicharutil/nsSaveAsCharset.h
@@ -3,71 +3,35 @@
  * 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/. */
 
-#ifndef nsSaveAsCharset_h__
-#define nsSaveAsCharset_h__
+#ifndef nsSaveAsCharset_h_
+#define nsSaveAsCharset_h_
 
 #include "nsStringFwd.h"
-#include "nsTArray.h"
 #include "nsISaveAsCharset.h"
-#include "nsCOMPtr.h"
-
-#define MASK_FALLBACK(a) (nsISaveAsCharset::mask_Fallback & (a))
-#define MASK_ENTITY(a) (nsISaveAsCharset::mask_Entity & (a))
-#define MASK_CHARSET_FALLBACK(a) (nsISaveAsCharset::mask_CharsetFallback & (a))
-#define ATTR_NO_FALLBACK(a) (nsISaveAsCharset::attr_FallbackNone == MASK_FALLBACK(a) && \
-                             nsISaveAsCharset::attr_EntityAfterCharsetConv != MASK_ENTITY(a))
-
-class nsIUnicodeEncoder;
-class nsIEntityConverter;
+#include "nsAutoPtr.h"
+#include "nsNCRFallbackEncoderWrapper.h"
+#include "nsString.h"
 
 class nsSaveAsCharset : public nsISaveAsCharset
 {
 public:
-	
-	//
-	// implementation methods
-	//
+
   nsSaveAsCharset();
 
-	//
-	// nsISupports
-	//
-	NS_DECL_ISUPPORTS
+  NS_DECL_ISUPPORTS
 
-	//
-	// nsIEntityConverter
-	//
-  NS_IMETHOD Init(const char *charset, uint32_t attr, uint32_t entityVersion) override;
+  NS_IMETHOD Init(const nsACString& aCharset, uint32_t aIgnored, uint32_t aAlsoIgnored) override;
 
-  NS_IMETHOD Convert(const char16_t *inString, char **_retval) override;
+  NS_IMETHOD Convert(const nsAString& ain, nsACString& aOut) override;
 
-  NS_IMETHODIMP GetCharset(char * *aCharset) override;
+  NS_IMETHODIMP GetCharset(nsACString& aCharset) override;
 
-protected:
+private:
 
   virtual ~nsSaveAsCharset();
 
-  NS_IMETHOD DoCharsetConversion(const char16_t *inString, char **outString);
-
-  NS_IMETHOD DoConversionFallBack(uint32_t inUCS4, char *outString, int32_t bufferLength);
-
-  // do the fallback, reallocate the buffer if necessary
-  // need to pass destination buffer info (size, current position and estimation of rest of the conversion)
-  NS_IMETHOD HandleFallBack(uint32_t character, char **outString, int32_t *bufferLength, 
-                            int32_t *currentPos, int32_t estimatedLength);
-
-  nsresult SetupUnicodeEncoder(const char* charset);
-
-  nsresult SetupCharsetList(const char *charsetList);
-
-  const char * GetNextCharset();
-
-  uint32_t mAttribute;                    // conversion attribute
-  uint32_t mEntityVersion;                // see nsIEntityConverter
-  nsCOMPtr<nsIUnicodeEncoder> mEncoder;   // encoder (convert from unicode)
-  nsCOMPtr<nsIEntityConverter> mEntityConverter;
-  nsTArray<nsCString> mCharsetList;
-  int32_t        mCharsetListIndex;
+  nsAutoPtr<nsNCRFallbackEncoderWrapper> mEncoder;
+  nsCString mCharset;
 };
 
 #endif
diff --git a/js/src/asmjs/AsmJSModule.cpp b/js/src/asmjs/AsmJSModule.cpp
index 5e744d4ceb39a2..6c0f32cf4808c6 100644
--- a/js/src/asmjs/AsmJSModule.cpp
+++ b/js/src/asmjs/AsmJSModule.cpp
@@ -326,8 +326,6 @@ AsmJSModule::finish(ExclusiveContext* cx, TokenStream& tokenStream, MacroAssembl
     if (!callSites_.appendAll(callSites))
         return false;
 
-    MOZ_ASSERT(pod.functionBytes_ % AsmJSPageSize == 0);
-
     // Absolute link metadata: absolute addresses that refer to some fixed
     // address in the address space.
     AbsoluteLinkArray& absoluteLinks = staticLinkData_.absoluteLinks;
diff --git a/js/src/asmjs/AsmJSValidate.cpp b/js/src/asmjs/AsmJSValidate.cpp
index 894704e8ee8136..ad5a832b65a8c4 100644
--- a/js/src/asmjs/AsmJSValidate.cpp
+++ b/js/src/asmjs/AsmJSValidate.cpp
@@ -1596,17 +1596,9 @@ class MOZ_STACK_CLASS ModuleValidator
             masm().patchCall(callerOffset, calleeOffset);
         }
 
-        // When an interrupt is triggered, all function code is mprotected and,
-        // for sanity, stub code (particularly the interrupt stub) is not.
-        // Protection works at page granularity, so we need to ensure that no
-        // stub code gets into the function code pages.
-        // TODO; this is no longer true and could be removed, see also
-        // bug 1200609.
         MOZ_ASSERT(!finishedFunctionBodies_);
-        masm().haltingAlign(AsmJSPageSize);
         module_->finishFunctionBodies(masm().currentOffset());
         finishedFunctionBodies_ = true;
-
         return true;
     }
 
diff --git a/js/src/vm/TraceLoggingGraph.cpp b/js/src/vm/TraceLoggingGraph.cpp
index d5a7b8b73503b7..1b7c9cdf966406 100644
--- a/js/src/vm/TraceLoggingGraph.cpp
+++ b/js/src/vm/TraceLoggingGraph.cpp
@@ -276,7 +276,7 @@ TraceLoggerGraph::flush()
         if (bytesWritten < tree.size())
             return false;
 
-        treeOffset += tree.lastEntryId();
+        treeOffset += tree.size();
         tree.clear();
     }
 
@@ -359,7 +359,7 @@ TraceLoggerGraph::startEventInternal(uint32_t id, uint64_t timestamp)
 
     if (parent.lastChildId() == 0) {
         MOZ_ASSERT(!entry.hasChildren());
-        MOZ_ASSERT(parent.treeId() == tree.lastEntryId() + treeOffset);
+        MOZ_ASSERT(parent.treeId() == treeOffset + tree.size() - 1);
 
         if (!updateHasChildren(parent.treeId()))
             return false;
diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp
index 5158b10392b5cb..ece52794379550 100644
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -5146,7 +5146,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
       nsIWidget* widget = aContainerFrame->GetNearestWidget();
       nsSize displaySize;
       if (widget) {
-        IntSize widgetSize = widget->GetClientSize();
+        LayoutDeviceIntSize widgetSize = widget->GetClientSize();
         int32_t p2a = presContext->AppUnitsPerDevPixel();
         displaySize.width = NSIntPixelsToAppUnits(widgetSize.width, p2a);
         displaySize.height = NSIntPixelsToAppUnits(widgetSize.height, p2a);
diff --git a/layout/base/UnitTransforms.h b/layout/base/UnitTransforms.h
index c952c839e5909c..58abbd0711bba4 100644
--- a/layout/base/UnitTransforms.h
+++ b/layout/base/UnitTransforms.h
@@ -174,7 +174,8 @@ template <typename TargetUnits, typename SourceUnits>
 static Maybe<gfx::IntPointTyped<TargetUnits>> UntransformTo(const gfx::Matrix4x4& aTransform,
                                                 const gfx::IntPointTyped<SourceUnits>& aPoint)
 {
-  gfx::Point4D point = aTransform.ProjectPoint(aPoint.ToUnknownPoint());
+  gfx::Point p = aPoint.ToUnknownPoint();
+  gfx::Point4D point = aTransform.ProjectPoint(p);
   if (!point.HasPositiveWCoord()) {
     return Nothing();
   }
diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp
index d11d5446beb2ab..562578f167c41f 100644
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1834,11 +1834,28 @@ void FlushFramesArray(nsTArray<FramesWithDepth>& aSource, nsTArray<nsIFrame*>* a
 void nsDisplayList::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
                             nsDisplayItem::HitTestState* aState,
                             nsTArray<nsIFrame*> *aOutFrames) const {
-  int32_t itemBufferStart = aState->mItemBuffer.Length();
   nsDisplayItem* item;
+
+  if (aState->mInPreserves3D) {
+    // Collect leaves of the current 3D rendering context.
+    for (item = GetBottom(); item; item = item->GetAbove()) {
+      MOZ_ASSERT(item->GetType() == nsDisplayTransform::TYPE_TRANSFORM);
+      if (item->Frame()->Extend3DContext() &&
+          !static_cast<nsDisplayTransform*>(item)->IsTransformSeparator()) {
+        item->HitTest(aBuilder, aRect, aState, aOutFrames);
+      } else {
+        // One of leaves in the current 3D rendering context.
+        aState->mItemBuffer.AppendElement(item);
+      }
+    }
+    return;
+  }
+
+  int32_t itemBufferStart = aState->mItemBuffer.Length();
   for (item = GetBottom(); item; item = item->GetAbove()) {
     aState->mItemBuffer.AppendElement(item);
   }
+
   nsAutoTArray<FramesWithDepth, 16> temp;
   for (int32_t i = aState->mItemBuffer.Length() - 1; i >= itemBufferStart; --i) {
     // Pop element off the end of the buffer. We want to shorten the buffer
@@ -1849,11 +1866,26 @@ void nsDisplayList::HitTest(nsDisplayListBuilder* aBuilder, const nsRect& aRect,
     bool snap;
     nsRect r = item->GetBounds(aBuilder, &snap).Intersect(aRect);
     bool alwaysIntersect =
-      item->Frame()->Combines3DTransformWithAncestors() &&
-      item->GetType() == nsDisplayItem::TYPE_TRANSFORM;
+      item->GetType() == nsDisplayItem::TYPE_TRANSFORM &&
+      (item->Frame()->Combines3DTransformWithAncestors() ||
+       item->Frame()->Extend3DContext() ||
+       static_cast<nsDisplayTransform*>(item)->IsTransformSeparator());
     if (alwaysIntersect || item->GetClip().MayIntersect(r)) {
       nsAutoTArray<nsIFrame*, 16> outFrames;
-      item->HitTest(aBuilder, aRect, aState, &outFrames);
+      if (item->Frame()->Extend3DContext() &&
+          item->GetType() == nsDisplayItem::TYPE_TRANSFORM &&
+          !static_cast<nsDisplayTransform*>(item)->IsTransformSeparator()) {
+        // Start gethering leaves of the 3D rendering context, and
+        // append leaves at the end of mItemBuffer.  Leaves are
+        // processed at following iterations.
+        aState->mInPreserves3D = true;
+        item->HitTest(aBuilder, aRect, aState, &outFrames);
+        aState->mInPreserves3D = false;
+        i = aState->mItemBuffer.Length();
+        continue;
+      } else {
+        item->HitTest(aBuilder, aRect, aState, &outFrames);
+      }
 
       // For 3d transforms with preserve-3d we add hit frames into the temp list
       // so we can sort them later, otherwise we add them directly to the output list.
@@ -4806,7 +4838,16 @@ nsDisplayTransform::SetReferenceFrameToAncestor(nsDisplayListBuilder* aBuilder)
   mReferenceFrame =
     aBuilder->FindReferenceFrameFor(outerFrame);
   mToReferenceFrame = mFrame->GetOffsetToCrossDoc(mReferenceFrame);
-  mAnimatedGeometryRoot = nsLayoutUtils::GetAnimatedGeometryRootForFrame(aBuilder, outerFrame);
+  if (nsLayoutUtils::IsFixedPosFrameInDisplayPort(mFrame)) {
+    // This is an odd special case. If we are both IsFixedPosFrameInDisplayPort
+    // and transformed that we are our own AGR parent.
+    // We want our frame to be our AGR because FrameLayerBuilder uses our AGR to
+    // determine if we are inside a fixed pos subtree. If we use the outer AGR
+    // from outside the fixed pos subtree FLB can't tell that we are fixed pos.
+    mAnimatedGeometryRoot = mFrame;
+  } else {
+    mAnimatedGeometryRoot = nsLayoutUtils::GetAnimatedGeometryRootForFrame(aBuilder, outerFrame);
+  }
   mVisibleRect = aBuilder->GetDirtyRect() + mToReferenceFrame;
 }
 
@@ -5419,7 +5460,7 @@ nsDisplayTransform::GetTransform()
 }
 
 const Matrix4x4&
-nsDisplayTransform::GetAccumulatedPreserved3DTransform()
+nsDisplayTransform::GetAccumulatedPreserved3DTransform(nsDisplayListBuilder* aBuilder)
 {
   // XXX: should go back to fix mTransformGetter.
   if (!mTransformPreserves3DInited) {
@@ -5428,13 +5469,22 @@ nsDisplayTransform::GetAccumulatedPreserved3DTransform()
       mTransformPreserves3D = GetTransform();
       return mTransformPreserves3D;
     }
+    MOZ_ASSERT(!mFrame->Extend3DContext() || IsTransformSeparator());
+
+    const nsIFrame* establisher; // Establisher of the 3D rendering context.
+    for (establisher = nsLayoutUtils::GetCrossDocParentFrame(mFrame);
+         establisher && establisher->Combines3DTransformWithAncestors();
+         establisher = nsLayoutUtils::GetCrossDocParentFrame(establisher)) {
+    }
+    establisher = nsLayoutUtils::GetCrossDocParentFrame(establisher);
+    const nsIFrame* establisherReference =
+      aBuilder->FindReferenceFrameFor(establisher);
+
+    nsPoint offset = mFrame->GetOffsetToCrossDoc(establisherReference);
     float scale = mFrame->PresContext()->AppUnitsPerDevPixel();
-    bool isReference =
-      mFrame->IsTransformed() ||
-      mFrame->Combines3DTransformWithAncestors() || mFrame->Extend3DContext();
     mTransformPreserves3D =
-      GetResultingTransformMatrixP3D(mFrame, ToReferenceFrame(), scale,
-                                     nullptr, nullptr, isReference);
+      GetResultingTransformMatrixP3D(mFrame, offset, scale,
+                                     nullptr, nullptr, true);
   }
   return mTransformPreserves3D;
 }
@@ -5555,6 +5605,11 @@ void nsDisplayTransform::HitTest(nsDisplayListBuilder *aBuilder,
                                  HitTestState *aState,
                                  nsTArray<nsIFrame*> *aOutFrames)
 {
+  if (aState->mInPreserves3D) {
+    mStoredList.HitTest(aBuilder, aRect, aState, aOutFrames);
+    return;
+  }
+
   /* Here's how this works:
    * 1. Get the matrix.  If it's singular, abort (clearly we didn't hit
    *    anything).
@@ -5564,9 +5619,9 @@ void nsDisplayTransform::HitTest(nsDisplayListBuilder *aBuilder,
    */
   // GetTransform always operates in dev pixels.
   float factor = mFrame->PresContext()->AppUnitsPerDevPixel();
-  Matrix4x4 matrix = GetTransform();
+  Matrix4x4 matrix = GetAccumulatedPreserved3DTransform(aBuilder);
 
-  if (!IsFrameVisible(mFrame, GetAccumulatedPreserved3DTransform())) {
+  if (!IsFrameVisible(mFrame, matrix)) {
     return;
   }
 
@@ -5641,9 +5696,9 @@ nsDisplayTransform::GetHitDepthAtPoint(nsDisplayListBuilder* aBuilder, const nsP
 {
   // GetTransform always operates in dev pixels.
   float factor = mFrame->PresContext()->AppUnitsPerDevPixel();
-  Matrix4x4 matrix = GetTransform();
+  Matrix4x4 matrix = GetAccumulatedPreserved3DTransform(aBuilder);
 
-  NS_ASSERTION(IsFrameVisible(mFrame, GetAccumulatedPreserved3DTransform()),
+  NS_ASSERTION(IsFrameVisible(mFrame, matrix),
                "We can't have hit a frame that isn't visible!");
 
   Matrix4x4 inverse = matrix;
@@ -5896,15 +5951,15 @@ bool nsDisplayTransform::UntransformRect(const nsRect &aTransformedBounds,
     return false;
   }
 
-  Rect result(NSAppUnitsToFloatPixels(aTransformedBounds.x, factor),
-              NSAppUnitsToFloatPixels(aTransformedBounds.y, factor),
-              NSAppUnitsToFloatPixels(aTransformedBounds.width, factor),
-              NSAppUnitsToFloatPixels(aTransformedBounds.height, factor));
+  RectDouble result(NSAppUnitsToFloatPixels(aTransformedBounds.x, factor),
+                    NSAppUnitsToFloatPixels(aTransformedBounds.y, factor),
+                    NSAppUnitsToFloatPixels(aTransformedBounds.width, factor),
+                    NSAppUnitsToFloatPixels(aTransformedBounds.height, factor));
 
-  Rect childGfxBounds(NSAppUnitsToFloatPixels(aChildBounds.x, factor),
-                      NSAppUnitsToFloatPixels(aChildBounds.y, factor),
-                      NSAppUnitsToFloatPixels(aChildBounds.width, factor),
-                      NSAppUnitsToFloatPixels(aChildBounds.height, factor));
+  RectDouble childGfxBounds(NSAppUnitsToFloatPixels(aChildBounds.x, factor),
+                            NSAppUnitsToFloatPixels(aChildBounds.y, factor),
+                            NSAppUnitsToFloatPixels(aChildBounds.width, factor),
+                            NSAppUnitsToFloatPixels(aChildBounds.height, factor));
 
   result = transform.Inverse().ProjectRectBounds(result, childGfxBounds);
   *aOutRect = nsLayoutUtils::RoundGfxRectToAppRect(ThebesRect(result), factor);
@@ -5920,17 +5975,17 @@ bool nsDisplayTransform::UntransformVisibleRect(nsDisplayListBuilder* aBuilder,
 
   // GetTransform always operates in dev pixels.
   float factor = mFrame->PresContext()->AppUnitsPerDevPixel();
-  Rect result(NSAppUnitsToFloatPixels(mVisibleRect.x, factor),
-              NSAppUnitsToFloatPixels(mVisibleRect.y, factor),
-              NSAppUnitsToFloatPixels(mVisibleRect.width, factor),
-              NSAppUnitsToFloatPixels(mVisibleRect.height, factor));
+  RectDouble result(NSAppUnitsToFloatPixels(mVisibleRect.x, factor),
+                    NSAppUnitsToFloatPixels(mVisibleRect.y, factor),
+                    NSAppUnitsToFloatPixels(mVisibleRect.width, factor),
+                    NSAppUnitsToFloatPixels(mVisibleRect.height, factor));
 
   bool snap;
   nsRect childBounds = mStoredList.GetBounds(aBuilder, &snap);
-  Rect childGfxBounds(NSAppUnitsToFloatPixels(childBounds.x, factor),
-                      NSAppUnitsToFloatPixels(childBounds.y, factor),
-                      NSAppUnitsToFloatPixels(childBounds.width, factor),
-                      NSAppUnitsToFloatPixels(childBounds.height, factor));
+  RectDouble childGfxBounds(NSAppUnitsToFloatPixels(childBounds.x, factor),
+                            NSAppUnitsToFloatPixels(childBounds.y, factor),
+                            NSAppUnitsToFloatPixels(childBounds.width, factor),
+                            NSAppUnitsToFloatPixels(childBounds.height, factor));
 
   /* We want to untransform the matrix, so invert the transformation first! */
   result = matrix.Inverse().ProjectRectBounds(result, childGfxBounds);
diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h
index be1e615e176cba..4d29d4cbbad009 100644
--- a/layout/base/nsDisplayList.h
+++ b/layout/base/nsDisplayList.h
@@ -1248,13 +1248,15 @@ class nsDisplayItem : public nsDisplayItemLink {
 #include "nsDisplayItemTypes.h"
 
   struct HitTestState {
-    explicit HitTestState() {}
+    explicit HitTestState() : mInPreserves3D(false) {}
 
     ~HitTestState() {
       NS_ASSERTION(mItemBuffer.Length() == 0,
                    "mItemBuffer should have been cleared");
     }
 
+    // Handling transform items for preserve 3D frames.
+    bool mInPreserves3D;
     nsAutoTArray<nsDisplayItem*, 100> mItemBuffer;
   };
 
@@ -3757,7 +3759,7 @@ class nsDisplayTransform: public nsDisplayItem
    * Return the transform that is aggregation of all transform on the
    * preserves3d chain.
    */
-  const Matrix4x4& GetAccumulatedPreserved3DTransform();
+  const Matrix4x4& GetAccumulatedPreserved3DTransform(nsDisplayListBuilder* aBuilder);
 
   float GetHitDepthAtPoint(nsDisplayListBuilder* aBuilder, const nsPoint& aPoint);
 
diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp
index 9b0b0ab663909d..a3d0bf293dd450 100644
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -104,17 +104,24 @@ class RefreshDriverTimer {
 
   virtual ~RefreshDriverTimer()
   {
-    NS_ASSERTION(mRefreshDrivers.Length() == 0, "Should have removed all refresh drivers from here by now!");
+    MOZ_ASSERT(mContentRefreshDrivers.Length() == 0, "Should have removed all content refresh drivers from here by now!");
+    MOZ_ASSERT(mRootRefreshDrivers.Length() == 0, "Should have removed all root refresh drivers from here by now!");
   }
 
   virtual void AddRefreshDriver(nsRefreshDriver* aDriver)
   {
     LOG("[%p] AddRefreshDriver %p", this, aDriver);
 
-    NS_ASSERTION(!mRefreshDrivers.Contains(aDriver), "AddRefreshDriver for a refresh driver that's already in the list!");
-    mRefreshDrivers.AppendElement(aDriver);
+    bool startTimer = mContentRefreshDrivers.IsEmpty() && mRootRefreshDrivers.IsEmpty();
+    if (IsRootRefreshDriver(aDriver)) {
+      NS_ASSERTION(!mRootRefreshDrivers.Contains(aDriver), "Adding a duplicate root refresh driver!");
+      mRootRefreshDrivers.AppendElement(aDriver);
+    } else {
+      NS_ASSERTION(!mContentRefreshDrivers.Contains(aDriver), "Adding a duplicate content refresh driver!");
+      mContentRefreshDrivers.AppendElement(aDriver);
+    }
 
-    if (mRefreshDrivers.Length() == 1) {
+    if (startTimer) {
       StartTimer();
     }
   }
@@ -123,10 +130,30 @@ class RefreshDriverTimer {
   {
     LOG("[%p] RemoveRefreshDriver %p", this, aDriver);
 
-    NS_ASSERTION(mRefreshDrivers.Contains(aDriver), "RemoveRefreshDriver for a refresh driver that's not in the list!");
-    mRefreshDrivers.RemoveElement(aDriver);
+    if (IsRootRefreshDriver(aDriver)) {
+      NS_ASSERTION(mRootRefreshDrivers.Contains(aDriver), "RemoveRefreshDriver for a refresh driver that's not in the root refresh list!");
+      mRootRefreshDrivers.RemoveElement(aDriver);
+    } else {
+      nsPresContext* displayRoot = aDriver->PresContext()->GetDisplayRootPresContext();
+      // During PresContext shutdown, we can't accurately detect
+      // if a root refresh driver exists or not. Therefore, we have to
+      // search and find out which list this driver exists in.
+      if (!displayRoot) {
+        if (mRootRefreshDrivers.Contains(aDriver)) {
+          mRootRefreshDrivers.RemoveElement(aDriver);
+        } else {
+          NS_ASSERTION(mContentRefreshDrivers.Contains(aDriver),
+                       "RemoveRefreshDriver without a display root for a driver that is not in the content refresh list");
+          mContentRefreshDrivers.RemoveElement(aDriver);
+        }
+      } else {
+        NS_ASSERTION(mContentRefreshDrivers.Contains(aDriver), "RemoveRefreshDriver for a driver that is not in the content refresh list");
+        mContentRefreshDrivers.RemoveElement(aDriver);
+      }
+    }
 
-    if (mRefreshDrivers.Length() == 0) {
+    bool stopTimer = mContentRefreshDrivers.IsEmpty() && mRootRefreshDrivers.IsEmpty();
+    if (stopTimer) {
       StopTimer();
     }
   }
@@ -138,11 +165,17 @@ class RefreshDriverTimer {
   {
     MOZ_ASSERT(NS_IsMainThread());
 
-    for (nsRefreshDriver* driver : mRefreshDrivers) {
+    for (nsRefreshDriver* driver : mContentRefreshDrivers) {
+      aNewTimer->AddRefreshDriver(driver);
+      driver->mActiveTimer = aNewTimer;
+    }
+    mContentRefreshDrivers.Clear();
+
+    for (nsRefreshDriver* driver : mRootRefreshDrivers) {
       aNewTimer->AddRefreshDriver(driver);
       driver->mActiveTimer = aNewTimer;
     }
-    mRefreshDrivers.Clear();
+    mRootRefreshDrivers.Clear();
 
     aNewTimer->mLastFireEpoch = mLastFireEpoch;
     aNewTimer->mLastFireTime = mLastFireTime;
@@ -153,6 +186,17 @@ class RefreshDriverTimer {
   virtual void StopTimer() = 0;
   virtual void ScheduleNextTick(TimeStamp aNowTime) = 0;
 
+  bool IsRootRefreshDriver(nsRefreshDriver* aDriver)
+  {
+    nsPresContext* displayRoot = aDriver->PresContext()->GetDisplayRootPresContext();
+    if (!displayRoot) {
+      return false;
+    }
+
+    nsRefreshDriver* rootRefreshDriver = displayRoot->GetRootPresContext()->RefreshDriver();
+    return aDriver == rootRefreshDriver;
+  }
+
   /*
    * Actually runs a tick, poking all the attached RefreshDrivers.
    * Grabs the "now" time via JS_Now and TimeStamp::Now().
@@ -164,6 +208,23 @@ class RefreshDriverTimer {
     Tick(jsnow, now);
   }
 
+  void TickRefreshDrivers(int64_t aJsNow, TimeStamp aNow, nsTArray<RefPtr<nsRefreshDriver>>& aDrivers)
+  {
+    if (aDrivers.IsEmpty()) {
+      return;
+    }
+
+    nsTArray<RefPtr<nsRefreshDriver> > drivers(aDrivers);
+    for (nsRefreshDriver* driver : drivers) {
+      // don't poke this driver if it's in test mode
+      if (driver->IsTestControllingRefreshesEnabled()) {
+        continue;
+      }
+
+      TickDriver(driver, aJsNow, aNow);
+    }
+  }
+
   /*
    * Tick the refresh drivers based on the given timestamp.
    */
@@ -175,17 +236,12 @@ class RefreshDriverTimer {
     mLastFireTime = now;
 
     LOG("[%p] ticking drivers...", this);
-    nsTArray<RefPtr<nsRefreshDriver> > drivers(mRefreshDrivers);
     // RD is short for RefreshDriver
     profiler_tracing("Paint", "RD", TRACING_INTERVAL_START);
-    for (nsRefreshDriver* driver : drivers) {
-      // don't poke this driver if it's in test mode
-      if (driver->IsTestControllingRefreshesEnabled()) {
-        continue;
-      }
 
-      TickDriver(driver, jsnow, now);
-    }
+    TickRefreshDrivers(jsnow, now, mContentRefreshDrivers);
+    TickRefreshDrivers(jsnow, now, mRootRefreshDrivers);
+
     profiler_tracing("Paint", "RD", TRACING_INTERVAL_END);
     LOG("[%p] done.", this);
   }
@@ -200,7 +256,8 @@ class RefreshDriverTimer {
   TimeStamp mLastFireTime;
   TimeStamp mTargetTime;
 
-  nsTArray<RefPtr<nsRefreshDriver> > mRefreshDrivers;
+  nsTArray<RefPtr<nsRefreshDriver> > mContentRefreshDrivers;
+  nsTArray<RefPtr<nsRefreshDriver> > mRootRefreshDrivers;
 
   // useful callback for nsITimer-based derived classes, here
   // bacause of c++ protected shenanigans
@@ -558,13 +615,18 @@ class InactiveRefreshDriverTimer final :
 
     // we don't really have to start with the newly added one, but we may as well
     // not tick the old ones at the fastest rate any more than we need to.
-    mNextDriverIndex = mRefreshDrivers.Length() - 1;
+    mNextDriverIndex = GetRefreshDriverCount() - 1;
 
     StopTimer();
     StartTimer();
   }
 
 protected:
+  uint32_t GetRefreshDriverCount()
+  {
+    return mContentRefreshDrivers.Length() + mRootRefreshDrivers.Length();
+  }
+
   virtual void StartTimer()
   {
     mLastFireEpoch = JS_Now();
@@ -593,7 +655,7 @@ class InactiveRefreshDriverTimer final :
     }
 
     // double the next tick time if we've already gone through all of them once
-    if (mNextDriverIndex >= mRefreshDrivers.Length()) {
+    if (mNextDriverIndex >= GetRefreshDriverCount()) {
       mNextTickDuration *= 2.0;
       mNextDriverIndex = 0;
     }
@@ -603,7 +665,7 @@ class InactiveRefreshDriverTimer final :
     mTimer->InitWithFuncCallback(TimerTickOne, this, delay, nsITimer::TYPE_ONE_SHOT);
 
     LOG("[%p] inactive timer next tick in %f ms [index %d/%d]", this, mNextTickDuration,
-        mNextDriverIndex, mRefreshDrivers.Length());
+        mNextDriverIndex, GetRefreshDriverCount());
   }
 
   /* Runs just one driver's tick. */
@@ -617,7 +679,9 @@ class InactiveRefreshDriverTimer final :
     mLastFireEpoch = jsnow;
     mLastFireTime = now;
 
-    nsTArray<RefPtr<nsRefreshDriver> > drivers(mRefreshDrivers);
+    nsTArray<RefPtr<nsRefreshDriver> > drivers(mContentRefreshDrivers);
+    drivers.AppendElements(mRootRefreshDrivers);
+
     if (mNextDriverIndex < drivers.Length() &&
         !drivers[mNextDriverIndex]->IsTestControllingRefreshesEnabled())
     {
diff --git a/layout/generic/ScrollbarActivity.cpp b/layout/generic/ScrollbarActivity.cpp
index dfe6ed7557ed92..e61e693324535a 100644
--- a/layout/generic/ScrollbarActivity.cpp
+++ b/layout/generic/ScrollbarActivity.cpp
@@ -363,7 +363,11 @@ SetOpacityOnElement(nsIContent* aContent, double aOpacity)
 bool
 ScrollbarActivity::UpdateOpacity(TimeStamp aTime)
 {
-  double progress = (aTime - mFadeBeginTime) / FadeDuration();
+  // Avoid division by zero if mScrollbarFadeDuration is zero, just jump
+  // to the end of the fade animation
+  double progress = mScrollbarFadeDuration
+    ? ((aTime - mFadeBeginTime) / FadeDuration())
+    : 1.0;
   double opacity = 1.0 - std::max(0.0, std::min(1.0, progress));
 
   // 'this' may be getting destroyed during SetOpacityOnElement calls.
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index 66006a5acd86c9..01c1d40e20ad27 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -1986,10 +1986,9 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
   nsRect dirtyRectOutsideTransform = dirtyRect;
   if (isTransformed) {
     const nsRect overflow = GetVisualOverflowRectRelativeToSelf();
-    if (aBuilder->IsForPainting() &&
-        (nsDisplayTransform::ShouldPrerenderTransformedContent(aBuilder,
-                                                               this) ||
-         Extend3DContext() || Combines3DTransformWithAncestors())) {
+    if (Extend3DContext() || Combines3DTransformWithAncestors() ||
+        nsDisplayTransform::ShouldPrerenderTransformedContent(aBuilder,
+                                                              this)) {
       dirtyRect = overflow;
     } else {
       if (overflow.IsEmpty()) {
diff --git a/layout/style/crashtests/1223688-1.html b/layout/style/crashtests/1223688-1.html
new file mode 100644
index 00000000000000..70f9d8579557bf
--- /dev/null
+++ b/layout/style/crashtests/1223688-1.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+
+function boom() {
+    CSS.supports('');
+
+    var style = document.createElement("style");
+    var tn = document.createTextNode("* { border: var(--b); }");
+    style.appendChild(tn);
+    document.body.appendChild(style);
+}
+
+</script>
+</head>
+<body onload="boom();"></body>
+</html>
diff --git a/layout/style/crashtests/crashtests.list b/layout/style/crashtests/crashtests.list
index fad26241f1595b..152f0cb88c59dc 100644
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -128,6 +128,7 @@ load 1167782-1.html
 load 1186768-1.xhtml
 load 1200568-1.html
 load 1206105-1.html
+load 1223688-1.html
 load 1223694-1.html
 load border-image-visited-link.html
 load font-face-truncated-src.html 
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 4bf7c11e51a74b..0d76f053be396d 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -441,6 +441,31 @@ class CSSParserImpl {
       bool mOriginalValue;
   };
 
+  /**
+   * RAII class to set aParser->mInSupportsCondition to true and restore it
+   * to false later.
+   */
+  class MOZ_RAII nsAutoInSupportsCondition
+  {
+  public:
+    explicit nsAutoInSupportsCondition(CSSParserImpl* aParser)
+      : mParser(aParser)
+    {
+      MOZ_ASSERT(!aParser->mInSupportsCondition,
+                 "nsAutoInSupportsCondition is not designed to be used "
+                 "re-entrantly");
+      mParser->mInSupportsCondition = true;
+    }
+
+    ~nsAutoInSupportsCondition()
+    {
+      mParser->mInSupportsCondition = false;
+    }
+
+  private:
+    CSSParserImpl* const mParser;
+  };
+
   // the caller must hold on to aString until parsing is done
   void InitScanner(nsCSSScanner& aScanner,
                    css::ErrorReporter& aReporter,
@@ -4333,7 +4358,7 @@ CSSParserImpl::ParseSupportsRule(RuleAppendFunc aAppendFunc, void* aProcessData)
 bool
 CSSParserImpl::ParseSupportsCondition(bool& aConditionMet)
 {
-  mInSupportsCondition = true;
+  nsAutoInSupportsCondition aisc(this);
 
   if (!GetToken(true)) {
     REPORT_UNEXPECTED_EOF(PESupportsConditionStartEOF2);
@@ -4351,7 +4376,6 @@ CSSParserImpl::ParseSupportsCondition(bool& aConditionMet)
     bool result = ParseSupportsConditionInParens(aConditionMet) &&
                   ParseSupportsConditionTerms(aConditionMet) &&
                   !mScanner->SeenBadToken();
-    mInSupportsCondition = false;
     return result;
   }
 
@@ -4359,12 +4383,10 @@ CSSParserImpl::ParseSupportsCondition(bool& aConditionMet)
       mToken.mIdent.LowerCaseEqualsLiteral("not")) {
     bool result = ParseSupportsConditionNegation(aConditionMet) &&
                   !mScanner->SeenBadToken();
-    mInSupportsCondition = false;
     return result;
   }
 
   REPORT_UNEXPECTED_TOKEN(PESupportsConditionExpectedStart);
-  mInSupportsCondition = false;
   return false;
 }
 
diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp
index 7c68d052f2021f..85606af4899013 100644
--- a/layout/xul/nsMenuPopupFrame.cpp
+++ b/layout/xul/nsMenuPopupFrame.cpp
@@ -1501,7 +1501,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
   // to save time since they will never have a titlebar.
   nsIWidget* widget = view->GetWidget();
   if (mPopupType == ePopupTypePanel && widget) {
-    mLastClientOffset = widget->GetClientOffsetUntyped();
+    mLastClientOffset = widget->GetClientOffset();
     viewPoint.x += presContext->DevPixelsToAppUnits(mLastClientOffset.x);
     viewPoint.y += presContext->DevPixelsToAppUnits(mLastClientOffset.y);
   }
@@ -2168,7 +2168,7 @@ nsMenuPopupFrame::MoveTo(const CSSIntPoint& aPos, bool aUpdateAttrs)
 {
   nsIWidget* widget = GetWidget();
   if ((mScreenRect.x == aPos.x && mScreenRect.y == aPos.y) &&
-      (!widget || widget->GetClientOffsetUntyped() == mLastClientOffset)) {
+      (!widget || widget->GetClientOffset() == mLastClientOffset)) {
     return;
   }
 
diff --git a/layout/xul/nsMenuPopupFrame.h b/layout/xul/nsMenuPopupFrame.h
index 5514271ea3e103..5bc575fa72c976 100644
--- a/layout/xul/nsMenuPopupFrame.h
+++ b/layout/xul/nsMenuPopupFrame.h
@@ -389,7 +389,10 @@ class nsMenuPopupFrame final : public nsBoxFrame, public nsMenuParent,
   // or (-1, -1, 0, 0) if anchored.
   nsIntRect GetScreenAnchorRect() const { return mScreenRect; }
 
-  nsIntPoint GetLastClientOffset() const { return mLastClientOffset; }
+  mozilla::LayoutDeviceIntPoint GetLastClientOffset() const
+  {
+    return mLastClientOffset;
+  }
 
   // Return the alignment of the popup
   int8_t GetAlignmentPosition() const;
@@ -526,7 +529,7 @@ class nsMenuPopupFrame final : public nsBoxFrame, public nsMenuParent,
   // The value of the client offset of our widget the last time we positioned
   // ourselves. We store this so that we can detect when it changes but the
   // position of our widget didn't change.
-  nsIntPoint mLastClientOffset;
+  mozilla::LayoutDeviceIntPoint mLastClientOffset;
 
   nsPopupType mPopupType; // type of popup
   nsPopupState mPopupState; // open state of the popup
diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp
index e432f707fe534f..dce837e6acc6ed 100644
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -473,7 +473,8 @@ nsXULPopupManager::PopupMoved(nsIFrame* aFrame, nsIntPoint aPnt)
   nsIntRect curDevSize = view->CalcWidgetBounds(eWindowType_popup);
   nsIWidget* widget = menuPopupFrame->GetWidget();
   if (curDevSize.x == aPnt.x && curDevSize.y == aPnt.y &&
-      (!widget || widget->GetClientOffsetUntyped() == menuPopupFrame->GetLastClientOffset())) {
+      (!widget || widget->GetClientOffset() ==
+                  menuPopupFrame->GetLastClientOffset())) {
     return;
   }
 
diff --git a/media/libcubeb/tests/common.h b/media/libcubeb/tests/common.h
index 47cc28cc7f4502..69445b86c6f506 100644
--- a/media/libcubeb/tests/common.h
+++ b/media/libcubeb/tests/common.h
@@ -27,4 +27,3 @@ void delay(unsigned int ms)
 #if !defined(M_PI)
 #define M_PI 3.14159265358979323846
 #endif
-
diff --git a/media/libcubeb/tests/test_audio.cpp b/media/libcubeb/tests/test_audio.cpp
index f2da917bef6ed0..69c166638b47c3 100644
--- a/media/libcubeb/tests/test_audio.cpp
+++ b/media/libcubeb/tests/test_audio.cpp
@@ -19,6 +19,7 @@
 
 #include "cubeb/cubeb.h"
 #include "common.h"
+#include "TestHarness.h"
 
 #define MAX_NUM_CHANNELS 32
 
@@ -261,6 +262,8 @@ void run_channel_rate_test()
 
 int main(int argc, char *argv[])
 {
+  ScopedXPCOM xpcom("test_audio");
+
   assert(run_panning_volume_test() == CUBEB_OK);
   run_channel_rate_test();
 
diff --git a/media/libcubeb/tests/test_latency.cpp b/media/libcubeb/tests/test_latency.cpp
index c02cd61a2022f0..c1b2ae2da109fe 100644
--- a/media/libcubeb/tests/test_latency.cpp
+++ b/media/libcubeb/tests/test_latency.cpp
@@ -5,11 +5,13 @@
 #include <cubeb/cubeb.h>
 #include <assert.h>
 #include <stdio.h>
-
+#include "TestHarness.h"
 #define LOG(msg) fprintf(stderr, "%s\n", msg);
 
 int main(int argc, char * argv[])
 {
+  ScopedXPCOM xpcom("test_latency");
+
   cubeb * ctx = NULL;
   int r;
   uint32_t max_channels;
@@ -49,6 +51,5 @@ int main(int argc, char * argv[])
 
   cubeb_destroy(ctx);
   LOG("cubeb_destroy ok");
-
   return EXIT_SUCCESS;
 }
diff --git a/media/libcubeb/tests/test_sanity.cpp b/media/libcubeb/tests/test_sanity.cpp
index 6841393fca33d2..1d7e5562bfaf65 100644
--- a/media/libcubeb/tests/test_sanity.cpp
+++ b/media/libcubeb/tests/test_sanity.cpp
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <math.h>
 #include "common.h"
+#include "TestHarness.h"
 
 #if (defined(_WIN32) || defined(__WIN32__))
 #define __func__ __FUNCTION__
@@ -571,6 +572,8 @@ int is_windows_7()
 int
 main(int argc, char * argv[])
 {
+  ScopedXPCOM xpcom("test_sanity");
+
   test_init_destroy_context();
   test_init_destroy_multiple_contexts();
   test_context_variables();
@@ -607,5 +610,6 @@ main(int argc, char * argv[])
   test_stream_destroy_pending_drain();
 */
   printf("\n");
+
   return 0;
 }
diff --git a/media/libcubeb/tests/test_tone.cpp b/media/libcubeb/tests/test_tone.cpp
index 52b8e1b3d27897..ae50c69281b595 100644
--- a/media/libcubeb/tests/test_tone.cpp
+++ b/media/libcubeb/tests/test_tone.cpp
@@ -17,6 +17,7 @@
 
 #include "cubeb/cubeb.h"
 #include "common.h"
+#include "TestHarness.h"
 
 #define SAMPLE_FREQUENCY 48000
 
@@ -72,6 +73,8 @@ void state_cb(cubeb_stream *stream, void *user, cubeb_state state)
 
 int main(int argc, char *argv[])
 {
+  ScopedXPCOM xpcom("test_tone");
+
   cubeb *ctx;
   cubeb_stream *stream;
   cubeb_stream_params params;
diff --git a/media/libstagefright/binding/MoofParser.cpp b/media/libstagefright/binding/MoofParser.cpp
index f3c7a0e763c57a..415ac353a32b9d 100644
--- a/media/libstagefright/binding/MoofParser.cpp
+++ b/media/libstagefright/binding/MoofParser.cpp
@@ -11,7 +11,7 @@
 #include "mozilla/Logging.h"
 
 #if defined(MOZ_FMP4)
-extern PRLogModuleInfo* GetDemuxerLog();
+extern mozilla::LogModule* GetDemuxerLog();
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
diff --git a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp b/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp
index 49d63b31b6a129..991a3582355f3a 100644
--- a/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp
+++ b/media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.cpp
@@ -33,7 +33,7 @@ namespace mozilla {
 #endif
 
 #ifdef MOZILLA_INTERNAL_API
-extern PRLogModuleInfo* GetGMPLog();
+extern mozilla::LogModule* GetGMPLog();
 #else
 // For CPP unit tests
 PRLogModuleInfo*
diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java
index e127d2bd4694a8..2bd63b7c38ae54 100644
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -6,7 +6,6 @@
 package org.mozilla.gecko;
 
 import org.mozilla.gecko.annotation.RobocopTarget;
-import org.mozilla.gecko.AdjustConstants;
 import org.mozilla.gecko.AppConstants.Versions;
 import org.mozilla.gecko.DynamicToolbar.PinReason;
 import org.mozilla.gecko.DynamicToolbar.VisibilityTransition;
@@ -112,6 +111,7 @@
 import android.os.StrictMode;
 import android.support.annotation.NonNull;
 import android.support.annotation.WorkerThread;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.view.MenuItemCompat;
@@ -330,7 +330,7 @@ public void onTabChanged(Tab tab, Tabs.TabEvents msg, Object data) {
                 tab.loadFavicon();
                 break;
             case BOOKMARK_ADDED:
-                showBookmarkAddedToast();
+                showBookmarkAddedSnackbar();
                 break;
             case BOOKMARK_REMOVED:
                 showBookmarkRemovedToast();
@@ -396,57 +396,48 @@ private void restoreTabEditingState(final TabEditingState editingState) {
         }
     }
 
-    private void showBookmarkAddedToast() {
+    private void showBookmarkAddedSnackbar() {
         // This flow is from the option menu which has check to see if a bookmark was already added.
         // So, it is safe here to show the toast that bookmark_added without any checks.
-        getButtonToast().show(false,
-                getResources().getString(R.string.bookmark_added),
-                ButtonToast.LENGTH_SHORT,
-                getResources().getString(R.string.bookmark_options),
-                null,
-                new ButtonToast.ToastListener() {
-                    @Override
-                    public void onButtonClicked() {
-                        Telemetry.sendUIEvent(TelemetryContract.Event.SHOW,
-                            TelemetryContract.Method.TOAST, "bookmark_options");
-                        showBookmarkDialog();
-                    }
 
-                    @Override
-                    public void onToastHidden(ButtonToast.ReasonHidden reason) { }
-                });
+        final SnackbarCallback callback = new SnackbarCallback() {
+            @Override
+            public void onClick(View v) {
+                Telemetry.sendUIEvent(TelemetryContract.Event.SHOW, TelemetryContract.Method.TOAST, "bookmark_options");
+                showBookmarkDialog();
+            }
+        };
+
+        showSnackbar(getResources().getString(R.string.bookmark_added),
+                     Snackbar.LENGTH_LONG,
+                     getResources().getString(R.string.bookmark_options),
+                     callback);
     }
 
     private void showBookmarkRemovedToast() {
         Toast.makeText(this, R.string.bookmark_removed, Toast.LENGTH_SHORT).show();
     }
 
-    private void showSwitchToReadingListToast(String message) {
-        getButtonToast().show(false,
-                message,
-                ButtonToast.LENGTH_SHORT,
-                getResources().getString(R.string.switch_button_message),
-                R.drawable.switch_button_icon,
-                new ButtonToast.ToastListener() {
-                    @Override
-                    public void onButtonClicked() {
-                        Telemetry.sendUIEvent(TelemetryContract.Event.SHOW, TelemetryContract.Method.TOAST, "reading_list");
+    private void showSwitchToReadingListSnackbar(String message) {
+        final SnackbarCallback callback = new SnackbarCallback() {
+            @Override
+            public void onClick(View v) {
+                Telemetry.sendUIEvent(TelemetryContract.Event.SHOW, TelemetryContract.Method.TOAST, "reading_list");
 
-                        final String aboutPageUrl = AboutPages.getURLForBuiltinPanelType(PanelType.READING_LIST);
-                        Tabs.getInstance().loadUrlInTab(aboutPageUrl);
-                    }
+                final String aboutPageUrl = AboutPages.getURLForBuiltinPanelType(PanelType.READING_LIST);
+                Tabs.getInstance().loadUrlInTab(aboutPageUrl);
+            }
+        };
 
-                    @Override
-                    public void onToastHidden(ButtonToast.ReasonHidden reason) { }
-                });
+        showSnackbar(message, Snackbar.LENGTH_LONG, getResources().getString(R.string.switch_button_message), callback);
     }
 
     public void onAddedToReadingList(String url) {
-        showSwitchToReadingListToast(getResources().getString(R.string.reading_list_added));
+        showSwitchToReadingListSnackbar(getResources().getString(R.string.reading_list_added));
     }
 
     public void onAlreadyInReadingList(String url) {
-        showSwitchToReadingListToast(getResources().getString(R.string.reading_list_duplicate));
+        showSwitchToReadingListSnackbar(getResources().getString(R.string.reading_list_duplicate));
     }
 
     public void onRemovedFromReadingList(String url) {
@@ -3662,28 +3653,21 @@ public void onUrlOpenInBackground(final String url, EnumSet<OnUrlOpenInBackgroun
         // hold a reference to the Tab itself in the anonymous listener class.
         final int newTabId = newTab.getId();
 
-        final ToastListener listener = new ButtonToast.ToastListener() {
+        final SnackbarCallback callback = new SnackbarCallback() {
             @Override
-            public void onButtonClicked() {
+            public void onClick(View v) {
                 Telemetry.sendUIEvent(TelemetryContract.Event.SHOW, TelemetryContract.Method.TOAST, "switchtab");
 
                 maybeSwitchToTab(newTabId);
             }
-
-            @Override
-            public void onToastHidden(ButtonToast.ReasonHidden reason) { }
         };
 
         final String message = isPrivate ?
                 getResources().getString(R.string.new_private_tab_opened) :
                 getResources().getString(R.string.new_tab_opened);
         final String buttonMessage = getResources().getString(R.string.switch_button_message);
-        getButtonToast().show(false,
-                              message,
-                              ButtonToast.LENGTH_SHORT,
-                              buttonMessage,
-                              R.drawable.switch_button_icon,
-                              listener);
+
+        showSnackbar(message, Snackbar.LENGTH_LONG, buttonMessage, callback);
     }
 
     // BrowserSearch.OnSearchListener
diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java
index e743d4961db381..5047fa7096ef5a 100644
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -73,6 +73,7 @@
 import android.os.StrictMode;
 import android.provider.ContactsContract;
 import android.provider.MediaStore.Images.Media;
+import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
@@ -657,10 +658,12 @@ public void run() {
 
             NativeJSObject action = message.optObject("action", null);
 
+            final SnackbarEventCallback snackbarCallback = new SnackbarEventCallback(callback);
+
             showSnackbar(msg,
                     duration,
                     action != null ? action.optString("label", null) : null,
-                    callback);
+                    snackbarCallback);
         } else if ("SystemUI:Visibility".equals(event)) {
             setSystemUiVisible(message.getBoolean("visible"));
 
@@ -859,21 +862,29 @@ public ButtonToast getButtonToast() {
         return mToast;
     }
 
-    void showSnackbar(final String message, final int duration, final String action, final EventCallback callback) {
+    void showSnackbar(final String message, final int duration, @Nullable final String action,
+                      final @Nullable SnackbarCallback callback) {
         final Snackbar snackbar = Snackbar.make(mRootLayout, message, duration);
 
-        if (!TextUtils.isEmpty(action)) {
-            final SnackbarEventCallback snackbarCallback = new SnackbarEventCallback(callback);
-
-            snackbar.setAction(action, snackbarCallback);
+        if (callback != null && !TextUtils.isEmpty(action)) {
+            snackbar.setAction(action, callback);
             snackbar.setActionTextColor(ContextCompat.getColor(this, R.color.fennec_ui_orange));
-            snackbar.setCallback(snackbarCallback);
+            snackbar.setCallback(callback);
         }
 
         snackbar.show();
     }
 
-    private static class SnackbarEventCallback extends Snackbar.Callback implements View.OnClickListener {
+    /**
+     * Combined interface for handling all callbacks from a snackbar because anonymous classes can only extend one
+     * interface or class.
+     */
+    public static abstract class SnackbarCallback extends Snackbar.Callback implements View.OnClickListener {};
+
+    /**
+     * SnackbarCallback implementation for delegating snackbar events to an EventCallback.
+     */
+    private static class SnackbarEventCallback extends SnackbarCallback {
         private EventCallback callback;
 
         public SnackbarEventCallback(EventCallback callback) {
diff --git a/mobile/android/base/home/SearchEngineRow.java b/mobile/android/base/home/SearchEngineRow.java
index 6f92a2c71d6224..8b5ea66d724af8 100644
--- a/mobile/android/base/home/SearchEngineRow.java
+++ b/mobile/android/base/home/SearchEngineRow.java
@@ -80,11 +80,6 @@ class SearchEngineRow extends AnimatedHeightLayout {
     private int mMaxSavedSuggestions;
     private int mMaxSearchSuggestions;
 
-    // Styles for text in a suggestion 'button' that is not part of the first instance of mUserSearchTerm
-    // Even though they're the same style, SpannableStringBuilder will interpret there as being only one Span present if we re-use a StyleSpan
-    StyleSpan mPriorToSearchTerm;
-    StyleSpan mAfterSearchTerm;
-
     public SearchEngineRow(Context context) {
         this(context, null);
     }
@@ -150,9 +145,6 @@ public boolean onLongClick(View v) {
         // Suggestion limits
         mMaxSavedSuggestions = getResources().getInteger(R.integer.max_saved_suggestions);
         mMaxSearchSuggestions = getResources().getInteger(R.integer.max_search_suggestions);
-
-        mPriorToSearchTerm = new StyleSpan(Typeface.BOLD);
-        mAfterSearchTerm = new StyleSpan(Typeface.BOLD);
     }
 
     private void setDescriptionOnSuggestion(View v, String suggestion) {
@@ -165,6 +157,38 @@ private String getSuggestionTextFromView(View v) {
         return suggestionText.getText().toString();
     }
 
+    /**
+     * Finds all occurrences of pattern in string and returns a list of the starting indices
+     * of each occurrence.
+     *
+     * @param pattern The pattern that is searched for
+     * @param string The string where we search for the pattern
+     */
+    private List<Integer> findAllOccurrencesOf(String pattern, String string) {
+        List<Integer> occurrences = new ArrayList<>();
+        final int patternLength = pattern.length();
+        int indexOfMatch = 0;
+        int lastIndexOfMatch = 0;
+        while(indexOfMatch != -1) {
+            indexOfMatch = string.indexOf(pattern, lastIndexOfMatch);
+            lastIndexOfMatch = indexOfMatch + patternLength;
+            if(indexOfMatch != -1) {
+                occurrences.add(indexOfMatch);
+            }
+        }
+        return occurrences;
+    }
+
+    /**
+     * Sets the content for the suggestion view.
+     *
+     * If the suggestion doesn't contain mUserSearchTerm, nothing is made bold.
+     * All instances of mUserSearchTerm in the suggestion are not bold.
+     *
+     * @param v The View that needs to be populated
+     * @param suggestion The suggestion text that will be placed in the view
+     * @param isUserSavedSearch whether the suggestion is from history or not
+     */
     private void setSuggestionOnView(View v, String suggestion, boolean isUserSavedSearch) {
         final ImageView historyIcon = (ImageView) v.findViewById(R.id.suggestion_item_icon);
         if (isUserSavedSearch) {
@@ -176,14 +200,19 @@ private void setSuggestionOnView(View v, String suggestion, boolean isUserSavedS
 
         final TextView suggestionText = (TextView) v.findViewById(R.id.suggestion_text);
         final String searchTerm = getSuggestionTextFromView(mUserEnteredView);
-        // If there is more than one copy of mUserSearchTerm, only the first is not bolded
-        final int startOfSearchTerm = suggestion.indexOf(searchTerm);
-        // Sometimes the suggestion does not contain mUserSearmTerm at all, in which case, bold nothing
-        if (startOfSearchTerm >= 0) {
-            final int endOfSearchTerm = startOfSearchTerm + searchTerm.length();
+        final int searchTermLength = searchTerm.length();
+        final List<Integer> occurrences = findAllOccurrencesOf(searchTerm, suggestion);
+        if (occurrences.size() > 0) {
             final SpannableStringBuilder sb = new SpannableStringBuilder(suggestion);
-            sb.setSpan(mPriorToSearchTerm, 0, startOfSearchTerm, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-            sb.setSpan(mAfterSearchTerm, endOfSearchTerm, suggestion.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+            int nextStartSpanIndex = 0;
+            // Done to make sure that the stretch of text after the last occurrence, till the end of the suggestion, is made bold
+            occurrences.add(suggestion.length());
+            for(int occurrence : occurrences) {
+                // Even though they're the same style, SpannableStringBuilder will interpret there as being only one Span present if we re-use a StyleSpan
+                StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
+                sb.setSpan(boldSpan, nextStartSpanIndex, occurrence, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+                nextStartSpanIndex = occurrence + searchTermLength;
+            }
             suggestionText.setText(sb);
         } else {
             suggestionText.setText(suggestion);
diff --git a/modules/libjar/InterceptedJARChannel.cpp b/modules/libjar/InterceptedJARChannel.cpp
index a47c26247939bb..c52e373b46cec2 100644
--- a/modules/libjar/InterceptedJARChannel.cpp
+++ b/modules/libjar/InterceptedJARChannel.cpp
@@ -56,6 +56,7 @@ InterceptedJARChannel::ResetInterception()
   mSynthesizedInput = nullptr;
 
   mChannel->ResetInterception();
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   return NS_OK;
 }
@@ -93,6 +94,7 @@ InterceptedJARChannel::FinishSynthesizedResponse(const nsACString& aFinalURLSpec
   mChannel->OverrideWithSynthesizedResponse(mSynthesizedInput, mContentType);
 
   mResponseBody = nullptr;
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   return NS_OK;
 }
@@ -109,6 +111,7 @@ InterceptedJARChannel::Cancel(nsresult aStatus)
   nsresult rv = mChannel->Cancel(aStatus);
   NS_ENSURE_SUCCESS(rv, rv);
   mResponseBody = nullptr;
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   return NS_OK;
 }
@@ -129,6 +132,16 @@ InterceptedJARChannel::GetConsoleReportCollector(nsIConsoleReportCollector**)
   return NS_ERROR_NOT_AVAILABLE;
 }
 
+NS_IMETHODIMP
+InterceptedJARChannel::SetReleaseHandle(nsISupports* aHandle)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mReleaseHandle);
+  MOZ_ASSERT(aHandle);
+  mReleaseHandle = aHandle;
+  return NS_OK;
+}
+
 void
 InterceptedJARChannel::NotifyController()
 {
diff --git a/modules/libjar/InterceptedJARChannel.h b/modules/libjar/InterceptedJARChannel.h
index f1dd2e78e7b4a3..63fc79ba93f01b 100644
--- a/modules/libjar/InterceptedJARChannel.h
+++ b/modules/libjar/InterceptedJARChannel.h
@@ -41,6 +41,8 @@ class InterceptedJARChannel : public nsIInterceptedChannel
   // The stream to write the body of the synthesized response.
   nsCOMPtr<nsIOutputStream> mResponseBody;
 
+  nsCOMPtr<nsISupports> mReleaseHandle;
+
   // The content type of the synthesized response.
   nsCString mContentType;
 
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index cd3ae642ff3c6c..82635d6ad4956e 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1822,6 +1822,13 @@ pref("network.proxy.socks_remote_dns",      false);
 pref("network.proxy.proxy_over_tls",        true);
 pref("network.proxy.no_proxies_on",         "localhost, 127.0.0.1");
 pref("network.proxy.failover_timeout",      1800); // 30 minutes
+
+// If this value is 'true' and a PAC or all given proxies are inaccessible or
+// failing, Firefox will attempt to connect to the server DIRECTly. Meaning
+// without a proxy. If set 'false', Firefox will not try to access without
+// proxy.
+pref("network.proxy.use_direct_on_fail",    true);
+
 pref("network.online",                      true); //online/offline
 pref("network.cookie.cookieBehavior",       0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-limitForeign
 #ifdef ANDROID
diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
index e064eb4766cda5..bdca7d3882a74f 100644
--- a/mozglue/misc/StackWalk.cpp
+++ b/mozglue/misc/StackWalk.cpp
@@ -1073,7 +1073,7 @@ FramePointerStackWalk(MozWalkStackCallback aCallback, uint32_t aSkipFrames,
     // we can assume that bp > sp
     if (next <= bp ||
         next > aStackEnd ||
-        (long(next) & 3)) {
+        (uintptr_t(next) & 3)) {
       break;
     }
 #if (defined(__ppc__) && defined(XP_MACOSX)) || defined(__powerpc64__)
diff --git a/netwerk/base/nsINetworkInterceptController.idl b/netwerk/base/nsINetworkInterceptController.idl
index 3e9ff02018c3c7..7e59c6cae5fd43 100644
--- a/netwerk/base/nsINetworkInterceptController.idl
+++ b/netwerk/base/nsINetworkInterceptController.idl
@@ -29,7 +29,7 @@ class ChannelInfo;
  * which do not implement nsIChannel.
  */
 
-[scriptable, uuid(231bb567-90e1-4973-9728-7dab93ab29a8)]
+[scriptable, uuid(64439e24-eda5-4f39-9a7e-162c4b5e0150)]
 interface nsIInterceptedChannel : nsISupports
 {
     /**
@@ -100,6 +100,14 @@ interface nsIInterceptedChannel : nsISupports
       return reporter.forget();
     }
 %}
+
+    /**
+     * Allow the ServiceWorkerManager to set an RAII-style object on the
+     * intercepted channel that should be released once the channel is
+     * torn down.
+     */
+    [noscript]
+    void setReleaseHandle(in nsISupports aHandle);
 };
 
 /**
diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp
index 558f99963dcdc2..65384bb171e1a4 100644
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -647,6 +647,12 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch *prefBranch,
                           mProxyOverTLS);
     }
 
+    // when proxies fail, try DIRECT
+    if (!pref || !strcmp(pref, PROXY_PREF("use_direct_on_fail"))) {
+        proxy_GetBoolPref(prefBranch, PROXY_PREF("use_direct_on_fail"),
+                          mFailoverToDirect);
+    }
+
     if (!pref || !strcmp(pref, PROXY_PREF("failover_timeout")))
         proxy_GetIntPref(prefBranch, PROXY_PREF("failover_timeout"),
                          mFailedProxyTimeout);
@@ -1405,8 +1411,18 @@ nsProtocolProxyService::GetFailoverForProxy(nsIProxyInfo  *aProxy,
                                             nsresult       aStatus,
                                             nsIProxyInfo **aResult)
 {
-    if (mProxyConfig == PROXYCONFIG_DIRECT) {
-        return NS_ERROR_NOT_AVAILABLE;
+    if (mFailoverToDirect) {
+        if (mProxyConfig == PROXYCONFIG_DIRECT) {
+            return NS_ERROR_NOT_AVAILABLE;
+        }
+    } else {
+        // We only support failover when a PAC file is configured, either
+        // directly or via system settings
+        if (mProxyConfig != PROXYCONFIG_PAC &&
+            mProxyConfig != PROXYCONFIG_WPAD &&
+            mProxyConfig != PROXYCONFIG_SYSTEM) {
+            return NS_ERROR_NOT_AVAILABLE;
+        }
     }
 
     // Verify that |aProxy| is one of our nsProxyInfo objects.
@@ -2009,32 +2025,46 @@ nsProtocolProxyService::PruneProxyInfo(const nsProtocolInfo &info,
     bool allDisabled = true;
     nsProxyInfo *iter;
 
-    // remove any disabled proxies.
-    nsProxyInfo *last = nullptr;
-    for (iter = head; iter; ) {
-        if (IsProxyDisabled(iter)) {
-            // reject!
-            nsProxyInfo *reject = iter;
+    if (!mFailoverToDirect) {
+        for (iter = head; iter; iter = iter->mNext) {
+            if (!IsProxyDisabled(iter)) {
+                allDisabled = false;
+                break;
+            }
+        }
+    }
 
-            iter = iter->mNext;
-            if (last)
-                last->mNext = iter;
+    if (!mFailoverToDirect && allDisabled) {
+        LOG(("All proxies are disabled, so trying all again"));
+    } else {
+        // remove any disabled proxies.
+        nsProxyInfo *last = nullptr;
+        for (iter = head; iter; ) {
+            if (IsProxyDisabled(iter)) {
+                // reject!
+                nsProxyInfo *reject = iter;
+
+                iter = iter->mNext;
+                if (last) {
+                    last->mNext = iter;
+                }
             else
                 head = iter;
 
-            reject->mNext = nullptr;
-            NS_RELEASE(reject);
-            continue;
-        }
+                reject->mNext = nullptr;
+                NS_RELEASE(reject);
+                continue;
+            }
 
-        allDisabled = false;
-        EnableProxy(iter);
+            allDisabled = false;
+            EnableProxy(iter);
 
-        last = iter;
-        iter = iter->mNext;
+            last = iter;
+            iter = iter->mNext;
+        }
     }
 
-    if (allDisabled) {
+    if (mFailoverToDirect && allDisabled) {
         LOG(("All proxies are disabled, try a DIRECT rule!"));
         *list = nullptr;
         return;
diff --git a/netwerk/base/nsProtocolProxyService.h b/netwerk/base/nsProtocolProxyService.h
index 7a2229d8e96a66..75b75be694faf0 100644
--- a/netwerk/base/nsProtocolProxyService.h
+++ b/netwerk/base/nsProtocolProxyService.h
@@ -390,6 +390,9 @@ class nsProtocolProxyService final : public nsIProtocolProxyService2
     nsFailedProxyTable           mFailedProxies;
     int32_t                      mFailedProxyTimeout;
 
+    // 'true' means try DIRECT when the proxies fail
+    bool                         mFailoverToDirect;
+
 private:
     nsresult AsyncResolveInternal(nsIChannel *channel, uint32_t flags,
                                   nsIProtocolProxyCallback *callback,
diff --git a/netwerk/ipc/NeckoParent.cpp b/netwerk/ipc/NeckoParent.cpp
index 85d3eba66a0127..ee81a495cef7ff 100644
--- a/netwerk/ipc/NeckoParent.cpp
+++ b/netwerk/ipc/NeckoParent.cpp
@@ -144,7 +144,12 @@ NeckoParent::GetValidatedAppInfo(const SerializedLoadContext& aSerialized,
         continue;
       }
     }
+    if (!aSerialized.mOriginAttributes.mSignedPkg.IsEmpty() &&
+        aSerialized.mOriginAttributes.mSignedPkg != tabContext.OriginAttributesRef().mSignedPkg) {
+      continue;
+    }
     aAttrs = OriginAttributes(appId, inBrowserElement);
+    aAttrs.mSignedPkg = tabContext.OriginAttributesRef().mSignedPkg;
     return nullptr;
   }
 
@@ -295,7 +300,7 @@ NeckoParent::AllocPCookieServiceParent()
   return new CookieServiceParent();
 }
 
-bool 
+bool
 NeckoParent::DeallocPCookieServiceParent(PCookieServiceParent* cs)
 {
   delete cs;
@@ -454,7 +459,7 @@ NeckoParent::AllocPTCPSocketParent(const nsString& /* host */,
 {
   // We actually don't need host/port to construct a TCPSocketParent since
   // TCPSocketParent will maintain an internal nsIDOMTCPSocket instance which
-  // can be delegated to get the host/port. 
+  // can be delegated to get the host/port.
   TCPSocketParent* p = new TCPSocketParent();
   p->AddIPDLReference();
   return p;
diff --git a/netwerk/protocol/http/Http2Compression.cpp b/netwerk/protocol/http/Http2Compression.cpp
index 0f52ec6e4b0d78..154f48f095e74a 100644
--- a/netwerk/protocol/http/Http2Compression.cpp
+++ b/netwerk/protocol/http/Http2Compression.cpp
@@ -245,7 +245,7 @@ nvFIFO::VariableLength() const
   return mTable.GetSize();
 }
 
-uint32_t
+size_t
 nvFIFO::StaticLength() const
 {
   return gStaticHeaders->GetSize();
@@ -260,7 +260,7 @@ nvFIFO::Clear()
 }
 
 const nvPair *
-nvFIFO::operator[] (int32_t index) const
+nvFIFO::operator[] (size_t index) const
 {
   // NWGH - ensure index > 0
   // NWGH - subtract 1 from index here
diff --git a/netwerk/protocol/http/Http2Compression.h b/netwerk/protocol/http/Http2Compression.h
index 40ddd31cb6f918..c2a9e350a1c65e 100644
--- a/netwerk/protocol/http/Http2Compression.h
+++ b/netwerk/protocol/http/Http2Compression.h
@@ -48,9 +48,9 @@ class nvFIFO
   uint32_t ByteCount() const;
   uint32_t Length() const;
   uint32_t VariableLength() const;
-  uint32_t StaticLength() const;
+  size_t StaticLength() const;
   void Clear();
-  const nvPair *operator[] (int32_t index) const;
+  const nvPair *operator[] (size_t index) const;
 
 private:
   uint32_t mByteCount;
diff --git a/netwerk/protocol/http/Http2Session.cpp b/netwerk/protocol/http/Http2Session.cpp
index b87cd5b2a8fcd1..6d993f0aaecedd 100644
--- a/netwerk/protocol/http/Http2Session.cpp
+++ b/netwerk/protocol/http/Http2Session.cpp
@@ -1093,8 +1093,8 @@ Http2Session::CleanupStream(uint32_t aID, nsresult aResult, errorType aResetCode
 
 static void RemoveStreamFromQueue(Http2Stream *aStream, nsDeque &queue)
 {
-  uint32_t size = queue.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
+  size_t size = queue.GetSize();
+  for (size_t count = 0; count < size; ++count) {
     Http2Stream *stream = static_cast<Http2Stream *>(queue.PopFront());
     if (stream != aStream)
       queue.Push(stream);
@@ -1841,8 +1841,8 @@ Http2Session::RecvGoAway(Http2Session *self)
   self->mStreamTransactionHash.Enumerate(GoAwayEnumerator, self);
 
   // Process the streams marked for deletion and restart.
-  uint32_t size = self->mGoAwayStreamsToRestart.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
+  size_t size = self->mGoAwayStreamsToRestart.GetSize();
+  for (size_t count = 0; count < size; ++count) {
     Http2Stream *stream =
       static_cast<Http2Stream *>(self->mGoAwayStreamsToRestart.PopFront());
 
@@ -1859,7 +1859,7 @@ Http2Session::RecvGoAway(Http2Session *self)
   // in another one. (they were never sent on the network so they implicitly
   // are not covered by the last-good id.
   size = self->mQueuedStreams.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
+  for (size_t count = 0; count < size; ++count) {
     Http2Stream *stream =
       static_cast<Http2Stream *>(self->mQueuedStreams.PopFront());
     MOZ_ASSERT(stream->Queued());
diff --git a/netwerk/protocol/http/InterceptedChannel.cpp b/netwerk/protocol/http/InterceptedChannel.cpp
index c36351955d52e0..b608c568e1234f 100644
--- a/netwerk/protocol/http/InterceptedChannel.cpp
+++ b/netwerk/protocol/http/InterceptedChannel.cpp
@@ -118,6 +118,16 @@ InterceptedChannelBase::GetConsoleReportCollector(nsIConsoleReportCollector** aC
   return NS_OK;
 }
 
+NS_IMETHODIMP
+InterceptedChannelBase::SetReleaseHandle(nsISupports* aHandle)
+{
+  MOZ_ASSERT(NS_IsMainThread());
+  MOZ_ASSERT(!mReleaseHandle);
+  MOZ_ASSERT(aHandle);
+  mReleaseHandle = aHandle;
+  return NS_OK;
+}
+
 InterceptedChannelChrome::InterceptedChannelChrome(nsHttpChannel* aChannel,
                                                    nsINetworkInterceptController* aController,
                                                    nsICacheEntry* aEntry)
@@ -172,6 +182,7 @@ InterceptedChannelChrome::ResetInterception()
   nsresult rv = mChannel->StartRedirectChannelToURI(uri, nsIChannelEventSink::REDIRECT_INTERNAL);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   return NS_OK;
 }
@@ -265,6 +276,7 @@ InterceptedChannelChrome::FinishSynthesizedResponse(const nsACString& aFinalURLS
       NS_ENSURE_SUCCESS(rv, rv);
     }
   }
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   return NS_OK;
 }
@@ -284,6 +296,7 @@ InterceptedChannelChrome::Cancel(nsresult aStatus)
   // to cancel which will provide OnStart/OnStopRequest to the channel.
   nsresult rv = mChannel->AsyncAbort(aStatus);
   NS_ENSURE_SUCCESS(rv, rv);
+  mReleaseHandle = nullptr;
   return NS_OK;
 }
 
@@ -349,6 +362,7 @@ InterceptedChannelContent::ResetInterception()
   mSynthesizedInput = nullptr;
 
   mChannel->ResetInterception();
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   return NS_OK;
 }
@@ -407,6 +421,7 @@ InterceptedChannelContent::FinishSynthesizedResponse(const nsACString& aFinalURL
   }
 
   mResponseBody = nullptr;
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   mStreamListener = nullptr;
   return NS_OK;
@@ -427,6 +442,7 @@ InterceptedChannelContent::Cancel(nsresult aStatus)
   // to cancel which will provide OnStart/OnStopRequest to the channel.
   nsresult rv = mChannel->AsyncAbort(aStatus);
   NS_ENSURE_SUCCESS(rv, rv);
+  mReleaseHandle = nullptr;
   mChannel = nullptr;
   mStreamListener = nullptr;
   return NS_OK;
diff --git a/netwerk/protocol/http/InterceptedChannel.h b/netwerk/protocol/http/InterceptedChannel.h
index f12b2e99d6f4da..61e196c5454f43 100644
--- a/netwerk/protocol/http/InterceptedChannel.h
+++ b/netwerk/protocol/http/InterceptedChannel.h
@@ -37,6 +37,7 @@ class InterceptedChannelBase : public nsIInterceptedChannel {
   Maybe<nsAutoPtr<nsHttpResponseHead>> mSynthesizedResponseHead;
 
   nsCOMPtr<nsIConsoleReportCollector> mReportCollector;
+  nsCOMPtr<nsISupports> mReleaseHandle;
 
   void EnsureSynthesizedResponse();
   void DoNotifyController();
@@ -55,6 +56,7 @@ class InterceptedChannelBase : public nsIInterceptedChannel {
 
   NS_IMETHOD GetResponseBody(nsIOutputStream** aOutput) override;
   NS_IMETHOD GetConsoleReportCollector(nsIConsoleReportCollector** aCollectorOut) override;
+  NS_IMETHOD SetReleaseHandle(nsISupports* aHandle) override;
 };
 
 class InterceptedChannelChrome : public InterceptedChannelBase
diff --git a/netwerk/protocol/http/PackagedAppService.cpp b/netwerk/protocol/http/PackagedAppService.cpp
index 49b8678194b772..b184eed1ca9cba 100644
--- a/netwerk/protocol/http/PackagedAppService.cpp
+++ b/netwerk/protocol/http/PackagedAppService.cpp
@@ -747,7 +747,7 @@ PackagedAppService::PackagedAppDownloader::AddCallback(nsIURI *aURI,
 {
   MOZ_RELEASE_ASSERT(NS_IsMainThread(), "mCallbacks hashtable is not thread safe");
   nsAutoCString spec;
-  aURI->GetAsciiSpec(spec);
+  aURI->GetSpecIgnoringRef(spec);
 
   LogURI("PackagedAppDownloader::AddCallback", this, aURI);
   LOG(("[%p]    > callback: %p\n", this, aCallback));
diff --git a/netwerk/protocol/http/SpdySession31.cpp b/netwerk/protocol/http/SpdySession31.cpp
index 1c8209162f0092..310d657ca70a9a 100644
--- a/netwerk/protocol/http/SpdySession31.cpp
+++ b/netwerk/protocol/http/SpdySession31.cpp
@@ -405,8 +405,8 @@ SpdySession31::QueueStream(SpdyStream31 *stream)
   LOG3(("SpdySession31::QueueStream %p stream %p queued.", this, stream));
 
 #ifdef DEBUG
-  int32_t qsize = mQueuedStreams.GetSize();
-  for (int32_t i = 0; i < qsize; i++) {
+  size_t qsize = mQueuedStreams.GetSize();
+  for (size_t i = 0; i < qsize; i++) {
     SpdyStream31 *qStream = static_cast<SpdyStream31 *>(mQueuedStreams.ObjectAt(i));
     MOZ_ASSERT(qStream != stream);
     MOZ_ASSERT(qStream->Queued());
@@ -954,8 +954,8 @@ SpdySession31::CleanupStream(SpdyStream31 *aStream, nsresult aResult,
 
 static void RemoveStreamFromQueue(SpdyStream31 *aStream, nsDeque &queue)
 {
-  uint32_t size = queue.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
+  size_t size = queue.GetSize();
+  for (size_t count = 0; count < size; ++count) {
     SpdyStream31 *stream = static_cast<SpdyStream31 *>(queue.PopFront());
     if (stream != aStream)
       queue.Push(stream);
@@ -1519,8 +1519,8 @@ SpdySession31::HandleGoAway(SpdySession31 *self)
   self->mStreamTransactionHash.Enumerate(GoAwayEnumerator, self);
 
   // Process the streams marked for deletion and restart.
-  uint32_t size = self->mGoAwayStreamsToRestart.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
+  size_t size = self->mGoAwayStreamsToRestart.GetSize();
+  for (size_t count = 0; count < size; ++count) {
     SpdyStream31 *stream =
       static_cast<SpdyStream31 *>(self->mGoAwayStreamsToRestart.PopFront());
 
@@ -1534,7 +1534,7 @@ SpdySession31::HandleGoAway(SpdySession31 *self)
   // in another one. (they were never sent on the network so they implicitly
   // are not covered by the last-good id.
   size = self->mQueuedStreams.GetSize();
-  for (uint32_t count = 0; count < size; ++count) {
+  for (size_t count = 0; count < size; ++count) {
     SpdyStream31 *stream =
       static_cast<SpdyStream31 *>(self->mQueuedStreams.PopFront());
     MOZ_ASSERT(stream->Queued());
diff --git a/netwerk/sctp/datachannel/DataChannel.cpp b/netwerk/sctp/datachannel/DataChannel.cpp
index be5e92358cf3f0..e6ac11e1035f28 100644
--- a/netwerk/sctp/datachannel/DataChannel.cpp
+++ b/netwerk/sctp/datachannel/DataChannel.cpp
@@ -1832,7 +1832,7 @@ DataChannelConnection::HandleStreamChangeEvent(const struct sctp_stream_change_e
 
       // Make sure we request enough streams if there's a big jump in streams
       // Could make a more complex API for OpenXxxFinish() and avoid this loop
-      int32_t num_needed = mPending.GetSize();
+      size_t num_needed = mPending.GetSize();
       LOG(("%d of %d new streams already needed", num_needed,
            new_len - old_len));
       num_needed -= (new_len - old_len); // number we added
diff --git a/netwerk/test/mochitests/mochitest.ini b/netwerk/test/mochitests/mochitest.ini
index 5292d0b257f7f4..aae031a82dba4e 100644
--- a/netwerk/test/mochitests/mochitest.ini
+++ b/netwerk/test/mochitests/mochitest.ini
@@ -25,6 +25,8 @@ skip-if = e10s
 skip-if = e10s
 [test_signed_web_packaged_app.html]
 skip-if = e10s || buildapp != 'browser'
+[test_signed_web_packaged_app_origin.html]
+skip-if = e10s || buildapp != 'browser'
 [test_web_packaged_app.html]
 [test_loadinfo_redirectchain.html]
 skip-if = buildapp == 'b2g' #no ssl support
diff --git a/netwerk/test/mochitests/test_signed_web_packaged_app_origin.html b/netwerk/test/mochitests/test_signed_web_packaged_app_origin.html
new file mode 100644
index 00000000000000..577a97b519fe09
--- /dev/null
+++ b/netwerk/test/mochitests/test_signed_web_packaged_app_origin.html
@@ -0,0 +1,94 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title> Web packaged app </title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script class="testbody" type="application/javascript;version=1.7">
+
+// The test is mainly to verify whether the packageId is populated
+// to the child side when loading a signed packaged content.
+// Since we have to have chrome priviledge to test if the node principal
+// has the expected origin attributes, we have to load and run a script
+// in content to get the nodePrincipal and send back to the opener
+// to check the origin.
+
+var Cc = SpecialPowers.Cc;
+var Ci = SpecialPowers.Ci;
+var Cu = SpecialPowers.Cu;
+var Cr = SpecialPowers.Cr;
+
+SpecialPowers.pushPrefEnv(
+  { "set": [["network.http.enable-packaged-apps", true],
+            ["network.http.signed-packages.enabled", true],
+            ["dom.mozBrowserFramesEnabled", true]] },
+  () => SpecialPowers.pushPermissions([
+    { "type": "browser", "allow": 1, "context": document }
+  ], function() {
+    runTest();
+  }));
+
+SimpleTest.waitForExplicitFinish();
+
+function runTest() {
+  var iframe = document.createElement("iframe");
+
+  // 1. We open a remote browser and navigate to a regular content first.
+  iframe.setAttribute('mozbrowser', 'true');
+  iframe.setAttribute('remote', 'true');
+  iframe.setAttribute("src", "http://example.org:80");
+
+  iframe.addEventListener("mozbrowserloadend", function loadend(e) {
+    iframe.removeEventListener("mozbrowserloadend", loadend);
+    ok(true, "Got mozbrowserloadend");
+
+    // 2. Then we navigate to a signed packaged content.
+    iframe.setAttribute("src", "http://mochi.test:8888/tests/netwerk/test/mochitests/signed_web_packaged_app.sjs!//index.html");
+
+    iframe.addEventListener("mozbrowserloadend", function loadend(e) {
+      iframe.removeEventListener("mozbrowserloadend", loadend);
+
+        // 3. Inject a script with chrome priviledge to content to get the nodePrincipal.
+        //    We communicate via message manager with event 'my-e10s-extension-message'.
+        var mm = SpecialPowers.wrap(iframe)
+                              .QueryInterface(Ci.nsIFrameLoaderOwner)
+                              .frameLoader
+                              .messageManager;
+
+        var fsl = mm.QueryInterface(Ci.nsIFrameScriptLoader);
+
+        mm.addMessageListener("get-node-principal-origin", function(message) {
+          let contentOrigin = message.objects.origin;
+          // The expected signedPkg is defined in 'signed_web_packaged_app.sjs'.
+          let kExpectedOrigin =
+            'http://mochi.test:8888^inBrowser=1&signedPkg=09bc9714-7ab6-4320-9d20-fde4c237522c';
+          is(contentOrigin, kExpectedOrigin, 'content origin check: ' + contentOrigin);
+          SimpleTest.finish();
+        });
+
+        // The script we are going to inject to the content.
+        let frameScript =
+`
+function getNodePrincipalOrigin() {
+  sendAsyncMessage("get-node-principal-origin", {}, { origin: content.document.nodePrincipal.origin });
+}
+`;
+        fsl.loadFrameScript("data:,(" + frameScript + ")()", true);
+    });
+  });
+
+  document.body.appendChild(iframe);
+}
+
+</script>
+</pre>
+</body>
+</html>
\ No newline at end of file
diff --git a/netwerk/test/unit/test_packaged_app_service.js b/netwerk/test/unit/test_packaged_app_service.js
index 0e3e4174e06b53..b4471d746c8abd 100644
--- a/netwerk/test/unit/test_packaged_app_service.js
+++ b/netwerk/test/unit/test_packaged_app_service.js
@@ -264,6 +264,8 @@ function run_test()
   add_test(test_worse_package_4);
   add_test(test_worse_package_5);
 
+  add_test(test_request_has_ref);
+
   // run tests
   run_next_test();
 }
@@ -351,6 +353,13 @@ function test_updated_package() {
     new packagedResourceListener(testData.content[0].data.replace(/\.\.\./g, 'xxx')));
 }
 
+// This tests that requested URI with reference should still work.
+function test_request_has_ref() {
+  packagePath = "/package";
+  let url = uri + packagePath + "!//index.html#Ref";
+  paservice.getResource(getChannelForURL(url), cacheListener);
+}
+
 // ----------------------------------------------------------------------------
 
 // This listener checks that the requested resources are not returned
diff --git a/python/mozboot/mozboot/android.py b/python/mozboot/mozboot/android.py
index 68a7813e807afd..e9e0e09ccf8737 100644
--- a/python/mozboot/mozboot/android.py
+++ b/python/mozboot/mozboot/android.py
@@ -235,3 +235,12 @@ def ensure_android_packages(android_tool, packages=None):
 
 def suggest_mozconfig(sdk_path=None, ndk_path=None):
     print(MOBILE_ANDROID_MOZCONFIG_TEMPLATE % (sdk_path, ndk_path))
+
+def android_ndk_url(os_name, ver='r10e') :
+    from sys import maxsize
+    base_url = 'https://dl.google.com/android/ndk/android-ndk-'
+
+    if maxsize > 2**32 :
+	return (base_url+ver+'-'+os_name+'-x86_64.bin')
+    else :
+	return (base_url+ver+'-'+os_name+'-x86.bin')
\ No newline at end of file
diff --git a/python/mozboot/mozboot/archlinux.py b/python/mozboot/mozboot/archlinux.py
index 6422743f6651af..726b57158a73fb 100644
--- a/python/mozboot/mozboot/archlinux.py
+++ b/python/mozboot/mozboot/archlinux.py
@@ -113,11 +113,8 @@ def install_mobile_android_packages(self):
         self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux'))
         self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e'))
         self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz'
-        is_64bits = sys.maxsize > 2**32
-        if is_64bits:
-            self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin'
-        else:
-            self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin'
+	self.ndk_url = android_ndk_url('linux')
+
         android.ensure_android_sdk_and_ndk(path=mozbuild_path,
                                            sdk_path=self.sdk_path, sdk_url=self.sdk_url,
                                            ndk_path=self.ndk_path, ndk_url=self.ndk_url)
diff --git a/python/mozboot/mozboot/debian.py b/python/mozboot/mozboot/debian.py
index 7c2c35ed21fcea..68498d4c4c2335 100644
--- a/python/mozboot/mozboot/debian.py
+++ b/python/mozboot/mozboot/debian.py
@@ -128,11 +128,8 @@ def install_mobile_android_packages(self):
         self.sdk_path = os.environ.get('ANDROID_SDK_HOME', os.path.join(mozbuild_path, 'android-sdk-linux'))
         self.ndk_path = os.environ.get('ANDROID_NDK_HOME', os.path.join(mozbuild_path, 'android-ndk-r10e'))
         self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-linux.tgz'
-        is_64bits = sys.maxsize > 2**32
-        if is_64bits:
-            self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin'
-        else:
-            self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin'
+        self.ndk_url = android_ndk_url('linux')
+
         android.ensure_android_sdk_and_ndk(path=mozbuild_path,
                                            sdk_path=self.sdk_path, sdk_url=self.sdk_url,
                                            ndk_path=self.ndk_path, ndk_url=self.ndk_url)
diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py
index 4641a022904611..736136d5fb7587 100644
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -355,9 +355,10 @@ def ensure_homebrew_mobile_android_packages(self):
         self.sdk_url = 'https://dl.google.com/android/android-sdk_r24.0.1-macosx.zip'
         is_64bits = sys.maxsize > 2**32
         if is_64bits:
-            self.ndk_url = 'https://dl.google.com/android/ndk/android-ndk-r10e-darwin-x86_64.bin'
+            self.ndk_url = android_ndk_url('darwin')
         else:
             raise Exception('You need a 64-bit version of Mac OS X to build Firefox for Android.')
+
         android.ensure_android_sdk_and_ndk(path=mozbuild_path,
                                            sdk_path=self.sdk_path, sdk_url=self.sdk_url,
                                            ndk_path=self.ndk_path, ndk_url=self.ndk_url)
diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py
index 7854b7726c9f44..09a87c39fa3600 100755
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -85,6 +85,7 @@ def build_dict(config, env=os.environ):
     d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER'))
     d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING'))
     d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1'
+    d['sync'] = substs.get('MOZ_SERVICES_SYNC') == '1'
     d['asan'] = substs.get('MOZ_ASAN') == '1'
     d['tsan'] = substs.get('MOZ_TSAN') == '1'
     d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1'
diff --git a/security/certverifier/NSSCertDBTrustDomain.cpp b/security/certverifier/NSSCertDBTrustDomain.cpp
index 1498ea9713eb75..805365799aaba7 100644
--- a/security/certverifier/NSSCertDBTrustDomain.cpp
+++ b/security/certverifier/NSSCertDBTrustDomain.cpp
@@ -914,7 +914,8 @@ NSSCertDBTrustDomain::CheckValidityIsAcceptable(Time notBefore, Time notAfter,
     return Success;
   }
 
-  Duration DURATION_39_MONTHS((3 * 365 + 3 * 31) * Time::ONE_DAY_IN_SECONDS);
+  Duration DURATION_27_MONTHS_PLUS_SLOP((2 * 365 + 3 * 31 + 7) *
+                                        Time::ONE_DAY_IN_SECONDS);
   Duration maxValidityDuration(UINT64_MAX);
   Duration validityDuration(notBefore, notAfter);
 
@@ -922,12 +923,9 @@ NSSCertDBTrustDomain::CheckValidityIsAcceptable(Time notBefore, Time notAfter,
     case ValidityCheckingMode::CheckingOff:
       return Success;
     case ValidityCheckingMode::CheckForEV:
-      // The EV Guidelines say the maximum is 27 months, but we use a higher
-      // limit here:
-      //  a) To (hopefully) minimize compatibility breakage.
-      //  b) Because there was some talk about raising the limit to 39 months to
-      //     match the BR limit.
-      maxValidityDuration = DURATION_39_MONTHS;
+      // The EV Guidelines say the maximum is 27 months, but we use a slightly
+      // higher limit here to (hopefully) minimize compatibility breakage.
+      maxValidityDuration = DURATION_27_MONTHS_PLUS_SLOP;
       break;
     default:
       PR_NOT_REACHED("We're not handling every ValidityCheckingMode type");
diff --git a/security/manager/ssl/tests/unit/pycert.py b/security/manager/ssl/tests/unit/pycert.py
index 461a81fa235b78..fc78a3ecf2fdd2 100755
--- a/security/manager/ssl/tests/unit/pycert.py
+++ b/security/manager/ssl/tests/unit/pycert.py
@@ -319,7 +319,7 @@ def __init__(self, paramStream):
         self.issuer = 'Default Issuer'
         actualNow = datetime.datetime.utcnow()
         self.now = datetime.datetime.strptime(str(actualNow.year), '%Y')
-        aYearAndAWhile = datetime.timedelta(days=550)
+        aYearAndAWhile = datetime.timedelta(days=400)
         self.notBefore = self.now - aYearAndAWhile
         self.notAfter = self.now + aYearAndAWhile
         self.subject = 'Default Subject'
diff --git a/security/manager/ssl/tests/unit/test_validity.js b/security/manager/ssl/tests/unit/test_validity.js
index a7d724bd3f5620..4e4da00a5e9796 100644
--- a/security/manager/ssl/tests/unit/test_validity.js
+++ b/security/manager/ssl/tests/unit/test_validity.js
@@ -63,7 +63,7 @@ function checkEVChains() {
   // Chain with an end entity cert with a validity period that is acceptable
   // for EV.
   const intFullName = "ev_int_60_months-evroot";
-  let eeFullName = `ev_ee_39_months-${intFullName}`;
+  let eeFullName = `ev_ee_27_months-${intFullName}`;
   let expectedNamesForOCSP = gEVExpected
                            ? [ intFullName,
                                eeFullName ]
@@ -73,7 +73,7 @@ function checkEVChains() {
 
   // Chain with an end entity cert with a validity period that is too long
   // for EV.
-  eeFullName = `ev_ee_40_months-${intFullName}`;
+  eeFullName = `ev_ee_28_months-${intFullName}`;
   expectedNamesForOCSP = gEVExpected
                            ? [ intFullName,
                                eeFullName ]
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_ee_39_months-ev_int_60_months-evroot.pem.certspec b/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec
similarity index 61%
rename from security/manager/ssl/tests/unit/test_validity/ev_ee_39_months-ev_int_60_months-evroot.pem.certspec
rename to security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec
index ec7844e2394ad5..d2c7fa127544c3 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_ee_39_months-ev_int_60_months-evroot.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_validity/ev_ee_27_months-ev_int_60_months-evroot.pem.certspec
@@ -1,5 +1,5 @@
 issuer:ev_int_60_months-evroot
-subject:ev_ee_39_months-ev_int_60_months-evroot
-validity:1188
-extension:authorityInformationAccess:http://www.example.com:8888/ev_ee_39_months-ev_int_60_months-evroot/
+subject:ev_ee_27_months-ev_int_60_months-evroot
+validity:823
+extension:authorityInformationAccess:http://www.example.com:8888/ev_ee_27_months-ev_int_60_months-evroot/
 extension:certificatePolicies:1.3.6.1.4.1.13769.666.666.666.1.500.9.1
diff --git a/security/manager/ssl/tests/unit/test_validity/ev_ee_40_months-ev_int_60_months-evroot.pem.certspec b/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec
similarity index 61%
rename from security/manager/ssl/tests/unit/test_validity/ev_ee_40_months-ev_int_60_months-evroot.pem.certspec
rename to security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec
index 77274de44cbd79..2dcfb2e29caff9 100644
--- a/security/manager/ssl/tests/unit/test_validity/ev_ee_40_months-ev_int_60_months-evroot.pem.certspec
+++ b/security/manager/ssl/tests/unit/test_validity/ev_ee_28_months-ev_int_60_months-evroot.pem.certspec
@@ -1,5 +1,5 @@
 issuer:ev_int_60_months-evroot
-subject:ev_ee_40_months-ev_int_60_months-evroot
-validity:1219
-extension:authorityInformationAccess:http://www.example.com:8888/ev_ee_40_months-ev_int_60_months-evroot/
+subject:ev_ee_28_months-ev_int_60_months-evroot
+validity:854
+extension:authorityInformationAccess:http://www.example.com:8888/ev_ee_28_months-ev_int_60_months-evroot/
 extension:certificatePolicies:1.3.6.1.4.1.13769.666.666.666.1.500.9.1
diff --git a/security/manager/ssl/tests/unit/test_validity/moz.build b/security/manager/ssl/tests/unit/test_validity/moz.build
index 8891f3e955762f..993fd3db329c4d 100644
--- a/security/manager/ssl/tests/unit/test_validity/moz.build
+++ b/security/manager/ssl/tests/unit/test_validity/moz.build
@@ -5,8 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 test_certificates = (
-    'ev_ee_39_months-ev_int_60_months-evroot.pem',
-    'ev_ee_40_months-ev_int_60_months-evroot.pem',
+    'ev_ee_27_months-ev_int_60_months-evroot.pem',
+    'ev_ee_28_months-ev_int_60_months-evroot.pem',
     'ev_int_60_months-evroot.pem',
     'evroot.pem',
 )
diff --git a/security/manager/tools/PreloadedHPKPins.json b/security/manager/tools/PreloadedHPKPins.json
index cf1703d9326179..e5cc34e3d2f880 100644
--- a/security/manager/tools/PreloadedHPKPins.json
+++ b/security/manager/tools/PreloadedHPKPins.json
@@ -97,7 +97,7 @@
         "Verisign Class 3 Public Primary Certification Authority - G3",
         "VeriSign Class 3 Public Primary Certification Authority - G4",
         "VeriSign Class 3 Public Primary Certification Authority - G5",
-        "Verisign Class 4 Public Primary Certification Authority - G3",
+        // "Verisign Class 4 Public Primary Certification Authority - G3",
         "VeriSign Universal Root Certification Authority"
       ]
     },
@@ -171,13 +171,13 @@
         "StartCom Certification Authority",
         "StartCom Certification Authority G2",
         "TC TrustCenter Class 3 CA II",
-        "TC TrustCenter Universal CA III",
+        // "TC TrustCenter Universal CA III",
         // "Thawte Premium Server CA",
         "thawte Primary Root CA",
         "thawte Primary Root CA - G2",
         "thawte Primary Root CA - G3",
         // "Thawte Server CA",
-        "UTN DATACorp SGC Root CA",
+        // "UTN DATACorp SGC Root CA",
         "UTN USERFirst Hardware Root CA",
         // "ValiCert Class 1 VA",
         // "ValiCert Class 2 VA",
@@ -187,7 +187,7 @@
         "Verisign Class 3 Public Primary Certification Authority - G3",
         "VeriSign Class 3 Public Primary Certification Authority - G4",
         "VeriSign Class 3 Public Primary Certification Authority - G5",
-        "Verisign Class 4 Public Primary Certification Authority - G3",
+        // "Verisign Class 4 Public Primary Certification Authority - G3",
         "VeriSign Universal Root Certification Authority",
         "XRamp Global CA Root"
       ]
diff --git a/testing/cppunittest.ini b/testing/cppunittest.ini
index e480fe6d38a036..0ab29bf1e8c456 100644
--- a/testing/cppunittest.ini
+++ b/testing/cppunittest.ini
@@ -29,7 +29,6 @@ skip-if = os == 'b2g' || (os == 'android' && debug) # Bug 1054246
 [TestDeadlockDetector]
 skip-if = os == 'b2g' || (os == 'android' && debug) # Bug 1054249
 [TestDeadlockDetectorScalability]
-[TestDeque]
 [TestDllInterceptor]
 skip-if = os != 'win'
 [TestEndian]
diff --git a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
index e8daf704908628..232ff7b21e1b03 100644
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -14,16 +14,14 @@
 import sys
 import urlparse
 
-from mozharness.base.python import (
-    PreScriptAction,
-)
+from mozharness.base.python import PostScriptRun, PreScriptAction
+from mozharness.mozilla.structuredlog import StructuredOutputParser
 from mozharness.mozilla.testing.testbase import (
     TestingMixin,
     testing_config_options,
 )
 from mozharness.mozilla.vcstools import VCSToolsScript
 
-
 # General command line arguments for Firefox ui tests
 firefox_ui_tests_config_options = [
     [['--dry-run'], {
@@ -109,6 +107,8 @@ def __init__(self, config_options=None,
             default_actions=default_actions or actions,
             *args, **kwargs)
 
+        self.reports = {'html': 'report.html', 'xunit': 'report.xml'}
+
         self.firefox_ui_repo = self.config['firefox_ui_repo']
         self.firefox_ui_branch = self.config.get('firefox_ui_branch')
 
@@ -161,12 +161,24 @@ def checkout(self):
             vcs='gittool'
         )
 
+    def copy_reports_to_upload_dir(self):
+        self.info("Copying reports to upload dir...")
+
+        dirs = self.query_abs_dirs()
+        for report in self.reports:
+            self.copy_to_upload_dir(os.path.join(dirs['abs_reports_dir'], self.reports[report]),
+                                    dest=os.path.join('reports', self.reports[report]),
+                                    short_desc='%s log' % self.reports[report],
+                                    long_desc='%s log' % self.reports[report],
+                                    max_backups=self.config.get("log_max_rotate", 0))
+
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
 
         abs_dirs = VCSToolsScript.query_abs_dirs(self)
         abs_dirs.update({
+            'abs_reports_dir': os.path.join(abs_dirs['abs_work_dir'], 'reports'),
             'fx_ui_dir': os.path.join(abs_dirs['abs_work_dir'], 'firefox_ui_tests'),
         })
         self.abs_dirs = abs_dirs
@@ -205,22 +217,31 @@ def query_minidump_stackwalk(self):
 
         super(FirefoxUITests, self).query_minidump_stackwalk(manifest=manifest_path)
 
+    @PostScriptRun
+    def _upload_reports_post_run(self):
+        if self.config.get("copy_reports_post_run", True):
+            self.copy_reports_to_upload_dir()
+
     def run_test(self, installer_path, env=None, cleanup=True, marionette_port=2828):
         """All required steps for running the tests against an installer."""
         dirs = self.query_abs_dirs()
 
-        gecko_log = os.path.join(dirs['abs_log_dir'], 'gecko.log')
-
         cmd = [
             self.query_python_path(),
             os.path.join(dirs['fx_ui_dir'], 'firefox_ui_harness', self.cli_script),
             '--installer', installer_path,
-            # Log to stdout until tests are stable.
-            # '--gecko-log', gecko_log,
-            '--gecko-log=-',
             '--address', 'localhost:{}'.format(marionette_port),
+
             # Use the work dir to get temporary data stored
             '--workspace', dirs['abs_work_dir'],
+
+            # logging options
+            '--gecko-log=-',  # output from the gecko process redirected to stdout
+            '--log-raw=-',  # structured log for output parser redirected to stdout
+
+            # additional reports helpful for Jenkins and inpection via Treeherder
+            '--log-html', os.path.join(dirs["abs_reports_dir"], self.reports['html']),
+            '--log-xunit', os.path.join(dirs["abs_reports_dir"], self.reports['xunit']),
         ]
 
         # Collect all pass-through harness options to the script
@@ -228,31 +249,28 @@ def run_test(self, installer_path, env=None, cleanup=True, marionette_port=2828)
 
         # Set further environment settings
         env = env or self.query_env()
+
         if self.minidump_stackwalk_path:
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
 
             if self.query_symbols_url():
                 cmd += ['--symbols-path', self.symbols_url]
 
-        return_code = self.run_command(cmd, cwd=dirs['abs_work_dir'],
-                                       output_timeout=300, env=env)
-
-        # Return more output if we fail
-        if return_code:
-            if os.path.exists(gecko_log):
-                contents = self.read_from_file(gecko_log, verbose=False)
-                self.warning('== Dumping gecko output ==')
-                self.warning(contents)
-                self.warning('== End of gecko output ==')
-            else:
-                # We're outputting to stdout with --gecko-log=- so there is not log to
-                # complaing about. Remove the commented line below when changing
-                # this behaviour.
-                # self.warning('No gecko.log was found: %s' % gecko_log)
-                pass
+        parser = StructuredOutputParser(config=self.config,
+                                        log_obj=self.log_obj,
+                                        strict=False)
+
+        return_code = self.run_command(cmd,
+                                       cwd=dirs['abs_work_dir'],
+                                       output_timeout=300,
+                                       output_parser=parser,
+                                       env=env)
+
+        tbpl_status, log_level = parser.evaluate_parser(return_code)
+        self.buildbot_status(tbpl_status, level=log_level)
 
         if cleanup:
-            for filepath in (installer_path, gecko_log):
+            for filepath in (installer_path,):
                 if os.path.exists(filepath):
                     self.debug('Removing {}'.format(filepath))
                     os.remove(filepath)
@@ -265,6 +283,9 @@ def _pre_run_tests(self, action):
             self.critical('Please specify an installer via --installer-path or --installer-url.')
             sys.exit(1)
 
+        # Necessary to allow mozlog to be activated
+        self.activate_virtualenv()
+
     def run_tests(self):
         dirs = self.query_abs_dirs()
 
diff --git a/testing/web-platform/harness/README.rst b/testing/web-platform/harness/README.rst
index 6e3b5fa254643d..63f18aca613dd8 100644
--- a/testing/web-platform/harness/README.rst
+++ b/testing/web-platform/harness/README.rst
@@ -29,7 +29,7 @@ following are most significant:
   The path to a binary file for the product (browser) to test against.
 
 ``--webdriver-binary`` (required if product is `chrome`)
-  The path to a `*driver` binary; e.g., a `chromedriver` binary.
+  The path to a `driver` binary; e.g., a `chromedriver` binary.
 
 ``--certutil-binary`` (required if product is `firefox` [#]_)
   The path to a `certutil` binary (for tests that must be run over https).
@@ -43,13 +43,18 @@ following are most significant:
 ``--prefs-root`` (required only when testing a Firefox binary)
   The path to a directory containing Firefox test-harness preferences. [#]_
 
+``--config`` (should default to `wptrunner.default.ini`)
+  The path to the config (ini) file.
+
 .. [#] The ``--certutil-binary`` option is required when the product is
    ``firefox`` unless ``--ssl-type=none`` is specified.
 
 .. [#] The ``--metadata`` path is to a directory that contains:
 
-  * a ``MANIFEST.json`` file (the web-platform-tests documentation has
-    instructions on generating this file); and
+  * a ``MANIFEST.json`` file (instructions on generating this file are
+    available in the `detailed documentation
+    <http://wptrunner.readthedocs.org/en/latest/usage.html#installing-wptrunner>`_);
+    and
   * (optionally) any expectation files (see below)
 
 .. [#] Example ``--prefs-root`` value: ``~/mozilla-central/testing/profiles``.
@@ -125,7 +130,7 @@ input to the `wptupdate` tool.
 Expectation File Format
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-Metadat about tests, notably including their expected results, is
+Metadata about tests, notably including their expected results, is
 stored in a modified ini-like format that is designed to be human
 editable, but also to be machine updatable.
 
diff --git a/testing/web-platform/harness/docs/usage.rst b/testing/web-platform/harness/docs/usage.rst
index 279f4f2c590419..8e74a4320c8287 100644
--- a/testing/web-platform/harness/docs/usage.rst
+++ b/testing/web-platform/harness/docs/usage.rst
@@ -28,19 +28,19 @@ environment created as above::
   pip install -e ./
 
 In addition to the dependencies installed by pip, wptrunner requires
-a copy of the web-platform-tests repository. That can be located
-anywhere on the filesystem, but the easiest option is to put it within
-the wptrunner checkout directory, as a subdirectory named ``tests``::
+a copy of the web-platform-tests repository. This can be located
+anywhere on the filesystem, but the easiest option is to put it
+under the same parent directory as the wptrunner checkout::
 
-  git clone https://github.com/w3c/web-platform-tests.git tests
+  git clone https://github.com/w3c/web-platform-tests.git
 
 It is also necessary to generate a web-platform-tests ``MANIFEST.json``
-file. It's recommended to put that within the wptrunner
-checkout directory, in a subdirectory named ``meta``::
+file. It's recommended to also put that under the same parent directory as
+the wptrunner checkout, in a directory named ``meta``::
 
   mkdir meta
-  cd tests
-  python tools/scripts/manifest.py ../meta/MANIFEST.json
+  cd web-platform-tests
+  python manifest --path ../meta/MANIFEST.json
 
 The ``MANIFEST.json`` file needs to be regenerated each time the
 web-platform-tests checkout is updated. To aid with the update process
@@ -74,6 +74,9 @@ takes multiple options, of which the following are most significant:
 ``--prefs-root`` (required only when testing a Firefox binary)
   The path to a directory containing Firefox test-harness preferences. [#]_
 
+``--config`` (should default to `wptrunner.default.ini`)
+  The path to the config (ini) file.
+
 .. [#] The ``--certutil-binary`` option is required when the product is
    ``firefox`` unless ``--ssl-type=none`` is specified.
 
@@ -94,10 +97,17 @@ The following examples show how to start wptrunner with various options.
 Starting wptrunner
 ------------------
 
+The examples below assume the following directory layout,
+though no specific folder structure is required::
+
+  ~/testtwf/wptrunner          # wptrunner checkout
+  ~/testtwf/web-platform-tests # web-platform-tests checkout
+  ~/testtwf/meta               # metadata
+
 To test a Firefox Nightly build in an OS X environment, you might start
 wptrunner using something similar to the following example::
 
-  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  wptrunner --metadata=~/testtwf/meta/ --tests=~/testtwf/web-platform-tests/ \
     --binary=~/mozilla-central/obj-x86_64-apple-darwin14.3.0/dist/Nightly.app/Contents/MacOS/firefox \
     --certutil-binary=~/mozilla-central/obj-x86_64-apple-darwin14.3.0/security/nss/cmd/certutil/certutil \
     --prefs-root=~/mozilla-central/testing/profiles
@@ -106,7 +116,7 @@ wptrunner using something similar to the following example::
 And to test a Chromium build in an OS X environment, you might start
 wptrunner using something similar to the following example::
 
-  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  wptrunner --metadata=~/testtwf/meta/ --tests=~/testtwf/web-platform-tests/ \
     --binary=~/chromium/src/out/Release/Chromium.app/Contents/MacOS/Chromium \
     --webdriver-binary=/usr/local/bin/chromedriver --product=chrome
 
@@ -118,7 +128,7 @@ To restrict a test run just to tests in a particular web-platform-tests
 subdirectory, specify the directory name in the positional arguments after
 the options; for example, run just the tests in the `dom` subdirectory::
 
-  wptrunner --metadata=~/web-platform-tests/ --tests=~/web-platform-tests/ \
+  wptrunner --metadata=~/testtwf/meta --tests=~/testtwf/web-platform-tests/ \
     --binary=/path/to/firefox --certutil-binary=/path/to/certutil \
     --prefs-root=/path/to/testing/profiles \
     dom
@@ -180,7 +190,7 @@ Configuration File
 
 wptrunner uses a ``.ini`` file to control some configuration
 sections. The file has three sections; ``[products]``,
-``[paths]`` and ``[web-platform-tests]``.
+``[manifest:default]`` and ``[web-platform-tests]``.
 
 ``[products]`` is used to
 define the set of available products. By default this section is empty
@@ -195,12 +205,12 @@ e.g.::
   chrome =
   netscape4 = path/to/netscape.py
 
-``[paths]`` specifies the default paths for the tests and metadata,
+``[manifest:default]`` specifies the default paths for the tests and metadata,
 relative to the config file. For example::
 
-  [paths]
-  tests = checkouts/web-platform-tests
-  metadata = /home/example/wpt/metadata
+  [manifest:default]
+  tests = ~/testtwf/web-platform-tests
+  metadata = ~/testtwf/meta
 
 
 ``[web-platform-tests]`` is used to set the properties of the upstream
diff --git a/testing/web-platform/harness/wptrunner/browsers/firefox.py b/testing/web-platform/harness/wptrunner/browsers/firefox.py
index d3698c22ecf046..cf4defa8a97cfd 100644
--- a/testing/web-platform/harness/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/harness/wptrunner/browsers/firefox.py
@@ -61,6 +61,8 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
                 executor_kwargs["timeout_multiplier"] = 2
         elif run_info_data["debug"]:
             executor_kwargs["timeout_multiplier"] = 3
+        elif test_type == "reftest":
+            executor_kwargs["timeout_multiplier"] = 2
     return executor_kwargs
 
 
diff --git a/testing/web-platform/harness/wptrunner/browsers/servo.py b/testing/web-platform/harness/wptrunner/browsers/servo.py
index 1ae9b7ea77b8f3..dce012d1a549e8 100644
--- a/testing/web-platform/harness/wptrunner/browsers/servo.py
+++ b/testing/web-platform/harness/wptrunner/browsers/servo.py
@@ -27,7 +27,8 @@ def check_args(**kwargs):
 def browser_kwargs(**kwargs):
     return {"binary": kwargs["binary"],
             "debug_info": kwargs["debug_info"],
-            "user_stylesheets": kwargs.get("user_stylesheets")}
+            "user_stylesheets": kwargs.get("user_stylesheets"),
+            "render_backend": kwargs.get("servo_backend")}
 
 
 def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
@@ -46,14 +47,21 @@ def env_options():
             "supports_debugger": True}
 
 
+def render_arg(render_backend):
+    return {"cpu": "--cpu"}[render_backend]
+
+
 class ServoBrowser(NullBrowser):
-    def __init__(self, logger, binary, debug_info=None, user_stylesheets=None):
+    def __init__(self, logger, binary, debug_info=None, user_stylesheets=None,
+                 render_backend="cpu"):
         NullBrowser.__init__(self, logger)
         self.binary = binary
         self.debug_info = debug_info
         self.user_stylesheets = user_stylesheets or []
+        self.render_backend = render_backend
 
     def executor_browser(self):
         return ExecutorBrowser, {"binary": self.binary,
                                  "debug_info": self.debug_info,
-                                 "user_stylesheets": self.user_stylesheets}
+                                 "user_stylesheets": self.user_stylesheets,
+                                 "render_backend": self.render_backend}
diff --git a/testing/web-platform/harness/wptrunner/browsers/servodriver.py b/testing/web-platform/harness/wptrunner/browsers/servodriver.py
index 7df28797efbb4e..9a7dd4eeda6b18 100644
--- a/testing/web-platform/harness/wptrunner/browsers/servodriver.py
+++ b/testing/web-platform/harness/wptrunner/browsers/servodriver.py
@@ -9,6 +9,7 @@
 from mozprocess import ProcessHandler
 
 from .base import Browser, require_arg, get_free_port, browser_command, ExecutorBrowser
+from .servo import render_arg
 from ..executors import executor_kwargs as base_executor_kwargs
 from ..executors.executorservodriver import (ServoWebDriverTestharnessExecutor,
                                              ServoWebDriverRefTestExecutor)
@@ -39,7 +40,9 @@ def check_args(**kwargs):
 
 def browser_kwargs(**kwargs):
     return {"binary": kwargs["binary"],
-            "debug_info": kwargs["debug_info"]}
+            "debug_info": kwargs["debug_info"],
+            "user_stylesheets": kwargs.get("user_stylesheets"),
+            "render_backend": kwargs.get("servo_backend")}
 
 
 def executor_kwargs(test_type, server_config, cache_manager, run_info_data, **kwargs):
@@ -66,7 +69,8 @@ def make_hosts_file():
 class ServoWebDriverBrowser(Browser):
     used_ports = set()
 
-    def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1"):
+    def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1",
+                 user_stylesheets=None, render_backend="cpu"):
         Browser.__init__(self, logger)
         self.binary = binary
         self.webdriver_host = webdriver_host
@@ -75,6 +79,8 @@ def __init__(self, logger, binary, debug_info=None, webdriver_host="127.0.0.1"):
         self.debug_info = debug_info
         self.hosts_path = make_hosts_file()
         self.command = None
+        self.user_stylesheets = user_stylesheets if user_stylesheets else []
+        self.render_backend = render_backend
 
     def start(self):
         self.webdriver_port = get_free_port(4444, exclude=self.used_ports)
@@ -82,13 +88,17 @@ def start(self):
 
         env = os.environ.copy()
         env["HOST_FILE"] = self.hosts_path
+        env["RUST_BACKTRACE"] = "1"
 
         debug_args, command = browser_command(self.binary,
-                                              ["--cpu", "--hard-fail",
+                                              [render_arg(self.render_backend), "--hard-fail",
                                                "--webdriver", str(self.webdriver_port),
                                                "about:blank"],
                                               self.debug_info)
 
+        for stylesheet in self.user_stylesheets:
+            command += ["--user-stylesheet", stylesheet]
+
         self.command = command
 
         self.command = debug_args + self.command
diff --git a/testing/web-platform/harness/wptrunner/executors/executorservo.py b/testing/web-platform/harness/wptrunner/executors/executorservo.py
index 649e4e0ba18d50..5445feea82f437 100644
--- a/testing/web-platform/harness/wptrunner/executors/executorservo.py
+++ b/testing/web-platform/harness/wptrunner/executors/executorservo.py
@@ -22,6 +22,12 @@
                    reftest_result_converter)
 from .process import ProcessTestExecutor
 from ..browsers.base import browser_command
+render_arg = None
+
+
+def do_delayed_imports():
+    global render_arg
+    from ..browsers.servo import render_arg
 
 hosts_text = """127.0.0.1 web-platform.test
 127.0.0.1 www.web-platform.test
@@ -37,11 +43,13 @@ def make_hosts_file():
         f.write(hosts_text)
     return hosts_path
 
+
 class ServoTestharnessExecutor(ProcessTestExecutor):
     convert_result = testharness_result_converter
 
     def __init__(self, browser, server_config, timeout_multiplier=1, debug_info=None,
                  pause_after_test=False):
+        do_delayed_imports()
         ProcessTestExecutor.__init__(self, browser, server_config,
                                      timeout_multiplier=timeout_multiplier,
                                      debug_info=debug_info)
@@ -62,7 +70,8 @@ def do_test(self, test):
         self.result_data = None
         self.result_flag = threading.Event()
 
-        args = ["--cpu", "--hard-fail", "-u", "Servo/wptrunner", "-z", self.test_url(test)]
+        args = [render_arg(self.browser.render_backend), "--hard-fail", "-u", "Servo/wptrunner",
+                "-z", self.test_url(test)]
         for stylesheet in self.browser.user_stylesheets:
             args += ["--user-stylesheet", stylesheet]
         for pref in test.environment.get('prefs', {}):
@@ -78,7 +87,7 @@ def do_test(self, test):
 
         env = os.environ.copy()
         env["HOST_FILE"] = self.hosts_path
-
+        env["RUST_BACKTRACE"] = "1"
 
 
         if not self.interactive:
@@ -166,7 +175,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
 
     def __init__(self, browser, server_config, binary=None, timeout_multiplier=1,
                  screenshot_cache=None, debug_info=None, pause_after_test=False):
-
+        do_delayed_imports()
         ProcessTestExecutor.__init__(self,
                                      browser,
                                      server_config,
@@ -193,8 +202,9 @@ def screenshot(self, test):
         with TempFilename(self.tempdir) as output_path:
             debug_args, command = browser_command(
                 self.binary,
-                ["--cpu", "--hard-fail", "--exit", "-u", "Servo/wptrunner",
-                 "-Z", "disable-text-aa", "--output=%s" % output_path, full_url],
+                [render_arg(self.browser.render_backend), "--hard-fail", "--exit",
+                 "-u", "Servo/wptrunner", "-Z", "disable-text-aa",
+                 "--output=%s" % output_path, full_url],
                 self.debug_info)
 
             for stylesheet in self.browser.user_stylesheets:
@@ -207,6 +217,7 @@ def screenshot(self, test):
 
             env = os.environ.copy()
             env["HOST_FILE"] = self.hosts_path
+            env["RUST_BACKTRACE"] = "1"
 
             if not self.interactive:
                 self.proc = ProcessHandler(self.command,
diff --git a/testing/web-platform/harness/wptrunner/executors/webdriver.py b/testing/web-platform/harness/wptrunner/executors/webdriver.py
index 247f53f1d7a169..dee2a1c2337816 100644
--- a/testing/web-platform/harness/wptrunner/executors/webdriver.py
+++ b/testing/web-platform/harness/wptrunner/executors/webdriver.py
@@ -220,12 +220,11 @@ def send(self, method, url, body=None, headers=None, key=None):
         except Exception:
             # This should probably be more specific
             raise IOError
-        body = resp.read()
+        resp_body = resp.read()
 
         try:
-            data = json.loads(body)
+            data = json.loads(resp_body)
         except:
-            raise
             raise WebDriverException("Could not parse response body as JSON: %s" % body)
 
         if resp.status != 200:
@@ -345,6 +344,24 @@ def _find_element(self, strategy, selector, all):
         return rv
 
 
+class Cookies(object):
+    def __init__(self, session):
+        self.session = session
+
+    def __getitem__(self, name):
+        self.session.send_command("GET", "cookie/%s" % name, {}, key="value")
+
+    def __setitem__(self, name, value):
+        cookie = {"name": name,
+                  "value": None}
+
+        if isinstance(name, (str, unicode)):
+            cookie["value"] = value
+        elif hasattr(value, "value"):
+            cookie["value"] = value.value
+        self.session.send_command("POST", "cookie/%s" % name, {}, key="value")
+
+
 class Session(object):
     def __init__(self, host, port, url_prefix="", desired_capabilities=None, port_timeout=60,
                  extension=None):
@@ -496,7 +513,7 @@ def set_cookie(self, name, value, path=None, domain=None, secure=None, expiry=No
             body["secure"] = secure
         if expiry is not None:
             body["expiry"] = expiry
-        self.send_command("POST", "cookie", body)
+        self.send_command("POST", "cookie", {"cookie": body})
 
     def delete_cookie(self, name=None):
         if name is None:
@@ -593,7 +610,7 @@ def name(self):
         return self.session.send_command("GET", self.url("name"))
 
     @command
-    def css(self, property_name):
+    def style(self, property_name):
         return self.session.send_command("GET", self.url("css/%s" % property_name))
 
     @property
@@ -601,6 +618,10 @@ def css(self, property_name):
     def rect(self):
         return self.session.send_command("GET", self.url("rect"))
 
+    @command
+    def attribute(self, name):
+        return self.session.send_command("GET", self.url("attribute/%s" % name))
+
 class ServoExtensions(object):
     def __init__(self, session):
         self.session = session
diff --git a/testing/web-platform/harness/wptrunner/manifestinclude.py b/testing/web-platform/harness/wptrunner/manifestinclude.py
index 6fba05128de226..d9b4ee455a6d06 100644
--- a/testing/web-platform/harness/wptrunner/manifestinclude.py
+++ b/testing/web-platform/harness/wptrunner/manifestinclude.py
@@ -8,6 +8,7 @@
 representing the file and each subnode representing a subdirectory that should
 be included or excluded.
 """
+import glob
 import os
 import urlparse
 
@@ -90,29 +91,36 @@ def _add_rule(self, test_manifests, url, direction):
             variant += "?" + query
 
         maybe_path = os.path.join(rest, last)
-
-        if os.path.exists(maybe_path):
-            for manifest, data in test_manifests.iteritems():
-                rel_path = os.path.relpath(maybe_path, data["tests_path"])
-                if ".." not in rel_path.split(os.sep):
-                    url = data["url_base"] + rel_path.replace(os.path.sep, "/") + variant
-                    break
+        paths = glob.glob(maybe_path)
+
+        if paths:
+            urls = []
+            for path in paths:
+                for manifest, data in test_manifests.iteritems():
+                    rel_path = os.path.relpath(path, data["tests_path"])
+                    if ".." not in rel_path.split(os.sep):
+                        urls.append(data["url_base"] + rel_path.replace(os.path.sep, "/") + variant)
+                        break
+        else:
+            urls = [url]
 
         assert direction in ("include", "exclude")
-        components = self._get_components(url)
 
-        node = self
-        while components:
-            component = components.pop()
-            if component not in node.child_map:
-                new_node = IncludeManifest(DataNode(component))
-                node.append(new_node)
-                new_node.set("skip", node.get("skip", {}))
+        for url in urls:
+            components = self._get_components(url)
+
+            node = self
+            while components:
+                component = components.pop()
+                if component not in node.child_map:
+                    new_node = IncludeManifest(DataNode(component))
+                    node.append(new_node)
+                    new_node.set("skip", node.get("skip", {}))
 
-            node = node.child_map[component]
+                node = node.child_map[component]
 
-        skip = False if direction == "include" else True
-        node.set("skip", str(skip))
+            skip = False if direction == "include" else True
+            node.set("skip", str(skip))
 
     def add_include(self, test_manifests, url_prefix):
         """Add a rule indicating that tests under a url path
diff --git a/testing/web-platform/harness/wptrunner/wptcommandline.py b/testing/web-platform/harness/wptrunner/wptcommandline.py
index 19be4c0be72ff7..9e84d111d576b9 100644
--- a/testing/web-platform/harness/wptrunner/wptcommandline.py
+++ b/testing/web-platform/harness/wptrunner/wptcommandline.py
@@ -165,6 +165,10 @@ def create_parser(product_choices=None):
     servo_group.add_argument("--user-stylesheet",
                              default=[], action="append", dest="user_stylesheets",
                              help="Inject a user CSS stylesheet into every test.")
+    servo_group.add_argument("--servo-backend",
+                             default="cpu", choices=["cpu", "webrender"],
+                             help="Rendering backend to use with Servo.")
+
 
     parser.add_argument("test_list", nargs="*",
                         help="List of URLs for tests to run, or paths including tests to run. "
diff --git a/testing/web-platform/meta/IndexedDB/idbtransaction_objectStoreNames.html.ini b/testing/web-platform/meta/IndexedDB/idbtransaction_objectStoreNames.html.ini
new file mode 100644
index 00000000000000..cc07c7db2eaa1b
--- /dev/null
+++ b/testing/web-platform/meta/IndexedDB/idbtransaction_objectStoreNames.html.ini
@@ -0,0 +1,3 @@
+[idbtransaction_objectStoreNames.html]
+  type: testharness
+  expected: ERROR
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 05b89aeadd205b..4cd8c7044f6cb3 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -11161,6 +11161,14 @@
         "path": "IndexedDB/idbindex_get7.htm",
         "url": "/IndexedDB/idbindex_get7.htm"
       },
+      {
+        "path": "IndexedDB/idbindex_getAll.html",
+        "url": "/IndexedDB/idbindex_getAll.html"
+      },
+      {
+        "path": "IndexedDB/idbindex_getAllKeys.html",
+        "url": "/IndexedDB/idbindex_getAllKeys.html"
+      },
       {
         "path": "IndexedDB/idbindex_getKey.htm",
         "url": "/IndexedDB/idbindex_getKey.htm"
@@ -11425,6 +11433,14 @@
         "path": "IndexedDB/idbobjectstore_get7.htm",
         "url": "/IndexedDB/idbobjectstore_get7.htm"
       },
+      {
+        "path": "IndexedDB/idbobjectstore_getAll.html",
+        "url": "/IndexedDB/idbobjectstore_getAll.html"
+      },
+      {
+        "path": "IndexedDB/idbobjectstore_getAllKeys.html",
+        "url": "/IndexedDB/idbobjectstore_getAllKeys.html"
+      },
       {
         "path": "IndexedDB/idbobjectstore_index.htm",
         "url": "/IndexedDB/idbobjectstore_index.htm"
@@ -11437,6 +11453,10 @@
         "path": "IndexedDB/idbobjectstore_openCursor_invalid.htm",
         "url": "/IndexedDB/idbobjectstore_openCursor_invalid.htm"
       },
+      {
+        "path": "IndexedDB/idbobjectstore_openKeyCursor.htm",
+        "url": "/IndexedDB/idbobjectstore_openKeyCursor.htm"
+      },
       {
         "path": "IndexedDB/idbobjectstore_put.htm",
         "url": "/IndexedDB/idbobjectstore_put.htm"
@@ -11513,6 +11533,10 @@
         "path": "IndexedDB/idbtransaction_abort.htm",
         "url": "/IndexedDB/idbtransaction_abort.htm"
       },
+      {
+        "path": "IndexedDB/idbtransaction_objectStoreNames.html",
+        "url": "/IndexedDB/idbtransaction_objectStoreNames.html"
+      },
       {
         "path": "IndexedDB/idbversionchangeevent.htm",
         "url": "/IndexedDB/idbversionchangeevent.htm"
@@ -13282,8 +13306,12 @@
         "url": "/dom/collections/HTMLCollection-supported-property-names.html"
       },
       {
-        "path": "dom/collections/storage-supported-property-names.html",
-        "url": "/dom/collections/storage-supported-property-names.html"
+        "path": "dom/collections/domstringmap-supported-property-names.html",
+        "url": "/dom/collections/domstringmap-supported-property-names.html"
+      },
+      {
+        "path": "dom/collections/namednodemap-supported-property-names.html",
+        "url": "/dom/collections/namednodemap-supported-property-names.html"
       },
       {
         "path": "dom/events/Event-constants.html",
@@ -13709,6 +13737,10 @@
         "path": "dom/nodes/Element-getElementsByClassName.html",
         "url": "/dom/nodes/Element-getElementsByClassName.html"
       },
+      {
+        "path": "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html",
+        "url": "/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html"
+      },
       {
         "path": "dom/nodes/Element-getElementsByTagName.html",
         "url": "/dom/nodes/Element-getElementsByTagName.html"
@@ -13837,6 +13869,10 @@
         "path": "dom/nodes/Node-contains.html",
         "url": "/dom/nodes/Node-contains.html"
       },
+      {
+        "path": "dom/nodes/Node-contains.xml",
+        "url": "/dom/nodes/Node-contains.xml"
+      },
       {
         "path": "dom/nodes/Node-insertBefore.html",
         "url": "/dom/nodes/Node-insertBefore.html"
@@ -13973,6 +14009,14 @@
         "path": "dom/nodes/getElementsByClassName-09.htm",
         "url": "/dom/nodes/getElementsByClassName-09.htm"
       },
+      {
+        "path": "dom/nodes/getElementsByClassName-10.xml",
+        "url": "/dom/nodes/getElementsByClassName-10.xml"
+      },
+      {
+        "path": "dom/nodes/getElementsByClassName-11.xml",
+        "url": "/dom/nodes/getElementsByClassName-11.xml"
+      },
       {
         "path": "dom/nodes/getElementsByClassName-12.htm",
         "url": "/dom/nodes/getElementsByClassName-12.htm"
@@ -17909,6 +17953,10 @@
         "path": "html/semantics/forms/the-select-element/common-HTMLOptionsCollection.html",
         "url": "/html/semantics/forms/the-select-element/common-HTMLOptionsCollection.html"
       },
+      {
+        "path": "html/semantics/forms/the-select-element/select-ask-for-reset.html",
+        "url": "/html/semantics/forms/the-select-element/select-ask-for-reset.html"
+      },
       {
         "path": "html/semantics/forms/the-select-element/select-named-getter.html",
         "url": "/html/semantics/forms/the-select-element/select-named-getter.html"
@@ -18473,6 +18521,10 @@
         "path": "html/webappapis/animation-frames/callback-invoked.html",
         "url": "/html/webappapis/animation-frames/callback-invoked.html"
       },
+      {
+        "path": "html/webappapis/animation-frames/callback-multicalls.html",
+        "url": "/html/webappapis/animation-frames/callback-multicalls.html"
+      },
       {
         "path": "html/webappapis/animation-frames/cancel-invoked.html",
         "url": "/html/webappapis/animation-frames/cancel-invoked.html"
@@ -18497,6 +18549,10 @@
         "path": "html/webappapis/scripting/events/body-onload.html",
         "url": "/html/webappapis/scripting/events/body-onload.html"
       },
+      {
+        "path": "html/webappapis/scripting/events/event-handler-attributes-body-window.html",
+        "url": "/html/webappapis/scripting/events/event-handler-attributes-body-window.html"
+      },
       {
         "path": "html/webappapis/scripting/events/event-handler-javascript.html",
         "url": "/html/webappapis/scripting/events/event-handler-javascript.html"
@@ -26141,10 +26197,6 @@
         "path": "shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html",
         "url": "/shadow-dom/untriaged/user-interaction/ranges-and-selections/test-002.html"
       },
-      {
-        "path": "subresource-integrity/subresource-integrity.html",
-        "url": "/subresource-integrity/subresource-integrity.html"
-      },
       {
         "path": "touch-events/create-touch-touchlist.html",
         "url": "/touch-events/create-touch-touchlist.html"
@@ -27617,6 +27669,10 @@
         "path": "webstorage/storage_string_conversion.html",
         "url": "/webstorage/storage_string_conversion.html"
       },
+      {
+        "path": "webstorage/storage_supported_property_names.html",
+        "url": "/webstorage/storage_supported_property_names.html"
+      },
       {
         "path": "webvtt/interfaces.html",
         "url": "/webvtt/interfaces.html"
@@ -29739,6 +29795,15 @@
       }
     ],
     "wdspec": [
+      {
+        "path": "webdriver/command_contexts/open_and_close_window_test.py"
+      },
+      {
+        "path": "webdriver/command_contexts/window_handle_test.py"
+      },
+      {
+        "path": "webdriver/command_contexts/window_size_test.py"
+      },
       {
         "path": "webdriver/cookie/cookie_test.py"
       },
@@ -29751,6 +29816,12 @@
       {
         "path": "webdriver/element_state/method_test.py"
       },
+      {
+        "path": "webdriver/element_state/properties.py"
+      },
+      {
+        "path": "webdriver/element_state/selected_test.py"
+      },
       {
         "path": "webdriver/element_state/visibility_test.py"
       },
@@ -29781,6 +29852,12 @@
       {
         "path": "webdriver/navigation/refresh-page.py"
       },
+      {
+        "path": "webdriver/navigation/refresh_page.py"
+      },
+      {
+        "path": "webdriver/screenshot/take_screenshot.py"
+      },
       {
         "path": "webdriver/timeouts/implicit_waits_tests.py"
       },
@@ -29789,21 +29866,24 @@
       },
       {
         "path": "webdriver/user_input/clear_test.py"
+      },
+      {
+        "path": "webdriver/user_input/click_test.py"
+      },
+      {
+        "path": "webdriver/user_input/sendkeys_test.py"
+      },
+      {
+        "path": "webdriver/windows/tabbing.py"
+      },
+      {
+        "path": "webdriver/windows/window_manipulation.py"
       }
     ]
   },
   "local_changes": {
     "deleted": [],
-    "items": {
-      "testharness": {
-        "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html": [
-          {
-            "path": "dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html",
-            "url": "/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html"
-          }
-        ]
-      }
-    },
+    "items": {},
     "reftest_nodes": {}
   },
   "reftest_nodes": {
@@ -31535,6 +31615,18 @@
         "url": "/html/rendering/bindings/the-textarea-element-0/rows-zero.html"
       }
     ],
+    "html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html": [
+      {
+        "path": "html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html",
+        "references": [
+          [
+            "/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html",
+            "=="
+          ]
+        ],
+        "url": "/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html"
+      }
+    ],
     "html/rendering/non-replaced-elements/flow-content-0/figure.html": [
       {
         "path": "html/rendering/non-replaced-elements/flow-content-0/figure.html",
@@ -35328,7 +35420,7 @@
       }
     ]
   },
-  "rev": "886dea2c3dbb79925360319a6a0f662ce196ab3c",
+  "rev": "a5f15d6bdbeeec010465dc906e542873d64797ec",
   "url_base": "/",
   "version": 2
-}
\ No newline at end of file
+}
diff --git a/testing/web-platform/meta/XMLHttpRequest/send-usp.html.ini b/testing/web-platform/meta/XMLHttpRequest/send-usp.html.ini
deleted file mode 100644
index b6b1b0a98d34e4..00000000000000
--- a/testing/web-platform/meta/XMLHttpRequest/send-usp.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[send-usp.html]
-  type: testharness
-  [XMLHttpRequest.send(URLSearchParams) (0)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/XMLHttpRequest/send-usp.worker.js.ini b/testing/web-platform/meta/XMLHttpRequest/send-usp.worker.js.ini
deleted file mode 100644
index 6e5a5b90985b6b..00000000000000
--- a/testing/web-platform/meta/XMLHttpRequest/send-usp.worker.js.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[send-usp.worker]
-  type: testharness
-  [XMLHttpRequest.send(URLSearchParams) (0)]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini
index b199ef1eaf656a..f749c1894f891a 100644
--- a/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.ini
@@ -7,3 +7,6 @@
   [Violation report status OK.]
     expected: FAIL
 
+  [Inline script without hash in CSP]
+    expected: NOTRUN
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.ini
deleted file mode 100644
index 0b0b52892bfdc0..00000000000000
--- a/testing/web-platform/meta/content-security-policy/blink-contrib/self-doesnt-match-blob.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[self-doesnt-match-blob.sub.html]
-  type: testharness
-  [Violation report status OK.]
-    expected: PASS
-
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini
index b4b7dd9e89fa4c..06626136a9d2a0 100644
--- a/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/shared-worker-connect-src-blocked.sub.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Expecting alerts: ["xhr blocked","TEST COMPLETE"\]]
     expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini
index 698eadb9cfd53e..0c9ff93db3c0ad 100644
--- a/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/blink-contrib/worker-connect-src-blocked.sub.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Expecting alerts: ["xhr blocked","TEST COMPLETE"\]]
     expected: FAIL
+
diff --git a/testing/web-platform/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini
index 12818a357541e2..fccf9a0c740976 100644
--- a/testing/web-platform/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/child-src/child-src-blocked.sub.html.ini
@@ -1,9 +1,5 @@
 [child-src-blocked.sub.html]
   type: testharness
-
   [Expecting logs: ["PASS IFrame #1 generated a load event."\]]
     expected: FAIL
 
-  [Violation report status OK.]
-    expected: PASS
-
diff --git a/testing/web-platform/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini b/testing/web-platform/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini
index cca6fefdeff5b1..4b82af0595fd1a 100644
--- a/testing/web-platform/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/child-src/child-src-cross-origin-load.sub.html.ini
@@ -2,13 +2,6 @@
   type: testharness
   disabled:
     if e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1209756
-
   [Expecting logs: ["PASS IFrame #1 generated a load event.","PASS IFrame #2 generated a load event.","PASS IFrame #3 generated a load event."\]]
     expected: FAIL
 
-  [Expecting alerts: ["PASS","PASS"\]]
-    expected: PASS
-
-  [Violation report status OK.]
-    expected: PASS
-
diff --git a/testing/web-platform/meta/content-security-policy/child-src/child-src-worker-blocked.sub.html.ini b/testing/web-platform/meta/content-security-policy/child-src/child-src-worker-blocked.sub.html.ini
deleted file mode 100644
index 87e7004a2cb6dc..00000000000000
--- a/testing/web-platform/meta/content-security-policy/child-src/child-src-worker-blocked.sub.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[child-src-worker-blocked.sub.html]
-  type: testharness
-  [Expecting alerts: ["PASS"\]]
-    expected: PASS
-
-  [Violation report status OK.]
-    expected: PASS
-
diff --git a/testing/web-platform/meta/dom/collections/domstringmap-supported-property-names.html.ini b/testing/web-platform/meta/dom/collections/domstringmap-supported-property-names.html.ini
new file mode 100644
index 00000000000000..df6606f80953fd
--- /dev/null
+++ b/testing/web-platform/meta/dom/collections/domstringmap-supported-property-names.html.ini
@@ -0,0 +1,5 @@
+[domstringmap-supported-property-names.html]
+  type: testharness
+  [Object.getOwnPropertyNames on DOMStringMap, multiple data attributes]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/collections/namednodemap-supported-property-names.html.ini b/testing/web-platform/meta/dom/collections/namednodemap-supported-property-names.html.ini
new file mode 100644
index 00000000000000..08c65c5e883396
--- /dev/null
+++ b/testing/web-platform/meta/dom/collections/namednodemap-supported-property-names.html.ini
@@ -0,0 +1,11 @@
+[namednodemap-supported-property-names.html]
+  type: testharness
+  [Object.getOwnPropertyNames on NamedNodeMap]
+    expected: FAIL
+
+  [Object.getOwnPropertyNames on NamedNodeMap of input]
+    expected: FAIL
+
+  [Object.getOwnPropertyNames on NamedNodeMap after attribute removal]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/Document-createElement-namespace.html.ini b/testing/web-platform/meta/dom/nodes/Document-createElement-namespace.html.ini
new file mode 100644
index 00000000000000..9647b1f7331ea2
--- /dev/null
+++ b/testing/web-platform/meta/dom/nodes/Document-createElement-namespace.html.ini
@@ -0,0 +1,74 @@
+[Document-createElement-namespace.html]
+  type: testharness
+  [Created element's namespace in created XML document]
+    expected: FAIL
+
+  [Created element's namespace in created XHTML document]
+    expected: FAIL
+
+  [Created element's namespace in created SVG document]
+    expected: FAIL
+
+  [Created element's namespace in created MathML document]
+    expected: FAIL
+
+  [Created element's namespace in empty.xml]
+    expected: FAIL
+
+  [Created element's namespace in empty.svg]
+    expected: FAIL
+
+  [Created element's namespace in minimal_html.xml]
+    expected: FAIL
+
+  [Created element's namespace in minimal_html.svg]
+    expected: FAIL
+
+  [Created element's namespace in xhtml.xml]
+    expected: FAIL
+
+  [Created element's namespace in xhtml.svg]
+    expected: FAIL
+
+  [Created element's namespace in svg.xml]
+    expected: FAIL
+
+  [Created element's namespace in svg.svg]
+    expected: FAIL
+
+  [Created element's namespace in mathml.xml]
+    expected: FAIL
+
+  [Created element's namespace in mathml.svg]
+    expected: FAIL
+
+  [Created element's namespace in bare_xhtml.xml]
+    expected: FAIL
+
+  [Created element's namespace in bare_xhtml.svg]
+    expected: FAIL
+
+  [Created element's namespace in bare_svg.xml]
+    expected: FAIL
+
+  [Created element's namespace in bare_svg.svg]
+    expected: FAIL
+
+  [Created element's namespace in bare_mathml.xml]
+    expected: FAIL
+
+  [Created element's namespace in bare_mathml.svg]
+    expected: FAIL
+
+  [Created element's namespace in xhtml_ns_removed.xml]
+    expected: FAIL
+
+  [Created element's namespace in xhtml_ns_removed.svg]
+    expected: FAIL
+
+  [Created element's namespace in xhtml_ns_changed.xml]
+    expected: FAIL
+
+  [Created element's namespace in xhtml_ns_changed.svg]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini b/testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini
index 750fe3e09d9748..260510ed1ac725 100644
--- a/testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini
+++ b/testing/web-platform/meta/dom/nodes/Node-lookupNamespaceURI.html.ini
@@ -39,3 +39,9 @@
   [For document, xhtml namespace is default]
     expected: FAIL
 
+  [Document should have xhtml namespace, prefix null]
+    expected: FAIL
+
+  [Document should have xhtml namespace, prefix ""]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html.ini
index 9e5d31c2cb0085..25b44ce97e3316 100644
--- a/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html.ini
+++ b/testing/web-platform/meta/html/browsers/browsing-the-web/history-traversal/browsing_context_name.html.ini
@@ -1,7 +1,7 @@
 [browsing_context_name.html]
   type: testharness
   disabled:
-    if os == "linux" and debug and bits == 32: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if (os == "linux") and debug and (bits == 32): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Retaining window.name on history traversal]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
index 41d2ed65d12a24..8b2da7649a01bc 100644
--- a/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
+++ b/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
@@ -3,3 +3,6 @@
   [Triggering navigation from withing beforeunload event]
     expected: FAIL
 
+  [Triggering navigation from within beforeunload event]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/008.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/008.html.ini
deleted file mode 100644
index 91e68dbe7db3b0..00000000000000
--- a/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[008.html]
-  type: testharness
-  disabled:
-    if os == "linux" and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
diff --git a/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/009.html.ini b/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/009.html.ini
deleted file mode 100644
index ba705668d8b548..00000000000000
--- a/testing/web-platform/meta/html/browsers/browsing-the-web/unloading-documents/unload/009.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[009.html]
-  type: testharness
-  disabled:
-    if os == "linux" and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
diff --git a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index ffc47f91636d07..db91b39cbbb226 100644
--- a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,6 +1,5 @@
 [traverse_the_history_4.html]
   type: testharness
   [Multiple history traversals, last would be aborted]
-    expected:
-      FAIL
+    expected: FAIL
 
diff --git a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html.ini b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html.ini
index 76c011297eca56..a8f62e3b75a999 100644
--- a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html.ini
+++ b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_after_load_1.html.ini
@@ -1,7 +1,7 @@
 [traverse_the_history_write_after_load_1.html]
   type: testharness
   disabled:
-    if os == "linux" and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if (os == "linux") and debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Traverse the history after document.write after the load event]
     expected:
       if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
index cdc17def95be5e..27736b1b64753e 100644
--- a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
+++ b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
@@ -1,7 +1,7 @@
 [traverse_the_history_write_onload_1.html]
   type: testharness
   disabled:
-    if debug or (os == "linux" and  bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if debug or ((os == "linux") and (bits == 64)): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Traverse the history when a history entry is written in the load event]
     expected:
       if debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html.ini b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html.ini
index 675aa30809aa74..e4dab315b08a2f 100644
--- a/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html.ini
+++ b/testing/web-platform/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_2.html.ini
@@ -1,7 +1,7 @@
 [traverse_the_history_write_onload_2.html]
   type: testharness
   disabled:
-    if debug or (os == "linux" and  bits == 64): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if debug or ((os == "linux") and (bits == 64)): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Traverse the history back and forward when a history entry is written in the load event]
     expected:
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini
deleted file mode 100644
index 74eb5cfa414573..00000000000000
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[close_beforeunload.html]
-  type: testharness
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1215800
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini
deleted file mode 100644
index 1ee1a84cfe4745..00000000000000
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[close_unload.html]
-  type: testharness
-  disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1215800
diff --git a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index 387541511fcd99..6149850d039e78 100644
--- a/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/testing/web-platform/meta/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,7 +1,7 @@
 [creating_browsing_context_test_01.html]
   type: testharness
   disabled:
-    if (os == "linux" and bits == 64) or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if ((os == "linux") and (bits == 64)) or debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   expected:
     if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
     if not debug and not e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
diff --git a/testing/web-platform/meta/html/browsers/windows/browsing-context-names/002.html.ini b/testing/web-platform/meta/html/browsers/windows/browsing-context-names/002.html.ini
index 6e8b872dcef0fb..656c2a8829a211 100644
--- a/testing/web-platform/meta/html/browsers/windows/browsing-context-names/002.html.ini
+++ b/testing/web-platform/meta/html/browsers/windows/browsing-context-names/002.html.ini
@@ -1,7 +1,7 @@
 [002.html]
   type: testharness
   disabled:
-    if debug or os == "win": https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
+    if debug or (os == "win"): https://bugzilla.mozilla.org/show_bug.cgi?id=1215461
   [Link with target=_blank, no rel]
     expected:
       if debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini b/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini
index 1df7bd3dc0b96e..f69e19be25e9c4 100644
--- a/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini
+++ b/testing/web-platform/meta/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini
@@ -1,8 +1,8 @@
 [frameElement.sub.html]
   type: testharness
-  [The window's frameElement attribute must return its container element if it is a nested browsing context]
+  [The SecurityError must be thrown if the container's document does not have the same effective script origin]
     expected: FAIL
 
-  [The SecurityError must be thrown if the container's document does not have the same effective script origin]
+  [The SecurityError must be thrown if the window accesses to frameElement attribute of a Window which does not have the same effective script origin]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
index 8ff2999a2def0f..259477aab6c500 100644
--- a/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
+++ b/testing/web-platform/meta/html/dom/elements/elements-in-the-dom/unknown-element.html.ini
@@ -1,6 +1,4 @@
 [unknown-element.html]
   type: testharness
   expected:
-    if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
     if not debug and e10s and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86") and (bits == 32): TIMEOUT
diff --git a/testing/web-platform/meta/html/dom/interfaces.html.ini b/testing/web-platform/meta/html/dom/interfaces.html.ini
index 00d2b7e552f4a8..94328492ca3d3d 100644
--- a/testing/web-platform/meta/html/dom/interfaces.html.ini
+++ b/testing/web-platform/meta/html/dom/interfaces.html.ini
@@ -2728,3 +2728,42 @@
   [Document interface: document.implementation.createDocument(null, "", null) must inherit property "ontoggle" with the proper type (154)]
     expected: FAIL
 
+  [HTMLAnchorElement interface: attribute origin]
+    expected: FAIL
+
+  [HTMLAreaElement interface: attribute origin]
+    expected: FAIL
+
+  [Location interface: window.location must have own property "origin"]
+    expected: FAIL
+
+  [Location interface: window.location must have own property "ancestorOrigins"]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute href]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute origin]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute protocol]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute host]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute hostname]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute port]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute pathname]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute search]
+    expected: FAIL
+
+  [WorkerLocation interface: attribute hash]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html.ini b/testing/web-platform/meta/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html.ini
index 1ee7a434cb21f6..784104d9d342e8 100644
--- a/testing/web-platform/meta/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html.ini
+++ b/testing/web-platform/meta/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html.ini
@@ -9,6 +9,3 @@
   [The HTMLFormControlsCollection interface is used for collections of listed elements in fieldset element]
     expected: FAIL
 
-  [The controls in the form element must be sorted in tree order]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html.ini b/testing/web-platform/meta/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html.ini
deleted file mode 100644
index b380dcc6fc20d5..00000000000000
--- a/testing/web-platform/meta/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[script-IDL-event-htmlfor.html]
-  type: testharness
-  [event and htmlFor IDL attributes of HTMLScriptElement 1]
-    expected: FAIL
-
-  [event and htmlFor IDL attributes of HTMLScriptElement 2]
-    expected: FAIL
-
-  [event and htmlFor IDL attributes of HTMLScriptElement 3]
-    expected: FAIL
-
-  [event and htmlFor IDL attributes of HTMLScriptElement 4]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-tooLong.html.ini b/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-tooLong.html.ini
deleted file mode 100644
index 92c942b5a95a17..00000000000000
--- a/testing/web-platform/meta/html/semantics/forms/constraints/form-validation-validity-tooLong.html.ini
+++ /dev/null
@@ -1,74 +0,0 @@
-[form-validation-validity-tooLong.html]
-  type: testharness
-  [[INPUT in TEXT status\] Dirty value - length of value is greater than maxlength]
-    expected: FAIL
-
-  [[INPUT in SEARCH status\] Dirty value - length of value is greater than maxlength]
-    expected: FAIL
-
-  [[INPUT in TEL status\] Dirty value - length of value is greater than maxlength]
-    expected: FAIL
-
-  [[INPUT in URL status\] Dirty value - length of value is greater than maxlength]
-    expected: FAIL
-
-  [[INPUT in PASSWORD status\] Dirty value - length of value is greater than maxlength]
-    expected: FAIL
-
-  [[textarea\]  Dirty value - length of value is greater than maxlength]
-    expected: FAIL
-
-  [[INPUT in TEXT status\] Dirty value - value is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in TEXT status\] Dirty value - length of value(AAA) in unicode is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in TEXT status\] Dirty value - value equals to maxlength]
-    expected: FAIL
-
-  [[INPUT in SEARCH status\] Dirty value - value is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in SEARCH status\] Dirty value - length of value(AAA) in unicode is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in SEARCH status\] Dirty value - value equals to maxlength]
-    expected: FAIL
-
-  [[INPUT in TEL status\] Dirty value - value is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in TEL status\] Dirty value - length of value(AAA) in unicode is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in TEL status\] Dirty value - value equals to maxlength]
-    expected: FAIL
-
-  [[INPUT in URL status\] Dirty value - value is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in URL status\] Dirty value - length of value(AAA) in unicode is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in URL status\] Dirty value - value equals to maxlength]
-    expected: FAIL
-
-  [[INPUT in PASSWORD status\] Dirty value - value is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in PASSWORD status\] Dirty value - length of value(AAA) in unicode is less than maxlength]
-    expected: FAIL
-
-  [[INPUT in PASSWORD status\] Dirty value - value equals to maxlength]
-    expected: FAIL
-
-  [[textarea\]  Dirty value - value is less than maxlength]
-    expected: FAIL
-
-  [[textarea\]  Dirty value - length of value(LF, CRLF) in unicode is less than maxlength]
-    expected: FAIL
-
-  [[textarea\]  Dirty value - length of value equals to maxlength]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini b/testing/web-platform/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
new file mode 100644
index 00000000000000..977b550e2c1fff
--- /dev/null
+++ b/testing/web-platform/meta/html/webappapis/scripting/events/event-handler-attributes-body-window.html.ini
@@ -0,0 +1,5 @@
+[event-handler-attributes-body-window.html]
+  type: testharness
+  [storage]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
index d5db08ca72619b..6acac7fd907507 100644
--- a/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/cross-origin-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -10,4 +10,3 @@
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
-
diff --git a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
index 347a8713a9fdae..8c8fd88ca23593 100644
--- a/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/http-csp/same-host-http/picture-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -10,4 +10,3 @@
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
-
diff --git a/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
index 04898ba9781208..7143d234741389 100644
--- a/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/meta-csp/same-host-http/object-tag/top-level/no-redirect/opt-in-blocks.https.html.ini
@@ -2,5 +2,5 @@
   type: testharness
   expected: TIMEOUT
   [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: object-tag\n                                 expectation: blocked]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
index 799abec55ec200..8f48daf76a4618 100644
--- a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/cross-origin-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -11,4 +11,3 @@
       if not debug and e10s and (os == "linux") and (version == "Ubuntu 12.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
-
diff --git a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
index 6037392bb16320..7c3f3c1a883169 100644
--- a/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
+++ b/testing/web-platform/meta/mixed-content/blockable/no-opt-in/same-host-http/picture-tag/top-level/no-redirect/no-opt-in-blocks.https.html.ini
@@ -10,4 +10,3 @@
       if debug and (os == "mac") and (version == "OS X 10.10.2") and (processor == "x86_64") and (bits == 64): FAIL
       if debug and not e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
 
-
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index 86e00e39b3258e..e9fb93bd84aa0f 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1 +1 @@
-0b6a123899da549977c73b35cf42d69daa94d823
\ No newline at end of file
+1e125923b6586c58492f54dc396e6cbfd09c6ae2
\ No newline at end of file
diff --git a/testing/web-platform/meta/quirks-mode/percentage-height-calculation.html.ini b/testing/web-platform/meta/quirks-mode/percentage-height-calculation.html.ini
index 2d0b5b2a6d917d..bab0aa441ff610 100644
--- a/testing/web-platform/meta/quirks-mode/percentage-height-calculation.html.ini
+++ b/testing/web-platform/meta/quirks-mode/percentage-height-calculation.html.ini
@@ -14,3 +14,4 @@
 
   [The percentage height calculation quirk, <HTML xmlns="{html}"><head><style>#test { height:100% }</style></head><body><div id="test"/></body></HTML>]
     expected: FAIL
+
diff --git a/testing/web-platform/meta/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html.ini b/testing/web-platform/meta/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html.ini
index 7aa29916859f90..859501787731bd 100644
--- a/testing/web-platform/meta/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html.ini
+++ b/testing/web-platform/meta/selectors-api/tests/submissions/Opera/ParentNode-query-queryAll.html.ini
@@ -2580,3 +2580,33 @@
   [In-document.query: Syntax, group of selectors separator, no whitespace (1) (with no refNodes): #group em,#group strong]
     expected: FAIL
 
+  [In-document.queryAll: Class selector, matching element with class value using non-ASCII characters (2) (with no refNodes): .台北Táiběi]
+    expected: FAIL
+
+  [In-document.query: Class selector, matching element with class value using non-ASCII characters (2) (with no refNodes): .台北Táiběi]
+    expected: FAIL
+
+  [In-document.queryAll: Class selector, chained, matching element with multiple class values using non-ASCII characters (2) (with no refNodes): .台北Táiběi.台北]
+    expected: FAIL
+
+  [In-document.query: Class selector, chained, matching element with multiple class values using non-ASCII characters (2) (with no refNodes): .台北Táiběi.台北]
+    expected: FAIL
+
+  [In-document.queryAll: ID selector, matching id value using non-ASCII characters (3) (with no refNodes): #台北Táiběi]
+    expected: FAIL
+
+  [In-document.query: ID selector, matching id value using non-ASCII characters (3) (with no refNodes): #台北Táiběi]
+    expected: FAIL
+
+  [In-document.queryAll: ID selector, matching id value using non-ASCII characters (4) (with no refNodes): #台北]
+    expected: FAIL
+
+  [In-document.query: ID selector, matching id value using non-ASCII characters (4) (with no refNodes): #台北]
+    expected: FAIL
+
+  [In-document.queryAll: ID selector, matching id values using non-ASCII characters (2) (with no refNodes): #台北Táiběi, #台北]
+    expected: FAIL
+
+  [In-document.query: ID selector, matching id values using non-ASCII characters (2) (with no refNodes): #台北Táiběi, #台北]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/url/interfaces.html.ini b/testing/web-platform/meta/url/interfaces.html.ini
index c35288b1b9d736..5797a138bf23ce 100644
--- a/testing/web-platform/meta/url/interfaces.html.ini
+++ b/testing/web-platform/meta/url/interfaces.html.ini
@@ -6,6 +6,9 @@
   [URL interface: operation domainToUnicode(ScalarValueString)]
     expected: FAIL
 
-  [URLSearchParams interface: existence and properties of interface object]
+  [URL interface: operation domainToASCII(USVString)]
+    expected: FAIL
+
+  [URL interface: operation domainToUnicode(USVString)]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/web-animations/keyframe-effect/constructor.html.ini b/testing/web-platform/meta/web-animations/keyframe-effect/constructor.html.ini
index 128447204b8ec0..15f2e5430a7d1c 100644
--- a/testing/web-platform/meta/web-animations/keyframe-effect/constructor.html.ini
+++ b/testing/web-platform/meta/web-animations/keyframe-effect/constructor.html.ini
@@ -3,51 +3,68 @@
   [easing values are parsed correctly when passed to the KeyframeEffectReadOnly constructor in KeyframeTimingOptions]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216842
+
   [composite values are parsed correctly when passed to the KeyframeEffectReadOnly constructor in PropertyIndexedKeyframes]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216843
+
   [composite values are parsed correctly when passed to the KeyframeEffectReadOnly constructor in Keyframe]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216843
+
   [composite values are parsed correctly when passed to the KeyframeEffectReadOnly constructor in KeyframeTimingOptions]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216843
+
   [a KeyframeEffectReadOnly can be constructed with a Keyframe sequence with different composite values, but the same composite value for a given offset]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216843
+
   [a KeyframeEffectReadOnly can be constructed with a one property one value PropertyIndexedKeyframes specification]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly constructed with a one property one value PropertyIndexedKeyframes specification roundtrips]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly can be constructed with a one property one non-array value PropertyIndexedKeyframes specification]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly constructed with a one property one non-array value PropertyIndexedKeyframes specification roundtrips]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly can be constructed with a one property two value PropertyIndexedKeyframes specification where the first value is invalid]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly constructed with a one property two value PropertyIndexedKeyframes specification where the first value is invalid roundtrips]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly can be constructed with a one property two value PropertyIndexedKeyframes specification where the second value is invalid]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly constructed with a one property two value PropertyIndexedKeyframes specification where the second value is invalid roundtrips]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly can be constructed with a two property PropertyIndexedKeyframes specification where one property is missing from the first Keyframe]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly constructed with a two property PropertyIndexedKeyframes specification where one property is missing from the first Keyframe roundtrips]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly can be constructed with a two property PropertyIndexedKeyframes specification where one property is missing from the last Keyframe]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
   [a KeyframeEffectReadOnly constructed with a two property PropertyIndexedKeyframes specification where one property is missing from the last Keyframe roundtrips]
     expected: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1216844
+
diff --git a/testing/web-platform/meta/webstorage/event_body_attribute.html.ini b/testing/web-platform/meta/webstorage/event_body_attribute.html.ini
index 712fa41d1c3551..e078b873d67db3 100644
--- a/testing/web-platform/meta/webstorage/event_body_attribute.html.ini
+++ b/testing/web-platform/meta/webstorage/event_body_attribute.html.ini
@@ -5,3 +5,6 @@
   [localStorage mutations fire StorageEvents that are caught by the event listener specified as an attribute on the body.]
     expected: FAIL
 
+  [sessionStorage mutations fire StorageEvents that are caught by the event listener specified as an attribute on the body.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webstorage/event_setattribute.html.ini b/testing/web-platform/meta/webstorage/event_setattribute.html.ini
index f92948cb78bcaa..541e82d46f0028 100644
--- a/testing/web-platform/meta/webstorage/event_setattribute.html.ini
+++ b/testing/web-platform/meta/webstorage/event_setattribute.html.ini
@@ -5,3 +5,6 @@
   [localStorage mutations fire StorageEvents that are caught by the event listener attached via setattribute.]
     expected: FAIL
 
+  [sessionStorage mutations fire StorageEvents that are caught by the event listener attached via setattribute.]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html.ini
index 75ed07b53965f8..48b081e539dd51 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/voice_object/voice_white-space_pre_wrapped.html.ini
@@ -1,3 +1,4 @@
 [voice_white-space_pre_wrapped.html]
   type: reftest
-  expected: FAIL
+  expected:
+    FAIL
diff --git a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini
index 7f0bbe967d129b..c1964f841053b8 100644
--- a/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini
+++ b/testing/web-platform/meta/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/white-space_pre.html.ini
@@ -1,4 +1,3 @@
 [white-space_pre.html]
   type: reftest
-  expected:
-    FAIL
+  expected: FAIL
diff --git a/testing/web-platform/meta/workers/interfaces/WorkerUtils/importScripts/004.html.ini b/testing/web-platform/meta/workers/interfaces/WorkerUtils/importScripts/004.html.ini
index 0d95be7218de52..2cf2189cd1a635 100644
--- a/testing/web-platform/meta/workers/interfaces/WorkerUtils/importScripts/004.html.ini
+++ b/testing/web-platform/meta/workers/interfaces/WorkerUtils/importScripts/004.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [importScripts broken script]
     expected: FAIL
+
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
index 7e1a48b1a1cf8b..e9a766c8f2eed3 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/fetch-request-css-base-url.https.html.ini
@@ -3,3 +3,4 @@
   bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1201160
   [CSS's base URL must be the request URL even when fetched from other URL.]
     expected: FAIL
+
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/resources/worker-interception-iframe.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/resources/worker-interception-iframe.https.html.ini
deleted file mode 100644
index 2f281012cb807e..00000000000000
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/resources/worker-interception-iframe.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[worker-interception-iframe.https.html]
-  type: testharness
-  disabled: not a test
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini
index 63f783dda6b29d..c9618db3b67c41 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-connect.https.html.ini
@@ -2,6 +2,7 @@
   type: testharness
   [Fetch test for connect-src]
     expected: FAIL
+
   [Redirected fetch test for connect-src]
     expected: FAIL
 
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini
index 362ff4dcd44972..562fe8d9452cec 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/service-worker-csp-default.https.html.ini
@@ -2,8 +2,10 @@
   type: testharness
   [importScripts test for default-src]
     expected: FAIL
+
   [Fetch test for default-src]
     expected: FAIL
+
   [Redirected fetch test for default-src]
     expected: FAIL
 
diff --git a/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini b/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini
index e5da8f09fe3a87..2402f8e5105fe8 100644
--- a/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini
+++ b/testing/web-platform/mozilla/meta/service-workers/service-worker/update-after-oneday.https.html.ini
@@ -1,2 +1,3 @@
 [update-after-oneday.https.html]
+  type: testharness
   prefs: [dom.serviceWorkers.testUpdateOverOneDay: true]
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/registration.https.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/registration.https.html
index bde78d149b17be..ae9f85fb27c5e9 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/registration.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/registration.https.html
@@ -142,7 +142,7 @@
     var scope = 'resources/scope/parse-error';
     return assert_promise_rejects(
         navigator.serviceWorker.register(script, {scope: scope}),
-        new SyntaxError(),
+        new TypeError(),
         'Registration of script including parse error should fail.');
   }, 'Registering script including parse error');
 
@@ -151,7 +151,7 @@
     var scope = 'resources/scope/undefined-error';
     return assert_promise_rejects(
         navigator.serviceWorker.register(script, {scope: scope}),
-        new ReferenceError(),
+        new TypeError(),
         'Registration of script including undefined error should fail.');
   }, 'Registering script including undefined error');
 
@@ -160,7 +160,7 @@
     var scope = 'resources/scope/uncaught-exception';
     return assert_promise_rejects(
         navigator.serviceWorker.register(script, {scope: scope}),
-        'AbortError',
+        new TypeError(),
         'Registration of script including uncaught exception should fail.');
   }, 'Registering script including uncaught exception');
 
@@ -180,7 +180,7 @@
     var scope = 'resources/scope/import-malformed-script';
     return assert_promise_rejects(
         navigator.serviceWorker.register(script, {scope: scope}),
-        new SyntaxError(),
+        new TypeError(),
         'Registration of script importing malformed script should fail.');
   }, 'Registering script importing malformed script');
 
@@ -189,7 +189,7 @@
     var scope = 'resources/scope/import-no-such-script';
     return assert_promise_rejects(
         navigator.serviceWorker.register(script, {scope: scope}),
-        'AbortError',
+        new TypeError(),
         'Registration of script importing non-existent script should fail.');
   }, 'Registering script importing non-existent script');
 
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html
index 96b363a344e379..48f618397c5cd8 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-cors-xhr-iframe.html
@@ -65,6 +65,11 @@
       [url + '?reject', true, FAIL],
       [remote_url + '?reject', false, FAIL],
       [remote_url + '?reject', true, FAIL],
+      // Event handler exception tests
+      [url + '?throw', false, FAIL],
+      [url + '?throw', true, FAIL],
+      [remote_url + '?throw', false, FAIL],
+      [remote_url + '?throw', true, FAIL],
       // Reject(resolve-null) tests
       [url + '?resolve-null', false, FAIL],
       [url + '?resolve-null', true, FAIL],
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js
index d0f75a727c312e..55431a05dcadfe 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/fetch-rewrite-worker.js
@@ -28,6 +28,9 @@ self.addEventListener('fetch', function(event) {
     if (params['ignore']) {
       return;
     }
+    if (params['throw']) {
+      throw new Error('boom');
+    }
     if (params['reject']) {
       event.respondWith(new Promise(function(resolve, reject) {
           reject();
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/update-worker.py b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/update-worker.py
index 225092f2fab22d..dbb61516977bab 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/update-worker.py
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/resources/update-worker.py
@@ -11,6 +11,7 @@ def main(request, response):
                ('Pragma', 'no-cache')]
 
     content_type = ''
+    extra_body = ''
 
     if mode == 'init':
         # Set a normal mimetype.
@@ -24,11 +25,21 @@ def main(request, response):
         response.set_cookie('mode', 'error');
     elif mode == 'error':
         # Set a disallowed mimetype.
-        # Unset and delete cookie to clean up the test setting.
+        # Set cookie value to 'syntax-error' so the next fetch will work in 'syntax-error' mode.
         content_type = 'text/html'
+        response.set_cookie('mode', 'syntax-error');
+    elif mode == 'syntax-error':
+        # Set cookie value to 'throw-install' so the next fetch will work in 'throw-install' mode.
+        content_type = 'application/javascript'
+        response.set_cookie('mode', 'throw-install');
+        extra_body = 'badsyntax(isbad;'
+    elif mode == 'throw-install':
+        # Unset and delete cookie to clean up the test setting.
+        content_type = 'application/javascript'
         response.delete_cookie('mode')
+        extra_body = "addEventListener('install', function(e) { throw new Error('boom'); });"
 
     headers.append(('Content-Type', content_type))
     # Return a different script for each access.
-    return headers, '// %s' % (time.time())
+    return headers, '/* %s */ %s' % (time.time(), extra_body)
 
diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html
index 40fa6cda177d1f..ebe6ac7e985898 100644
--- a/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html
+++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/update.https.html
@@ -69,6 +69,36 @@
                         'promise reject with a SecurityError.');
           assert_equals(registration.active.scriptURL, expected_url,
                         'active should still exist after update failure.');
+
+          // A new worker(generated by update-worker.py) should be found.
+          // The returned promise should reject as update-worker.py returns
+          // a worker script with a syntax error.
+          return registration.update();
+        })
+      .then(
+        function() { assert_unreached("update() should reject."); },
+        function(e) {
+          assert_throws({name: 'TypeError'}, function () { throw e; },
+                        'A script syntax error should make update() ' +
+                        'promise reject with a TypeError.');
+          assert_equals(registration.active.scriptURL, expected_url,
+                        'active should still exist after update failure.');
+
+          // A new worker(generated by update-worker.py) should be found.
+          // The returned promise should not reject, even though
+          // update-worker.py returns a worker script that throws in the
+          // install event handler.
+          return Promise.all([registration.update(),
+                              wait_for_update(t, registration)]);
+        })
+      .then(function() {
+          assert_equals(registration.installing.scriptURL, expected_url,
+                        'new installing should be set after update resolves.');
+          assert_equals(registration.waiting, null,
+                        'waiting should be null after activated.');
+          assert_equals(registration.active.scriptURL, expected_url,
+                        'active should still exist after update found.');
+
           return service_worker_unregister_and_done(t, scope);
         });
   }, 'Update a registration.');
diff --git a/testing/web-platform/tests/.gitignore b/testing/web-platform/tests/.gitignore
index 72908a311d8611..7728bbdc3c4706 100644
--- a/testing/web-platform/tests/.gitignore
+++ b/testing/web-platform/tests/.gitignore
@@ -9,3 +9,4 @@ config.json
 node_modules
 scratch
 testharness_runner.html
+webdriver/.idea
diff --git a/testing/web-platform/tests/IndexedDB/idbindex_getAll.html b/testing/web-platform/tests/IndexedDB/idbindex_getAll.html
new file mode 100644
index 00000000000000..507b6c9f860eb6
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/idbindex_getAll.html
@@ -0,0 +1,232 @@
+<!DOCTYPE html>
+<title>IndexedDB: Test IDBIndex.getAll.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({explicit_done: true});
+
+var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
+var ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
+
+function doSetup(dbName, dbVersion, onsuccess) {
+  var delete_request = indexedDB.deleteDatabase(dbName);
+  delete_request.onerror = function() {
+    assert_unreached('deleteDatabase should not fail');
+  };
+  delete_request.onsuccess = function(e) {
+    var req = indexedDB.open(dbName, dbVersion);
+    req.onsuccess = onsuccess;
+    req.onerror = function() {
+      assert_unreached('open should not fail');
+    };
+    req.onupgradeneeded = function(evt) {
+      var connection = evt.target.result;
+
+      var store = connection.createObjectStore('generated',
+            {autoIncrement: true, keyPath: 'id'});
+      var index = store.createIndex('test_idx', 'upper');
+      alphabet.forEach(function(letter) {
+        store.put({ch: letter, upper: letter.toUpperCase()});
+      });
+
+      store = connection.createObjectStore('out-of-line', null);
+      index = store.createIndex('test_idx', 'upper');
+      alphabet.forEach(function(letter) {
+        store.put({ch: letter, upper: letter.toUpperCase()}, letter);
+      });
+
+      store = connection.createObjectStore('out-of-line-not-unique', null);
+      index = store.createIndex('test_idx', 'half');
+      alphabet.forEach(function(letter) {
+        if (letter <= 'm')
+          store.put({ch: letter, half: 'first'}, letter);
+        else
+          store.put({ch: letter, half: 'second'}, letter);
+      });
+
+      store = connection.createObjectStore('out-of-line-multi', null);
+      index = store.createIndex('test_idx', 'attribs', {multiEntry: true});
+      alphabet.forEach(function(letter) {
+        attrs = [];
+        if (['a', 'e', 'i', 'o', 'u'].indexOf(letter) != -1)
+          attrs.push('vowel');
+        else
+          attrs.push('consonant');
+        if (letter == 'a')
+          attrs.push('first');
+        if (letter == 'z')
+          attrs.push('last');
+        store.put({ch: letter, attribs: attrs}, letter);
+      });
+
+      store = connection.createObjectStore('empty', null);
+      index = store.createIndex('test_idx', 'upper');
+    };
+  };
+}
+
+function createGetAllRequest(t, storeName, connection, range, maxCount) {
+    var transaction = connection.transaction(storeName, 'readonly');
+    var store = transaction.objectStore(storeName);
+    var index = store.index('test_idx');
+    var req = index.getAll(range, maxCount);
+    req.onerror = t.unreached_func('getAll request should succeed');
+    return req;
+}
+
+doSetup(location.pathname + '-IDBIndex.getAll', 1, function(evt) {
+    var connection = evt.target.result;
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection, 'C');
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), ['c']);
+          assert_array_equals(data.map(function(e) { return e.upper; }), ['C']);
+          t.done();
+      });
+    }, 'Single item get');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'empty', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAll() on empty object store should return an empty array');
+          t.done();
+      });
+    }, 'Empty object store');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), alphabet);
+          assert_array_equals(data.map(function(e) { return e.upper; }), ALPHABET);
+          t.done();
+      });
+    }, 'Get all keys');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection, undefined,
+                                    10);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'abcdefghij'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'ABCDEFGHIJ'.split(''));
+          t.done();
+      });
+    }, 'maxCount=10');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('G', 'M'));
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'ghijklm'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'GHIJKLM'.split(''));
+          t.done();
+      });
+    }, 'Get bound range');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('G', 'M'), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'ghi'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'GHI'.split(''));
+          t.done();
+      });
+    }, 'Get bound range with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+          IDBKeyRange.bound('G', 'K', false, true));
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'ghij'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'GHIJ'.split(''));
+          t.done();
+      });
+    }, 'Get upper excluded');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+          IDBKeyRange.bound('G', 'K', true, false));
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'hijk'.split(''));
+          assert_array_equals(data.map(function(e) { return e.upper; }), 'HIJK'.split(''));
+          t.done();
+      });
+    }, 'Get lower excluded');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'generated',
+          connection, IDBKeyRange.bound(4, 15), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_true(Array.isArray(data));
+          assert_equals(data.length, 0);
+          t.done();
+      });
+    }, 'Get bound range (generated) with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line',
+          connection, "Doesn't exist");
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAll() using a nonexistent key should return an empty array');
+          t.done();
+      req.onerror = t.unreached_func('getAll request should succeed');
+      });
+    }, 'Non existent key');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+          undefined, 0);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), alphabet);
+          assert_array_equals(data.map(function(e) { return e.upper; }), ALPHABET);
+          t.done();
+      });
+    }, 'maxCount=0');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line-not-unique', connection,
+                                    'first');
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), 'abcdefghijklm'.split(''));
+          assert_true(data.every(function(e) { return e.half === 'first'; }));
+          t.done();
+      });
+    }, 'Retrieve multiEntry key');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line-multi', connection,
+                                    'vowel');
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_class_string(data, 'Array', 'result should be an array');
+          assert_array_equals(data.map(function(e) { return e.ch; }), ['a', 'e', 'i', 'o', 'u']);
+          assert_array_equals(data[0].attribs, ['vowel', 'first']);
+          assert_true(data.every(function(e) { return e.attribs[0] === 'vowel'; }));
+          t.done();
+      });
+    }, 'Retrieve one key multiple values');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
+});
+
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/idbindex_getAllKeys.html b/testing/web-platform/tests/IndexedDB/idbindex_getAllKeys.html
new file mode 100644
index 00000000000000..7653a515260551
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/idbindex_getAllKeys.html
@@ -0,0 +1,207 @@
+<!DOCTYPE html>
+<title>IndexedDB: Test IDBIndex.getAllKeys.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({explicit_done: true});
+
+var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
+
+function doSetup(dbName, dbVersion, onsuccess) {
+  var delete_request = indexedDB.deleteDatabase(dbName);
+  delete_request.onerror = function() {
+    assert_unreached('deleteDatabase should not fail');
+  };
+  delete_request.onsuccess = function(e) {
+    var req = indexedDB.open(dbName, dbVersion);
+    req.onsuccess = onsuccess;
+    req.onerror = function() {
+      assert_unreached('open should not fail');
+    };
+    req.onupgradeneeded = function(evt) {
+      var connection = evt.target.result;
+
+      var store = connection.createObjectStore('generated',
+            {autoIncrement: true, keyPath: 'id'});
+      var index = store.createIndex('test_idx', 'upper');
+      alphabet.forEach(function(letter) {
+        store.put({ch: letter, upper: letter.toUpperCase()});
+      });
+
+      store = connection.createObjectStore('out-of-line', null);
+      index = store.createIndex('test_idx', 'upper');
+      alphabet.forEach(function(letter) {
+        store.put({ch: letter, upper: letter.toUpperCase()}, letter);
+      });
+
+      store = connection.createObjectStore('out-of-line-multi', null);
+      index = store.createIndex('test_idx', 'attribs', {multiEntry: true});
+      alphabet.forEach(function(letter) {
+        attrs = [];
+        if (['a', 'e', 'i', 'o', 'u'].indexOf(letter) != -1)
+          attrs.push('vowel');
+        else
+          attrs.push('consonant');
+        if (letter == 'a')
+          attrs.push('first');
+        if (letter == 'z')
+          attrs.push('last');
+        store.put({ch: letter, attribs: attrs}, letter.toUpperCase());
+      });
+
+      store = connection.createObjectStore('empty', null);
+      index = store.createIndex('test_idx', 'upper');
+    };
+  };
+}
+
+function createGetAllKeysRequest(t, storeName, connection, range, maxCount) {
+    var transaction = connection.transaction(storeName, 'readonly');
+    var store = transaction.objectStore(storeName);
+    var index = store.index('test_idx');
+    var req = index.getAllKeys(range, maxCount);
+    req.onerror = t.unreached_func('getAllKeys request should succeed');
+    return req;
+}
+
+doSetup(location.pathname + '-IDBIndex.getAllKeys', 1, function(evt) {
+    var connection = evt.target.result;
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection, 'C');
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_array_equals(evt.target.result, ['c']);
+          t.done();
+      });
+    }, 'Single item get');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'empty', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAllKeys() on empty object store should return empty array');
+          t.done();
+      });
+    }, 'Empty object store');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, alphabet,
+              'getAllKeys() should return a..z');
+          t.done();
+      });
+    }, 'Get all keys');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'generated', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+              [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+               19, 20, 21, 22, 23, 24, 25, 26],
+              'getAllKeys() should return 1..26');
+          t.done();
+      });
+    }, 'Get all generated keys');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection, undefined,
+                                    10);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+                             'abcdefghij'.split(''),
+                             'getAllKeys() should return a..j');
+          t.done();
+      });
+    }, 'maxCount=10');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('G', 'M'));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+                              'ghijklm'.split(''),
+                              'getAllKeys() should return g..m');
+          t.done();
+      });
+    }, 'Get bound range');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('G', 'M'), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+                             ['g', 'h', 'i'],
+                             'getAllKeys() should return g..i');
+          t.done();
+      });
+    }, 'Get bound range with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+          IDBKeyRange.bound('G', 'K', false, true));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+                             ['g', 'h', 'i', 'j'],
+                             'getAllKeys() should return g..j');
+          t.done();
+      });
+    }, 'Get upper excluded');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+          IDBKeyRange.bound('G', 'K', true, false));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+                             ['h', 'i', 'j', 'k'],
+                             'getAllKeys() should return h..k');
+          t.done();
+      });
+    }, 'Get lower excluded');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'generated',
+          connection, IDBKeyRange.bound(4, 15), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+                              'getAllKeys() should return []');
+          t.done();
+      });
+    }, 'Get bound range (generated) with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line',
+          connection, "Doesn't exist");
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAllKeys() using a nonexistent key should return empty array');
+          t.done();
+      req.onerror = t.unreached_func('getAllKeys request should succeed');
+      });
+    }, 'Non existent key');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+          undefined, 0);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, alphabet,
+              'getAllKeys() should return a..z');
+          t.done();
+      });
+    }, 'maxCount=0');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line-multi', connection,
+                                        'vowel');
+      req.onsuccess = t.step_func(function(evt) {
+        assert_array_equals(evt.target.result, ['A','E','I','O','U'])
+        t.done();
+      });
+      req.onerror = t.unreached_func('getAllKeys request should succeed');
+    }, 'Retrieve multiEntry keys');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
+});
+
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/idbobjectstore_getAll.html b/testing/web-platform/tests/IndexedDB/idbobjectstore_getAll.html
new file mode 100644
index 00000000000000..f81e4caf3d2531
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/idbobjectstore_getAll.html
@@ -0,0 +1,174 @@
+<!DOCTYPE html>
+<title>IndexedDB: Test IDBObjectStore.getAll.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({explicit_done: true});
+
+var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
+
+function doSetup(dbName, dbVersion, onsuccess) {
+  var delete_request = indexedDB.deleteDatabase(dbName);
+  delete_request.onerror = function() {
+    assert_unreached('deleteDatabase should not fail');
+  };
+  delete_request.onsuccess = function(e) {
+    var req = indexedDB.open(dbName, dbVersion);
+    req.onsuccess = onsuccess;
+    req.onerror = function() {
+      assert_unreached('open should not fail');
+    };
+    req.onupgradeneeded = function(evt) {
+      var connection = evt.target.result;
+
+      var store = connection.createObjectStore('generated',
+            {autoIncrement: true, keyPath: 'id'});
+      alphabet.forEach(function(letter) {
+        store.put({ch: letter});
+      });
+
+      store = connection.createObjectStore('out-of-line', null);
+      alphabet.forEach(function(letter) {
+        store.put('value-' + letter, letter);
+      });
+
+      store = connection.createObjectStore('empty', null);
+    };
+  };
+}
+
+function createGetAllRequest(t, storeName, connection, range, maxCount) {
+    var transaction = connection.transaction(storeName, 'readonly');
+    var store = transaction.objectStore(storeName);
+    var req = store.getAll(range, maxCount);
+    req.onerror = t.unreached_func('getAll request should succeed');
+    return req;
+}
+
+doSetup(location.pathname + '-IDBObjectStore.getAll', 1, function(evt) {
+    var connection = evt.target.result;
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection, 'c');
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['value-c']);
+          t.done();
+      });
+    }, 'Single item get');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'generated', connection, 3);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_true(Array.isArray(data));
+          assert_equals(data.length, 1);
+          assert_equals(data[0].id, 3);
+          assert_equals(data[0].ch, 'c');
+          t.done();
+      });
+    }, 'Single item get (generated key)');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'empty', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAll() on empty object store should return an empty array');
+          t.done();
+      });
+    }, 'getAll on empty object store');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+              alphabet.map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'Get all values');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection, undefined,
+                                    10);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+              'abcdefghij'.split('').map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'Test maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'm'));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+              'ghijklm'.split('').map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'Get bound range');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'm'), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['g', 'h', 'i']
+              .map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'Get bound range with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'k', false, true));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['g', 'h', 'i', 'j']
+              .map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'Get upper excluded');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'k', true, false));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['h', 'i', 'j', 'k']
+              .map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'Get lower excluded');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'generated', connection,
+                                    IDBKeyRange.bound(4, 15), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_true(Array.isArray(data));
+          assert_array_equals(data.map(function(e) { return e.ch; }), ['d', 'e', 'f']);
+          assert_array_equals(data.map(function(e) { return e.id; }), [4, 5, 6]);
+          t.done();
+      });
+    }, 'Get bound range (generated) with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection,
+                                    "Doesn't exist");
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAll() using a nonexistent key should return an empty array');
+          t.done();
+      });
+      req.onerror = t.unreached_func('getAll request should succeed');
+    }, 'Non existent key');
+
+    async_test(function(t) {
+      var req = createGetAllRequest(t, 'out-of-line', connection, undefined, 0);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result,
+              alphabet.map(function(c) { return 'value-' + c; }));
+          t.done();
+      });
+    }, 'zero maxCount');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
+});
+
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/idbobjectstore_getAllKeys.html b/testing/web-platform/tests/IndexedDB/idbobjectstore_getAllKeys.html
new file mode 100644
index 00000000000000..f4d317d4328d4d
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/idbobjectstore_getAllKeys.html
@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<title>IndexedDB: Test IDBObjectStore.getAllKeys.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+setup({explicit_done: true});
+
+var alphabet = 'abcdefghijklmnopqrstuvwxyz'.split('');
+
+function doSetup(dbName, dbVersion, onsuccess) {
+  var delete_request = indexedDB.deleteDatabase(dbName);
+  delete_request.onerror = function() {
+    assert_unreached('deleteDatabase should not fail');
+  };
+  delete_request.onsuccess = function(e) {
+    var req = indexedDB.open(dbName, dbVersion);
+    req.onsuccess = onsuccess;
+    req.onerror = function() {
+      assert_unreached('open should not fail');
+    };
+    req.onupgradeneeded = function(evt) {
+      var connection = evt.target.result;
+
+      var store = connection.createObjectStore('generated',
+            {autoIncrement: true, keyPath: 'id'});
+      alphabet.forEach(function(letter) {
+        store.put({ch: letter});
+      });
+
+      store = connection.createObjectStore('out-of-line', null);
+      alphabet.forEach(function(letter) {
+        store.put('value-' + letter, letter);
+      });
+
+      store = connection.createObjectStore('empty', null);
+    };
+  };
+}
+
+function createGetAllKeysRequest(t, storeName, connection, range, maxCount) {
+    var transaction = connection.transaction(storeName, 'readonly');
+    var store = transaction.objectStore(storeName);
+    var req = store.getAllKeys(range, maxCount);
+    req.onerror = t.unreached_func('getAllKeys request should succeed');
+    return req;
+}
+
+doSetup(location.pathname + '-IDBObjectStore.getAllKeys', 1, function(evt) {
+    var connection = evt.target.result;
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection, 'c');
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['c']);
+          t.done();
+      });
+    }, 'Single item get');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'generated', connection, 3);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_true(Array.isArray(data));
+          assert_array_equals(data, [3]);
+          t.done();
+      });
+    }, 'Single item get (generated key)');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'empty', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAllKeys() on empty object store should return an empty ' +
+                  'array');
+          t.done();
+      });
+    }, 'getAllKeys on empty object store');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, alphabet);
+          t.done();
+      });
+    }, 'Get all values');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection, undefined,
+                                    10);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, 'abcdefghij'.split(''));
+          t.done();
+      });
+    }, 'Test maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'm'));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, 'ghijklm'.split(''));
+          t.done();
+      });
+    }, 'Get bound range');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'm'), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['g', 'h', 'i']);
+          t.done();
+      });
+    }, 'Get bound range with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'k', false, true));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['g', 'h', 'i', 'j']);
+          t.done();
+      });
+    }, 'Get upper excluded');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    IDBKeyRange.bound('g', 'k', true, false));
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, ['h', 'i', 'j', 'k']);
+          t.done();
+      });
+    }, 'Get lower excluded');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'generated', connection,
+                                    IDBKeyRange.bound(4, 15), 3);
+      req.onsuccess = t.step_func(function(evt) {
+          var data = evt.target.result;
+          assert_true(Array.isArray(data));
+          assert_array_equals(data, [4, 5, 6]);
+          t.done();
+      });
+    }, 'Get bound range (generated) with maxCount');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection,
+                                    "Doesn't exist");
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, [],
+              'getAllKeys() using a nonexistent key should return an ' +
+                  'empty array');
+          t.done();
+      });
+      req.onerror = t.unreached_func('getAllKeys request should succeed');
+    }, 'Non existent key');
+
+    async_test(function(t) {
+      var req = createGetAllKeysRequest(t, 'out-of-line', connection, undefined,
+          0);
+      req.onsuccess = t.step_func(function(evt) {
+          assert_array_equals(evt.target.result, alphabet);
+          t.done();
+      });
+    }, 'zero maxCount');
+
+    // Explicit done needed in case async_test body fails synchronously.
+    done();
+});
+
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/idbobjectstore_openKeyCursor.htm b/testing/web-platform/tests/IndexedDB/idbobjectstore_openKeyCursor.htm
new file mode 100644
index 00000000000000..9dc547c3ff968a
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/idbobjectstore_openKeyCursor.htm
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<title>IDBObjectStore.openKeyCursor()</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+function store_test(func, name) {
+    async_test(function(t) {
+        var del = indexedDB.deleteDatabase(name);
+        del.onerror = t.unreached_func("deleteDatabase failed");
+        var open = indexedDB.open(name);
+        open.onupgradeneeded = t.step_func(function() {
+            var db = open.result;
+            var store = db.createObjectStore("store");
+            for (var i = 0; i < 10; ++i) {
+                store.put("value: " + i, i);
+            }
+        });
+
+        open.onsuccess = t.step_func(function() {
+            var db = open.result;
+            var tx = db.transaction("store");
+            var store = tx.objectStore("store");
+            func(t, db, tx, store);
+        });
+    }, name);
+}
+
+store_test(function(t, db, tx, store) {
+    var expected = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+    var actual = [];
+    var request = store.openKeyCursor();
+    request.onsuccess = t.step_func(function() {
+        var cursor = request.result;
+        if (!cursor)
+            return;
+        assert_equals(cursor.direction, "next");
+        assert_false("value" in cursor);
+        assert_equals(indexedDB.cmp(cursor.key, cursor.primaryKey), 0);
+        actual.push(cursor.key);
+        cursor.continue();
+    });
+
+    tx.onabort = t.unreached_func("transaction aborted");
+    tx.oncomplete = t.step_func(function() {
+        assert_array_equals(expected, actual, "keys should match");
+        t.done();
+    });
+
+}, "IDBObjectStore.openKeyCursor() - forward iteration");
+
+store_test(function(t, db, tx, store) {
+    var expected = [9, 8, 7, 6, 5, 4, 3, 2, 1, 0];
+    var actual = [];
+    var request = store.openKeyCursor(null, "prev");
+    request.onsuccess = t.step_func(function() {
+        var cursor = request.result;
+        if (!cursor)
+            return;
+        assert_equals(cursor.direction, "prev");
+        assert_false("value" in cursor);
+        assert_equals(indexedDB.cmp(cursor.key, cursor.primaryKey), 0);
+        actual.push(cursor.key);
+        cursor.continue();
+    });
+
+    tx.onabort = t.unreached_func("transaction aborted");
+    tx.oncomplete = t.step_func(function() {
+        assert_array_equals(expected, actual, "keys should match");
+        t.done();
+    });
+
+}, "IDBObjectStore.openKeyCursor() - reverse iteration");
+
+store_test(function(t, db, tx, store) {
+    var expected = [4, 5, 6];
+    var actual = [];
+    var request = store.openKeyCursor(IDBKeyRange.bound(4, 6));
+    request.onsuccess = t.step_func(function() {
+        var cursor = request.result;
+        if (!cursor)
+            return;
+        assert_equals(cursor.direction, "next");
+        assert_false("value" in cursor);
+        assert_equals(indexedDB.cmp(cursor.key, cursor.primaryKey), 0);
+        actual.push(cursor.key);
+        cursor.continue();
+    });
+
+    tx.onabort = t.unreached_func("transaction aborted");
+    tx.oncomplete = t.step_func(function() {
+        assert_array_equals(expected, actual, "keys should match");
+        t.done();
+    });
+
+}, "IDBObjectStore.openKeyCursor() - forward iteration with range");
+
+store_test(function(t, db, tx, store) {
+    var expected = [6, 5, 4];
+    var actual = [];
+    var request = store.openKeyCursor(IDBKeyRange.bound(4, 6), "prev");
+    request.onsuccess = t.step_func(function() {
+        var cursor = request.result;
+        if (!cursor)
+            return;
+        assert_equals(cursor.direction, "prev");
+        assert_false("value" in cursor);
+        assert_equals(indexedDB.cmp(cursor.key, cursor.primaryKey), 0);
+        actual.push(cursor.key);
+        cursor.continue();
+    });
+
+    tx.onabort = t.unreached_func("transaction aborted");
+    tx.oncomplete = t.step_func(function() {
+        assert_array_equals(expected, actual, "keys should match");
+        t.done();
+    });
+
+}, "IDBObjectStore.openKeyCursor() - reverse iteration with range");
+
+store_test(function(t, db, tx, store) {
+    assert_throws("DataError", function() { store.openKeyCursor(NaN); },
+        "openKeyCursor should throw on invalid number key");
+    assert_throws("DataError", function() { store.openKeyCursor(new Date(NaN)); },
+        "openKeyCursor should throw on invalid date key");
+    assert_throws("DataError", function() {
+        var cycle = [];
+        cycle.push(cycle);
+        store.openKeyCursor(cycle);
+    }, "openKeyCursor should throw on invalid array key");
+    assert_throws("DataError", function() { store.openKeyCursor({}); },
+        "openKeyCursor should throw on invalid key type");
+    setTimeout(t.step_func(function() {
+        assert_throws("TransactionInactiveError", function() { store.openKeyCursor(); },
+            "openKeyCursor should throw if transaction is inactive");
+        t.done();
+    }), 0);
+
+}, "IDBObjectStore.openKeyCursor() - invalid inputs");
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/idbtransaction_objectStoreNames.html b/testing/web-platform/tests/IndexedDB/idbtransaction_objectStoreNames.html
new file mode 100644
index 00000000000000..b964248a692b2a
--- /dev/null
+++ b/testing/web-platform/tests/IndexedDB/idbtransaction_objectStoreNames.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<title>IndexedDB: IDBTransaction.objectStoreNames attribute</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+function indexeddb_test(upgrade_func, open_func, description) {
+    async_test(function(t) {
+        var dbname = document.location + '-' + t.name;
+        var del = indexedDB.deleteDatabase(dbname);
+        del.onerror = t.unreached_func('deleteDatabase should succeed');
+        var open = indexedDB.open(dbname, 1);
+        open.onerror = t.unreached_func('open should succeed');
+        open.onupgradeneeded = t.step_func(function() {
+            var db = open.result;
+            var tx = open.transaction;
+            upgrade_func(t, db, tx);
+        });
+        open.onsuccess = t.step_func(function() {
+            var db = open.result;
+            open_func(t, db);
+        });
+    }, description);
+}
+
+function with_stores_test(store_names, open_func, description) {
+    indexeddb_test(function(t, db, tx) {
+        store_names.forEach(function(name) {
+            db.createObjectStore(name);
+        });
+    }, open_func, description);
+}
+
+indexeddb_test(function(t, db, tx) {
+    assert_array_equals(tx.objectStoreNames, [],
+        'transaction objectStoreNames should be empty');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.createObjectStore('s1');
+    assert_array_equals(tx.objectStoreNames, ['s1'],
+        'transaction objectStoreNames should have new store');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.createObjectStore('s3');
+    assert_array_equals(tx.objectStoreNames, ['s1', 's3'],
+        'transaction objectStoreNames should have new store');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.createObjectStore('s2');
+    assert_array_equals(tx.objectStoreNames, ['s1', 's2', 's3'],
+        'transaction objectStoreNames should be sorted');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+
+    db.deleteObjectStore('s1');
+    assert_array_equals(tx.objectStoreNames, ['s2', 's3'],
+        'transaction objectStoreNames should be updated after delete');
+    assert_array_equals(db.objectStoreNames, tx.objectStoreNames,
+        'connection and transacton objectStoreNames should match');
+}, function(t, db) {
+    t.done();
+}, 'IDBTransaction.objectStoreNames - during upgrade transaction');
+
+(function() {
+    var saved_tx;
+    indexeddb_test(function(t, db, tx) {
+        saved_tx = tx;
+        db.createObjectStore('s2');
+        db.createObjectStore('s3');
+    }, function(t, db) {
+        db.close();
+        var open2 = indexedDB.open(db.name, db.version + 1);
+        open2.onerror = t.unreached_func('open should succeed');
+        open2.onupgradeneeded = t.step_func(function() {
+            var db2 = open2.result;
+            var tx2 = open2.transaction;
+            assert_array_equals(tx2.objectStoreNames, ['s2', 's3'],
+                'transaction should have previous stores in scope');
+            assert_array_equals(db2.objectStoreNames, tx2.objectStoreNames,
+                'connection and transacton objectStoreNames should match');
+
+            db2.createObjectStore('s4');
+            assert_array_equals(tx2.objectStoreNames, ['s2', 's3', 's4'],
+                'transaction should have new store in scope');
+            assert_array_equals(db2.objectStoreNames, tx2.objectStoreNames,
+                'connection and transacton objectStoreNames should match');
+
+            assert_array_equals(saved_tx.objectStoreNames, ['s2', 's3'],
+                'previous transaction objectStoreNames should be unchanged');
+            assert_array_equals(db.objectStoreNames, saved_tx.objectStoreNames,
+                'connection and transaction objectStoreNames should match');
+            t.done();
+        });
+    }, 'IDBTransaction.objectStoreNames - value after close');
+}());
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    assert_array_equals(db.transaction('s1').objectStoreNames, ['s1'],
+        'transaction should have one store in scope');
+    assert_array_equals(db.transaction(['s1', 's2']).objectStoreNames,
+        ['s1', 's2'],
+        'transaction should have two stores in scope');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - transaction scope');
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    var tx = db.transaction(['s1', 's2'], 'readwrite');
+    tx.objectStore('s1').put(0, 0);
+    tx.onabort = t.unreached_func('transaction should complete');
+    tx.oncomplete = t.step_func(function() {
+        assert_array_equals(tx.objectStoreNames, ['s1', 's2'],
+            'objectStoreNames should return scope after transaction commits');
+        t.done();
+    });
+}, 'IDBTransaction.objectStoreNames - value after commit');
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    var tx = db.transaction(['s1', 's2'], 'readwrite');
+    tx.objectStore('s1').put(0, 0);
+    tx.objectStore('s1').add(0, 0);
+    tx.oncomplete = t.unreached_func('transaction should abort');
+    tx.onabort = t.step_func(function() {
+        assert_array_equals(tx.objectStoreNames, ['s1', 's2'],
+            'objectStoreNames should return scope after transaction aborts');
+        t.done();
+    });
+}, 'IDBTransaction.objectStoreNames - value after abort');
+
+with_stores_test(['s1', 's2', 's3'], function(t, db) {
+    assert_array_equals(db.transaction(['s3', 's2', 's1']).objectStoreNames,
+        ['s1', 's2', 's3'],
+        'transaction objectStoreNames should be sorted');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - sorting');
+
+with_stores_test(['s1', 's2'], function(t, db) {
+    assert_array_equals(
+        db.transaction(['s2', 's1', 's2']).objectStoreNames,
+            ['s1', 's2'],
+        'transaction objectStoreNames should not have duplicates');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - no duplicates');
+
+var unusual_names = [
+    '', // empty string
+
+    '\x00', // U+0000 NULL
+    '\xFF', // U+00FF LATIN SMALL LETTER Y WITH DIAERESIS
+
+    '1', // basic ASCII
+    '12', // basic ASCII
+    '123', // basic ASCII
+    'abc', // basic ASCII
+    'ABC', // basic ASCII
+
+    '\xA2', // U+00A2 CENT SIGN
+    '\u6C34', // U+6C34 CJK UNIFIED IDEOGRAPH (water)
+    '\uD834\uDD1E', // U+1D11E MUSICAL SYMBOL G-CLEF (UTF-16 surrogate pair)
+    '\uFFFD', // U+FFFD REPLACEMENT CHARACTER
+
+    '\uD800', // UTF-16 surrogate lead
+    '\uDC00', // UTF-16 surrogate trail
+];
+unusual_names.sort();
+
+indexeddb_test(function(t, db, tx) {
+    unusual_names.slice().reverse().forEach(function(name) {
+        db.createObjectStore(name);
+    });
+    assert_array_equals(tx.objectStoreNames, unusual_names,
+        'transaction should have names sorted');
+}, function(t, db) {
+    var tx = db.transaction(unusual_names.slice().reverse().concat(unusual_names));
+    assert_array_equals(tx.objectStoreNames, unusual_names,
+        'transaction should have names sorted with no duplicates');
+    t.done();
+}, 'IDBTransaction.objectStoreNames - unusual names');
+
+</script>
diff --git a/testing/web-platform/tests/IndexedDB/support.js b/testing/web-platform/tests/IndexedDB/support.js
index 2eeca4f1f5385c..1e8458fee965ab 100644
--- a/testing/web-platform/tests/IndexedDB/support.js
+++ b/testing/web-platform/tests/IndexedDB/support.js
@@ -1,29 +1,6 @@
 var databaseName = "database";
 var databaseVersion = 1;
 
-if (!window.indexedDB)
-{
-    if (window.msIndexedDB)
-    {
-        window.indexedDB = window.msIndexedDB;
-    }
-    else if (window.mozIndexedDB)
-    {
-        window.indexedDB = window.mozIndexedDB;
-    }
-    else if (window.webkitIndexedDB)
-    {
-        window.indexedDB        = webkitIndexedDB;
-        IDBCursor               = webkitIDBCursor;
-        IDBDatabaseException    = webkitIDBDatabaseException;
-        IDBIndex                = webkitIDBIndex;
-        IDBObjectStore          = webkitIDBObjectStore;
-        IDBRequest              = webkitIDBRequest;
-        IDBKeyRange             = webkitIDBKeyRange;
-        IDBTransaction          = webkitIDBTransaction;
-    }
-}
-
 /* Delete created databases
  *
  * Go through each finished test, see if it has an associated database. Close
diff --git a/testing/web-platform/tests/README.md b/testing/web-platform/tests/README.md
index 8157a4a841cbf5..cac36bc2f37a48 100644
--- a/testing/web-platform/tests/README.md
+++ b/testing/web-platform/tests/README.md
@@ -2,8 +2,10 @@ The Web Platform Tests Project [![IRC chat](https://goo.gl/6nCIks)](http://irc.w
 ==============================
 
 The Web Platform Tests Project is a W3C-coordinated attempt to build a
-cross-browser testsuite for the Web-platform stack. Writing tests in a
-way that allows them to be run in all browsers gives browser projects
+cross-browser testsuite for the Web-platform stack.  However, for mainly
+historic reasons, the CSS WG testsuite is in a separate repository,
+[csswg-test](https://github.com/w3c/csswg-test). Writing tests in a way
+that allows them to be run in all browsers gives browser projects
 confidence that they are shipping software that is compatible with other
 implementations, and that later implementations will be compatible with
 their implementations. This in turn gives Web authors/developers
diff --git a/testing/web-platform/tests/app-uri/appURI_test.html b/testing/web-platform/tests/app-uri/appURI_test.html
index 1baaf06ac6ac8d..8b83969bbc1580 100644
--- a/testing/web-platform/tests/app-uri/appURI_test.html
+++ b/testing/web-platform/tests/app-uri/appURI_test.html
@@ -126,13 +126,13 @@
 
 
         /**
-         *	ContentType reponse
+         *	ContentType response
          *
          *	rules for dereferencing an app: URI => 
 		  8. Let potential-file be the result of attempting locate the file at path
          */
 
-        TC_name = "Test: [HTTP] 200 reponse status (OK),value of content-type as the [HTTP] ";
+        TC_name = "Test: [HTTP] 200 response status (OK),value of content-type as the [HTTP] ";
         TC_name += "Content-Type header, and the contents of potential-file as the response body";
 
         var ContentTypeResponsetests = [ /* scheme:[ TC name, URI, content-type] */
@@ -334,7 +334,7 @@
                 xhr.send();
             });
         }
-        Get_403_reponse(TC_name + " Access to resticted URI - 403 Forbidden error expected", 
+        Get_403_reponse(TC_name + " Access to restricted URI - 403 Forbidden error expected", 
         window.location.protocol + "//f15a6d20-cefa-13e5-1972-800e20d19a76/" + 'resources/ExamPLE/mmY/index.html', "");
 
 
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
index 14582670b22302..8a064c701727cf 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html
@@ -6,37 +6,68 @@
     <title>scripthash-unicode-normalization</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/content-security-policy/support/alertAssert.sub.js?alerts=%5B%22PASS%22%2C%22PASS%22%5D">
-
 
     </script>
     <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'sha256-xy4iRAvdlFCq+M5+4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self';
+script-src 'self' 'nonce-nonceynonce' 'sha256-dWTP4Di8KBjaiXvQ5mRquI9OoBSo921ahYxLfYSiuT8='; connect-src 'self';
 -->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+
+<body>
     <!-- The following two scripts contain two separate code points (U+00C5
         and U+212B, respectively) which, depending on your text editor, might be
-        rendered the same. However, their difference is important as they should
-        be NFC normalized to the same code point, thus they should hash to the
-        same value.-->
-    <script>
-        'Å';
-        alert_assert('PASS');
+        rendered the same.However, their difference is important because, under
+        NFC normalization, they would become the same code point, which would be
+        against the spec. This test, therefore, validates that the scripts have
+        *different* hash values. -->
+    <script nonce="nonceynonce">
+      var matchingContent = 'Å';
+      var nonMatchingContent = 'Å';
 
-    </script>
-    <script>
-        'Å';
-        alert_assert('PASS');
+      // This script should have a hash value of
+      // sha256-9UFeeZbvnMa0tLNu76v96T4Hh+UtDWHm2lPQJoTWb9c=
+      var scriptContent1 = "window.finish('" + matchingContent + "');";
+
+      // This script should have a hash value of
+      // sha256-iNjjXUXds31FFvkAmbC74Sxnvreug3PzGtu16udQyqM=
+      var scriptContent2 = "window.finish('" + nonMatchingContent + "');";
 
+      var script1 = document.createElement('script');
+      script1.innerHTML = scriptContent1;
+      var script2 = document.createElement('script');
+      script2.innerHTML = scriptContent2;
+
+      script1.test = async_test("Inline script with hash in CSP");
+      script2.test = async_test("Inline script without hash in CSP");
+
+      var failure = function() {
+        assert_unreached();
+      }
+
+      window.finish = function(content) {
+        if (content == matchingContent) {
+          script1.test.step(function() {
+            script1.test.done();
+          });
+        } else {
+          assert_unreached();
+        }
+      }
+
+      script1.onerror = failure;
+      script2.onerror = script2.test.step_func(function() {
+        script2.test.done();
+      });
+      document.body.appendChild(script1);
+      document.body.appendChild(script2);
     </script>
-</head>
 
-<body>
     <p>
         This tests Unicode normalization. While appearing the same, the strings in the scripts are different Unicode points, but through normalization, should be the same when the hash is taken.
     </p>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=false"></script>
+    <script async defer src="../support/checkReport.sub.js?reportExists=true"></script>
 </body>
 
 </html>
diff --git a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
index 6281a2623861f1..a23724f8ab4006 100644
--- a/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
+++ b/testing/web-platform/tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers
@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: scripthash-unicode-normalization={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-xy4iRAvdlFCq+M5+4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'nonce-nonceynonce' 'sha256-9UFeeZbvnMa0tLNu76v96T4Hh+UtDWHm2lPQJoTWb9c='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
diff --git a/testing/web-platform/tests/dom/collections/domstringmap-supported-property-names.html b/testing/web-platform/tests/dom/collections/domstringmap-supported-property-names.html
new file mode 100644
index 00000000000000..430aa44c3af294
--- /dev/null
+++ b/testing/web-platform/tests/dom/collections/domstringmap-supported-property-names.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>DOMStringMap Test: Supported property names</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+
+<div id="edge1" data-="012">Simple</div>
+
+<div id="edge2" data-id-="012">Simple</div>
+
+<div id="user" data-id="1234567890" data-user="johndoe" data-date-of-birth>
+    John Doe
+</div>
+
+<div id="user2" data-unique-id="1234567890"> Jane Doe </div>
+
+<div id="user3" data-unique-id="4324324241"> Jim Doe </div>
+
+<script>
+
+test(function() {
+    var element = document.querySelector('#edge1');
+    assert_array_equals(Object.getOwnPropertyNames(element.dataset),
+        [""]);
+}, "Object.getOwnPropertyNames on DOMStringMap, empty data attribute");
+
+test(function() {
+    var element = document.querySelector('#edge2');
+    assert_array_equals(Object.getOwnPropertyNames(element.dataset),
+        ["id-"]);
+}, "Object.getOwnPropertyNames on DOMStringMap, data attribute trailing hyphen");
+
+test(function() {
+    var element = document.querySelector('#user');
+    assert_array_equals(Object.getOwnPropertyNames(element.dataset),
+        ['id', 'user', 'dateOfBirth']);
+}, "Object.getOwnPropertyNames on DOMStringMap, multiple data attributes");
+
+test(function() {
+    var element = document.querySelector('#user2');
+    element.dataset.middleName = "mark";
+    assert_array_equals(Object.getOwnPropertyNames(element.dataset),
+        ['uniqueId', 'middleName']);
+}, "Object.getOwnPropertyNames on DOMStringMap, attribute set on dataset in JS");
+
+test(function() {
+    var element = document.querySelector('#user3');
+    element.setAttribute("data-age", 30);
+    assert_array_equals(Object.getOwnPropertyNames(element.dataset),
+        ['uniqueId', 'age']);
+}, "Object.getOwnPropertyNames on DOMStringMap, attribute set on element in JS");
+
+</script>
diff --git a/testing/web-platform/tests/dom/collections/namednodemap-supported-property-names.html b/testing/web-platform/tests/dom/collections/namednodemap-supported-property-names.html
new file mode 100644
index 00000000000000..2c5dee4efd6879
--- /dev/null
+++ b/testing/web-platform/tests/dom/collections/namednodemap-supported-property-names.html
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>NamedNodeMap Test: Supported property names</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div id="simple" class="fancy">Simple</div>
+<input id="result" type="text" value="" width="200px">
+<script>
+
+test(function() {
+    var elt = document.querySelector('#simple');
+    assert_array_equals(Object.getOwnPropertyNames(elt.attributes),
+        ['0','1','id','class']);
+}, "Object.getOwnPropertyNames on NamedNodeMap");
+
+test(function() {
+    var result = document.getElementById("result");
+    assert_array_equals(Object.getOwnPropertyNames(result.attributes),
+        ['0','1','2','3','id','type','value','width']);
+}, "Object.getOwnPropertyNames on NamedNodeMap of input");
+
+test(function() {
+    var result = document.getElementById("result");
+    result.removeAttribute("width");
+    assert_array_equals(Object.getOwnPropertyNames(result.attributes),
+        ['0','1','2','id','type','value']);
+}, "Object.getOwnPropertyNames on NamedNodeMap after attribute removal");
+
+</script>
\ No newline at end of file
diff --git a/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html b/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html
index b81bf8f08fd71e..d0f68b2bbfc9a2 100644
--- a/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html
+++ b/testing/web-platform/tests/dom/nodes/Document-createElement-namespace.html
@@ -13,22 +13,17 @@
  */
 
 /**
- * Test that an element created using the Document object doc has the namespace
- * that would be expected for the given contentType.
+ * Test that an element created using the Document object doc has the HTML
+ * namespace.
  */
 function testDoc(doc, contentType) {
-  // WebKit doesn't support document.contentType, so they don't get this sanity
-  // check :(
   if (doc.contentType !== undefined) {
+    // Sanity check
     assert_equals(doc.contentType, contentType,
                   "Wrong MIME type -- incorrect server config?");
   }
 
-  var expectedNamespace = contentType == "text/html" ||
-                          contentType == "application/xhtml+xml"
-                          ? "http://www.w3.org/1999/xhtml" : null;
-
-  assert_equals(doc.createElement("x").namespaceURI, expectedNamespace);
+  assert_equals(doc.createElement("x").namespaceURI, "http://www.w3.org/1999/xhtml");
 }
 
 // First test various objects we create in JS
diff --git a/testing/web-platform/tests/dom/nodes/Node-lookupNamespaceURI.html b/testing/web-platform/tests/dom/nodes/Node-lookupNamespaceURI.html
index 1b8c46deb7d6b3..45b6c0fbbcf303 100644
--- a/testing/web-platform/tests/dom/nodes/Node-lookupNamespaceURI.html
+++ b/testing/web-platform/tests/dom/nodes/Node-lookupNamespaceURI.html
@@ -23,43 +23,40 @@ <h1>LookupNamespaceURI and IsDefaultNamespace</h1>
 
 
 var frag = document.createDocumentFragment();
-lookupNamespaceURI(frag, null, null, 'DocumentFragment should have null namespace');
-lookupNamespaceURI(frag, '', null, 'DocumentFragment should have null namespace');
-lookupNamespaceURI(frag, 'foo', null, 'DocumentFragment should have null namespace');
-lookupNamespaceURI(frag, 'xmlns', null, 'DocumentFragment should have null namespace');
-isDefaultNamespace(frag, null, true, 'DocumentFragment is in default namespace');
-isDefaultNamespace(frag, '', true, 'DocumentFragment is in default namespace');
-isDefaultNamespace(frag, 'foo', false, 'DocumentFragment is in default namespace');
-isDefaultNamespace(frag, 'xmlns', false, 'DocumentFragment is in default namespace');
+lookupNamespaceURI(frag, null, null, 'DocumentFragment should have null namespace, prefix null');
+lookupNamespaceURI(frag, '', null, 'DocumentFragment should have null namespace, prefix ""');
+lookupNamespaceURI(frag, 'foo', null, 'DocumentFragment should have null namespace, prefix "foo"');
+lookupNamespaceURI(frag, 'xmlns', null, 'DocumentFragment should have null namespace, prefix "xmlns"');
+isDefaultNamespace(frag, null, true, 'DocumentFragment is in default namespace, prefix null');
+isDefaultNamespace(frag, '', true, 'DocumentFragment is in default namespace, prefix ""');
+isDefaultNamespace(frag, 'foo', false, 'DocumentFragment is in default namespace, prefix "foo"');
+isDefaultNamespace(frag, 'xmlns', false, 'DocumentFragment is in default namespace, prefix "xmlns"');
 
 
 
 var fooElem = document.createElementNS('fooNamespace', 'prefix:elem');
 fooElem.setAttribute('bar', 'value');
 
-lookupNamespaceURI(fooElem, null, null, 'Element should have null namespace');
-lookupNamespaceURI(fooElem, '', null, 'Element should have null namespace');
+lookupNamespaceURI(fooElem, null, null, 'Element should have null namespace, prefix null');
+lookupNamespaceURI(fooElem, '', null, 'Element should have null namespace, prefix ""');
 lookupNamespaceURI(fooElem, 'fooNamespace', null, 'Element should not have namespace matching prefix with namespaceURI value');
 lookupNamespaceURI(fooElem, 'xmlns', null, 'Element should not have XMLNS namespace');
 lookupNamespaceURI(fooElem, 'prefix', 'fooNamespace', 'Element has namespace URI matching prefix');
-isDefaultNamespace(fooElem, null, true, 'Empty namespace is not default');
-isDefaultNamespace(fooElem, '', true, 'Empty namespace is not default');
+isDefaultNamespace(fooElem, null, true, 'Empty namespace is not default, prefix null');
+isDefaultNamespace(fooElem, '', true, 'Empty namespace is not default, prefix ""');
 isDefaultNamespace(fooElem, 'fooNamespace', false, 'fooNamespace is not default');
 isDefaultNamespace(fooElem, 'http://www.w3.org/2000/xmlns/', false, 'xmlns namespace is not default');
 
 fooElem.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:bar', 'barURI');
 fooElem.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns', 'bazURI');
 
-lookupNamespaceURI(fooElem, null, 'bazURI', 'Element should have baz namespace');
-lookupNamespaceURI(fooElem, '', 'bazURI', 'Element should have baz namespace');
-lookupNamespaceURI(fooElem, 'prefix', 'fooNamespace', 'Element has namespace URI matching prefix');
+lookupNamespaceURI(fooElem, null, 'bazURI', 'Element should have baz namespace, prefix null');
+lookupNamespaceURI(fooElem, '', 'bazURI', 'Element should have baz namespace, prefix ""');
 lookupNamespaceURI(fooElem, 'xmlns', null, 'Element does not has namespace with xlmns prefix');
 lookupNamespaceURI(fooElem, 'bar', 'barURI', 'Element has bar namespace');
 
-isDefaultNamespace(fooElem, null, false, 'Empty namespace is not default');
-isDefaultNamespace(fooElem, '', false, 'Empty namespace is not default');
-isDefaultNamespace(fooElem, 'fooNamespace', false, 'fooNamespace is not default');
-isDefaultNamespace(fooElem, 'http://www.w3.org/2000/xmlns/', false, 'xmlns namespace is not default');
+isDefaultNamespace(fooElem, null, false, 'Empty namespace is not default on fooElem, prefix null');
+isDefaultNamespace(fooElem, '', false, 'Empty namespace is not default on fooElem, prefix ""');
 isDefaultNamespace(fooElem, 'barURI', false, 'bar namespace is not default');
 isDefaultNamespace(fooElem, 'bazURI', true, 'baz namespace is default');
 
@@ -71,8 +68,8 @@ <h1>LookupNamespaceURI and IsDefaultNamespace</h1>
 lookupNamespaceURI(comment, 'prefix', 'fooNamespace', 'Comment should inherit namespace URI matching prefix');
 lookupNamespaceURI(comment, 'bar', 'barURI', 'Comment should inherit bar namespace');
 
-isDefaultNamespace(comment, null, false, 'For comment, empty namespace is not default');
-isDefaultNamespace(comment, '', false, 'For comment, empty namespace is not default');
+isDefaultNamespace(comment, null, false, 'For comment, empty namespace is not default, prefix null');
+isDefaultNamespace(comment, '', false, 'For comment, empty namespace is not default, prefix ""');
 isDefaultNamespace(comment, 'fooNamespace', false, 'For comment, fooNamespace is not default');
 isDefaultNamespace(comment, 'http://www.w3.org/2000/xmlns/', false, 'For comment, xmlns namespace is not default');
 isDefaultNamespace(comment, 'barURI', false, 'For comment, inherited bar namespace is not default');
@@ -86,8 +83,8 @@ <h1>LookupNamespaceURI and IsDefaultNamespace</h1>
 lookupNamespaceURI(fooChild, 'xmlns', null, 'Child element should not have XMLNS namespace');
 lookupNamespaceURI(fooChild, 'prefix', 'fooNamespace', 'Child element has namespace URI matching prefix');
 
-isDefaultNamespace(fooChild, null, false, 'Empty namespace is not default for child');
-isDefaultNamespace(fooChild, '', false, 'Empty namespace is not default for child');
+isDefaultNamespace(fooChild, null, false, 'Empty namespace is not default for child, prefix null');
+isDefaultNamespace(fooChild, '', false, 'Empty namespace is not default for child, prefix ""');
 isDefaultNamespace(fooChild, 'fooNamespace', false, 'fooNamespace is not default for child');
 isDefaultNamespace(fooChild, 'http://www.w3.org/2000/xmlns/', false, 'xmlns namespace is not default for child');
 isDefaultNamespace(fooChild, 'barURI', false, 'bar namespace is not default for child');
@@ -97,13 +94,13 @@ <h1>LookupNamespaceURI and IsDefaultNamespace</h1>
 document.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:bar', 'barURI');
 document.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns', 'bazURI');
 
-lookupNamespaceURI(document, null, 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace');
-lookupNamespaceURI(document, '', 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace');
+lookupNamespaceURI(document, null, 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace, prefix null');
+lookupNamespaceURI(document, '', 'http://www.w3.org/1999/xhtml', 'Document should have xhtml namespace, prefix ""');
 lookupNamespaceURI(document, 'prefix', null, 'Document has no namespace URI matching prefix');
 lookupNamespaceURI(document, 'bar', 'barURI', 'Document has bar namespace');
 
-isDefaultNamespace(document, null, false, 'For document, Empty namespace is not default');
-isDefaultNamespace(document, '', false, 'For document, Empty namespace is not default');
+isDefaultNamespace(document, null, false, 'For document, empty namespace is not default, prefix null');
+isDefaultNamespace(document, '', false, 'For document, empty namespace is not default, prefix ""');
 isDefaultNamespace(document, 'fooNamespace', false, 'For document, fooNamespace is not default');
 isDefaultNamespace(document, 'http://www.w3.org/2000/xmlns/', false, 'For document, xmlns namespace is not default');
 isDefaultNamespace(document, 'barURI', false, 'For document, bar namespace is not default');
diff --git a/testing/web-platform/tests/dom/nodes/getElementsByClassName-10.xml b/testing/web-platform/tests/dom/nodes/getElementsByClassName-10.xml
index 42bd6adb792b6d..b3e3122cb0999e 100644
--- a/testing/web-platform/tests/dom/nodes/getElementsByClassName-10.xml
+++ b/testing/web-platform/tests/dom/nodes/getElementsByClassName-10.xml
@@ -6,11 +6,13 @@
  </head>
  <body>
   <div id="log"/>
-  <x class="a"/>
-  <g:x class="a"/>
+  <div id="tests">
+    <x class="a"/>
+    <g:x class="a"/>
+  </div>
   <script>test(function() {
                  assert_array_equals(document.getElementsByClassName("a"),
-                                     document.getElementsByTagName("x"));
+                                     document.getElementById("tests").children);
                })
   </script>
  </body>
diff --git a/testing/web-platform/tests/dom/nodes/getElementsByClassName-11.xml b/testing/web-platform/tests/dom/nodes/getElementsByClassName-11.xml
index 1d618ddb9a28d1..8593fa7a0edd62 100644
--- a/testing/web-platform/tests/dom/nodes/getElementsByClassName-11.xml
+++ b/testing/web-platform/tests/dom/nodes/getElementsByClassName-11.xml
@@ -6,16 +6,18 @@
  </head>
  <body>
   <div id="log" />
-  <x class="a"/>
-  <g:x class="a"/>
-  <x t:class="a" h:class="a" g:class="a"/>
-  <g:x t:class="a" h:class="a" g:class="a"/>
-  <t:x class="a" t:class="a" h:class="a" g:class="a"/>
+  <div id="tests">
+    <x class="a"/>
+    <g:x class="a"/>
+    <x t:class="a" h:class="a" g:class="a"/>
+    <g:x t:class="a" h:class="a" g:class="a"/>
+    <t:x class="a" t:class="a" h:class="a" g:class="a"/>
+  </div>
   <script>
    test(function() {
           var collection = document.getElementsByClassName("a");
-          var test = document.getElementsByTagName("x");
-          assert_array_equals(collection, [test[0], test[1]]);
+          var test = document.getElementById("tests").children;
+          assert_array_equals(collection, [test[0], test[1], test[4]]);
          })
   </script>
  </body>
diff --git a/testing/web-platform/tests/dom/nodes/selectors.js b/testing/web-platform/tests/dom/nodes/selectors.js
index e0d68bd98a6846..c3e2d909e14d11 100644
--- a/testing/web-platform/tests/dom/nodes/selectors.js
+++ b/testing/web-platform/tests/dom/nodes/selectors.js
@@ -266,10 +266,9 @@ var validSelectors = [
   {name: "Class selector, matching element with specified class",                                           selector: ".class-p",                expect: ["class-p1","class-p2", "class-p3"],                                              level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class selector, chained, matching only elements with all specified classes",                      selector: "#class .apple.orange.banana",    expect: ["class-div1", "class-div2", "class-p4", "class-div3", "class-p6", "class-div4"], level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class Selector, chained, with type selector",                                                     selector: "div.apple.banana.orange", expect: ["class-div1", "class-div2", "class-div3", "class-div4"],                         level: 1, testType: TEST_QSA | TEST_MATCH},
-  // Caution: If copying and pasting the folowing non-ASCII classes, ensure unicode normalisation is not performed in the process.
-  {name: "Class selector, matching element with class value using non-ASCII characters",                    selector: ".台北Táiběi",             expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "Class selector, matching multiple elements with class value using non-ASCII characters",          selector: ".台北",                     expect: ["class-span1","class-span2"], level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters", selector: ".台北Táiběi.台北",          expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching element with class value using non-ASCII characters (1)",                selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci",             expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, matching multiple elements with class value using non-ASCII characters",          selector: ".\u53F0\u5317",                     expect: ["class-span1","class-span2"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters (1)", selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci.\u53F0\u5317",          expect: ["class-span1"],               level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character",                              selector: ".foo\\:bar",              expect: ["class-span3"],               level: 1, testType: TEST_QSA | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character",                              selector: ".test\\.foo\\[5\\]bar",   expect: ["class-span4"],               level: 1, testType: TEST_QSA | TEST_MATCH},
 
@@ -282,10 +281,9 @@ var validSelectors = [
   {name: "ID selector, not matching non-existent ancestor",           selector: "#none #id-div1",            expect: [] /*no matches*/,      level: 1, testType: TEST_QSA},
   {name: "ID selector, matching multiple elements with duplicate id", selector: "#id-li-duplicate",          expect: ["id-li-duplicate", "id-li-duplicate", "id-li-duplicate", "id-li-duplicate"], level: 1, testType: TEST_QSA | TEST_MATCH},
 
-  // Caution: If copying and pasting the folowing non-ASCII IDs, ensure unicode normalisation is not performed in the process.
-  {name: "ID selector, matching id value using non-ASCII characters",    selector: "#台北Táiběi",           expect: ["台北Táiběi"],       level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "ID selector, matching id value using non-ASCII characters",    selector: "#台北",                   expect: ["台北"],               level: 1, testType: TEST_QSA | TEST_MATCH},
-  {name: "ID selector, matching id values using non-ASCII characters",   selector: "#台北Táiběi, #台北",      expect: ["台北Táiběi", "台北"], level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (1)",    selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci",           expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci"],       level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (2)",    selector: "#\u53F0\u5317",                   expect: ["\u53F0\u5317"],               level: 1, testType: TEST_QSA | TEST_MATCH},
+  {name: "ID selector, matching id values using non-ASCII characters (1)", selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci, #\u53F0\u5317",      expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci", "\u53F0\u5317"], level: 1, testType: TEST_QSA | TEST_MATCH},
 
   // XXX runMatchesTest() in level2-lib.js can't handle this because obtaining the expected nodes requires escaping characters when generating the selector from 'expect' values
   {name: "ID selector, matching element with id with escaped character", selector: "#\\#foo\\:bar",         expect: ["#foo:bar"],         level: 1, testType: TEST_QSA},
@@ -631,10 +629,9 @@ var scopedSelectors = [
   {name: "Class selector, matching element with specified class (1)",                                           selector: ".class-p",                ctx: "", expect: ["class-p1","class-p2", "class-p3"],                                              level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class selector, chained, matching only elements with all specified classes (1)",                      selector: "#class .apple.orange.banana",    ctx: "", expect: ["class-div1", "class-div2", "class-p4", "class-div3", "class-p6", "class-div4"], level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class Selector, chained, with type selector (1)",                                                     selector: "div.apple.banana.orange", ctx: "", expect: ["class-div1", "class-div2", "class-div3", "class-div4"],                         level: 1, testType: TEST_FIND | TEST_MATCH},
-  // Caution: If copying and pasting the folowing non-ASCII classes, ensure unicode normalisation is not performed in the process.
-  {name: "Class selector, matching element with class value using non-ASCII characters",                    selector: ".台北Táiběi",             ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "Class selector, matching multiple elements with class value using non-ASCII characters (1)",          selector: ".台北",                     ctx: "", expect: ["class-span1","class-span2"], level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters", selector: ".台北Táiběi.台北",          ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching element with class value using non-ASCII characters (2)",                    selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci",             ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, matching multiple elements with class value using non-ASCII characters (1)",          selector: ".\u53F0\u5317",                     ctx: "", expect: ["class-span1","class-span2"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "Class selector, chained, matching element with multiple class values using non-ASCII characters (2)", selector: ".\u53F0\u5317Ta\u0301ibe\u030Ci.\u53F0\u5317",          ctx: "", expect: ["class-span1"],               level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character (1)",                              selector: ".foo\\:bar",              ctx: "", expect: ["class-span3"],               level: 1, testType: TEST_FIND | TEST_MATCH},
   {name: "Class selector, matching element with class with escaped character (1)",                              selector: ".test\\.foo\\[5\\]bar",   ctx: "", expect: ["class-span4"],               level: 1, testType: TEST_FIND | TEST_MATCH},
 
@@ -647,10 +644,9 @@ var scopedSelectors = [
   {name: "ID selector, not matching non-existent ancestor",           selector: "#none #id-div1",            ctx: "", expect: [] /*no matches*/,      level: 1, testType: TEST_FIND},
   {name: "ID selector, matching multiple elements with duplicate id (1)", selector: "#id-li-duplicate",          ctx: "", expect: ["id-li-duplicate", "id-li-duplicate", "id-li-duplicate", "id-li-duplicate"], level: 1, testType: TEST_FIND | TEST_MATCH},
 
-  // Caution: If copying and pasting the folowing non-ASCII IDs, ensure unicode normalisation is not performed in the process.
-  {name: "ID selector, matching id value using non-ASCII characters",    selector: "#台北Táiběi",           ctx: "", expect: ["台北Táiběi"],       level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "ID selector, matching id value using non-ASCII characters (1)",    selector: "#台北",                   ctx: "", expect: ["台北"],               level: 1, testType: TEST_FIND | TEST_MATCH},
-  {name: "ID selector, matching id values using non-ASCII characters",   selector: "#台北Táiběi, #台北",      ctx: "", expect: ["台北Táiběi", "台北"], level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (3)",    selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci",           ctx: "", expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci"],       level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id value using non-ASCII characters (4)",    selector: "#\u53F0\u5317",                   ctx: "", expect: ["\u53F0\u5317"],               level: 1, testType: TEST_FIND | TEST_MATCH},
+  {name: "ID selector, matching id values using non-ASCII characters (2)",   selector: "#\u53F0\u5317Ta\u0301ibe\u030Ci, #\u53F0\u5317",      ctx: "", expect: ["\u53F0\u5317Ta\u0301ibe\u030Ci", "\u53F0\u5317"], level: 1, testType: TEST_FIND | TEST_MATCH},
 
   // XXX runMatchesTest() in level2-lib.js can't handle this because obtaining the expected nodes requires escaping characters when generating the selector from 'expect' values
   {name: "ID selector, matching element with id with escaped character", selector: "#\\#foo\\:bar",         ctx: "", expect: ["#foo:bar"],         level: 1, testType: TEST_FIND},
diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html b/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html
index 73fcade5b04080..d7131b00db9f90 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<title>Triggering navigation from withing beforeunload event</title>
+<title>Triggering navigation from within beforeunload event</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html b/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html
index c32ce05ad04957..015507d8177fc7 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/008.html
@@ -6,9 +6,11 @@
 <script>
 var iframe;
 var t = async_test();
-onload = setTimeout(function() {
-                      var iframe = document.getElementsByTagName("iframe")[0];
-                      iframe.src="about:blank";
-                    }, 100)
+onload = function() {
+  setTimeout(function() {
+    var iframe = document.getElementsByTagName("iframe")[0];
+    iframe.src="about:blank";
+  }, 100)
+};
 </script>
 <iframe src="008-1.html"></iframe>
diff --git a/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html b/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html
index 09e65ef736f858..0e93e047017a5c 100644
--- a/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html
+++ b/testing/web-platform/tests/html/browsers/browsing-the-web/unloading-documents/unload/009.html
@@ -6,9 +6,11 @@
 <script>
 var iframe;
 var t = async_test();
-onload = setTimeout(function() {
-                      var iframe = document.getElementsByTagName("iframe")[0];
-                      iframe.src="about:blank";
-                    }, 100)
+onload = function() {
+  setTimeout(function() {
+    var iframe = document.getElementsByTagName("iframe")[0];
+    iframe.src="about:blank";
+  }, 100)
+}
 </script>
 <iframe src="009-1.html"></iframe>
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html
index ff577f8de4662f..6f44d8a83ecade 100644
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html
+++ b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload-1.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <script>
+onload = function() {opener.postMessage("loaded", "*")};
 onbeforeunload = function() {
   opener.callback();
 }
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html
index 7ff9fcc0559c9d..dcb8830ab68d5d 100644
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html
+++ b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html
@@ -6,8 +6,11 @@
 <script>
 var t = async_test();
 var w = window.open("close_beforeunload-1.html");
-setTimeout(function() {
+onmessage = t.step_func(function(event) {
+  if (event.data != "loaded") {
+    return;
+  }
   w.close();
-}, 1000);
+});
 callback = function() {t.done()}
 </script>
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html
index 0c8f2f5749ae97..9a9e304e843ebc 100644
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html
+++ b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload-1.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <script>
+onload = function() {opener.postMessage("loaded", "*")};
 onunload = function() {
   opener.callback();
 }
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html
index d442c6278a4163..e4d231b2856a2b 100644
--- a/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html
+++ b/testing/web-platform/tests/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html
@@ -6,8 +6,11 @@
 <script>
 var t = async_test();
 var w = window.open("close_unload-1.html");
-setTimeout(function() {
+onmessage = t.step_func(function(event) {
+  if (event.data != "loaded") {
+    return;
+  }
   w.close();
-}, 1000);
+});
 callback = function() {t.done()}
 </script>
diff --git a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html b/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html
index ffc4a2c0d1603b..a9fe824ef3cd71 100644
--- a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html
+++ b/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html
@@ -7,7 +7,8 @@
 <script>
 
 var t1 = async_test("The window's frameElement attribute must return its container element if it is a nested browsing context");
-var t2 = async_test("The SecurityError must be thrown if the container's document does not have the same effective script origin");
+var t2 = async_test("The SecurityError must be thrown if the window accesses to frameElement attribute of a Window which does not have the same effective script origin");
+var t3 = async_test("The window's frameElement attribute must return null if the container's document does not have the same effective script origin");
 
 function on_load() {
   t1.step(function () {
@@ -17,9 +18,9 @@
                   "The frameElement attribute should be the object element.");
     assert_equals(window["win3"].frameElement, document.getElementById("emb"),
                   "The frameElement attribute should be the embed element.");
-    assert_equals(document.getElementById("fr3").contentWindow[0].frameElement,
-                  document.getElementById("fr3").contentDocument.getElementById("f1"),
-                 "The frameElement attribute should be the frame element in 'test.html'.");
+    assert_equals(document.getElementById("fr4").contentWindow[0].frameElement,
+                  document.getElementById("fr4").contentDocument.getElementById("f1"),
+                  "The frameElement attribute should be the frame element in 'test.html'.");
   });
   t1.done();
 
@@ -28,23 +29,39 @@
                   "The SecurityError exception should be thrown.");
   });
   t2.done();
+
+  t3.step(function () {
+    document.getElementById("fr5").contentWindow.postMessage(null, "*");
+  });
+  window.addEventListener("message", function (event) {
+    var data = JSON.parse(event.data);
+    if (data.name == "testcase3") {
+      t3.step(function () {
+        assert_equals(data.result, "window.frameElement = null",
+                      "The frameElement attribute should be null.");
+      });
+      t3.done();
+    }
+  }, false);
 }
 
 </script>
 <body onload="on_load()">
   <div id="log"></div>
   <iframe id="fr1"></iframe>
-  <iframe id="fr2" src="test.html"></iframe>
+  <iframe id="fr2" src="test.html"></iframe> <!-- cross origin -->
   <iframe id="fr3" src="" style="display:none"></iframe>
   <object id="obj" name="win2" type="text/html" data="about:blank"></object>
   <embed id="emb" name="win3" type="image/svg+xml" src="/images/green.svg" />
+  <iframe id="fr4" src="test.html"></iframe> <!-- same origin -->
+  <iframe id="fr5" src="testcase3.html"></iframe> <!-- cross origin -->
   <script>
 
   setup(function () {
-    var src = "http://{{domains[www1]}}:{{ports[http][0]}}";
-    src += document.location.pathname.substring(0, document.location.pathname.lastIndexOf("/") + 1);
-    src += "test.html";
-    document.getElementById("fr2").src = src;
+    var src_base = "http://{{domains[www1]}}:{{ports[http][0]}}";
+    src_base += document.location.pathname.substring(0, document.location.pathname.lastIndexOf("/") + 1);
+    document.getElementById("fr2").src = src_base + "test.html";
+    document.getElementById("fr5").src = src_base + "testcase3.html";
   });
 
   test(function () {
diff --git a/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/testcase3.html b/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/testcase3.html
new file mode 100644
index 00000000000000..d67bde26f432f0
--- /dev/null
+++ b/testing/web-platform/tests/html/browsers/windows/nested-browsing-contexts/testcase3.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<title>Testcase 3: frameElement attribute must return null if the container\'s document does not have the same effective script origin</title>
+<script>
+window.addEventListener("message", function (event) {
+  try {
+    var result = "window.frameElement = " + window.frameElement;
+  } catch (e) {
+    result = e.message;
+  }
+  event.source.postMessage(JSON.stringify({name: "testcase3", result: result}),
+                           "*");
+}, false);
+</script>
diff --git a/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html b/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html
index a3d5990ea4969b..e67c04fc8dd174 100644
--- a/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html
+++ b/testing/web-platform/tests/html/dom/documents/resource-metadata-management/document-lastModified-01.html
@@ -25,14 +25,18 @@
   var minutes = d.getMinutes()
   var seconds = d.getSeconds()
 
-  test(function() {
-    var local_time = hours * 60 * 60 + minutes * 60 + seconds;
-    var m = pattern.exec(last_modified);
-    var last_modified_time = parseInt(m[1]) * 60 * 60 + parseInt(m[2]) * 60 + parseInt(m[3]);
-    assert_approx_equals(last_modified_time, local_time, 2,
-                         "Hours and minutes should match local time.");
-  }, "Date returned by lastModified is in the user's local time zone.");
-
+  // Checking whether d and and new instance of Date have the same timezone.
+  // Do not run the time zone test in the case daylight saving occurs.
+  var d2 = new Date();
+  if (d2.getTimezoneOffset() == d.getTimezoneOffset()) {
+    test(function() {
+      var local_time = hours * 60 * 60 + minutes * 60 + seconds;
+      var m = pattern.exec(last_modified);
+      var last_modified_time = parseInt(m[1]) * 60 * 60 + parseInt(m[2]) * 60 + parseInt(m[3]);
+      assert_approx_equals(last_modified_time, local_time, 2,
+                           "Hours and minutes should match local time.");
+    }, "Date returned by lastModified is in the user's local time zone.");
+  }
   var t = async_test("Date returned by lastModified is current after timeout.");
 
   setTimeout(function() {
diff --git a/testing/web-platform/tests/html/dom/elements-embedded.js b/testing/web-platform/tests/html/dom/elements-embedded.js
index a948b62ff83bda..4966abdcf8ed58 100644
--- a/testing/web-platform/tests/html/dom/elements-embedded.js
+++ b/testing/web-platform/tests/html/dom/elements-embedded.js
@@ -141,7 +141,7 @@ var embeddedElements = {
     hreflang: "string",
     type: "string",
 
-          //URLUtils
+    // HTMLHyperlinkElementUtils
     href: "url",
 
     // Obsolete
diff --git a/testing/web-platform/tests/html/dom/elements-text.js b/testing/web-platform/tests/html/dom/elements-text.js
index bcfcb8f00ffe73..96c1d923702601 100644
--- a/testing/web-platform/tests/html/dom/elements-text.js
+++ b/testing/web-platform/tests/html/dom/elements-text.js
@@ -10,7 +10,7 @@ var textElements = {
     hreflang: "string",
     type: "string",
 
-    // URLUtils
+    // HTMLHyperlinkElementUtils
     href: "url",
 
     // Obsolete
diff --git a/testing/web-platform/tests/html/dom/interfaces.html b/testing/web-platform/tests/html/dom/interfaces.html
index cc5945f246119e..69d81ccb0eba31 100644
--- a/testing/web-platform/tests/html/dom/interfaces.html
+++ b/testing/web-platform/tests/html/dom/interfaces.html
@@ -11,16 +11,6 @@
 <h1>HTML IDL tests</h1>
 <div id=log></div>
 
-<!-- URLUtils* stubs -->
-<script type=text/plain class=untested>
-interface URLUtils {
-  stringifier;
-};
-interface URLUtilsReadOnly {
-  stringifier;
-};
-</script>
-<!-- DOM IDLs -->
 <script type=text/plain class=untested>
 [Constructor(DOMString type, optional EventInit eventInitDict)/*,
  Exposed=(Window,Worker)*/]
@@ -868,6 +858,21 @@ <h1>HTML IDL tests</h1>
          Float32Array or Float64Array or
          DataView) ArrayBufferView;
 
+[NoInterfaceObject, Exposed=Window]
+interface HTMLHyperlinkElementUtils {
+  stringifier attribute USVString href;
+           attribute USVString origin;
+           attribute USVString protocol;
+           attribute USVString username;
+           attribute USVString password;
+           attribute USVString host;
+           attribute USVString hostname;
+           attribute USVString port;
+           attribute USVString pathname;
+           attribute USVString search;
+           attribute USVString hash;
+};
+
 interface HTMLAllCollection : HTMLCollection {
   // inherits length and 'getter'
   Element? item(unsigned long index);
@@ -1125,19 +1130,17 @@ <h1>HTML IDL tests</h1>
 };
 
 interface HTMLAnchorElement : HTMLElement {
-           attribute DOMString target;
-           attribute DOMString download;
-  [PutForwards=value] attribute DOMSettableTokenList ping;
-           attribute DOMString rel;
+  attribute DOMString target;
+  attribute DOMString download;
+  [PutForwards=value] readonly attribute DOMSettableTokenList ping;
+  attribute DOMString rel;
   readonly attribute DOMTokenList relList;
-           attribute DOMString hreflang;
-           attribute DOMString type;
-
-           attribute DOMString text;
+  attribute DOMString hreflang;
+  attribute DOMString type;
 
-  // also has obsolete members
+  attribute DOMString text;
 };
-HTMLAnchorElement implements URLUtils;
+HTMLAnchorElement implements HTMLHyperlinkElementUtils;
 
 interface HTMLDataElement : HTMLElement {
            attribute DOMString value;
@@ -1494,20 +1497,17 @@ <h1>HTML IDL tests</h1>
 };
 
 interface HTMLAreaElement : HTMLElement {
-           attribute DOMString alt;
-           attribute DOMString coords;
-           attribute DOMString shape;
-           attribute DOMString target;
-           attribute DOMString download;
-  [PutForwards=value] attribute DOMSettableTokenList ping;
-           attribute DOMString rel;
+  attribute DOMString alt;
+  attribute DOMString coords;
+  attribute DOMString shape;
+  attribute DOMString target;
+  attribute DOMString download;
+  [PutForwards=value] readonly attribute DOMSettableTokenList ping;
+  attribute DOMString rel;
   readonly attribute DOMTokenList relList;
-           attribute DOMString hreflang;
-           attribute DOMString type;
-
-  // also has obsolete members
+  // hreflang and type are not reflected
 };
-HTMLAreaElement implements URLUtils;
+HTMLAreaElement implements HTMLHyperlinkElementUtils;
 
 interface HTMLTableElement : HTMLElement {
            attribute HTMLTableCaptionElement? caption;
@@ -2320,11 +2320,22 @@ <h1>HTML IDL tests</h1>
 };
 
 [Unforgeable] interface Location {
-  void assign(DOMString url);
-  void replace(DOMString url);
+  stringifier attribute USVString href;
+           attribute USVString origin;
+           attribute USVString protocol;
+           attribute USVString host;
+           attribute USVString hostname;
+           attribute USVString port;
+           attribute USVString pathname;
+           attribute USVString search;
+           attribute USVString hash;
+
+  void assign(USVString url);
+  void replace(USVString url);
   void reload();
+
+  [SameObject] readonly attribute USVString[] ancestorOrigins;
 };
-Location implements URLUtils;
 
 [Constructor(DOMString type, optional PopStateEventInit eventInitDict), Exposed=Window,Worker]
 interface PopStateEvent : Event {
@@ -2816,8 +2827,17 @@ <h1>HTML IDL tests</h1>
 WorkerNavigator implements NavigatorOnLine;
 
 [Exposed=Worker]
-interface WorkerLocation { };
-WorkerLocation implements URLUtilsReadOnly;
+interface WorkerLocation {
+  stringifier readonly attribute USVString href;
+  readonly attribute USVString origin;
+  readonly attribute USVString protocol;
+  readonly attribute USVString host;
+  readonly attribute USVString hostname;
+  readonly attribute USVString port;
+  readonly attribute USVString pathname;
+  readonly attribute USVString search;
+  readonly attribute USVString hash;
+};
 
 interface Storage {
   readonly attribute unsigned long length;
diff --git a/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html b/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html
index bf2911954e571f..65d7be35648e3e 100644
--- a/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html
+++ b/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlallcollection.html
@@ -9,7 +9,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
-<body>
+<body id="tags">
 <img src="../../../../images/green.png" name="picture">
 <script>
 test(function(){ assert_equals(document.all.length,12)}, "Test for HTMLAllCollection size");
@@ -18,8 +18,6 @@
 
 test(function(){ assert_equals(document.all[0].tagName,"HTML")}, "Test lookup by index using []");
 
-test(function(){ assert_equals(document.all.tags("script").length,3)}, "Test for multiple occurence 3 <script> found");
-
 test(function(){ assert_equals(document.all.item("picture").nodeName,"IMG")}, "Test lookup IMG by name");
 
 test(function(){ assert_equals(document.all.namedItem("picture").nodeName,"IMG")}, "Test lookup IMG by namedItem ");
@@ -27,7 +25,11 @@
 test(function(){ assert_equals(document.all("picture").nodeName,"IMG")}, "Test lookup IMG in collection using ()");
 
 test(function(){ assert_equals(document.all["picture"].nodeName,"IMG")}, "Test lookup IMG in collection using []");
+
+test(function(){ assert_equals(document.all.picture.nodeName,"IMG")}, "Test lookup IMG in collection using .");
+
+test(function(){ assert_equals(document.all.tags.id,"tags")}, "Test lookup tags in collection using .");
 </script>
 <div id="log"></div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html b/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html
index a867ab826ab760..8c8e1dbc1bf9a9 100644
--- a/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html
+++ b/testing/web-platform/tests/html/infrastructure/common-dom-interfaces/collections/htmlformcontrolscollection.html
@@ -18,8 +18,12 @@
         <input type="checkbox" name="cb">
       </td>
     </tr>
-    <button id="btn"></button>
-    <button name="btn"></button>
+    <tr>
+      <td>
+        <button id="btn"></button>
+        <button name="btn"></button>
+      </td>
+    </tr>
   </table>
 </form>
 
@@ -50,8 +54,8 @@
 
 //getter - name
 test(function () {
-  assert_equals(coll1("r1"), rdo, "HTMLFormControlsCollection(name) should return the 'input' element in radio status.");
-}, "HTMLFormControlsCollection(name) must return the named item");
+  assert_throws(TypeError(), function() { coll1("r1") });
+}, "HTMLFormControlsCollection is not callable");
 
 test(function () {
   assert_equals(coll1["r1"], rdo, "HTMLFormControlsCollection[name] should return the 'input' element in radio status.");
diff --git a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
index 0c5913944c5230..1a8c4a2f8543bb 100644
--- a/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
+++ b/testing/web-platform/tests/html/obsolete/requirements-for-implementations/other-elements-attributes-and-apis/script-IDL-event-htmlfor.html
@@ -16,8 +16,8 @@
   var script = document.createElement("script");
   script.setAttribute("event", "blah");
   script.setAttribute("for", "blah");
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
+  assert_equals(script.event, "blah");
+  assert_equals(script.htmlFor, "blah");
   assert_equals(script.getAttribute("event"), "blah");
   assert_equals(script.getAttribute("for"), "blah");
 })
@@ -27,10 +27,10 @@
   script.setAttribute("for", "blah");
   script.event = "foo";
   script.htmlFor = "foo";
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
-  assert_equals(script.getAttribute("event"), "blah");
-  assert_equals(script.getAttribute("for"), "blah");
+  assert_equals(script.event, "foo");
+  assert_equals(script.htmlFor, "foo");
+  assert_equals(script.getAttribute("event"), "foo");
+  assert_equals(script.getAttribute("for"), "foo");
 })
 test(function() {
   var script = document.createElement("script");
@@ -38,10 +38,10 @@
   script.setAttribute("for", "blah");
   script.event = null;
   script.htmlFor = null;
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
-  assert_equals(script.getAttribute("event"), "blah");
-  assert_equals(script.getAttribute("for"), "blah");
+  assert_equals(script.event, "null");
+  assert_equals(script.htmlFor, "null");
+  assert_equals(script.getAttribute("event"), "null");
+  assert_equals(script.getAttribute("for"), "null");
 })
 test(function() {
   var script = document.createElement("script");
@@ -49,9 +49,9 @@
   script.setAttribute("for", "blah");
   script.event = undefined;
   script.htmlFor = undefined;
-  assert_equals(script.event, "");
-  assert_equals(script.htmlFor, "");
-  assert_equals(script.getAttribute("event"), "blah");
-  assert_equals(script.getAttribute("for"), "blah");
+  assert_equals(script.event, "undefined");
+  assert_equals(script.htmlFor, "undefined");
+  assert_equals(script.getAttribute("event"), "undefined");
+  assert_equals(script.getAttribute("for"), "undefined");
 })
 </script>
diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html
new file mode 100644
index 00000000000000..3f2fbca317c0ec
--- /dev/null
+++ b/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align-ref.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset=utf-8>
+<link rel="match" href="div-align-ref.html">
+<style>
+.test { width: 50px; background-color: yellow; }
+.center { text-align: center; }
+.center .test { margin: 0 auto; }
+.left { text-align: left; }
+.left .test { margin-right: auto; }
+.right { text-align: right; }
+.right .test { margin-left: auto; }
+.rtl { direction: rtl; }
+.ltr { direction: ltr; }
+.left .margin { margin-left: 1em; }
+.right .margin { margin-right: 1em; }
+</style>
+</head>
+<body>
+<!-- Centered tests -->
+<div class=center>
+<div class=test>t א</div>
+<div class="test rtl">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div class=center>
+<div class="test left">t א</div>
+<div class="test right">t א</div>
+</div>
+
+<div class=left>
+<div class=center>
+<div class=test>t א</div>
+</div>
+</div>
+
+<!-- Left-aligned tests -->
+<div class=left>
+<div class=test>t א</div>
+<div class="test rtl">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div class="left rtl">
+<div class=test>t א</div>
+<div class="test ltr">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div class=left>
+<div class="test center">t א</div>
+<div class="test right">t א</div>
+</div>
+
+<!-- Right-aligned tests -->
+<div class=right>
+<div class=test>t א</div>
+<div class="test rtl">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div class="right rtl">
+<div class=test>t א</div>
+<div class="test ltr">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div class=right>
+<div class="test left">t א</div>
+<div class="test center">t א</div>
+</div>
+
+</body>
+</html>
+
diff --git a/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html b/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html
new file mode 100644
index 00000000000000..67ab68e5899031
--- /dev/null
+++ b/testing/web-platform/tests/html/rendering/non-replaced-elements/flow-content-0/div-align.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset=utf-8>
+<style>
+.test { width: 50px; background-color: yellow; }
+.rtl { direction: rtl; }
+.ltr { direction: ltr; }
+[align=left] .margin { margin-left: 1em }
+[align=right] .margin { margin-right: 1em }
+</style>
+</head>
+<body>
+<!-- Centered tests -->
+<div align=center>
+<div class=test>t א</div>
+<div class="test rtl">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div align=center>
+<div class=test align=left>t א</div>
+<div class=test align=right>t א</div>
+</div>
+
+<div align=left>
+<div align=center>
+<div class=test>t א</div>
+</div>
+</div>
+
+<!-- Left-aligned tests -->
+<div align=left>
+<div class=test>t א</div>
+<div class="test rtl">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div align=left class=rtl>
+<div class=test>t א</div>
+<div class="test ltr">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div align=left>
+<div class=test align=center>t א</div>
+<div class=test align=right>t א</div>
+</div>
+
+<!-- Right-aligned tests -->
+<div align=right>
+<div class=test>t א</div>
+<div class="test rtl">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div align=right class=rtl>
+<div class=test>t א</div>
+<div class="test ltr">t א</div>
+<div class="test margin">t א</div>
+</div>
+
+<div align=right>
+<div class=test align=left>t א</div>
+<div class=test align=center>t א</div>
+</div>
+
+</body>
+</html>
+
diff --git a/testing/web-platform/tests/html/semantics/forms/constraints/support/validator.js b/testing/web-platform/tests/html/semantics/forms/constraints/support/validator.js
index cd9d96404f5923..e969ce460da773 100644
--- a/testing/web-platform/tests/html/semantics/forms/constraints/support/validator.js
+++ b/testing/web-platform/tests/html/semantics/forms/constraints/support/validator.js
@@ -285,30 +285,10 @@ var validator = {
   },
 
   set_dirty: function(ctl) {
-    document.designMode = "on";
     ctl.focus();
     var old_value = ctl.value;
     ctl.value = "a";
     ctl.value = old_value;
-    if (
-      // See https://html.spec.whatwg.org/multipage/#input-type-attr-summary
-      // and https://html.spec.whatwg.org/multipage/#textFieldSelection
-      (
-        ctl.tagName === "INPUT" && (
-          ctl.type === "text" ||
-          ctl.type === "search" ||
-          ctl.type === "tel" ||
-          ctl.type === "url" ||
-          ctl.type === "password"
-        )
-      ) ||
-      ctl.tagName === "TEXTAREA"
-    ) {
-      ctl.value += "1";
-      ctl.setSelectionRange(ctl.value.length - 1, ctl.value.length);
-      document.execCommand("Delete");
-    }
-    document.designMode = "off";
   },
 
   pre_check: function(ctl, item) {
diff --git a/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html b/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html
index 46baa8e1ce5bbe..cf854f5260bb2a 100644
--- a/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html
+++ b/testing/web-platform/tests/html/semantics/forms/the-option-element/option-text-recurse.html
@@ -74,4 +74,19 @@
   option.appendChild(document.createTextNode("text"));
   assert_equals(option.text, "text");
 }, "option.text should work if the option is in a MathML script element");
+
+test(function() {
+  var option = document.createElement("option");
+  option.appendChild(document.createTextNode("te"));
+  option.appendChild(document.createComment("comment"));
+  option.appendChild(document.createTextNode("xt"));
+  assert_equals(option.text, "text");
+}, "option.text should ignore comment children");
+test(function() {
+  var option = document.createElement("option");
+  option.appendChild(document.createTextNode("te"));
+  option.appendChild(document.createProcessingInstruction("target", "data"));
+  option.appendChild(document.createTextNode("xt"));
+  assert_equals(option.text, "text");
+}, "option.text should ignore PI children");
 </script>
diff --git a/testing/web-platform/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html b/testing/web-platform/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html
index 429c642a6859c8..c5c8510a4746c9 100644
--- a/testing/web-platform/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html
+++ b/testing/web-platform/tests/html/semantics/forms/the-select-element/common-HTMLOptionsCollection-namedItem.html
@@ -5,6 +5,8 @@
 <title id='title'>HTMLOptionsCollection</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
 <div id="log"></div>
 <select id="selly">
   <option id="id1" name="name1">1</option>
@@ -37,26 +39,16 @@
 }, "if no item has a name or id value matching the parameter, return null and stop");
 
 test(function () {
-    var testarr = [];
-    for (var i = 0; i < selly.namedItem('id3').length; i++) {
-        testarr.push(selly.namedItem('id3')[i].text);
-    }
-    assert_array_equals(testarr, ['3','duplicate ID']);
-}, "return an HTMLOptionsCollection in correct order for repeated 'id' value");
+    assert_equals(selly.namedItem('id3')["value"], "3");
+}, "if multiple items have a name or *id* value matching the parameter, return the first object and stop");
 
 test(function () {
-    var testarr = [];
-    for (var i = 0; i < selly.namedItem('name4').length; i++) {
-        testarr.push(selly.namedItem('name4')[i].text);
-    }
-    assert_array_equals(testarr, ['4', 'duplicate name']);
-}, "return an HTMLOptionsCollection in correct order for repeated 'name' value");
+    assert_equals(selly.namedItem('name4')["value"], "4");
+}, "if multiple items have a *name* or id value matching the parameter, return the first object and stop");
 
 test(function () {
-    var testarr = [];
-    for (var i = 0; i < selly.namedItem('mixed1').length; i++) {
-        testarr.push(selly.namedItem('mixed1')[i].text);
-    }
-    assert_array_equals(testarr, ['mixed ID', 'mixed name']);
-}, "return an HTMLOptionsCollection in correct order for repeated mixed value");
+    assert_equals(selly.namedItem('mixed1')["value"], "mixed ID");
+}, "if multiple items have a *name* or *id* value matching the parameter, return the first object and stop");
 </script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/html/semantics/forms/the-select-element/select-ask-for-reset.html b/testing/web-platform/tests/html/semantics/forms/the-select-element/select-ask-for-reset.html
new file mode 100644
index 00000000000000..822114fb265b1a
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/forms/the-select-element/select-ask-for-reset.html
@@ -0,0 +1,97 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>HTMLSelectElement ask for reset</title>
+<link rel="author" title="Dongie Agnir" href="dongie.agnir@gmail.com">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id=log></div>
+<script>
+test(function() {
+  var select = makeSelect(5);
+
+  select.children[4].selected = true;
+  unselectedExcept(select, 4);
+
+  select.children[4].remove();
+  unselectedExcept(select, 0); // remove selected node, should default to first
+
+  select.children[3].selected = true;
+
+  select.children[0].remove();
+  unselectedExcept(select, 2); // last node still selected
+
+  select.size = 2;
+  select.children[2].remove();
+
+  unselectedExcept(select, null);
+}, "ask for reset on node remove, non multiple.");
+
+test(function() {
+  var select = makeSelect(3);
+  select.children[1].selected = true;
+
+  // insert selected option, should remain selected
+  var opt4 = document.createElement("option");
+  opt4.selected = true;
+  select.appendChild(opt4);
+  unselectedExcept(select, 3);
+
+  // insert unselected, 3 should remain selected
+  var opt5 = document.createElement("option");
+  select.appendChild(opt5);
+  unselectedExcept(select, 3);
+}, "ask for reset on node insert, non multiple.");
+
+test(function() {
+  var select = makeSelect(3);
+
+  var options = select.children;
+
+  // select options from first to last
+  for (var i = 0; i < options.length; ++i) {
+    options[i].selected = true;
+    unselectedExcept(select, i);
+  }
+
+  // select options from last to first
+  for (var i = options.length - 1; i >= 0; --i) {
+    options[i].selected = true;
+    unselectedExcept(select, i);
+  }
+
+  options[2].selected = true;
+  options[2].selected = false; // none selected
+  unselectedExcept(select, 0);
+
+  // disable first so option at index 1 is first eligible
+  options[0].disabled = true;
+  options[2].selected = true;
+  options[2].selected = false; // none selected
+  unselectedExcept(select, 1);
+
+  select.size = 2;
+  options[1].selected = false;
+  unselectedExcept(select, null); // size > 1 so should not default to any
+}, "change selectedness of option, non multiple.");
+
+
+function unselectedExcept(sel, opt) {
+  for (var i = 0; i < sel.children.length; ++i) {
+    if (i != opt) {
+      assert_false(sel.children[i].selected, "option should not be selected.");
+    }
+    if (opt != null) {
+      assert_true(sel.children[opt].selected, "option should be selected.");
+    }
+  }
+}
+
+function makeSelect(n) {
+  var sel = document.createElement("select");
+  for (var i = 0; i < n; ++i) {
+    opt = document.createElement("option");
+    sel.appendChild(opt);
+  }
+  return sel;
+}
+</script>
diff --git a/testing/web-platform/tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html b/testing/web-platform/tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html
index b9e523334f33b3..b8449229d5bd4d 100644
--- a/testing/web-platform/tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html
+++ b/testing/web-platform/tests/html/semantics/tabular-data/attributes-common-to-td-and-th-elements/cellIndex.html
@@ -38,4 +38,13 @@
   var td = tr.appendChild(document.createElement("td"));
   assert_equals(td.cellIndex, 1);
 }, "For cells whose parent is a tr, cellIndex should be the index.")
+test(function() {
+  var tr = document.createElement("tr");
+  var th = tr.appendChild(document.createElement("th"));
+  assert_equals(th.cellIndex, 0);
+  tr.appendChild(document.createElement("div"));
+  tr.appendChild(document.createTextNode("Hello World"));
+  var td = tr.appendChild(document.createElement("td"));
+  assert_equals(td.cellIndex, 1)
+}, "For cells whose parent is a tr with non td/th sibling, cellIndex should skip those non td/th siblings.")
 </script>
diff --git a/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html b/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html
index 820c7dd87b0553..c81abd82600f65 100644
--- a/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html
+++ b/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/deleteRow.html
@@ -43,4 +43,12 @@
   });
 }, "HTMLTableSectionElement deleteRow(-2)");
 
+test(function () {
+  assert_equals(tbody.rows.length, 1);
+  tbody.deleteRow(-1);
+  assert_equals(tbody.rows.length, 0);
+  tbody.deleteRow(-1);
+  assert_equals(tbody.rows.length, 0);
+}, "HTMLTableSectionElement deleteRow(-1) with no rows");
+
 </script>
diff --git a/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html b/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html
index 1318323986e00d..4c13db7aa5f6b7 100644
--- a/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html
+++ b/testing/web-platform/tests/html/semantics/tabular-data/the-tbody-element/insertRow.html
@@ -35,6 +35,12 @@
   assert_equals(tbody.rows.length, 4);
 }, "HTMLTableSectionElement insertRow()");
 
+test(function () {
+  var trEle = tbody.insertRow(tbody.rows.length);
+  assert_equals(tbody.rows[tbody.rows.length - 1], trEle);
+  assert_equals(tbody.rows.length, 5);
+}, "HTMLTableSectionElement insertRow(rows.length)");
+
 test(function () {
   assert_throws("IndexSizeError", function () {
     tbody.insertRow(-2);
diff --git a/testing/web-platform/tests/html/semantics/tabular-data/the-tr-element/deleteCell.html b/testing/web-platform/tests/html/semantics/tabular-data/the-tr-element/deleteCell.html
index 9262364eec8160..1400d32e1b1ee0 100644
--- a/testing/web-platform/tests/html/semantics/tabular-data/the-tr-element/deleteCell.html
+++ b/testing/web-platform/tests/html/semantics/tabular-data/the-tr-element/deleteCell.html
@@ -43,4 +43,12 @@
   });
 }, "HTMLTableRowElement deleteCell(cells.length)");
 
+test(function () {
+  assert_equals(tr.cells.length, 1);
+  tr.deleteCell(-1);
+  assert_equals(tr.cells.length, 0);
+  tr.deleteCell(-1);
+  assert_equals(tr.cells.length, 0);
+}, "HTMLTableRowElement deleteCell(-1) with no cells");
+
 </script>
diff --git a/testing/web-platform/tests/html/webappapis/animation-frames/callback-multicalls.html b/testing/web-platform/tests/html/webappapis/animation-frames/callback-multicalls.html
new file mode 100644
index 00000000000000..90e75a1f405a51
--- /dev/null
+++ b/testing/web-platform/tests/html/webappapis/animation-frames/callback-multicalls.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>AnimationTiming Test: multiple calls to requestAnimationFrame with the same callback</title>
+<link rel="author" title="Intel" href="http://www.intel.com">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/webappapis.html#dom-window-requestanimationframe">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+
+  async_test(function(t) {
+    var counter = 0;
+    window.requestAnimationFrame(callback);
+
+    function callback() {
+      ++counter;
+      if (counter == 2) {
+        t.done();
+      } else {
+        window.requestAnimationFrame(callback);
+      }
+    };
+
+  }, "Check that multiple calls to requestAnimationFrame with the same callback will result in multiple entries being in the list with that same callback.");
+
+</script>
diff --git a/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html b/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html
new file mode 100644
index 00000000000000..bfd6f9c68155a6
--- /dev/null
+++ b/testing/web-platform/tests/html/webappapis/scripting/events/event-handler-attributes-body-window.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<title>HTMLBodyElement event handlers</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<body>
+<script>
+function f() {
+  return 0;
+}
+
+var handlers = ['blur','error','focus','load','resize','scroll',
+                'afterprint','beforeprint','beforeunload','hashchange',
+                'languagechange','message','offline','online','pagehide',
+                'pageshow','popstate','storage','unload'];
+handlers.forEach(function(handler) {
+  test(function() {
+    document.body['on' + handler] = f;
+    assert_equals(window['on' + handler], f);
+  }, handler);
+});
+
+</script>
diff --git a/testing/web-platform/tests/lint.whitelist b/testing/web-platform/tests/lint.whitelist
index d65d0af5facbd3..57d307454f8864 100644
--- a/testing/web-platform/tests/lint.whitelist
+++ b/testing/web-platform/tests/lint.whitelist
@@ -24,7 +24,6 @@ INDENT TABS: tools/*
 INDENT TABS: touch-events/*
 INDENT TABS: web-animations/*
 INDENT TABS: webaudio/*
-INDENT TABS: webdriver/*
 INDENT TABS: webvtt/*
 INDENT TABS: XMLHttpRequest/*
 
@@ -43,7 +42,6 @@ TRAILING WHITESPACE: shadow-dom/*
 TRAILING WHITESPACE: svg/import/*
 TRAILING WHITESPACE: tools/*
 TRAILING WHITESPACE: webaudio/*
-TRAILING WHITESPACE: webdriver/*
 TRAILING WHITESPACE: WebIDL/*
 TRAILING WHITESPACE: webvtt/*
 TRAILING WHITESPACE: XMLHttpRequest/*
@@ -108,3 +106,6 @@ W3C-TEST.ORG:subresource-integrity/refresh-header.js.headers
 # Lint doesn't know about sub.svg I guess
 PARSE-FAILED:content-security-policy/svg/including.sub.svg
 
+#Helper files that aren't valid XML
+PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/empty.xml
+PARSE-FAILED:dom/nodes/Document-createElement-namespace-tests/minimal_html.xml
\ No newline at end of file
diff --git a/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html b/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
index 60e22d4b7d54e0..81c5881dfab814 100644
--- a/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
+++ b/testing/web-platform/tests/pointerevents/pointerevent_capture_suppressing_mouse-manual.html
@@ -34,6 +34,7 @@ <h4>
         <script type='text/javascript'>
             var isPointerCapture = false;
             var isRelatedTargetValueTested = false;
+            var isTargetAuthenticityTested = false;
             var count = 0;
 
             var detected_pointertypes = {};
@@ -92,6 +93,13 @@ <h4>
                             }, "relatedTarget is null when the capture is set. relatedTarget is " + event.relatedTarget);
                             isRelatedTargetValueTested = true;
                         }
+                        var hitTest = document.elementFromPoint(event.clientX, event.clientY);
+                        if(event.target !== hitTest && !isTargetAuthenticityTested) {
+                            test(function () {
+                                assert_unreached("pointerover for this target shouldn't trigger events on capture target");
+                            }, "pointerover should only trigger over the black rectangle");
+                            isTargetAuthenticityTested = true;
+                        }
                     }
                     else {
                         test_pointerover_no_capture.done();
diff --git a/testing/web-platform/tests/resources/testharness.js b/testing/web-platform/tests/resources/testharness.js
index 4e203c4863a8c8..7920ccd4e80e43 100644
--- a/testing/web-platform/tests/resources/testharness.js
+++ b/testing/web-platform/tests/resources/testharness.js
@@ -1176,6 +1176,7 @@ policies and contribution forms [3].
                 NO_MODIFICATION_ALLOWED_ERR: 'NoModificationAllowedError',
                 NOT_FOUND_ERR: 'NotFoundError',
                 NOT_SUPPORTED_ERR: 'NotSupportedError',
+                INUSE_ATTRIBUTE_ERR: 'InUseAttributeError',
                 INVALID_STATE_ERR: 'InvalidStateError',
                 SYNTAX_ERR: 'SyntaxError',
                 INVALID_MODIFICATION_ERR: 'InvalidModificationError',
@@ -1202,6 +1203,7 @@ policies and contribution forms [3].
                 NoModificationAllowedError: 7,
                 NotFoundError: 8,
                 NotSupportedError: 9,
+                InUseAttributeError: 10,
                 InvalidStateError: 11,
                 SyntaxError: 12,
                 InvalidModificationError: 13,
diff --git a/testing/web-platform/tests/subresource-integrity/crossorigin-creds-script.js.sub.headers b/testing/web-platform/tests/subresource-integrity/crossorigin-creds-script.js.sub.headers
index cf16bd88ef53ad..d6af1f0deabbf2 100644
--- a/testing/web-platform/tests/subresource-integrity/crossorigin-creds-script.js.sub.headers
+++ b/testing/web-platform/tests/subresource-integrity/crossorigin-creds-script.js.sub.headers
@@ -1,2 +1,2 @@
-Access-Control-Allow-Origin: {{location[scheme]}}://{{domains[]}}:{{location[port]}}
+Access-Control-Allow-Origin: {{location[scheme]}}://{{domains[]}}{{GET[acao_port]}}
 Access-Control-Allow-Credentials: true
diff --git a/testing/web-platform/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers b/testing/web-platform/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers
index cf16bd88ef53ad..d6af1f0deabbf2 100644
--- a/testing/web-platform/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers
+++ b/testing/web-platform/tests/subresource-integrity/crossorigin-creds-style.css.sub.headers
@@ -1,2 +1,2 @@
-Access-Control-Allow-Origin: {{location[scheme]}}://{{domains[]}}:{{location[port]}}
+Access-Control-Allow-Origin: {{location[scheme]}}://{{domains[]}}{{GET[acao_port]}}
 Access-Control-Allow-Credentials: true
diff --git a/testing/web-platform/tests/subresource-integrity/subresource-integrity.html b/testing/web-platform/tests/subresource-integrity/subresource-integrity.sub.html
similarity index 87%
rename from testing/web-platform/tests/subresource-integrity/subresource-integrity.html
rename to testing/web-platform/tests/subresource-integrity/subresource-integrity.sub.html
index 9519fc127fed50..43ff7cb5910ee4 100644
--- a/testing/web-platform/tests/subresource-integrity/subresource-integrity.html
+++ b/testing/web-platform/tests/subresource-integrity/subresource-integrity.sub.html
@@ -1,24 +1,49 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Subresource Integrity</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
 
 <div id="log"></div>
 
 <div id="container"></div>
 <script>
+    // This horrible hack is needed for the 'use-credentials' tests because, on
+    // response, if port 80 or 443 is the current port, it will not appear to
+    // the browser as part of the origin string. Since the origin *string* is
+    // used for CORS access control, instead of the origin itself, if there
+    // isn't an exact string match, the check will fail. For example,
+    // "http://example.com" would not match "http://example.com:80", because
+    // they are not exact string matches, even though the origins are the same.
+    //
+    // Thus, we only want the Access-Control-Allow-Origin header to have
+    // the port if it's not port 80 or 443, since the user agent will elide the
+    // ports in those cases.
+    var main_domain = "{{domains[]}}";
+    var www_domain = "{{domains[www]}}";
+    var default_port = "{{ports[http][0]}}";
+    if (location.protocol === "https:") {
+      default_port = "{{ports[https][0]}}";
+    }
+
+    var port_string = "";
+    if (default_port !== "80" && default_port !== "443")
+      port_string = ":" + default_port;
+
+    www_host_and_port = www_domain + port_string;
+
     // <script> tests
     var xorigin_anon_script = location.protocol
-      + '//www1.' + location.hostname + ':' + location.port
+      + '//' + www_host_and_port
       + '/subresource-integrity/crossorigin-anon-script.js';
 
     var xorigin_creds_script = location.protocol
-      + '//www1.' + location.hostname + ':' + location.port
-      + '/subresource-integrity/crossorigin-creds-script.js';
+      + '//' + www_host_and_port
+      + '/subresource-integrity/crossorigin-creds-script.js?acao_port='
+      + port_string;
 
     var xorigin_ineligible_script = location.protocol
-      + '//www1.' + location.hostname + ':' + location.port
+      + '//' + www_host_and_port
       + '/subresource-integrity/crossorigin-ineligible-script.js';
 
     var SRIScriptTest = function(pass, name, src, integrityValue, crossoriginValue) {
@@ -51,17 +76,20 @@
         document.body.appendChild(e);
     };
 
+    // Note that all of these style URLs have query parameters started, so any
+    // additional parameters should be appended starting with '&'.
     var xorigin_anon_style = location.protocol
-      + '//www1.' + location.hostname + ':' + location.port
-      + '/subresource-integrity/crossorigin-anon-style.css';
+      + '//' + www_host_and_port
+      + '/subresource-integrity/crossorigin-anon-style.css?';
 
     var xorigin_creds_style = location.protocol
-      + '//www1.' + location.hostname + ':' + location.port
-      + '/subresource-integrity/crossorigin-creds-style.css';
+      + '//' + www_host_and_port
+      + '/subresource-integrity/crossorigin-creds-style.css?acao_port='
+      + port_string;
 
     var xorigin_ineligible_style = location.protocol
-      + '//www1.' + location.hostname + ':' + location.port
-      + '/subresource-integrity/crossorigin-ineligible-style.css';
+      + '//' + www_host_and_port
+      + '/subresource-integrity/crossorigin-ineligible-style.css?';
 
     // <link> tests
     // Style tests must be done synchronously because they rely on the presence
@@ -376,7 +404,7 @@
         true,
         "<crossorigin='anonymous'> with correct hash, ACAO: *",
         {
-            href: xorigin_anon_style + '?1',
+            href: xorigin_anon_style + '&1',
             integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
             crossorigin: "anonymous"
         }
@@ -387,7 +415,7 @@
         false,
         "<crossorigin='anonymous'> with incorrect hash, ACAO: *",
         {
-            href: xorigin_anon_style + '?2',
+            href: xorigin_anon_style + '&2',
             integrity: "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk=",
             crossorigin: "anonymous"
         }
@@ -398,7 +426,7 @@
         true,
         "<crossorigin='use-credentials'> with correct hash, CORS-eligible",
         {
-            href: xorigin_creds_style + '?1',
+            href: xorigin_creds_style + '&1',
             integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
             crossorigin: "use-credentials"
         }
@@ -409,7 +437,7 @@
         false,
         "<crossorigin='use-credentials'> with incorrect hash CORS-eligible",
         {
-            href: xorigin_creds_style + '?2',
+            href: xorigin_creds_style + '&2',
             integrity: "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk=",
             crossorigin: "use-credentials"
         }
@@ -420,7 +448,7 @@
         false,
         "<crossorigin='anonymous'> with CORS-ineligible resource",
         {
-            href: xorigin_ineligible_style + '?1',
+            href: xorigin_ineligible_style + '&1',
             integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4=",
             crossorigin: "anonymous"
         }
@@ -431,7 +459,7 @@
         false,
         "Cross-origin, not CORS request, with correct hash",
         {
-            href: xorigin_anon_style + '?3',
+            href: xorigin_anon_style + '&3',
             integrity: "sha256-CzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk7gyCWUV4="
         }
     );
@@ -441,7 +469,7 @@
         false,
         "Cross-origin, not CORS request, with hash mismatch",
         {
-            href: xorigin_anon_style + '?4',
+            href: xorigin_anon_style + '&4',
             integrity: "sha256-deadbeefCzHgdJ7wOccM8L89n4bhcJMz3F+SPLT7YZk="
         }
     );
@@ -451,7 +479,7 @@
         true,
         "Cross-origin, empty integrity",
         {
-            href: xorigin_anon_style + '?5',
+            href: xorigin_anon_style + '&5',
             integrity: ""
         }
     );
@@ -540,6 +568,6 @@
     style_tests.execute();
 
 </script>
-<!--TODO check cache-poisoned resources, transfer-encoding, 3xx redirect
+<!-- TODO check cache-poisoned resources, transfer-encoding, 3xx redirect
    to resource with matching hash, and cross-origin leakage test as in sec5.3.
-   -->
+    -->
diff --git a/testing/web-platform/tests/tools/manifest/manifest.py b/testing/web-platform/tests/tools/manifest/manifest.py
index 6bc4406626da29..c263cb7b7343c4 100644
--- a/testing/web-platform/tests/tools/manifest/manifest.py
+++ b/testing/web-platform/tests/tools/manifest/manifest.py
@@ -376,3 +376,4 @@ def load(tests_root, manifest):
 def write(manifest, manifest_path):
     with open(manifest_path, "w") as f:
         json.dump(manifest.to_json(), f, sort_keys=True, indent=2, separators=(',', ': '))
+        f.write("\n")
diff --git a/testing/web-platform/tests/tools/manifest/sourcefile.py b/testing/web-platform/tests/tools/manifest/sourcefile.py
index 7c0f976a44b4f4..f16ec8a35a9928 100644
--- a/testing/web-platform/tests/tools/manifest/sourcefile.py
+++ b/testing/web-platform/tests/tools/manifest/sourcefile.py
@@ -134,7 +134,7 @@ def markup_type(self):
             ext = ext[1:]
         if ext in ["html", "htm"]:
             return "html"
-        if ext in ["xhtml", "xht"]:
+        if ext in ["xhtml", "xht", "xml"]:
             return "xhtml"
         if ext == "svg":
             return "svg"
diff --git a/testing/web-platform/tests/tools/webdriver/webdriver/driver.py b/testing/web-platform/tests/tools/webdriver/webdriver/driver.py
index f76881367ef4d1..27d543ed22b92b 100644
--- a/testing/web-platform/tests/tools/webdriver/webdriver/driver.py
+++ b/testing/web-platform/tests/tools/webdriver/webdriver/driver.py
@@ -85,7 +85,7 @@ def maximize_window(self):
     def get_window_size(self):
         """Get the dimensions of the current window."""
         result = self._window_command('GET', '/size', 'getWindowSize')
-        return { 'height': result[height], 'width': result[width] }
+        return {'height': result['height'], 'width': result['width']}
 
     def set_window_size(self, height, width):
         """Set the size of the current window."""
diff --git a/testing/web-platform/tests/url/interfaces.html b/testing/web-platform/tests/url/interfaces.html
index 4cae46732be1a9..254242fb8847a5 100644
--- a/testing/web-platform/tests/url/interfaces.html
+++ b/testing/web-platform/tests/url/interfaces.html
@@ -9,54 +9,38 @@ <h1>URL IDL tests</h1>
 <div id=log></div>
 
 <script type=text/plain>
-[Constructor(DOMString url, optional DOMString base = "about:blank"),
- Exposed=Window,Worker]
+[Constructor(USVString url, optional USVString base),
+ Exposed=(Window,Worker)]
 interface URL {
-  static DOMString domainToASCII(ScalarValueString domain);
-  static DOMString domainToUnicode(ScalarValueString domain);
-};
-URL implements URLUtils;
-
-[NoInterfaceObject]
-interface URLUtils {
-  stringifier attribute ScalarValueString href;
-  readonly attribute DOMString origin;
+  static USVString domainToASCII(USVString domain);
+  static USVString domainToUnicode(USVString domain);
 
-           attribute ScalarValueString protocol;
-           attribute ScalarValueString username;
-           attribute ScalarValueString password;
-           attribute ScalarValueString host;
-           attribute ScalarValueString hostname;
-           attribute ScalarValueString port;
-           attribute ScalarValueString pathname;
-           attribute ScalarValueString search;
-           readonly attribute URLSearchParams searchParams;
-           attribute ScalarValueString hash;
+  stringifier attribute USVString href;
+  readonly attribute USVString origin;
+           attribute USVString protocol;
+           attribute USVString username;
+           attribute USVString password;
+           attribute USVString host;
+           attribute USVString hostname;
+           attribute USVString port;
+           attribute USVString pathname;
+           attribute USVString search;
+  readonly attribute URLSearchParams searchParams;
+           attribute USVString hash;
 };
 
-[NoInterfaceObject]
-interface URLUtilsReadOnly {
-  stringifier readonly attribute DOMString href;
-  readonly attribute DOMString origin;
-
-  readonly attribute DOMString protocol;
-  readonly attribute DOMString host;
-  readonly attribute DOMString hostname;
-  readonly attribute DOMString port;
-  readonly attribute DOMString pathname;
-  readonly attribute DOMString search;
-  readonly attribute DOMString hash;
-};
+[Constructor(optional (USVString or URLSearchParams) init = ""),
+ Exposed=(Window,Worker)]
 interface URLSearchParams {
-  void append(ScalarValueString name, ScalarValueString value);
-  void delete(ScalarValueString name);
-  DOMString? get(ScalarValueString name);
-  sequence<DOMString> getAll(ScalarValueString name);
-  boolean has(ScalarValueString name);
-  void set(ScalarValueString name, ScalarValueString value);
+  void append(USVString name, USVString value);
+  void delete(USVString name);
+  USVString? get(USVString name);
+  sequence<USVString> getAll(USVString name);
+  boolean has(USVString name);
+  void set(USVString name, USVString value);
+  iterable<USVString, USVString>;
   stringifier;
 };
-typedef DOMString ScalarValueString;
 </script>
 <script>
 "use strict";
diff --git a/testing/web-platform/tests/webdriver/base_test.py b/testing/web-platform/tests/webdriver/base_test.py
index 9fe6b6ef3f0cc6..851099936d2915 100644
--- a/testing/web-platform/tests/webdriver/base_test.py
+++ b/testing/web-platform/tests/webdriver/base_test.py
@@ -10,7 +10,7 @@
 sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
 sys.path.insert(1, os.path.join(repo_root, "tools", "wptserve"))
 from wptserve import server
-from webdriver.driver import WebDriver
+from selenium import webdriver
 
 
 class WebDriverBaseTest(unittest.TestCase):
@@ -33,9 +33,10 @@ def create_driver():
     config = ConfigParser.ConfigParser()
     config.read('webdriver.cfg')
     section = os.environ.get("WD_BROWSER", 'firefox')
-    url = 'http://127.0.0.1:4444/wd/hub'
     if config.has_option(section, 'url'):
         url = config.get(section, "url")
+    else:
+        url = 'http://127.0.0.1:4444/wd/hub'
     capabilities = None
     if config.has_option(section, 'capabilities'):
         try:
@@ -45,5 +46,15 @@ def create_driver():
     mode = 'compatibility'
     if config.has_option(section, 'mode'):
         mode = config.get(section, 'mode')
-
-    return WebDriver(url, {}, capabilities, mode)
+    if section == 'firefox':
+        driver = webdriver.Firefox()
+    elif section == 'chrome':
+        driver = webdriver.Chrome()
+    elif section == 'edge':
+        driver = webdriver.Remote()
+    elif section == 'ie':
+        driver = webdriver.Ie()
+    elif section == 'selendroid':
+        driver = webdriver.Android()
+
+    return driver
diff --git a/testing/web-platform/tests/webdriver/command_contexts/__init__.py b/testing/web-platform/tests/webdriver/command_contexts/__init__.py
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/testing/web-platform/tests/webdriver/command_contexts/open_and_close_window_test.py b/testing/web-platform/tests/webdriver/command_contexts/open_and_close_window_test.py
new file mode 100644
index 00000000000000..61d04d93d74d12
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/command_contexts/open_and_close_window_test.py
@@ -0,0 +1,64 @@
+import os
+import sys
+import random
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+repo_root = os.path.abspath(os.path.join(__file__, "../../.."))
+sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
+from webdriver import exceptions
+
+
+class OpenAndCloseWindowTest(base_test.WebDriverBaseTest):
+    def setUp(self):
+        self.driver.get(self.webserver.where_is("command_contexts/res/first-page.html"))
+
+    def tearDown(self):
+        handles = self.driver.get_window_handles()
+
+        for i in range(len(handles) - 1):
+            self.driver.switch_to_window(handles[i])
+            self.driver.close()
+
+        self.driver.switch_to_window(self.driver.get_window_handles()[0])
+
+    def test_open_new_window(self):
+        handles = self.driver.get_window_handles()
+        self.driver.find_element_by_id("open_new_window").click()
+        self.assertEquals(len(handles) + 1, len(self.driver.get_window_handles()))
+
+    def test_get_window_handles_returns_the_windows_that_have_been_opened(self):
+        self.driver.find_element_by_id("open_new_window").click()
+        handles = self.driver.get_window_handles()
+        self.driver.switch_to_window(handles[0])
+        url1 = self.driver.get_current_url()
+        self.driver.switch_to_window(handles[1])
+        url2 = self.driver.get_current_url()
+
+        if url1 == self.webserver.where_is("controlling_windows/res/other-page.html"):
+            self.assertEquals(url2, self.webserver.where_is("controlling_windows/res/first-page.html"))
+        elif url1 == self.webserver.where_is("controlling_windows/res/first-page.html"):
+            self.assertEquals(url2, self.webserver.where_is("controlling_windows/res/other-page.html"))
+        else:
+            self.fail("The wrong set of URLs were returned")
+
+    def test_close_window(self):
+        open_windows = len(self.driver.get_window_handles())
+
+        self.driver.find_element_by_id("open_new_window").click()
+        self.assertEquals(1 + open_windows, len(self.driver.get_window_handles()))
+
+        self.driver.close()
+        self.assertEquals(open_windows, len(self.driver.get_window_handles()))
+
+    def test_command_sent_to_closed_window_returns_no_such_window_exception(self):
+        self.driver.find_element_by_id("open_new_window").click()
+        self.driver.close()
+
+        with self.assertRaises(exceptions.NoSuchWindowException):
+            self.driver.get_window_handle()
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/command_contexts/res/first-page.html b/testing/web-platform/tests/webdriver/command_contexts/res/first-page.html
new file mode 100644
index 00000000000000..e4aa13ebdae6b5
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/command_contexts/res/first-page.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>First Page</title>
+</head>
+<body>
+    <a href="./other-page.html" target="_blank" id="open_new_window">Open new window</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/command_contexts/res/other-page.html b/testing/web-platform/tests/webdriver/command_contexts/res/other-page.html
new file mode 100644
index 00000000000000..4bb487452692a6
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/command_contexts/res/other-page.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Other Page</title>
+</head>
+<body>
+    <a href="./other-page.html" target="_blank" id="open_new_window">Open new window</a>
+</body>
+</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/command_contexts/window_handle_test.py b/testing/web-platform/tests/webdriver/command_contexts/window_handle_test.py
new file mode 100644
index 00000000000000..6d8e569f049406
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/command_contexts/window_handle_test.py
@@ -0,0 +1,33 @@
+import os
+import sys
+import random
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+repo_root = os.path.abspath(os.path.join(__file__, "../../.."))
+sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
+from webdriver import exceptions
+
+
+class WindowHandleTest(base_test.WebDriverBaseTest):
+    def setUp(self):
+        self.driver.get(self.webserver.where_is("command_contexts/res/first-page.html"))
+
+    def test_window_handle_is_not_current(self):
+        handle = self.driver.get_window_handle()
+        self.assertNotEquals(handle, "current")
+
+    def test_window_handles_are_unique(self):
+        number_of_windows = 20
+        new_window_button = self.driver.find_element_by_id("open_new_window")
+        for i in range(0, number_of_windows):
+            new_window_button.click()
+
+        handles = self.driver.get_window_handles()
+        if len(handles) > len(set(handles)):
+            self.fail('At least one window handle was repeated')
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/command_contexts/window_size_test.py b/testing/web-platform/tests/webdriver/command_contexts/window_size_test.py
new file mode 100644
index 00000000000000..955e9fea09626a
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/command_contexts/window_size_test.py
@@ -0,0 +1,35 @@
+import os
+import sys
+import random
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+repo_root = os.path.abspath(os.path.join(__file__, "../../.."))
+sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
+from webdriver import exceptions
+
+class WindowSizeTest(base_test.WebDriverBaseTest):
+
+    def test_set_and_get_window_size(self):
+        self.driver.get(self.webserver.where_is("command_contexts/res/first-page.html"))
+
+        initial_dimensions = self.driver.get_window_size()
+
+        new_dimensions = {
+            "height": initial_dimensions["height"] - 100,
+            "width": initial_dimensions["width"] - 100}
+
+        try:
+            self.driver.set_window_size(new_dimensions["height"], new_dimensions["width"])
+
+            actual_dimensions = self.driver.get_window_size()
+
+            self.assertDictEqual(new_dimensions, actual_dimensions)
+        except exceptions.UnsupportedOperationException:
+            pass
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/cookie/cookie_test.py b/testing/web-platform/tests/webdriver/cookie/cookie_test.py
index e4211cbb946f06..e57d467130837c 100644
--- a/testing/web-platform/tests/webdriver/cookie/cookie_test.py
+++ b/testing/web-platform/tests/webdriver/cookie/cookie_test.py
@@ -4,7 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions
+from selenium.common import exceptions
 
 
 class CookieTest(base_test.WebDriverBaseTest):
@@ -12,20 +12,14 @@ def setUp(self):
         self.driver.get(self.webserver.where_is("cookie/res/cookie_container.html"))
 
     def test_can_create_a_well_formed_cookie( self ):
-        name = 'foo'
-        value = 'bar'
-
-        self.driver.add_cookie({ 'name': name, 'value': value })
+        self.driver.add_cookie({'name': 'foo', 'value': 'bar'})
 
     def test_cookies_should_allow_secure_to_be_set( self ):
         name = 'foo'
-        value = 'bar'
-        secure = True
-
-        self.driver.add_cookie({ 'name': name,
-                                 'value': value,
-                                 'path': '/',
-                                 'secure': secure})
+        self.driver.add_cookie({'name': name,
+                                'value': 'bar',
+                                'path': '/',
+                                'secure': (True)})
         self.assertTrue(self.driver.get_cookie(name)[0]['secure'])
 
     def test_secure_defaults_to_false( self ):
@@ -39,10 +33,8 @@ def test_secure_defaults_to_false( self ):
 
     def test_should_throw_an_exception_when_semicolon_exists_in_the_cookie_attribute(self):
         invalid_name = 'foo;bar'
-        value = 'foobar'
-
         try:
-            self.driver.add_cookie({ 'name': invalid_name, 'value': value })
+            self.driver.add_cookie({'name': invalid_name, 'value': 'foobar'})
             self.fail( 'should have thrown exceptions.' )
 
         except exceptions.UnableToSetCookieException:
@@ -51,10 +43,8 @@ def test_should_throw_an_exception_when_semicolon_exists_in_the_cookie_attribute
             pass
 
     def test_should_throw_an_exception_the_name_is_null(self):
-        val = 'foobar'
-
         try:
-            self.driver.add_cookie({ 'name': None, 'value': val })
+            self.driver.add_cookie({'name': None, 'value': 'foobar'})
             self.fail( 'should have thrown exceptions.' )
 
         except exceptions.UnableToSetCookieException:
diff --git a/testing/web-platform/tests/webdriver/element_location/element_location_test.py b/testing/web-platform/tests/webdriver/element_location/element_location_test.py
index acbc56d7ee4901..aff548ea5e4825 100644
--- a/testing/web-platform/tests/webdriver/element_location/element_location_test.py
+++ b/testing/web-platform/tests/webdriver/element_location/element_location_test.py
@@ -5,16 +5,15 @@
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
 
-
 class ElementLocationTest(base_test.WebDriverBaseTest):
     def test_find_element_by_name(self):
         self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
-        e = self.driver.find_element_by_css("*[name='name']")
+        e = self.driver.find_element_by_name("name")
         self.assertEquals("name", e.text)
 
     def test_find_element_by_css_selector(self):
         self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
-        e = self.driver.find_element_by_css("#id")
+        e = self.driver.find_element_by_css_selector("#id")
         self.assertEquals("id", e.text)
 
     def test_find_element_by_link_text(self):
@@ -32,6 +31,30 @@ def test_find_element_by_xpath(self):
         e = self.driver.find_element_by_xpath("//*[@id='id']")
         self.assertEquals("id", e.text)
 
+    def test_find_elements_by_name(self):
+        self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
+        e = self.driver.find_elements_by_name("name")
+        self.assertEquals("name", e[0].text)
+
+    def test_find_elements_by_css_selector(self):
+        self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
+        e = self.driver.find_elements_by_css_selector("#id")
+        self.assertEquals("id", e[0].text)
+
+    def test_find_elements_by_link_text(self):
+        self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
+        e = self.driver.find_elements_by_link_text("link text")
+        self.assertEquals("link text", e[0].text)
+
+    def test_find_elements_by_partial_link_text(self):
+        self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
+        e = self.driver.find_elements_by_partial_link_text("link tex")
+        self.assertEquals("link text", e[0].text)
+
+    def test_find_elements_by_xpath(self):
+        self.driver.get(self.webserver.where_is("element_location/res/elements.html"))
+        e = self.driver.find_elements_by_xpath("//*[@id='id']")
+        self.assertEquals("id", e[0].text)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/testing/web-platform/tests/webdriver/element_state/method_test.py b/testing/web-platform/tests/webdriver/element_state/method_test.py
index e357471a0c277a..85b240c7ad550d 100644
--- a/testing/web-platform/tests/webdriver/element_state/method_test.py
+++ b/testing/web-platform/tests/webdriver/element_state/method_test.py
@@ -9,12 +9,12 @@
 class GetElementAttributeTest(base_test.WebDriverBaseTest):
     def test_get_element_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-id-attribute.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertEqual("myId", el.get_attribute("id"))
 
     def test_style_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-style-attribute.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         expected_style = """
                          font-family: \"Gill Sans Extrabold\",Helvetica,sans-serif;
                          line-height: 1.2; font-weight: bold;
@@ -23,49 +23,85 @@ def test_style_attribute(self):
 
     def test_color_serialization_of_style_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-color-style-attribute.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertEqual("color: rgba(255, 0, 0, 1.0);", el.get_attribute("style"))
 
     def test_true_if_boolean_attribute_present(self):
         self.driver.get(self.webserver.where_is("element_state/res/input-with-checked-attribute.html"))
-        el = self.driver.find_element_by_css("input")
+        el = self.driver.find_element_by_css_selector("input")
         self.assertEqual("true", el.get_attribute("checked"))
 
     def test_none_if_boolean_attribute_absent(self):
         self.driver.get(self.webserver.where_is("element_state/res/input-without-checked-attribute.html"))
-        el = self.driver.find_element_by_css("input")
+        el = self.driver.find_element_by_css_selector("input")
         self.assertIsNone(el.get_attribute("checked"))
 
     def test_option_with_attribute_value(self):
         self.driver.get(self.webserver.where_is("element_state/res/option-with-value-attribute.html"))
-        el = self.driver.find_element_by_css("option")
+        el = self.driver.find_element_by_css_selector("option")
         self.assertEqual("value1", el.get_attribute("value"))
 
     def test_option_without_value_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/option-without-value-attribute.html"))
-        el = self.driver.find_element_by_css("option")
+        el = self.driver.find_element_by_css_selector("option")
         self.assertEqual("Value 1", el.get_attribute("value"))
 
     def test_a_href_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/a-with-href-attribute.html"))
-        el = self.driver.find_element_by_css("a")
+        el = self.driver.find_element_by_css_selector("a")
         self.assertEqual("http://web-platform.test:8000/path#fragment", el.get_attribute("href"))
 
     def test_img_src_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/img-with-src-attribute.html"))
-        el = self.driver.find_element_by_css("img")
+        el = self.driver.find_element_by_css_selector("img")
         self.assertEqual("http://web-platform.test:8000/images/blue.png", el.get_attribute("src"))
 
     def test_custom_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-custom-attribute.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertEqual("attribute value", el.get_attribute("webdriver-custom-attribute"))
 
     def test_attribute_not_present(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-without-attribute.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertIsNone(el.get_attribute("class"))
 
+    def test_find_attribute_with_special_characters(self):
+        self.driver.get(self.webserver.where_is("element_state/res/get-element-attribute-extended.html"))
+        element = self.driver.find_element_by_id("id_special_char_attribute_name")
+        attribute = element.get_attribute("*")
+        self.assertEquals("special_char_attribute_name", attribute)
+
+    def test_find_attribute_with_special_char_name_and_value(self):
+        self.driver.get(self.webserver.where_is("element_state/res/get-element-attribute-extended.html"))
+        element = self.driver.find_element_by_id("id_special_char_attribute_name_and_value")
+        attribute = element.get_attribute("@")
+        self.assertEquals("(", attribute)
+
+    def test_find_attribute_with_numeric_name(self):
+        self.driver.get(self.webserver.where_is("element_state/res/get-element-attribute-extended.html"))
+        element = self.driver.find_element_by_id("id_attribute_name_numeric")
+        attribute = element.get_attribute("1")
+        self.assertEquals("numeric attribute name", attribute)
+
+    def test_find_attribute_with_numeric_value(self):
+        self.driver.get(self.webserver.where_is("element_state/res/get-element-attribute-extended.html"))
+        element = self.driver.find_element_by_id("id_attribute_value_numeric")
+        attribute = element.get_attribute("one")
+        self.assertEquals("2", attribute)
+
+    def test_find_attribute_with_negative_numeric_name(self):
+        self.driver.get(self.webserver.where_is("element_state/res/get-element-attribute-extended.html"))
+        element = self.driver.find_element_by_id("id_attribute_negative_numeric_name")
+        attribute = element.get_attribute("-5")
+        self.assertEquals("attribute name is -5", attribute)
+
+    def test_find_attribute_with_negative_numeric_value(self):
+        self.driver.get(self.webserver.where_is("element_state/res/get-element-attribute-extended.html"))
+        element = self.driver.find_element_by_id("id_attribute_negative_numeric_value")
+        attribute = element.get_attribute("negative_numeric_value")
+        self.assertEquals("-9", attribute)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/testing/web-platform/tests/webdriver/element_state/properties.py b/testing/web-platform/tests/webdriver/element_state/properties.py
new file mode 100644
index 00000000000000..a767700852e9c3
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/element_state/properties.py
@@ -0,0 +1,17 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+
+class GetElementPropertiesTest(base_test.WebDriverBaseTest):
+    def test_get_element_text(self):
+        self.driver.get(self.webserver.where_is("element_state/res/elements_text.html"))
+        e = self.driver.find_element_by_name("name")
+        self.assertEquals("name", e.text)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/element_state/res/element-hidden-by-z-index.html b/testing/web-platform/tests/webdriver/element_state/res/element-hidden-by-z-index.html
index c51049079b80be..05e8eebeb540c7 100644
--- a/testing/web-platform/tests/webdriver/element_state/res/element-hidden-by-z-index.html
+++ b/testing/web-platform/tests/webdriver/element_state/res/element-hidden-by-z-index.html
@@ -10,7 +10,7 @@
     height: 50px;
     width: 50px;
   }
-  
+
   #overlay {
     background: blue;
 
diff --git a/testing/web-platform/tests/webdriver/element_state/res/element-moved-behind-other-element-by-transform.html b/testing/web-platform/tests/webdriver/element_state/res/element-moved-behind-other-element-by-transform.html
index ee5470514e9177..f91e729deb762f 100644
--- a/testing/web-platform/tests/webdriver/element_state/res/element-moved-behind-other-element-by-transform.html
+++ b/testing/web-platform/tests/webdriver/element_state/res/element-moved-behind-other-element-by-transform.html
@@ -4,20 +4,20 @@
 
 <style>
   * { position: relative }
-  
+
   #overlay {
     height: 50px;
     width: 50px;
     background: blue;
     z-index: 1;
   }
-  
+
   #hidden {
     height: 50px;
     width: 50px;
     background: red;
     z-index: -1;
-  
+
     transform: translate(0, -50px);
 
     /* fix your browsers god damnit */
diff --git a/testing/web-platform/tests/webdriver/element_state/res/element-partially-hidden-by-other-element.html b/testing/web-platform/tests/webdriver/element_state/res/element-partially-hidden-by-other-element.html
index 2a234cc2afb9ad..3d032592863398 100644
--- a/testing/web-platform/tests/webdriver/element_state/res/element-partially-hidden-by-other-element.html
+++ b/testing/web-platform/tests/webdriver/element_state/res/element-partially-hidden-by-other-element.html
@@ -7,7 +7,7 @@
     height: 100px;
     width: 100px;
   }
-  
+
   #partial {
     background: yellow;
   }
diff --git a/testing/web-platform/tests/webdriver/element_state/res/element-selected.html b/testing/web-platform/tests/webdriver/element_state/res/element-selected.html
new file mode 100644
index 00000000000000..c2ad98924cf508
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/element_state/res/element-selected.html
@@ -0,0 +1,89 @@
+<html>
+<body>
+<select>
+    <option id="selected-1">selected-1</option>
+</select>
+<select>
+    <option id="selected-2">selected-2</option>
+    <option id="unselected-1">unselected-1</option>
+</select>
+<select disabled>
+    <option id="unselected-2">unselected-2</option>
+    <option id="selected-3" selected>selected-3</option>
+    <option id="unselected-3">unselected-3</option>
+</select>
+<select>
+    <option id="unselected-4" checked>unselected-4</option>
+    <option id="unselected-5">unselected-5</option>
+    <option id="selected-4" selected>selected-4</option>
+</select>
+<select>
+    <option id="unselected-6" selected>unselected-6</option>
+    <option id="selected-5">selected-5</option>
+</select>
+<script>
+    document.getElementById("selected-5").selected = true;
+</script>
+<select multiple>
+    <option id="unselected-7">unselected-7</option>
+    <option id="unselected-8">unselected-8</option>
+</select>
+<select multiple>
+    <option id="selected-6" selected>selected-6</option>
+    <option id="unselected-9" selected>unselected-9</option>
+    <option id="selected-7">selected-7</option>
+</select>
+<script>
+    document.getElementById("unselected-9").selected = false;
+    document.getElementById("selected-7").selected = true;
+</script>
+
+<h1>Input Checkbox Elements</h1>
+<input type="checkbox" id="selected-8" />selected-8
+<script>
+   document.getElementById("selected-8").checked = true;
+</script>
+<input type="checkbox" id="selected-9" checked />selected-9
+<script>
+   document.getElementById("selected-9").indeterminate = true;
+</script>
+<input type="checkbox" id="unselected-10" />unselected-10
+<input type="checkbox" id="unselected-11" checked />unselected-11
+<script>
+   document.getElementById("unselected-11").checked = false;
+</script>
+<input type="checkbox" id="unselected-12" />unselected-12
+<script>
+   document.getElementById("unselected-12").indeterminate = true;
+</script>
+<input type="checkbox" id="unselected-13" selected />unselected-13
+<input type="checkbox" id="selected-10" checked />selected-10
+
+<h1>Input Radio Elements</h1>
+<br>Group 1:<br>
+<input type="radio" name="group1" id="selected-11" checked />selected-11
+<br>Group 2:<br>
+<input type="radio" name="group2" id="selected-12" />selected-12
+<script>
+   document.getElementById("selected-12").checked = true;
+</script>
+<br>Group 3:<br>
+<input type="radio" name="group3" id="unselected-14" />unselected-14
+<input type="radio" name="group3" id="selected-13" checked />selected-13
+<br>Group 4:<br>
+<input type="radio" name="group4" id="unselected-15" checked />unselected-15
+<input type="radio" name="group4" id="selected-14" checked />selected-14
+<br>Group 5:<br>
+<input type="radio" name="group5" id="unselected-16" />unselected-16
+<input type="radio" name="group5" id="unselected-17" checked />unselected-17
+<script>
+   document.getElementById("unselected-17").checked = false;
+</script>
+<br>Group 6<br>
+<input type="radio" name="group6" id="selected-15" />selected-15
+<input type="radio" name="group6" id="unselected-18" checked />unselected-18
+<script>
+   document.getElementById("selected-15").checked = true;
+</script>
+</body>
+</html>
diff --git a/testing/web-platform/tests/webdriver/element_state/res/element-with-same-color-as-parent-background.html b/testing/web-platform/tests/webdriver/element_state/res/element-with-same-color-as-parent-background.html
index 88cda898ad527c..80a4118dff5fae 100644
--- a/testing/web-platform/tests/webdriver/element_state/res/element-with-same-color-as-parent-background.html
+++ b/testing/web-platform/tests/webdriver/element_state/res/element-with-same-color-as-parent-background.html
@@ -8,7 +8,7 @@
     background: blue;
     width: 50px; height: 50px;
   }
-  
+
   #hidden {
     margin-top: -50px;
   }
diff --git a/testing/web-platform/tests/webdriver/element_state/res/elements_text.html b/testing/web-platform/tests/webdriver/element_state/res/elements_text.html
new file mode 100644
index 00000000000000..45b7c2370121e5
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/element_state/res/elements_text.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+
+<title>Element location</title>
+
+<body>
+  <div id="id">id</div>
+  <div id="name" name="name">name</div>
+  <a id="link">link text</a>
+</body>
diff --git a/testing/web-platform/tests/webdriver/element_state/res/get-element-attribute-extended.html b/testing/web-platform/tests/webdriver/element_state/res/get-element-attribute-extended.html
new file mode 100644
index 00000000000000..1fff60f032394d
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/element_state/res/get-element-attribute-extended.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Get Element Attribute Extended</title>
+
+<span id=my_id_with_a_relatively_long_name_test class=my_id_with_a_relatively_long_name_test_class>Span</span>
+<span id=my-id>Span</span>
+
+<div class=container>
+ <div id=div1 name=div-name>
+  <div id=div1-1_div1>
+   <h1 id=h1_div1.1_div1 class=span-class>h1 element, id:h1_div1.1_div1</h1>
+  </div>
+ </div>
+
+ <div class=div-depth-2>
+  <div class=div-depth-3>
+   <div class=div-depth-4>
+    <span id=my_id_with_a_relatively_long_name_test class=my_id_with_a_relatively_long_name_test_class>Span</span>
+   </div>
+  </div>
+ </div>
+
+ <div>
+  <a>anchor text 123</a>
+  <a>anchor text 123</a>
+
+  <select>
+   <option id="opt-1" style="font-size: 11px; display: block;" selected>My Option 1</option>
+   <option class="opt" >My Option 2</option>
+   <option value="one">My Option 3</option>
+  </select>
+ </div>
+
+ <a id="no-vi-1" class="cant-see" style="display:none">no visibility</a><br/>
+ <a id="no-vi-2" style="display:none">no visibility</a><br/>
+ <a id="no-vi-2" style="display:none">no visibility</a><br/>
+
+ <span id=my_id_with_a_relatively_long_name_test2>Span</span>
+ <span id="id.period">Span</span>
+</div>
+
+<div id=id_attribute_accesskey accesskey=nothing></div>
+
+<!-- Multiple elements with same class  -->
+
+<div id=id_div_multiple_elements_same_class_nested_depth_0 class=multiple_elements_same_class_nested>
+ <div id=id_multiple_elements_same_class_nested_div_depth_1 class=multiple_elements_same_class_nested>
+  <div id=id_multiple_elements_same_class_nested_div_depth_2 class=multiple_elements_same_class_nested>
+  </div>
+ </div>
+</div>
+
+<!-- Attribute name with special characters -->
+<div id=id_special_char_attribute_name *=special_char_attribute_name></div>
+
+<!-- Attribute value with special characters -->
+<div id=id_special_char_attribute_value name="*"></div>
+
+<!-- Attribute value and name with special characters -->
+<div id=id_special_char_attribute_name_and_value @="("></div>
+
+<!-- Attribute name is numeric. -->
+<div id"id_attribute_name_numeric 1="numeric attribute name"></div>
+
+<!-- Attribute value is numeric. -->
+<div id=id_attribute_value_numeric one=2></div>
+
+<!-- Attribute name is negative numeric. -->
+<div id=id_attribute_negative_numeric_name -5="attribute name is -5"></div>
+
+<!-- Attribute value is negative numeric. -->
+<div id=id_attribute_negative_numeric_value negative_numeric_value=-9></div>
diff --git a/testing/web-platform/tests/webdriver/element_state/selected_test.py b/testing/web-platform/tests/webdriver/element_state/selected_test.py
new file mode 100644
index 00000000000000..9c80f29f60d0c0
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/element_state/selected_test.py
@@ -0,0 +1,210 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+
+class GetElementSelectedTest(base_test.WebDriverBaseTest):
+    def test_selected_1(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-1")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_2(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-2")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_3(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-3")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_4(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-4")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_5(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-5")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_6(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-6")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_7(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-7")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_8(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-8")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_9(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-9")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_10(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-10")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_11(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-11")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_12(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-12")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_13(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-13")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_14(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-14")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_selected_15(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("selected-15")
+
+        self.assertEquals(element.is_selected(), True)
+
+    def test_unselected_1(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-1")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_2(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-2")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_3(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-3")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_4(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-4")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_5(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-5")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_6(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-6")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_7(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-7")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_8(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-8")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_9(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-9")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_10(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-10")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_11(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-11")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_12(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-12")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_13(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-13")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_14(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-14")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_15(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-15")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_16(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-16")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_17(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-17")
+
+        self.assertEquals(element.is_selected(), False)
+
+    def test_unselected_18(self):
+        self.driver.get(self.webserver.where_is("element_state/res/element-selected.html"))
+        element = self.driver.find_element_by_id("unselected-18")
+
+        self.assertEquals(element.is_selected(), False)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/element_state/visibility_test.py b/testing/web-platform/tests/webdriver/element_state/visibility_test.py
index 02efadb0aca322..58218a7ff2e0ac 100644
--- a/testing/web-platform/tests/webdriver/element_state/visibility_test.py
+++ b/testing/web-platform/tests/webdriver/element_state/visibility_test.py
@@ -4,41 +4,41 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions
+from selenium.common import exceptions
 
 
 class NaturalNonVisibleElementsTest(base_test.WebDriverBaseTest):
     def test_0x0_pixel_element_is_not_visible(self):
         self.driver.get(self.webserver.where_is("element_state/res/0x0-pixels.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertFalse(el.is_displayed())
 
     def test_0x0_pixel_text_node_is_visible(self):
         self.driver.get(self.webserver.where_is("element_state/res/0x0-pixels-text-node.html"))
-        el = self.driver.find_element_by_css("p")
+        el = self.driver.find_element_by_css_selector("p")
         self.assertTrue(el.is_displayed())
 
     def test_1x1_pixel_element(self):
         self.driver.get(self.webserver.where_is("element_state/res/1x1-pixels.html"))
-        el = self.driver.find_element_by_css("p")
+        el = self.driver.find_element_by_css_selector("p")
         self.assertTrue(el.is_displayed())
 
     def test_zero_sized_element_is_shown_if_decendant_has_size(self):
         self.driver.get(self.webserver.where_is("element_state/res/zero-sized-element-with-sizable-decendant.html"))
-        parent = self.driver.find_element_by_css("#parent")
-        child = self.driver.find_element_by_css("#child")
+        parent = self.driver.find_element_by_css_selector("#parent")
+        child = self.driver.find_element_by_css_selector("#child")
 
         self.assertTrue(parent.is_displayed())
         self.assertTrue(child.is_displayed())
 
     def test_input_type_hidden_is_never_visible(self):
         self.driver.get(self.webserver.where_is("element_state/res/input-type-hidden.html"))
-        input = self.driver.find_element_by_css("input")
+        input = self.driver.find_element_by_css_selector("input")
         self.assertFalse(input.is_displayed())
 
     def test_input_morphs_into_hidden(self):
         self.driver.get(self.webserver.where_is("element_state/res/input-morphs-into-hidden.html"))
-        input = self.driver.find_element_by_css("input")
+        input = self.driver.find_element_by_css_selector("input")
         self.assertFalse(input.is_displayed())
 
     def test_parent_node_visible_when_all_children_are_absolutely_positioned_and_overflow_is_hidden(self):
@@ -51,10 +51,10 @@ def test_parent_of_absolutely_positioned_elements_visible_where_ancestor_overflo
 
         self.driver.get(self.webserver.where_is("element_state/res/absolute-children-ancestor-hidden-overflow.html"))
 
-        children = self.driver.find_elements_by_css(".child")
+        children = self.driver.find_elements_by_css_selector(".child")
         assert all(child.is_displayed() for child in children)
 
-        parent = self.driver.find_element_by_css("#parent")
+        parent = self.driver.find_element_by_css_selector("#parent")
         assert parent.is_displayed()
 
     def test_element_hidden_by_overflow_x_is_not_visible(self):
@@ -66,8 +66,8 @@ def test_element_hidden_by_overflow_x_is_not_visible(self):
 
         for page in pages:
             self.driver.get(self.webserver.where_is(page))
-            right = self.driver.find_element_by_css("#right")
-            bottom_right = self.driver.find_element_by_css("#bottom-right")
+            right = self.driver.find_element_by_css_selector("#right")
+            bottom_right = self.driver.find_element_by_css_selector("#bottom-right")
 
             self.assertFalse(right.is_displayed())
             self.assertFalse(bottom_right.is_displayed())
@@ -81,8 +81,8 @@ def test_element_hidden_by_overflow_y_is_not_visible(self):
 
         for page in pages:
             self.driver.get(self.webserver.where_is(page))
-            bottom = self.driver.find_element_by_css("#bottom")
-            bottom_right = self.driver.find_element_by_css("#bottom-right")
+            bottom = self.driver.find_element_by_css_selector("#bottom")
+            bottom_right = self.driver.find_element_by_css_selector("#bottom-right")
 
             self.assertFalse(bottom.is_displayed())
             self.assertFalse(bottom_right.is_displayed())
@@ -104,78 +104,78 @@ def test_element_scrollable_by_overflow_y_is_visible(self):
 
     def test_element_outside_viewport(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-outside-viewport.html"))
-        hidden = self.driver.find_element_by_css("div")
+        hidden = self.driver.find_element_by_css_selector("div")
         self.assertFalse(hidden.is_displayed())
 
     def test_element_dynamically_moved_outside_viewport(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-dynamically-moved-outside-viewport.html"))
-        hidden = self.driver.find_element_by_css("div")
+        hidden = self.driver.find_element_by_css_selector("div")
         self.assertFalse(hidden.is_displayed())
 
     def test_element_hidden_by_other_element(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-hidden-by-other-element.html"))
-        overlay = self.driver.find_element_by_css("#overlay")
-        hidden = self.driver.find_element_by_css("#hidden")
+        overlay = self.driver.find_element_by_css_selector("#overlay")
+        hidden = self.driver.find_element_by_css_selector("#hidden")
 
         self.assertTrue(overlay.is_displayed())
         self.assertFalse(hidden.is_displayed())
 
     def test_element_partially_hidden_by_other_element(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-partially-hidden-by-other-element.html"))
-        partial = self.driver.find_element_by_css("#partial")
+        partial = self.driver.find_element_by_css_selector("#partial")
         self.assertTrue(partial.is_displayed())
 
     def test_element_hidden_by_z_index(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-hidden-by-z-index.html"))
-        overlay = self.driver.find_element_by_css("#overlay")
-        hidden = self.driver.find_element_by_css("#hidden")
+        overlay = self.driver.find_element_by_css_selector("#overlay")
+        hidden = self.driver.find_element_by_css_selector("#hidden")
 
         self.assertTrue(overlay.is_displayed())
         self.assertFalse(hidden.is_displayed())
 
     def test_element_moved_outside_viewport_by_transform(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-moved-outside-viewport-by-transform.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertFalse(el.is_displayed())
 
     def test_element_moved_behind_other_element_by_transform(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-moved-behind-other-element-by-transform.html"))
-        overlay = self.driver.find_element_by_css("#overlay")
-        hidden = self.driver.find_element_by_css("#hidden")
+        overlay = self.driver.find_element_by_css_selector("#overlay")
+        hidden = self.driver.find_element_by_css_selector("#hidden")
 
         self.assertTrue(overlay.is_displayed())
         self.assertFalse(hidden.is_displayed())
 
     def test_text_with_same_color_as_background(self):
         self.driver.get(self.webserver.where_is("element_state/res/text-with-same-color-as-background.html"))
-        p = self.driver.find_element_by_css("p")
+        p = self.driver.find_element_by_css_selector("p")
         self.assertFalse(p.is_displayed())
 
     def test_text_with_same_color_as_parent_background(self):
         self.driver.get(self.webserver.where_is("element_state/res/text-with-same-color-as-parent-background.html"))
-        p = self.driver.find_element_by_css("p")
+        p = self.driver.find_element_by_css_selector("p")
         self.assertFalse(p.is_displayed())
 
     def test_text_with_matching_color_and_background(self):
         self.driver.get(self.webserver.where_is("element_state/res/text-with-matching-color-and-background.html"))
-        p = self.driver.find_element_by_css("p")
+        p = self.driver.find_element_by_css_selector("p")
         self.assertTrue(p.is_displayed())
 
     def test_element_with_same_color_as_background(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-same-color-as-background.html"))
-        el = self.driver.find_element_by_css("div")
+        el = self.driver.find_element_by_css_selector("div")
         self.assertFalse(el.is_displayed())
 
     def test_element_with_same_color_as_parent_background(self):
         self.driver.get(self.webserver.where_is("element_state/res/element-with-same-color-as-parent-background.html"))
-        hidden = self.driver.find_element_by_css("#hidden")
+        hidden = self.driver.find_element_by_css_selector("#hidden")
         self.assertFalse(hidden.is_displayed())
 
 
 class BodyElementIsAlwaysDisplayedTest(base_test.WebDriverBaseTest):
     def assert_body_is_displayed_on(self, page):
         self.driver.get(self.webserver.where_is(page))
-        body = self.driver.find_element_by_css("body")
+        body = self.driver.find_element_by_css_selector("body")
         assert body.is_displayed()
 
     def test_implicit(self):
@@ -194,86 +194,86 @@ def test_overflow_hidden(self):
 class DisplayTest(base_test.WebDriverBaseTest):
     def test_display_block(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-block.html"))
-        el = self.driver.find_element_by_css("p")
+        el = self.driver.find_element_by_css_selector("p")
         self.assertTrue(el.is_displayed())
 
     def test_display_none(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none.html"))
-        el = self.driver.find_element_by_css("p")
+        el = self.driver.find_element_by_css_selector("p")
         self.assertFalse(el.is_displayed())
 
     def test_display_none_hides_child_node(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-child.html"))
-        parent = self.driver.find_element_by_css("#parent")
-        child = self.driver.find_element_by_css("#child")
+        parent = self.driver.find_element_by_css_selector("#parent")
+        child = self.driver.find_element_by_css_selector("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_display_none_hides_child_node_link(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-child-link.html"))
-        child = self.driver.find_element_by_css("#child")
+        child = self.driver.find_element_by_css_selector("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_hides_child_node_paragraph(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-child-paragraph.html"))
-        child = self.driver.find_element_by_css("#child")
+        child = self.driver.find_element_by_css_selector("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_on_parent_takes_presedence(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-parent-presedence.html"))
-        child = self.driver.find_element_by_css("#child")
+        child = self.driver.find_element_by_css_selector("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_on_parent_takes_presedence_over_visibility_visible(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-parent-presedence-visibility.html"))
-        child = self.driver.find_element_by_css("#child")
+        child = self.driver.find_element_by_css_selector("#child")
         self.assertFalse(child.is_displayed())
 
     def test_display_none_hidden_dynamically(self):
         self.driver.get(self.webserver.where_is("element_state/res/display-none-dynamic.html"))
-        hidden = self.driver.find_element_by_css("#hidden")
+        hidden = self.driver.find_element_by_css_selector("#hidden")
         self.assertFalse(hidden.is_displayed())
 
 
 class VisibilityTest(base_test.WebDriverBaseTest):
     def test_element_state_hidden(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-hidden.html"))
-        el = self.driver.find_element_by_css("p")
+        el = self.driver.find_element_by_css_selector("p")
         self.assertFalse(el.is_displayed())
 
     def test_element_state_visible(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-visible.html"))
-        el = self.driver.find_element_by_css("p")
+        el = self.driver.find_element_by_css_selector("p")
         self.assertTrue(el.is_displayed())
 
     def test_visibility_hidden_hides_child_node(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child.html"))
-        parent = self.driver.find_element_by_css("#parent")
-        child = self.driver.find_element_by_css("#child")
+        parent = self.driver.find_element_by_css_selector("#parent")
+        child = self.driver.find_element_by_css_selector("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_visibility_hidden_hides_child_node_link(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child-link.html"))
-        parent = self.driver.find_element_by_css("#parent")
-        child = self.driver.find_element_by_css("#child")
+        parent = self.driver.find_element_by_css_selector("#parent")
+        child = self.driver.find_element_by_css_selector("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_visibility_hidden_hides_child_node_paragraph(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child-paragraph.html"))
-        parent = self.driver.find_element_by_css("#parent")
-        child = self.driver.find_element_by_css("#child")
+        parent = self.driver.find_element_by_css_selector("#parent")
+        child = self.driver.find_element_by_css_selector("#child")
 
         self.assertFalse(parent.is_displayed())
         self.assertFalse(child.is_displayed())
 
     def test_visibility_hidden_on_child_takes_precedence(self):
         self.driver.get(self.webserver.where_is("element_state/res/visibility-child-presedence.html"))
-        child = self.driver.find_element_by_css("#child")
+        child = self.driver.find_element_by_css_selector("#child")
         self.assertTrue(child.is_displayed())
 
     def test_visibility_hidden_on_parent_takes_precedence_over_display_block(self):
@@ -284,33 +284,33 @@ def test_visibility_hidden_set_dynamically(self):
 
     def test_should_show_element_not_visible_with_hidden_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/hidden.html"))
-        singleHidden = self.driver.find_element_by_css('#singleHidden')
+        singleHidden = self.driver.find_element_by_css_selector('#singleHidden')
         self.assertFalse(singleHidden.is_displayed())
 
     def test_should_show_element_not_visible_when_parent_element_has_hidden_attribute(self):
         self.driver.get(self.webserver.where_is("element_state/res/hidden.html"))
-        child = self.driver.find_element_by_css('#child')
+        child = self.driver.find_element_by_css_selector('#child')
         self.assertFalse(child.is_displayed())
 
 
 class VisibilityInteractionTest(base_test.WebDriverBaseTest):
     def test_input_hidden_is_unclickable(self):
         self.driver.get(self.webserver.where_is("element_state/res/input-type-hidden-unclickable.html"))
-        input = self.driver.find_element_by_css("input")
+        input = self.driver.find_element_by_css_selector("input")
 
         with self.assertRaises(exceptions.ElementNotVisibleException):
             input.click()
 
     def test_hidden_input_checkbox_is_untogglable(self):
         self.driver.get(self.webserver.where_is("element_state/res/hidden-input-type-checkbox-untogglable.html"))
-        checkbox = self.driver.find_element_by_css("input")
+        checkbox = self.driver.find_element_by_css_selector("input")
 
         with self.assertRaises(exceptions.ElementNotVisibleException):
             checkbox.click()
 
     def test_typing_in_hidden_input_is_impossible(self):
         self.driver.get(self.webserver.where_is("element_state/res/hidden-input-type-text-writing.html"))
-        textfield = self.driver.find_element_by_css("input")
+        textfield = self.driver.find_element_by_css_selector("input")
 
         with self.assertRaises(exceptions.ElementNotVisibleException):
             textfield.send_keys("Koha is a popular Indian cheese")
diff --git a/testing/web-platform/tests/webdriver/javascript/execute_script_test.py b/testing/web-platform/tests/webdriver/javascript/execute_script_test.py
index 72810a5fe0402d..dd7cfca946cd64 100644
--- a/testing/web-platform/tests/webdriver/javascript/execute_script_test.py
+++ b/testing/web-platform/tests/webdriver/javascript/execute_script_test.py
@@ -4,6 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
+from selenium.webdriver.remote.webelement import WebElement
 
 
 class ExecuteScriptTest(base_test.WebDriverBaseTest):
diff --git a/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py b/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py
index 2650a2dc678759..83f7d14500179e 100644
--- a/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py
+++ b/testing/web-platform/tests/webdriver/modal/alerts_quit_test.py
@@ -4,16 +4,17 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions, wait
+from selenium.common import exceptions
+from selenium.webdriver.support import wait
 
 
 class AlertsQuitTest(base_test.WebDriverBaseTest):
     def setUp(self):
-        self.wait = wait.WebDriverWait(self.driver, 5, ignored_exceptions=[exceptions.NoSuchAlertException])
+        self.wait = wait.WebDriverWait(self.driver, 5, ignored_exceptions=[exceptions.NoAlertPresentException])
         self.driver.get(self.webserver.where_is('modal/res/alerts.html'))
 
     def test_can_quit_when_an_alert_is_present(self):
-        self.driver.find_element_by_css('#alert').click()
+        self.driver.find_element_by_css_selector('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         self.driver.quit()
         with self.assertRaises(Exception):
diff --git a/testing/web-platform/tests/webdriver/modal/alerts_test.py b/testing/web-platform/tests/webdriver/modal/alerts_test.py
index d4182f6d07bbd2..5f6f8a9f57c654 100644
--- a/testing/web-platform/tests/webdriver/modal/alerts_test.py
+++ b/testing/web-platform/tests/webdriver/modal/alerts_test.py
@@ -4,144 +4,145 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions, wait
-
+from selenium.common import exceptions
+from selenium.webdriver.support import wait
 
 class AlertsTest(base_test.WebDriverBaseTest):
     def setUp(self):
-        self.wait = wait.WebDriverWait(self.driver, 5, ignored_exceptions = [exceptions.NoSuchAlertException])
+        self.wait = wait.WebDriverWait(self.driver, 5, ignored_exceptions = [exceptions.NoAlertPresentException])
         self.driver.get(self.webserver.where_is('modal/res/alerts.html'))
 
     def tearDown(self):
         try:
             self.driver.switch_to_alert().dismiss()
-        except exceptions.NoSuchAlertException:
+        except exceptions.NoAlertPresentException:
             pass
 
     # Alerts
     def test_should_allow_user_to_accept_an_alert(self):
-        self.driver.find_element_by_css('#alert').click()
+        self.driver.find_element_by_css_selector('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.driver.get_current_url()
+        self.driver.current_url
 
     def test_should_allow_user_to_accept_an_alert_with_no_text(self):
-        self.driver.find_element_by_css('#empty-alert').click()
+        self.driver.find_element_by_css_selector('#empty-alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.driver.get_current_url()
+        self.driver.current_url
 
     def test_should_allow_user_to_dismiss_an_alert(self):
-        self.driver.find_element_by_css('#alert').click()
+        self.driver.find_element_by_css_selector('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.driver.get_current_url()
+        self.driver.current_url
 
     def test_should_allow_user_to_get_text_of_an_alert(self):
-        self.driver.find_element_by_css('#alert').click()
+        self.driver.find_element_by_css_selector('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
-        value = alert.get_text()
+        value = alert.text
         alert.accept()
         self.assertEquals('cheese', value)
 
     def test_setting_the_value_of_an_alert_throws(self):
-        self.driver.find_element_by_css('#alert').click()
+        self.driver.find_element_by_css_selector('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
-	with self.assertRaises(exceptions.ElementNotVisibleException):
-	    alert.send_keys('cheese')
+        with self.assertRaises(exceptions.ElementNotVisibleException):
+            alert.send_keys('cheese')
         alert.accept()
 
     def test_alert_should_not_allow_additional_commands_if_dismissed(self):
-        self.driver.find_element_by_css('#alert').click()
+        self.driver.find_element_by_css_selector('#alert').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        with self.assertRaises(exceptions.NoSuchAlertException):
-            alert.get_text()
+        with self.assertRaises(exceptions.NoAlertPresentException):
+            alert.text
 
     # Prompts
     def test_should_allow_user_to_accept_a_prompt(self):
-        self.driver.find_element_by_css('#prompt').click()
+        self.driver.find_element_by_css_selector('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == '')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == '')
 
     def test_should_allow_user_to_dismiss_a_prompt(self):
-        self.driver.find_element_by_css('#prompt').click()
+        self.driver.find_element_by_css_selector('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'null')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == 'null')
 
     def test_should_allow_user_to_set_the_value_of_a_prompt(self):
-        self.driver.find_element_by_css('#prompt').click()
+        self.driver.find_element_by_css_selector('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.send_keys('cheese')
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'cheese')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == 'cheese')
 
     def test_should_allow_user_to_get_text_of_a_prompt(self):
-        self.driver.find_element_by_css('#prompt').click()
+        self.driver.find_element_by_css_selector('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
-        value = alert.get_text()
+        value = alert.text
         alert.accept()
         self.assertEquals('Enter something', value)
 
     def test_prompt_should_not_allow_additional_commands_if_dismissed(self):
-        self.driver.find_element_by_css('#prompt').click()
+        self.driver.find_element_by_css_selector('#prompt').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        with self.assertRaises(exceptions.NoSuchAlertException):
-            alert.get_text()
+        with self.assertRaises(exceptions.NoAlertPresentException):
+            alert.text
 
     def test_prompt_should_use_default_value_if_no_keys_sent(self):
-        self.driver.find_element_by_css('#prompt-with-default').click()
+        self.driver.find_element_by_css_selector('#prompt-with-default').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'This is a default value')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == 'This is a default value')
 
     def test_prompt_should_have_null_value_if_dismissed(self):
-        self.driver.find_element_by_css('#prompt-with-default').click()
+        self.driver.find_element_by_css_selector('#prompt-with-default').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'null')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == 'null')
 
     # Confirmations
     def test_should_allow_user_to_accept_a_confirm(self):
-        self.driver.find_element_by_css('#confirm').click()
+        self.driver.find_element_by_css_selector('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'true')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == 'true')
 
     def test_should_allow_user_to_dismiss_a_confirm(self):
-        self.driver.find_element_by_css('#confirm').click()
+        self.driver.find_element_by_css_selector('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.dismiss()
-        self.wait.until(lambda x: x.find_element_by_css('#text').text == 'false')
+        self.wait.until(lambda x: x.find_element_by_css_selector('#text').text == 'false')
 
     def test_setting_the_value_of_a_confirm_throws(self):
-        self.driver.find_element_by_css('#confirm').click()
+        self.driver.find_element_by_css_selector('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         with self.assertRaises(exceptions.ElementNotVisibleException):
             alert.send_keys('cheese')
         alert.accept()
 
     def test_should_allow_user_to_get_text_of_a_confirm(self):
-        self.driver.find_element_by_css('#confirm').click()
+        self.driver.find_element_by_css_selector('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
-        value = alert.get_text()
+        value = alert.text
         alert.accept()
         self.assertEquals('cheese', value)
 
     def test_confirm_should_not_allow_additional_commands_if_dismissed(self):
-        self.driver.find_element_by_css('#confirm').click()
+        self.driver.find_element_by_css_selector('#confirm').click()
         alert = self.wait.until(lambda x: x.switch_to_alert())
         alert.accept()
-        with self.assertRaises(exceptions.NoSuchAlertException):
-            alert.get_text()
+        with self.assertRaises(exceptions.NoAlertPresentException):
+            alert.text
 
+"""
     def test_switch_to_missing_alert_fails(self):
-        with self.assertRaises(exceptions.NoSuchAlertException):
+        with self.assertRaises(exceptions.NoAlertPresentException):
             self.driver.switch_to_alert()
-
+"""
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/testing/web-platform/tests/webdriver/navigation/auth_tests.py b/testing/web-platform/tests/webdriver/navigation/auth_tests.py
index 068e44fe9f6ad6..52a18cdb8ef59a 100644
--- a/testing/web-platform/tests/webdriver/navigation/auth_tests.py
+++ b/testing/web-platform/tests/webdriver/navigation/auth_tests.py
@@ -5,14 +5,14 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions
+from selenium.common import exceptions
 from wptserve import server
 from wptserve.router import any_method
 from wptserve.handlers import basic_auth_handler
 
 class WebDriverAuthTest(unittest.TestCase):
 
-    # Set up class to start HTTP Server that responds to 
+    # Set up class to start HTTP Server that responds to
     # test URLs with various 401 responses
     @classmethod
     def setUpClass(cls):
diff --git a/testing/web-platform/tests/webdriver/navigation/forward.py b/testing/web-platform/tests/webdriver/navigation/forward.py
index 6cc77c2a45856a..67ca83227bf976 100644
--- a/testing/web-platform/tests/webdriver/navigation/forward.py
+++ b/testing/web-platform/tests/webdriver/navigation/forward.py
@@ -11,12 +11,12 @@ class ForwardTest(base_test.WebDriverBaseTest):
     def test_forward(self):
         self.driver.get(self.webserver.where_is('navigation/res/forwardStart.html'))
         self.driver.get(self.webserver.where_is('navigation/res/forwardNext.html'))
-        nextbody = self.driver.find_element_by_css("body").text
-        self.driver.go_back()
-        currbody = self.driver.find_element_by_css("body").text
+        nextbody = self.driver.find_element_by_css_selector("body").text
+        self.driver.back()
+        currbody = self.driver.find_element_by_css_selector("body").text
         self.assertNotEqual(nextbody, currbody)
-        self.driver.go_forward()
-        currbody = self.driver.find_element_by_css("body").text
+        self.driver.forward()
+        currbody = self.driver.find_element_by_css_selector("body").text
         self.assertEqual(nextbody, currbody)
 
 
diff --git a/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py b/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py
index 057fb9c58284d2..99759681a0d958 100644
--- a/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py
+++ b/testing/web-platform/tests/webdriver/navigation/forwardToNothing.py
@@ -10,9 +10,9 @@ class ForwardToNothingTest(base_test.WebDriverBaseTest):
     # Get a static page that must be the same upon refresh
     def test_forwardToNothing(self):
         self.driver.get(self.webserver.where_is('navigation/forwardStart.html'))
-        body = self.driver.find_element_by_css("body").text
-        self.driver.go_forward()
-        currbody = self.driver.find_element_by_css("body").text
+        body = self.driver.find_element_by_css_selector("body").text
+        self.driver.forward()
+        currbody = self.driver.find_element_by_css_selector("body").text
         self.assertEqual(body, currbody)
 
 
diff --git a/testing/web-platform/tests/webdriver/navigation/get_from_http_test.py b/testing/web-platform/tests/webdriver/navigation/get_from_http_test.py
index 714e65f2b4dbdb..d28a0d0b142676 100644
--- a/testing/web-platform/tests/webdriver/navigation/get_from_http_test.py
+++ b/testing/web-platform/tests/webdriver/navigation/get_from_http_test.py
@@ -10,7 +10,7 @@ class GetFromHttpTest(base_test.WebDriverBaseTest):
     def testGetUrlWithNoRedirectionOverHttp(self):
         page = self.webserver.where_is('navigation/res/empty.html')
         self.driver.get(page)
-        url = self.driver.get_current_url()
+        url = self.driver.current_url
         self.assertEquals(page, url)
 
 
@@ -18,7 +18,7 @@ def testGetWillFollowTheLocationHeader(self):
         page = self.webserver.where_is('navigation/redirect')
         self.driver.get(page)
         expected = self.webserver.where_is('navigation/res/empty.html')
-        url = self.driver.get_current_url()
+        url = self.driver.current_url
         self.assertEquals(expected, url)
 
 
@@ -26,7 +26,7 @@ def testGetWillFollowMetaRefreshThatRefreshesInstantly(self):
         page = self.webserver.where_is('navigation/res/instant-meta-redirect.html')
         self.driver.get(page)
         expected = self.webserver.where_is('navigation/res/empty.html')
-        url = self.driver.get_current_url()
+        url = self.driver.current_url
         self.assertEquals(expected, url)
 
 
@@ -34,14 +34,14 @@ def testGetWillFollowMetaRefreshThatRefreshesAfterOneSecond(self):
         page = self.webserver.where_is('navigation/res/1s-meta-redirect.html')
         self.driver.get(page)
         expected = self.webserver.where_is('navigation/res/empty.html')
-        url = self.driver.get_current_url()
+        url = self.driver.current_url
         self.assertEquals(expected, url)
 
 
     def testGetWillNotFollowMetaRefreshThatRefreshesAfterMoreThanOneSecond(self):
         page = self.webserver.where_is('navigation/res/60s-meta-redirect.html')
         self.driver.get(page)
-        url = self.driver.get_current_url()
+        url = self.driver.current_url
         self.assertEquals(page, url)
 
 
diff --git a/testing/web-platform/tests/webdriver/navigation/invalid_cert_test.py b/testing/web-platform/tests/webdriver/navigation/invalid_cert_test.py
index 5f84827966dc34..b980146ee2ca7a 100644
--- a/testing/web-platform/tests/webdriver/navigation/invalid_cert_test.py
+++ b/testing/web-platform/tests/webdriver/navigation/invalid_cert_test.py
@@ -21,7 +21,7 @@ def testCanNavigateToSiteWithSelfSignedCert(self):
             'navigation/res/empty.html').replace('http:', 'https:', 1)
 
         self.driver.get(expected)
-        self.assertEquals(expected, self.driver.get_current_url())
+        self.assertEquals(expected, self.driver.current_url)
 
 
 if __name__ == '__main__':
diff --git a/testing/web-platform/tests/webdriver/navigation/refresh_page.py b/testing/web-platform/tests/webdriver/navigation/refresh_page.py
new file mode 100644
index 00000000000000..1e1899008b0af0
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/navigation/refresh_page.py
@@ -0,0 +1,27 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+
+class RefreshPageTest(base_test.WebDriverBaseTest):
+    # Get a static page that must be the same upon refresh
+    def test_refreshPage(self):
+        self.driver.get(self.webserver.where_is('navigation/res/refreshPageStatic.html'))
+        body = self.driver.find_element_by_css_selector("body").text
+        self.driver.execute_script("document.getElementById('body').innerHTML=''")
+        self.driver.refresh()
+        newbody = self.driver.find_element_by_css_selector("body").text
+        self.assertEqual(body, newbody)
+
+        self.driver.get(self.webserver.where_is('navigation/res/refreshPageDynamic.html'))
+        body = self.driver.find_element_by_css_selector("body").text
+        self.driver.refresh()
+        newbody = self.driver.find_element_by_css_selector("body").text
+        self.assertNotEqual(body, newbody)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/runtests_p0.py b/testing/web-platform/tests/webdriver/runtests_p0.py
new file mode 100644
index 00000000000000..dc52c14be63f5e
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/runtests_p0.py
@@ -0,0 +1,42 @@
+import unittest
+
+from unittest import TestLoader, TextTestRunner, TestSuite
+
+from cookie import cookie_test
+from navigation import forward
+from navigation import forwardToNothing
+from navigation import get_from_http_test
+from navigation import refresh_page
+from element_location import element_location_test
+from element_state import visibility_test
+from element_state import method_test
+from element_state import properties
+from javascript import execute_script_test
+from user_input import clear_test
+from windows import window_manipulation
+from windows import tabbing
+
+
+
+if __name__ == "__main__":
+
+    loader = TestLoader()
+    suite = TestSuite((
+        loader.loadTestsFromModule(cookie_test),
+        loader.loadTestsFromModule(forward),
+        loader.loadTestsFromModule(forwardToNothing),
+        loader.loadTestsFromModule(element_location_test),
+        loader.loadTestsFromModule(visibility_test),
+        loader.loadTestsFromModule(execute_script_test),
+        loader.loadTestsFromModule(clear_test),
+        loader.loadTestsFromModule(method_test),
+        loader.loadTestsFromModule(properties),
+        loader.loadTestsFromModule(refresh_page),
+        loader.loadTestsFromModule(get_from_http_test),
+        loader.loadTestsFromModule(window_manipulation),
+        loader.loadTestsFromModule(tabbing)
+        ))
+
+    runner = TextTestRunner(verbosity=2)
+    runner.run(suite)
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/screenshot/__init__.py b/testing/web-platform/tests/webdriver/screenshot/__init__.py
new file mode 100644
index 00000000000000..0c8107bebedd89
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/screenshot/__init__.py
@@ -0,0 +1 @@
+__author__ = 'b-redeg'
diff --git a/testing/web-platform/tests/webdriver/screenshot/res/screenshot.html b/testing/web-platform/tests/webdriver/screenshot/res/screenshot.html
new file mode 100644
index 00000000000000..057bb9bf5f8568
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/screenshot/res/screenshot.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>"img" element with not fully qualified url</title>
+
+<img src="//web-platform.test:8000/images/blue.png">&nbsp;</a>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/screenshot/take_screenshot.py b/testing/web-platform/tests/webdriver/screenshot/take_screenshot.py
new file mode 100644
index 00000000000000..20ff2bff2aefb0
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/screenshot/take_screenshot.py
@@ -0,0 +1,15 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+
+class ScreenShotTest(base_test.WebDriverBaseTest):
+    # Get a static page that must be the same upon refresh
+    def test_screenShot(self):
+        self.driver.get(self.webserver.where_is('screenshot/res/screen.html'))
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py b/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py
index e39723c50c1fe5..5faa0ad122dbc3 100644
--- a/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py
+++ b/testing/web-platform/tests/webdriver/timeouts/implicit_waits_tests.py
@@ -4,7 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions
+from selenium.common import exceptions
 
 
 class ImplicitWaitsTests(base_test.WebDriverBaseTest):
@@ -12,15 +12,15 @@ def setUp(self):
         self.driver.get(self.webserver.where_is('timeouts/res/implicit_waits_tests.html'))
 
     def test_find_element_by_id(self):
-        add = self.driver.find_element_by_css("#adder")
-        self.driver.set_implicit_timeout(3)
+        add = self.driver.find_element_by_css_selector("#adder")
+        self.driver.implicitly_wait(3)
         add.click()
-        self.driver.find_element_by_css("#box0")  # All is well if this doesn't throw.
+        self.driver.find_element_by_css_selector("#box0")  # All is well if this doesn't throw.
 
     def test_should_still_fail_to_find_an_element_when_implicit_waits_are_enabled(self):
-        self.driver.set_implicit_timeout(0.5)
+        self.driver.implicitly_wait(0.5)
         try:
-            self.driver.find_element_by_css("#box0")
+            self.driver.find_element_by_css_selector("#box0")
             self.fail("Expected NoSuchElementException to have been thrown")
         except exceptions.NoSuchElementException as e:
             pass
@@ -28,10 +28,10 @@ def test_should_still_fail_to_find_an_element_when_implicit_waits_are_enabled(se
             self.fail("Expected NoSuchElementException but got " + str(e))
 
     def test_should_return_after_first_attempt_to_find_one_after_disabling_implicit_waits(self):
-        self.driver.set_implicit_timeout(3)
-        self.driver.set_implicit_timeout(0)
+        self.driver.implicitly_wait(3)
+        self.driver.implicitly_wait(0)
         try:
-            self.driver.find_element_by_css("#box0")
+            self.driver.find_element_by_css_selector("#box0")
             self.fail("Expected NoSuchElementException to have been thrown")
         except exceptions.NoSuchElementException as e:
             pass
@@ -39,24 +39,24 @@ def test_should_return_after_first_attempt_to_find_one_after_disabling_implicit_
             self.fail("Expected NoSuchElementException but got " + str(e))
 
     def test_should_implicitly_wait_until_at_least_one_element_is_found_when_searching_for_many(self):
-        add = self.driver.find_element_by_css("#adder")
-        self.driver.set_implicit_timeout(2)
+        add = self.driver.find_element_by_css_selector("#adder")
+        self.driver.implicitly_wait(2)
         add.click()
         add.click()
-        elements = self.driver.find_elements_by_css(".redbox")
+        elements = self.driver.find_elements_by_css_selector(".redbox")
         self.assertTrue(len(elements) >= 1)
 
     def test_should_still_fail_to_find_an_element_by_class_when_implicit_waits_are_enabled(self):
-        self.driver.set_implicit_timeout(0.5)
-        elements = self.driver.find_elements_by_css(".redbox")
+        self.driver.implicitly_wait(0.5)
+        elements = self.driver.find_elements_by_css_selector(".redbox")
         self.assertEqual(0, len(elements))
 
     def test_should_return_after_first_attempt_to_find_many_after_disabling_implicit_waits(self):
-        add = self.driver.find_element_by_css("#adder")
-        self.driver.set_implicit_timeout(1.1)
-        self.driver.set_implicit_timeout(0)
+        add = self.driver.find_element_by_css_selector("#adder")
+        self.driver.implicitly_wait(1.1)
+        self.driver.implicitly_wait(0)
         add.click()
-        elements = self.driver.find_elements_by_css(".redbox")
+        elements = self.driver.find_elements_by_css_selector(".redbox")
         self.assertEqual(0, len(elements))
 
 
diff --git a/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py b/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py
index 6d8693f6c2e9b1..2f0d3beebaa687 100644
--- a/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py
+++ b/testing/web-platform/tests/webdriver/timeouts/page_load_timeouts_tests.py
@@ -4,7 +4,7 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions
+from selenium.common import exceptions
 
 
 class PageLoadTimeoutTest(base_test.WebDriverBaseTest):
diff --git a/testing/web-platform/tests/webdriver/user_input/clear_test.py b/testing/web-platform/tests/webdriver/user_input/clear_test.py
index 5375725128b999..34e82e15999d20 100644
--- a/testing/web-platform/tests/webdriver/user_input/clear_test.py
+++ b/testing/web-platform/tests/webdriver/user_input/clear_test.py
@@ -6,45 +6,45 @@
 
 sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
 import base_test
-from webdriver import exceptions
+from selenium.common import exceptions
 
 
 class ElementClearTest(base_test.WebDriverBaseTest):
     def test_writable_text_input_element_should_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_writable_input_page.html"))
-        e = self.driver.find_element_by_css("#writableTextInput")
+        e = self.driver.find_element_by_css_selector("#writableTextInput")
         e.clear()
         self.assertEquals("", e.get_attribute("value"))
 
     def test_disabled_text_input_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_disabled_input_page.html"))
-        e = self.driver.find_element_by_css("#disabledTextInput")
+        e = self.driver.find_element_by_css_selector("#disabledTextInput")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_read_only_text_input_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_readonly_input_page.html"))
-        e = self.driver.find_element_by_css("#readOnlyTextInput")
+        e = self.driver.find_element_by_css_selector("#readOnlyTextInput")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_writable_text_area_element_should_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_writable_textarea_page.html"))
-        e = self.driver.find_element_by_css("#writableTextArea")
+        e = self.driver.find_element_by_css_selector("#writableTextArea")
         e.clear()
         self.assertEquals("", e.get_attribute("value"))
 
     def test_disabled_text_area_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_disabled_textarea_page.html"))
-        e = self.driver.find_element_by_css("#disabledTextArea")
+        e = self.driver.find_element_by_css_selector("#disabledTextArea")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_read_only_text_input_element_should_not_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_readonly_textarea_page.html"))
-        e = self.driver.find_element_by_css("#readOnlyTextArea")
+        e = self.driver.find_element_by_css_selector("#readOnlyTextArea")
         self.assertRaises(exceptions.InvalidElementStateException, lambda: e.clear())
 
     def test_content_editable_area_should_clear(self):
         self.driver.get(self.webserver.where_is("user_input/res/element_clear_contenteditable_page.html"))
-        e = self.driver.find_element_by_css("#contentEditableElement")
+        e = self.driver.find_element_by_css_selector("#contentEditableElement")
         e.clear()
         self.assertEquals("", e.text)
 
diff --git a/testing/web-platform/tests/webdriver/user_input/click_test.py b/testing/web-platform/tests/webdriver/user_input/click_test.py
new file mode 100644
index 00000000000000..c151f9bcdb2cf5
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/user_input/click_test.py
@@ -0,0 +1,349 @@
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+repo_root = os.path.abspath(os.path.join(__file__, "../../.."))
+sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
+from webdriver import exceptions, wait
+
+
+class ClickTest(base_test.WebDriverBaseTest):
+    def setUp(self):
+        self.wait = wait.WebDriverWait(self.driver, 5, ignored_exceptions = [exceptions.NoSuchAlertException])
+        self.driver.get(self.webserver.where_is('modal/res/alerts.html'))
+
+    def tearDown(self):
+        try:
+            self.driver.switch_to_alert().dismiss()
+        except exceptions.NoSuchAlertException:
+            pass
+
+    def test_click_div(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("div")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "div")
+
+    def test_click_p(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("p")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "p")
+
+    def test_click_h1(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("h1")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "h1")
+
+    def test_click_pre(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("pre")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "pre")
+
+    def test_click_ol(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("ol")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "ol")
+
+    def test_click_ul(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("ul")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "ul")
+
+    def test_click_a(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("a")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "a")
+
+    def test_click_img(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("img")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "img")
+
+    def test_click_video(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("video")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "video")
+
+    def test_click_canvas(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("canvas")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "canvas")
+
+    def test_click_progress(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("progress")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "progress")
+
+    def test_click_textarea(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("textarea")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "textarea")
+
+    def test_click_button(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("button")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "button")
+
+    def test_click_svg(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("svg")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "svg")
+
+    def test_click_input_range(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_range")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_range")
+
+    def test_click_input_button(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_button")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_button")
+
+    def test_click_input_submit(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_submit")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_submit")
+
+    def test_click_input_reset(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_reset")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_reset")
+
+    def test_click_input_checkbox(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_checkbox")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_checkbox")
+
+    def test_click_input_radio(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_radio")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_radio")
+
+    def test_click_input_text(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_text")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_text")
+
+    def test_click_input_number(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_number")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_number")
+
+    def test_click_input_tel(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_tel")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_tel")
+
+    def test_click_input_url(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_url")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_url")
+
+    def test_click_input_email(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_email")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_email")
+
+    def test_click_input_search(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_search")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_search")
+
+    def test_click_input_image(self):
+        self.driver.get(self.webserver.where_is("user_input/res/click.html"))
+
+        element = self.driver.find_element_by_id("input_image")
+        element.click()
+
+        alert = self.wait.until(lambda x: x.switch_to_alert())
+        value = alert.get_text()
+        alert.accept()
+
+        self.assertEquals(value, "input_image")
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/user_input/res/click.html b/testing/web-platform/tests/webdriver/user_input/res/click.html
new file mode 100644
index 00000000000000..3517bfca89766f
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/user_input/res/click.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <style>
+        .testcase {
+            background-color: #DDD;
+            margin: 30px;
+            min-width: 500px;
+            min-height: 70px;
+        }
+    </style>
+</head>
+<body>
+    <div id="div" class="testcase" onclick="alert('div')">div</div>
+    <p id="p" class="testcase" onclick="alert('p')">p</p>
+    <h1 id="h1" class="testcase" onclick="alert('h1')">h1</h1>
+    <pre id="pre" class="testcase" onclick="alert('pre')">pre</pre>
+    <ol id="ol" class="testcase" onclick="alert('ol')">ol</ol>
+    <ul id="ul" class="testcase" onclick="alert('ul')">ul</ul>
+    <a id="a" class="testcase" onclick="alert('a')">a</a>
+    <img id="img" class="testcase" onclick="alert('img')" src="data:image/png;base64,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AJgMEkAAAAAAk0ECCAAAAGAySAABAAAATAYJIAAAAIDJIAEEAAAAMBkkgAAAAAAmgwQQAAAAwGSQAAIAAACYDBJAAAAAAJNBAggAAABgMkgAAQAAAEwGCSAAAACAySABBAAAADAZJIAAAAAAJoMEEAAAAMBkkAACAAAAmAwSQAAAAACTQQIIAAAAYDJIAAEAAABMBgkgAAAAgMkgAQQAAAAwGSSAAAAAACaDBBAAAADAZJAAAgAAAJgMEkAAAAAAk0ECCAAAAGAySAABAAAATAYJIAAAAIDJIAEEAAAAMBkkgAAAAAAmgwQQAAAAwGSQAAIAAACYDBJAAAAAAJNBAggAAABgMkgAAQAAAEwGCSAAAACAySABBAAAADAZJIAAAAAAJoMEEAAAAMBkkAACAAAAmAwSQAAAAACTQQIIAAAAYDJIAAEAAABMBgkgAAAAgMkgAQQAAAAwGSSAAAAAACaDBBAAAADAZJAAAgAAAJgMEkAAAAAAk0ECCAAAAGAySAABAAAATAYJIAAAAIDJIAEEAAAAMBkkgAAAAAAmgwQQAAAAwGSQAAIAAACYDBJAAAAAAJNBAggAAABgMkgAAQAAAEwGCSAAAACAySABBAAAADAZJIAAAAAAJoMEEAAAAMBkkAACAAAAmAwSQAAAAACTQQIIAAAAYDJIAAEAAABMBgkgAAAAgMkgAQQAAAAwFaL/A1remQsHpt6bAAAAAElFTkSuQmCC" />
+    <video id="video" class="testcase" onclick="alert('video')">video</video>
+    <canvas id="canvas" class="testcase" onclick="alert('canvas')">canvas</canvas>
+    <progress id="progress" class="testcase" onclick="alert('progress')">progress</progress>
+    <textarea id="textarea" class="testcase" onclick="alert('textarea')">textarea</textarea>
+    <button id="button" class="testcase" onclick="alert('button')">button</button>
+    <svg id="svg" class="testcase" onclick="alert('svg')"><circle cx="50" cy="50" r="40" stroke="white" stroke-width="4" fill="blue" /></svg>
+    <input id="input_range" class="testcase" onclick="alert('input_range')" type="range" />
+    <input id="input_button" class="testcase" onclick="alert('input_button')" type="button" />
+    <input id="input_submit" class="testcase" onclick="alert('input_submit')" type="submit" />
+    <input id="input_reset" class="testcase" onclick="alert('input_reset')" type="reset" />
+    <input id="input_checkbox" class="testcase" onclick="alert('input_checkbox')" type="checkbox" />
+    <input id="input_radio" class="testcase" onclick="alert('input_radio')" type="radio" />
+    <input id="input_text" class="testcase" onclick="alert('input_text')" type="text" />
+    <input id="input_number" class="testcase" onclick="alert('input_number')" type="number" />
+    <input id="input_tel" class="testcase" onclick="alert('input_tel')" type="tel" />
+    <input id="input_url" class="testcase" onclick="alert('input_url')" type="url" />
+    <input id="input_email" class="testcase" onclick="alert('input_email')" type="email" />
+    <input id="input_search" class="testcase" onclick="alert('input_search')" type="search" />
+    <input id="input_image" class="testcase" onclick="alert('input_image')" type="image" />
+</body>
+</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/user_input/res/text-form-landing.html b/testing/web-platform/tests/webdriver/user_input/res/text-form-landing.html
new file mode 100644
index 00000000000000..345e60e0409d27
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/user_input/res/text-form-landing.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>Text Form Landing</title>
+</head>
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/user_input/res/text-form.html b/testing/web-platform/tests/webdriver/user_input/res/text-form.html
new file mode 100644
index 00000000000000..d99ec899dcd446
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/user_input/res/text-form.html
@@ -0,0 +1,25 @@
+<html>
+<head>
+    <title>Text Form</title>
+    <meta charset="utf-8" />
+    <script>
+        function key_press() {
+            document.getElementById("text").textContent = document.getElementById("Text1").value;
+        }
+
+        function got_focus() {
+            var output = document.getElementById("output");
+            output.checked = true;
+        }
+    </script>
+</head>
+<body>
+    <p id="text"></p>
+    <form action="text-form-landing.html">
+        <input id="Text1" type="text" onkeyup="key_press()"/>
+        <input id="Text2" type="text" onfocus="got_focus()" />
+        <input id="output" type="checkbox" />
+        <input type="submit" name="e" value="mc2" />
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/user_input/sendkeys_test.py b/testing/web-platform/tests/webdriver/user_input/sendkeys_test.py
new file mode 100644
index 00000000000000..d2edcbabd9ac01
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/user_input/sendkeys_test.py
@@ -0,0 +1,96 @@
+import os
+import sys
+import random
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+
+repo_root = os.path.abspath(os.path.join(__file__, "../../.."))
+sys.path.insert(1, os.path.join(repo_root, "tools", "webdriver"))
+from webdriver import exceptions
+
+
+class SendKeysTest(base_test.WebDriverBaseTest):
+    def setUp(self):
+        self.driver.get(self.webserver.where_is("user_input/res/text-form.html"))
+
+    def test_send_simple_string(self):
+        element = self.driver.find_element_by_id("Text1")
+        element.send_keys("lorem ipsum")
+
+        self.assertEquals(self.driver.find_element_by_id("text").get_text(), u"lorem ipsum")
+
+    def test_send_return(self):
+        element = self.driver.find_element_by_id("Text1")
+        returnkey = unichr(int("E006", 16))
+        element.send_keys([returnkey])
+
+        self.assertEquals(u"" + self.driver.get_current_url(), u"" + self.webserver.where_is("user_input/res/text-form-landing.html?e=mc2"))
+
+    def test_send_backspace(self):
+        element = self.driver.find_element_by_id("Text1")
+        element.send_keys("world ")
+        element.send_keys("wide ")
+        element.send_keys("web ")
+        element.send_keys("consortium")
+
+        backspace= unichr(int("E003", 16))
+        for i in range(0, 11):
+            element.send_keys([backspace])
+
+        self.assertEquals(self.driver.find_element_by_id("text").get_text(), u"world wide web")
+
+    def test_send_tab(self):
+        element1 = self.driver.find_element_by_id("Text1")
+        element2 = self.driver.find_element_by_id("Text2")
+        element1.send_keys("typing here")
+
+        tab= unichr(int("E004", 16))
+        element1.send_keys([tab])
+
+        output = self.driver.find_element_by_id("output")
+        tab_pressed = output.get_attribute("checked")
+        self.assertEquals(tab_pressed, u"true")
+
+    def test_send_shift(self):
+        element = self.driver.find_element_by_id("Text1")
+        element.send_keys("low ")
+
+        shift= unichr(int("E008", 16))
+        element.send_keys([shift , "u", "p", shift])
+
+        self.assertEquals(self.driver.find_element_by_id("text").get_text(), u"low UP")
+
+    def test_send_arrow_keys(self):
+        element = self.driver.find_element_by_id("Text1")
+
+        element.send_keys("internet")
+
+        backspace= unichr(int("E003", 16))
+        left= unichr(int("E012", 16))
+        right= unichr(int("E014", 16))
+        for i in range(0, 4):
+            element.send_keys([left])
+
+        element.send_keys([backspace])
+        element.send_keys([right])
+        element.send_keys("a")
+
+        self.assertEquals(self.driver.find_element_by_id("text").get_text(), u"intranet")
+
+    def test_select_text_with_shift(self):
+        element = self.driver.find_element_by_id("Text1")
+
+        element.send_keys("WebDriver")
+        backspace= unichr(int("E003", 16))
+        shift= unichr(int("E008", 16))
+        left= unichr(int("E012", 16))
+
+        element.send_keys([shift, left, left, left, left, left, left, backspace])
+
+        self.assertEquals(self.driver.find_element_by_id("text").get_text(), u"Web")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/webdriver.cfg b/testing/web-platform/tests/webdriver/webdriver.cfg
index 98ecde7bd7c402..cb74f56ceaaca9 100644
--- a/testing/web-platform/tests/webdriver/webdriver.cfg
+++ b/testing/web-platform/tests/webdriver/webdriver.cfg
@@ -21,6 +21,10 @@ mode: compatibility
 capabilities: {"browserName": "ie"}
 mode: compatibility
 
+[edge]
+capabilities: {"browserName": "edge"}
+mode: compatibility
+
 [ios-driver]
 capabilities: {"browserName": "iphone"}
 mode: compatibility
diff --git a/testing/web-platform/tests/webdriver/windows/__init__.py b/testing/web-platform/tests/webdriver/windows/__init__.py
new file mode 100644
index 00000000000000..0c8107bebedd89
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/__init__.py
@@ -0,0 +1 @@
+__author__ = 'b-redeg'
diff --git a/testing/web-platform/tests/webdriver/windows/res/win1.html b/testing/web-platform/tests/webdriver/windows/res/win1.html
new file mode 100644
index 00000000000000..b8bf7e80b5bb32
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/res/win1.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>window one</title>
+
+<div onclick="window.open('win2.html')">win2</div>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/windows/res/win2.html b/testing/web-platform/tests/webdriver/windows/res/win2.html
new file mode 100644
index 00000000000000..81a068fa8885cf
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/res/win2.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>window two</title>
+
+<img src="//web-platform.test:8000/images/blue.png">&nbsp;</a>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/windows/res/win3.html b/testing/web-platform/tests/webdriver/windows/res/win3.html
new file mode 100644
index 00000000000000..d3ee6944b57cfc
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/res/win3.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>window three</title>
+
+<img src="//web-platform.test:8000/images/blue.png">&nbsp;</a>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/windows/res/win4.html b/testing/web-platform/tests/webdriver/windows/res/win4.html
new file mode 100644
index 00000000000000..ef35f76176902a
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/res/win4.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>window four</title>
+
+<img src="//web-platform.test:8000/images/blue.png">&nbsp;</a>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/windows/res/win5.html b/testing/web-platform/tests/webdriver/windows/res/win5.html
new file mode 100644
index 00000000000000..673d2a19a1fce3
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/res/win5.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>window five</title>
+
+<img src="//web-platform.test:8000/images/blue.png">&nbsp;</a>
\ No newline at end of file
diff --git a/testing/web-platform/tests/webdriver/windows/tabbing.py b/testing/web-platform/tests/webdriver/windows/tabbing.py
new file mode 100644
index 00000000000000..a6b5f99bf37429
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/tabbing.py
@@ -0,0 +1,30 @@
+# -*- mode: python; fill-column: 100; comment-column: 100; -*-
+
+import os
+import sys
+import unittest
+import time
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+from selenium.common import exceptions
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.common.action_chains import ActionChains
+
+
+class tabbingTest(base_test.WebDriverBaseTest):
+    def test_open_close_tab(self):
+        self.driver.get(self.webserver.where_is("windows/res/win1.html"))
+        self.driver.find_element_by_tag_name("div").click()
+        h = self.driver.window_handles
+        self.assertEquals(2, len(h))
+        self.driver.switch_to.window(h[1])
+        try:
+            self.driver.switch_to.window("does not exist")
+            self.fail("NoSuchWindowException expected")
+        except exceptions.NoSuchWindowException:
+            pass
+        self.driver.close()
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/webdriver/windows/window_manipulation.py b/testing/web-platform/tests/webdriver/windows/window_manipulation.py
new file mode 100644
index 00000000000000..027716727760c0
--- /dev/null
+++ b/testing/web-platform/tests/webdriver/windows/window_manipulation.py
@@ -0,0 +1,43 @@
+# -*- mode: python; fill-column: 100; comment-column: 100; -*-
+
+import os
+import sys
+import unittest
+
+sys.path.insert(1, os.path.abspath(os.path.join(__file__, "../..")))
+import base_test
+from selenium.common import exceptions
+
+
+class WindowingTest(base_test.WebDriverBaseTest):
+    def test_maximize(self):
+        #self.driver.get(self.webserver.where_is("windows/res/win1.html"))
+        self.driver.maximize_window()
+
+    def test_window_size_manipulation(self):
+        #self.driver.get(self.webserver.where_is("windows/res/win1.html"))
+        self.driver.set_window_size(400, 400)
+        window_size = self.driver.get_window_size()
+        self.assertTrue("width" in window_size)
+        self.assertTrue("height" in window_size)
+        self.assertEquals({"width": 400, "height":400}, window_size)
+
+        """
+        todo: make that work
+        see: https://w3c.github.io/webdriver/webdriver-spec.html#setwindowsize
+                result = self.driver.set_window_size(100, 100)
+                self.assertTrue("status" in result)
+                self.assertEquals(result["status"], 500)
+        """
+
+    def test_window_position_manipulation(self):
+        #self.driver.get(self.webserver.where_is("windows/res/win1.html"))
+        self.driver.set_window_position(400, 400)
+        window_position = self.driver.get_window_position()
+        self.assertTrue("x" in window_position)
+        self.assertTrue("y" in window_position)
+        self.assertEquals({"x": 400, "y": 400}, window_position)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html
index f5b142b93c4c17..78ed9e4ca2a674 100644
--- a/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html
+++ b/testing/web-platform/tests/websockets/interfaces/WebSocket/close/close-multiple.html
@@ -14,9 +14,14 @@
   ws.close();
   ws.close();
   ws.close();
-  setTimeout(t.step_func(function() {
+  var f = t.step_func(function() {
+    if (i < 1) {
+      setTimeout(f, 500);
+      return;
+    }
     assert_equals(i, 1);
     t.done()
-  }), 50);
+  });
+  setTimeout(f, 500);
 });
 </script>
diff --git a/testing/web-platform/tests/webstorage/eventTestHarness.js b/testing/web-platform/tests/webstorage/eventTestHarness.js
index 6d1eee9336c2db..893d25058a24b6 100644
--- a/testing/web-platform/tests/webstorage/eventTestHarness.js
+++ b/testing/web-platform/tests/webstorage/eventTestHarness.js
@@ -33,6 +33,20 @@ function countStorageEvents(callback, expectedNumEvents, times)
     setTimeout(onTimeout, 20);
 }
 
+function clearStorage(storageName, callback)
+{
+    if (window[storageName].length === 0) {
+        storageEventList = [];
+        setTimeout(callback, 0);
+    } else {
+        window[storageName].clear();
+        runAfterNStorageEvents(function() {
+            storageEventList = [];
+            callback();
+        }, 1);
+    }
+}
+
 function testStorages(testCallback)
 {
     testCallback("sessionStorage");
diff --git a/testing/web-platform/tests/webstorage/event_basic.js b/testing/web-platform/tests/webstorage/event_basic.js
index 5dfbe032c876a0..fe8446cec6a23f 100644
--- a/testing/web-platform/tests/webstorage/event_basic.js
+++ b/testing/web-platform/tests/webstorage/event_basic.js
@@ -4,15 +4,11 @@ testStorages(function(storageString) {
         var storage = window[storageString];
         t.add_cleanup(function() { storage.clear() });
 
-        storageEventList = new Array();
-        storage.clear();
+        clearStorage(storageString, t.step_func(step1));
         assert_equals(storage.length, 0, "storage.length");
 
-        runAfterNStorageEvents(t.step_func(step1), 0);
-
         function step1(msg)
         {
-            storageEventList = new Array();
             storage.setItem('FOO', 'BAR');
 
             runAfterNStorageEvents(t.step_func(step2), 1);
diff --git a/testing/web-platform/tests/webstorage/event_body_attribute.js b/testing/web-platform/tests/webstorage/event_body_attribute.js
index 8220349f83b962..d6256355622737 100644
--- a/testing/web-platform/tests/webstorage/event_body_attribute.js
+++ b/testing/web-platform/tests/webstorage/event_body_attribute.js
@@ -4,11 +4,14 @@ testStorages(function(storageString) {
         var storage = window[storageString];
         t.add_cleanup(function() { storage.clear() });
 
-        storage.clear();
+        clearStorage(storageString, t.step_func(step0));
         assert_equals(storage.length, 0, "storage.length");
 
-        iframe.onload = t.step_func(step1);
-        iframe.src = "resources/event_body_handler.html";
+        function step0(msg)
+        {
+            iframe.onload = t.step_func(step1);
+            iframe.src = "resources/event_body_handler.html";
+        }
 
         function step1(msg)
         {
diff --git a/testing/web-platform/tests/webstorage/event_case_sensitive.js b/testing/web-platform/tests/webstorage/event_case_sensitive.js
index 0b7a9b22a3290b..2729a3bed3c467 100644
--- a/testing/web-platform/tests/webstorage/event_case_sensitive.js
+++ b/testing/web-platform/tests/webstorage/event_case_sensitive.js
@@ -4,11 +4,14 @@ testStorages(function(storageString) {
         var storage = window[storageString];
         t.add_cleanup(function() { storage.clear() });
 
-        storage.clear();
+        clearStorage(storageString, t.step_func(step0));
         assert_equals(storage.length, 0, "storage.length");
-        storage.foo = "test";
 
-        runAfterNStorageEvents(t.step_func(step1), 1);
+        function step0(msg)
+        {
+            storage.foo = "test";
+            runAfterNStorageEvents(t.step_func(step1), 1);
+        }
 
         function step1(msg)
         {
diff --git a/testing/web-platform/tests/webstorage/event_constructor_eventinit.html b/testing/web-platform/tests/webstorage/event_constructor_eventinit.html
index 31b238acc1952f..3b4a77cb2cb319 100644
--- a/testing/web-platform/tests/webstorage/event_constructor_eventinit.html
+++ b/testing/web-platform/tests/webstorage/event_constructor_eventinit.html
@@ -9,21 +9,18 @@
     <h1>event_Constructor</h1>
     <div id="log"></div>
     <script>
-        test(function() {
-            var t = async_test("StorageEvent constructor and nulls");
+        async_test(function(t) {
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.type, 'storage', 'type');
-                    assert_equals(event.key, null, 'key');
-                    assert_equals(event.oldValue, null, 'oldValue');
-                    assert_equals(event.newValue, null, 'newValue');
-                    assert_equals(event.url, 'null', 'url');
-                    assert_equals(event.storageArea, null, 'storageArea');
-                });
+                assert_equals(event.type, 'storage', 'type');
+                assert_equals(event.key, null, 'key');
+                assert_equals(event.oldValue, null, 'oldValue');
+                assert_equals(event.newValue, null, 'newValue');
+                assert_equals(event.url, 'null', 'url');
+                assert_equals(event.storageArea, null, 'storageArea');
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
             var event = new StorageEvent('storage', {
                 key: null,
                 oldValue: null,
@@ -31,7 +28,7 @@ <h1>event_Constructor</h1>
                 url: null
             });
             window.dispatchEvent(event);
-        }, "Construct StorageEvent with StorageEventInit.");
+        }, "StorageEvent constructor and nulls - Construct StorageEvent with StorageEventInit.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_local_key.html b/testing/web-platform/tests/webstorage/event_local_key.html
index b2e89e25ad9499..84512da2d2d5b7 100644
--- a/testing/web-platform/tests/webstorage/event_local_key.html
+++ b/testing/web-platform/tests/webstorage/event_local_key.html
@@ -4,40 +4,35 @@
   <title>WebStorage Test: localStorage event - key</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_local_key</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("key property test of local event");
-
-        test(function() {
+        async_test(function(t) {
             localStorage.clear();
+            t.add_cleanup(function() { localStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             var expected = ['name', null]
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.key, expected.shift());
-                });
+                assert_equals(event.key, expected.shift());
                 if (!expected.length) {
                     t.done();
                 }
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/local_set_item_clear_iframe.html');
             document.body.appendChild(el);
-        }, "Local event is fired due to an invocation of the setItem(), clear() methods.");
+        }, "key property test of local event - Local event is fired due to an invocation of the setItem(), clear() methods.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_local_newvalue.html b/testing/web-platform/tests/webstorage/event_local_newvalue.html
index 67a6a5d218c3d3..2b743c37bfc7ea 100644
--- a/testing/web-platform/tests/webstorage/event_local_newvalue.html
+++ b/testing/web-platform/tests/webstorage/event_local_newvalue.html
@@ -4,40 +4,35 @@
   <title>WebStorage Test: localStorage event - newValue</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_local_newValue</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("newValue property test of local event");
-
-        test(function() {
+        async_test(function(t) {
             localStorage.clear();
+            t.add_cleanup(function() { localStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             var expected = ['user1', 'user2', null]
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.newValue, expected.shift());
-                });
+                assert_equals(event.newValue, expected.shift());
                 if (!expected.length) {
                     t.done();
                 }
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/local_change_item_iframe.html');
             document.body.appendChild(el);
-        }, "Local event is fired due to an invocation of the setItem(), clear() methods.");
+        }, "newValue property test of local event - Local event is fired due to an invocation of the setItem(), clear() methods.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_local_oldvalue.html b/testing/web-platform/tests/webstorage/event_local_oldvalue.html
index d84d9e0a6e5125..87c79aa07d4058 100644
--- a/testing/web-platform/tests/webstorage/event_local_oldvalue.html
+++ b/testing/web-platform/tests/webstorage/event_local_oldvalue.html
@@ -4,40 +4,35 @@
   <title>WebStorage Test: localStorage event - oldValue</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_local_oldValue</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("oldValue property test of local event");
-
-        test(function() {
+        async_test(function(t) {
             localStorage.clear();
+            t.add_cleanup(function() { localStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             var expected = [null, 'user1', null]
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.oldValue, expected.shift());
-                });
+                assert_equals(event.oldValue, expected.shift());
                 if (!expected.length) {
                     t.done();
                 }
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/local_change_item_iframe.html');
             document.body.appendChild(el);
-        }, "Local event is fired due to an invocation of the setItem(), clear() methods.");
+        }, "oldValue property test of local event - Local event is fired due to an invocation of the setItem(), clear() methods.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_local_removeitem.html b/testing/web-platform/tests/webstorage/event_local_removeitem.html
index ba911254d59b22..7b81ea2bac1f8b 100644
--- a/testing/web-platform/tests/webstorage/event_local_removeitem.html
+++ b/testing/web-platform/tests/webstorage/event_local_removeitem.html
@@ -9,10 +9,11 @@
 
 <script>
 
-var t = async_test("key property test of local event");
-
-t.step(function() {
+async_test(function(t) {
     localStorage.clear();
+    t.add_cleanup(function() { localStorage.clear() });
+
+    self.step = function(f) { t.step(f); };
 
     var event_index = 0;
     window.addEventListener('storage', t.step_func(function(event) {
@@ -39,6 +40,6 @@
     el.setAttribute('id', 'ifrm');
     el.setAttribute('src', 'resources/local_set_item_remove_iframe.html');
     document.body.appendChild(el);
-});
+}, "key property test of local event");
 
 </script>
diff --git a/testing/web-platform/tests/webstorage/event_local_storagearea.html b/testing/web-platform/tests/webstorage/event_local_storagearea.html
index 33788de88a5bb0..db4b114a951a43 100644
--- a/testing/web-platform/tests/webstorage/event_local_storagearea.html
+++ b/testing/web-platform/tests/webstorage/event_local_storagearea.html
@@ -4,41 +4,36 @@
   <title>WebStorage Test: localStorage event - storageArea</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_local_storageArea</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("storageArea property test of local event");
-
-        test(function() {
+        async_test(function(t) {
             localStorage.clear();
+            t.add_cleanup(function() { localStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.storageArea.length, 1);
-                    var key = event.storageArea.key(0);
-                    var value = event.storageArea.getItem(key);
-                    assert_equals(key, "name");
-                    assert_equals(value, "user1");
-                });
+                assert_equals(event.storageArea.length, 1);
+                var key = event.storageArea.key(0);
+                var value = event.storageArea.getItem(key);
+                assert_equals(key, "name");
+                assert_equals(value, "user1");
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/local_set_item_iframe.html');
             document.body.appendChild(el);
-        }, "Local event is fired due to an invocation of the setItem() method.");
+        }, "storageArea property test of local event - Local event is fired due to an invocation of the setItem() method.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_local_storageeventinit.html b/testing/web-platform/tests/webstorage/event_local_storageeventinit.html
index 1c0321e58ecb5f..3a7e5d18f47926 100644
--- a/testing/web-platform/tests/webstorage/event_local_storageeventinit.html
+++ b/testing/web-platform/tests/webstorage/event_local_storageeventinit.html
@@ -9,20 +9,18 @@
     <h1>event_local_StorageEventInit</h1>
     <div id="log"></div>
     <script>
-        test(function() {
-            var t = async_test("storageeventinit test");
+        async_test(function(t) {
+
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.key, 'key');
-                    assert_equals(event.oldValue, 'oldValue');
-                    assert_equals(event.newValue, 'newValue');
-                    assert_equals(event.url, window.location.href);
-                    assert_equals(event.storageArea, window.localStorage);
-                });
+                assert_equals(event.key, 'key');
+                assert_equals(event.oldValue, 'oldValue');
+                assert_equals(event.newValue, 'newValue');
+                assert_equals(event.url, window.location.href);
+                assert_equals(event.storageArea, window.localStorage);
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var event = new StorageEvent('storage', {
                 key: 'key',
@@ -33,7 +31,7 @@ <h1>event_local_StorageEventInit</h1>
             });
 
             window.dispatchEvent(event);
-        }, "Storage event is fired due to set values for StorageEventInit.");
+        }, "storageeventinit test - Storage event is fired due to set values for StorageEventInit.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_local_url.html b/testing/web-platform/tests/webstorage/event_local_url.html
index ec2d04d0d99ff1..7345ce3736bbb2 100644
--- a/testing/web-platform/tests/webstorage/event_local_url.html
+++ b/testing/web-platform/tests/webstorage/event_local_url.html
@@ -4,45 +4,40 @@
   <title>WebStorage Test: localStorage event - url</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_local_url</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("url property test of local event");
-
-        test(function() {
+        async_test(function(t) {
             localStorage.clear();
+            t.add_cleanup(function() { localStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             function onStorageEvent(event) {
-                t.step(function() {
-                    var url = window.location.href;
+                var url = window.location.href;
 
-                    var pos = url.lastIndexOf("/");
-                    if (pos != -1) {
-                        url = url.substr(0, pos + 1);
-                        url = url + "resources/local_set_item_iframe.html";
-                    }
+                var pos = url.lastIndexOf("/");
+                if (pos != -1) {
+                    url = url.substr(0, pos + 1);
+                    url = url + "resources/local_set_item_iframe.html";
+                }
 
-                   assert_equals(event.url, url);
-                });
+                assert_equals(event.url, url);
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/local_set_item_iframe.html');
             document.body.appendChild(el);
-        }, "Local event is fired due to an invocation of the setItem() method.");
+        }, "url property test of local event - Local event is fired due to an invocation of the setItem() method.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_session_key.html b/testing/web-platform/tests/webstorage/event_session_key.html
index 7e628390ffd9c5..62600aa3942b33 100644
--- a/testing/web-platform/tests/webstorage/event_session_key.html
+++ b/testing/web-platform/tests/webstorage/event_session_key.html
@@ -4,40 +4,35 @@
   <title>WebStorage Test: sessionStorage event - key</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_session_key</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("key property test of session event");
-
-        test(function() {
+        async_test(function(t) {
             sessionStorage.clear();
+            t.add_cleanup(function() { sessionStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             var expected = ['name', null]
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.key, expected.shift());
-                });
+                assert_equals(event.key, expected.shift());
                 if (!expected.length) {
                     t.done();
                 }
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/session_set_item_clear_iframe.html');
             document.body.appendChild(el);
-        }, "Session event is fired due to an invocation of the setItem(), clear() methods.");
+        }, "key property test of session event - Session event is fired due to an invocation of the setItem(), clear() methods.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_session_newvalue.html b/testing/web-platform/tests/webstorage/event_session_newvalue.html
index a2824983f1f751..1f367988e0812f 100644
--- a/testing/web-platform/tests/webstorage/event_session_newvalue.html
+++ b/testing/web-platform/tests/webstorage/event_session_newvalue.html
@@ -4,23 +4,20 @@
   <title>WebStorage Test: sessionStorage event - newValue</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_session_newValue</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("newvalue property test of session event");
-
-        test(function() {
+        async_test(function(t) {
             sessionStorage.clear();
+            t.add_cleanup(function() { sessionStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             var expected = ['user1', 'user2', null]
             function onStorageEvent(event) {
                 t.step(function() {
@@ -31,13 +28,13 @@ <h1>event_session_newValue</h1>
                 }
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/session_change_item_iframe.html');
             document.body.appendChild(el);
-        }, "Session event is fired due to an invocation of the setItem(), clear() methods.");
+        }, "newvalue property test of session event - Session event is fired due to an invocation of the setItem(), clear() methods.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_session_oldvalue.html b/testing/web-platform/tests/webstorage/event_session_oldvalue.html
index cd61b45fdcdf5c..00400df252432e 100644
--- a/testing/web-platform/tests/webstorage/event_session_oldvalue.html
+++ b/testing/web-platform/tests/webstorage/event_session_oldvalue.html
@@ -4,40 +4,35 @@
   <title>WebStorage Test: sessionStorage event - oldValue</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_session_oldValue</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("oldvalue property test of session event");
-
-        test(function() {
+        async_test(function(t) {
             sessionStorage.clear();
+            t.add_cleanup(function() { sessionStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             var expected = [null, 'user1', null]
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.oldValue, expected.shift());
-                });
+                assert_equals(event.oldValue, expected.shift());
                 if (!expected.length) {
                     t.done();
                 }
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/session_change_item_iframe.html');
             document.body.appendChild(el);
-        }, "Session event is fired due to an invocation of the setItem(), clear() methods.");
+        }, "oldvalue property test of session event - Session event is fired due to an invocation of the setItem(), clear() methods.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_session_removeitem.html b/testing/web-platform/tests/webstorage/event_session_removeitem.html
index 268cfeb42a0b7e..7b3c6446ed95a5 100644
--- a/testing/web-platform/tests/webstorage/event_session_removeitem.html
+++ b/testing/web-platform/tests/webstorage/event_session_removeitem.html
@@ -9,10 +9,11 @@
 
 <script>
 
-var t = async_test("key property test of session event");
-
-t.step(function() {
+async_test(function(t) {
     sessionStorage.clear();
+    t.add_cleanup(function() { sessionStorage.clear() });
+
+    self.step = function(f) { t.step(f); };
 
     var event_index = 0;
     window.addEventListener('storage', t.step_func(function(event) {
@@ -39,5 +40,5 @@
     el.setAttribute('id', 'ifrm');
     el.setAttribute('src', 'resources/session_set_item_remove_iframe.html');
     document.body.appendChild(el);
-});
+}, "key property test of session event");
 </script>
diff --git a/testing/web-platform/tests/webstorage/event_session_storagearea.html b/testing/web-platform/tests/webstorage/event_session_storagearea.html
index 023866218c2a07..d2c2ba437e8e8b 100644
--- a/testing/web-platform/tests/webstorage/event_session_storagearea.html
+++ b/testing/web-platform/tests/webstorage/event_session_storagearea.html
@@ -4,40 +4,36 @@
   <title>WebStorage Test: sessionStorage event - storageArea</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_session_storageArea</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("storageArea property test of session event");
+        async_test(function(t) {
+            sessionStorage.clear();
+            t.add_cleanup(function() { sessionStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
 
-        test(function() {
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.storageArea.length, 1);
-                    var key = event.storageArea.key(0);
-                    var value = event.storageArea.getItem(key);
-                    assert_equals(key, "name");
-                    assert_equals(value, "user1");
-                });
+                assert_equals(event.storageArea.length, 1);
+                var key = event.storageArea.key(0);
+                var value = event.storageArea.getItem(key);
+                assert_equals(key, "name");
+                assert_equals(value, "user1");
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/session_set_item_iframe.html');
             document.body.appendChild(el);
-        }, "Session event is fired due to an invocation of the setItem() method.");
+        }, "storageArea property test of session event - session event is fired due to an invocation of the setItem() method.");
     </script>
 
  </body>
diff --git a/testing/web-platform/tests/webstorage/event_session_storageeventinit.html b/testing/web-platform/tests/webstorage/event_session_storageeventinit.html
index 454a03d3ea14f1..69539df41a401d 100644
--- a/testing/web-platform/tests/webstorage/event_session_storageeventinit.html
+++ b/testing/web-platform/tests/webstorage/event_session_storageeventinit.html
@@ -9,20 +9,17 @@
     <h1>event_session_StorageEventInit</h1>
     <div id="log"></div>
     <script>
-        test(function() {
-            var t = async_test("storageeventinit test");
+        async_test(function(t) {
             function onStorageEvent(event) {
-                t.step(function() {
-                    assert_equals(event.key, 'key');
-                    assert_equals(event.oldValue, 'oldValue');
-                    assert_equals(event.newValue, 'newValue');
-                    assert_equals(event.url, window.location.href);
-                    assert_equals(event.storageArea, window.sessionStorage);
-                });
+                assert_equals(event.key, 'key');
+                assert_equals(event.oldValue, 'oldValue');
+                assert_equals(event.newValue, 'newValue');
+                assert_equals(event.url, window.location.href);
+                assert_equals(event.storageArea, window.sessionStorage);
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var event = new StorageEvent('storage', {
                 key: 'key',
@@ -33,7 +30,7 @@ <h1>event_session_StorageEventInit</h1>
             });
 
             window.dispatchEvent(event);
-        }, "Storage event is fired due to set values for StorageEventInit.");
+        }, "storageeventinit test - Storage event is fired due to set values for StorageEventInit.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_session_url.html b/testing/web-platform/tests/webstorage/event_session_url.html
index 9e312a882ee252..85250acc2b9d19 100644
--- a/testing/web-platform/tests/webstorage/event_session_url.html
+++ b/testing/web-platform/tests/webstorage/event_session_url.html
@@ -4,45 +4,40 @@
   <title>WebStorage Test: sessionStorage event - url</title>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script>
-      function fail(msg) {
-          t.step(function() {
-              assert_unreached(msg);
-          });
-          t.done();
-      }
-  </script>
  </head>
  <body>
     <h1>event_session_url</h1>
     <div id="log"></div>
     <script>
-        var t = async_test("url property test of session event");
-
-        test(function() {
+        async_test(function(t) {
             sessionStorage.clear();
+            t.add_cleanup(function() { sessionStorage.clear() });
+
+            self.fail = t.step_func(function(msg) {
+                assert_unreached(msg);
+                t.done();
+            });
+
             function onStorageEvent(event) {
-                t.step(function() {
-                    var url = window.location.href;
+                var url = window.location.href;
 
-                    var pos = url.lastIndexOf("/");
-                    if (pos != -1) {
-                        url = url.substr(0, pos + 1);
-                        url = url + "resources/session_set_item_iframe.html";
-                    }
+                var pos = url.lastIndexOf("/");
+                if (pos != -1) {
+                    url = url.substr(0, pos + 1);
+                    url = url + "resources/session_set_item_iframe.html";
+                }
 
-                   assert_equals(event.url, url);
-                });
+                assert_equals(event.url, url);
                 t.done();
             }
 
-            window.addEventListener('storage', onStorageEvent, false);
+            window.addEventListener('storage', t.step_func(onStorageEvent), false);
 
             var el = document.createElement("iframe");
             el.setAttribute('id', 'ifrm');
             el.setAttribute('src', 'resources/session_set_item_iframe.html');
             document.body.appendChild(el);
-        }, "Session event is fired due to an invocation of the setItem() method.");
+        }, "url property test of session event - Session event is fired due to an invocation of the setItem() method.");
     </script>
  </body>
 </html>
diff --git a/testing/web-platform/tests/webstorage/event_setattribute.js b/testing/web-platform/tests/webstorage/event_setattribute.js
index a143cd6b2ea116..9d8e328fcaff77 100644
--- a/testing/web-platform/tests/webstorage/event_setattribute.js
+++ b/testing/web-platform/tests/webstorage/event_setattribute.js
@@ -4,16 +4,17 @@ testStorages(function(storageString) {
         var storage = window[storageString];
         t.add_cleanup(function() { storage.clear() });
 
-        storageEventList = new Array();
-        storage.clear();
+        clearStorage(storageString, t.step_func(step0));
         assert_equals(storage.length, 0, "storage.length");
 
-        iframe.onload = t.step_func(step1);
-        iframe.src = "resources/event_setattribute_handler.html";
+        function step0(msg)
+        {
+            iframe.onload = t.step_func(step1);
+            iframe.src = "resources/event_setattribute_handler.html";
+        }
 
         function step1(msg)
         {
-            storageEventList = new Array();
             storage.setItem('FOO', 'BAR');
 
             runAfterNStorageEvents(t.step_func(step2), 1);
diff --git a/testing/web-platform/tests/webstorage/idlharness.html b/testing/web-platform/tests/webstorage/idlharness.html
index 094e12616eee0a..454e441d6f968d 100644
--- a/testing/web-platform/tests/webstorage/idlharness.html
+++ b/testing/web-platform/tests/webstorage/idlharness.html
@@ -31,7 +31,7 @@ <h1>Web Storage IDL tests</h1>
   readonly attribute unsigned long length;
   DOMString? key(unsigned long index);
   getter DOMString? getItem(DOMString key);
-  setter creator void setItem(DOMString key, DOMString value);
+  setter void setItem(DOMString key, DOMString value);
   deleter void removeItem(DOMString key);
   void clear();
 };
diff --git a/testing/web-platform/tests/webstorage/resources/local_set_item_remove_iframe.html b/testing/web-platform/tests/webstorage/resources/local_set_item_remove_iframe.html
index 7a4962f8e58fd8..7451594c898c40 100644
--- a/testing/web-platform/tests/webstorage/resources/local_set_item_remove_iframe.html
+++ b/testing/web-platform/tests/webstorage/resources/local_set_item_remove_iframe.html
@@ -2,7 +2,7 @@
 <html>
  <body>
     <script>
-        parent.t.step(function() {
+        parent.step(function() {
             localStorage.setItem("name", "user1");
             localStorage.removeItem('name');
         });
diff --git a/testing/web-platform/tests/webstorage/resources/session_set_item_remove_iframe.html b/testing/web-platform/tests/webstorage/resources/session_set_item_remove_iframe.html
index d2cad3cd4641be..60303e70f5d9b2 100644
--- a/testing/web-platform/tests/webstorage/resources/session_set_item_remove_iframe.html
+++ b/testing/web-platform/tests/webstorage/resources/session_set_item_remove_iframe.html
@@ -2,7 +2,7 @@
 <html>
  <body>
      <script>
-        parent.t.step(function() {
+        parent.step(function() {
             sessionStorage.setItem("name", "user1");
             sessionStorage.removeItem('name');
         });
diff --git a/testing/web-platform/tests/dom/collections/storage-supported-property-names.html b/testing/web-platform/tests/webstorage/storage_supported_property_names.html
similarity index 100%
rename from testing/web-platform/tests/dom/collections/storage-supported-property-names.html
rename to testing/web-platform/tests/webstorage/storage_supported_property_names.html
diff --git a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
index ce3221e31f0187..69b7e959d3bdfc 100644
--- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
@@ -31,6 +31,7 @@ support-files =
 [test_multi_word_search.js]
 [test_queryurl.js]
 [test_remotetabmatches.js]
+skip-if = !sync
 [test_searchEngine_alias.js]
 [test_searchEngine_current.js]
 [test_searchEngine_host.js]
diff --git a/toolkit/components/telemetry/TelemetryController.jsm b/toolkit/components/telemetry/TelemetryController.jsm
index 6571fe6e1e6b5e..808da38e202728 100644
--- a/toolkit/components/telemetry/TelemetryController.jsm
+++ b/toolkit/components/telemetry/TelemetryController.jsm
@@ -225,8 +225,7 @@ this.TelemetryController = Object.freeze({
     aOptions.addClientId = aOptions.addClientId || false;
     aOptions.addEnvironment = aOptions.addEnvironment || false;
 
-    const testOnly = Impl.submitExternalPing(aType, aPayload, aOptions);
-    return testOnly;
+    return Impl.submitExternalPing(aType, aPayload, aOptions);
   },
 
   /**
diff --git a/widget/PuppetWidget.cpp b/widget/PuppetWidget.cpp
index b012bf168dd1cc..55f5a81e513b63 100644
--- a/widget/PuppetWidget.cpp
+++ b/widget/PuppetWidget.cpp
@@ -1171,9 +1171,9 @@ PuppetWidget::GetWindowPosition()
 }
 
 NS_METHOD
-PuppetWidget::GetScreenBoundsUntyped(nsIntRect &aRect) {
-  aRect.MoveTo(WidgetToScreenOffset().ToUnknownPoint());
-  aRect.SizeTo(mBounds.Size());
+PuppetWidget::GetScreenBounds(LayoutDeviceIntRect& aRect) {
+  aRect.MoveTo(WidgetToScreenOffset());
+  aRect.SizeTo(LayoutDeviceIntSize::FromUnknownSize(mBounds.Size()));
   return NS_OK;
 }
 
diff --git a/widget/PuppetWidget.h b/widget/PuppetWidget.h
index 7dfb905c0b988a..976d6e459ed05f 100644
--- a/widget/PuppetWidget.h
+++ b/widget/PuppetWidget.h
@@ -129,11 +129,11 @@ class PuppetWidget : public nsBaseWidget
   NS_IMETHOD SetTitle(const nsAString& aTitle) override
   { return NS_ERROR_UNEXPECTED; }
 
-  virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() override
+  virtual LayoutDeviceIntPoint WidgetToScreenOffset() override
   { return LayoutDeviceIntPoint::FromUnknownPoint(GetWindowPosition() + GetChromeDimensions()); }
 
   void InitEvent(WidgetGUIEvent& aEvent,
-                 mozilla::LayoutDeviceIntPoint* aPoint = nullptr);
+                 LayoutDeviceIntPoint* aPoint = nullptr);
 
   NS_IMETHOD DispatchEvent(WidgetGUIEvent* aEvent, nsEventStatus& aStatus) override;
   nsEventStatus DispatchAPZAwareEvent(WidgetInputEvent* aEvent) override;
@@ -212,7 +212,7 @@ class PuppetWidget : public nsBaseWidget
   // Get the screen position of the application window.
   nsIntPoint GetWindowPosition();
 
-  NS_IMETHOD GetScreenBoundsUntyped(nsIntRect &aRect) override;
+  NS_IMETHOD GetScreenBounds(LayoutDeviceIntRect& aRect) override;
 
   NS_IMETHOD StartPluginIME(const mozilla::WidgetKeyboardEvent& aKeyboardEvent,
                             int32_t aPanelX, int32_t aPanelY,
@@ -226,13 +226,13 @@ class PuppetWidget : public nsBaseWidget
                                             const nsAString& aCharacters,
                                             const nsAString& aUnmodifiedCharacters,
                                             nsIObserver* aObserver) override;
-  virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                               uint32_t aNativeMessage,
                                               uint32_t aModifierFlags,
                                               nsIObserver* aObserver) override;
-  virtual nsresult SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
                                              nsIObserver* aObserver) override;
-  virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
                                                     uint32_t aNativeMessage,
                                                     double aDeltaX,
                                                     double aDeltaY,
@@ -275,9 +275,9 @@ class PuppetWidget : public nsBaseWidget
 
   bool CacheEditorRect();
   bool CacheCompositionRects(uint32_t& aStartOffset,
-                             nsTArray<mozilla::LayoutDeviceIntRect>& aRectArray,
+                             nsTArray<LayoutDeviceIntRect>& aRectArray,
                              uint32_t& aTargetCauseOffset);
-  bool GetCaretRect(mozilla::LayoutDeviceIntRect& aCaretRect, uint32_t aCaretOffset);
+  bool GetCaretRect(LayoutDeviceIntRect& aCaretRect, uint32_t aCaretOffset);
   uint32_t GetCaretOffset();
 
   nsIWidgetListener* GetCurrentWidgetListener();
diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp
index 6b248feceb6766..28f4c2c34695e3 100644
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -953,7 +953,7 @@ nsWindow::BringToFront()
 }
 
 NS_IMETHODIMP
-nsWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
+nsWindow::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
     LayoutDeviceIntPoint p = WidgetToScreenOffset();
 
diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h
index 7f7313446c1a51..2cd4a2f8709dd1 100644
--- a/widget/android/nsWindow.h
+++ b/widget/android/nsWindow.h
@@ -64,7 +64,7 @@ class nsWindow :
     void OnSizeChanged(const mozilla::gfx::IntSize& aSize);
 
     void InitEvent(mozilla::WidgetGUIEvent& event,
-                   mozilla::LayoutDeviceIntPoint* aPoint = 0);
+                   LayoutDeviceIntPoint* aPoint = 0);
 
     //
     // nsIWidget
@@ -105,8 +105,8 @@ class nsWindow :
     virtual bool IsEnabled() const override;
     NS_IMETHOD Invalidate(const nsIntRect &aRect) override;
     NS_IMETHOD SetFocus(bool aRaise = false) override;
-    NS_IMETHOD GetScreenBoundsUntyped(nsIntRect &aRect) override;
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() override;
+    NS_IMETHOD GetScreenBounds(LayoutDeviceIntRect& aRect) override;
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
     NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
                              nsEventStatus& aStatus) override;
     nsEventStatus DispatchEvent(mozilla::WidgetGUIEvent* aEvent);
diff --git a/widget/cocoa/nsChildView.h b/widget/cocoa/nsChildView.h
index b582a37adcb151..14426c252b75b9 100644
--- a/widget/cocoa/nsChildView.h
+++ b/widget/cocoa/nsChildView.h
@@ -378,9 +378,9 @@ class nsChildView : public nsBaseWidget
   NS_IMETHOD              Enable(bool aState) override;
   virtual bool            IsEnabled() const override;
   NS_IMETHOD              SetFocus(bool aRaise) override;
-  NS_IMETHOD              GetBoundsUntyped(nsIntRect &aRect) override;
-  NS_IMETHOD              GetClientBoundsUntyped(nsIntRect &aRect) override;
-  NS_IMETHOD              GetScreenBoundsUntyped(nsIntRect &aRect) override;
+  NS_IMETHOD              GetBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetClientBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetScreenBounds(LayoutDeviceIntRect& aRect) override;
 
   // Returns the "backing scale factor" of the view's window, which is the
   // ratio of pixels in the window's backing store to Cocoa points. Prior to
@@ -402,7 +402,7 @@ class nsChildView : public nsBaseWidget
 
   virtual void*           GetNativeData(uint32_t aDataType) override;
   virtual nsresult        ConfigureChildren(const nsTArray<Configuration>& aConfigurations) override;
-  virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() override;
+  virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
   virtual bool            ShowsResizeIndicator(nsIntRect* aResizerRect) override;
 
   static  bool            ConvertStatus(nsEventStatus aStatus)
@@ -456,15 +456,15 @@ class nsChildView : public nsBaseWidget
                                             const nsAString& aUnmodifiedCharacters,
                                             nsIObserver* aObserver) override;
 
-  virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                               uint32_t aNativeMessage,
                                               uint32_t aModifierFlags,
                                               nsIObserver* aObserver) override;
 
-  virtual nsresult SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
                                              nsIObserver* aObserver) override
   { return SynthesizeNativeMouseEvent(aPoint, NSMouseMoved, 0, aObserver); }
-  virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
                                                     uint32_t aNativeMessage,
                                                     double aDeltaX,
                                                     double aDeltaY,
@@ -551,7 +551,7 @@ class nsChildView : public nsBaseWidget
 
   bool IsPluginFocused() { return mPluginFocused; }
 
-  virtual nsIntPoint GetClientOffsetUntyped() override;
+  virtual LayoutDeviceIntPoint GetClientOffset() override;
 
   void DispatchAPZWheelInputEvent(mozilla::InputData& aEvent, bool aCanTriggerSwipe);
 
diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm
index 33d99924091e8b..769ca75fade818 100644
--- a/widget/cocoa/nsChildView.mm
+++ b/widget/cocoa/nsChildView.mm
@@ -906,31 +906,33 @@ static void PrintViewHierarchy(NSView *view)
 #pragma mark -
 
 // Get this component dimension
-NS_IMETHODIMP nsChildView::GetBoundsUntyped(nsIntRect &aRect)
+NS_IMETHODIMP nsChildView::GetBounds(LayoutDeviceIntRect& aRect)
 {
+  nsIntRect tmp;
   if (!mView) {
-    aRect = mBounds;
+    tmp = mBounds;
   } else {
-    aRect = CocoaPointsToDevPixels([mView frame]);
+    tmp = CocoaPointsToDevPixels([mView frame]);
   }
+  aRect = LayoutDeviceIntRect::FromUnknownRect(tmp);
   return NS_OK;
 }
 
-NS_IMETHODIMP nsChildView::GetClientBoundsUntyped(nsIntRect &aRect)
+NS_IMETHODIMP nsChildView::GetClientBounds(mozilla::LayoutDeviceIntRect& aRect)
 {
-  GetBoundsUntyped(aRect);
+  GetBounds(aRect);
   if (!mParentWidget) {
     // For top level widgets we want the position on screen, not the position
     // of this view inside the window.
-    aRect.MoveTo(WidgetToScreenOffset().ToUnknownPoint());
+    aRect.MoveTo(WidgetToScreenOffset());
   }
   return NS_OK;
 }
 
-NS_IMETHODIMP nsChildView::GetScreenBoundsUntyped(nsIntRect &aRect)
+NS_IMETHODIMP nsChildView::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
-  GetBoundsUntyped(aRect);
-  aRect.MoveTo(WidgetToScreenOffset().ToUnknownPoint());
+  GetBounds(aRect);
+  aRect.MoveTo(WidgetToScreenOffset());
   return NS_OK;
 }
 
@@ -1520,15 +1522,15 @@ inline uint16_t COLOR8TOCOLOR16(uint8_t color8)
 
 #pragma mark -
 
-nsIntPoint nsChildView::GetClientOffsetUntyped()
+LayoutDeviceIntPoint nsChildView::GetClientOffset()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
   NSPoint origin = [mView convertPoint:NSMakePoint(0, 0) toView:nil];
   origin.y = [[mView window] frame].size.height - origin.y;
-  return CocoaPointsToDevPixels(origin);
+  return LayoutDeviceIntPoint::FromUnknownPoint(CocoaPointsToDevPixels(origin));
 
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(nsIntPoint(0, 0));
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0, 0));
 }
 
 //    Return the offset between this child view and the screen.
diff --git a/widget/cocoa/nsCocoaWindow.h b/widget/cocoa/nsCocoaWindow.h
index 145e9c7e00406a..930f3a77567e24 100644
--- a/widget/cocoa/nsCocoaWindow.h
+++ b/widget/cocoa/nsCocoaWindow.h
@@ -270,10 +270,10 @@ class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
     NS_IMETHOD              SetModal(bool aState) override;
     virtual bool            IsVisible() const override;
     NS_IMETHOD              SetFocus(bool aState=false) override;
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() override;
-    virtual nsIntPoint GetClientOffsetUntyped() override;
-    virtual mozilla::LayoutDeviceIntSize
-    ClientToWindowSize(const mozilla::LayoutDeviceIntSize& aClientSize) override;
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
+    virtual LayoutDeviceIntPoint GetClientOffset() override;
+    virtual LayoutDeviceIntSize
+    ClientToWindowSize(const LayoutDeviceIntSize& aClientSize) override;
 
     virtual void* GetNativeData(uint32_t aDataType) override;
 
@@ -307,8 +307,8 @@ class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
 
     NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint) override;
     NS_IMETHOD              Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override;
-    NS_IMETHOD              GetClientBoundsUntyped(nsIntRect &aRect) override;
-    NS_IMETHOD              GetScreenBoundsUntyped(nsIntRect &aRect) override;
+    NS_IMETHOD              GetClientBounds(LayoutDeviceIntRect& aRect) override;
+    NS_IMETHOD              GetScreenBounds(LayoutDeviceIntRect& aRect) override;
     void                    ReportMoveEvent();
     void                    ReportSizeEvent();
     NS_IMETHOD              SetCursor(nsCursor aCursor) override;
@@ -340,11 +340,11 @@ class nsCocoaWindow : public nsBaseWidget, public nsPIWidgetCocoa
     virtual void SetWindowAnimationType(WindowAnimationType aType) override;
     virtual void SetDrawsTitle(bool aDrawTitle) override;
     virtual void SetUseBrightTitlebarForeground(bool aBrightForeground) override;
-    NS_IMETHOD SetNonClientMargins(mozilla::LayoutDeviceIntMargin &margins) override;
+    NS_IMETHOD SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
     NS_IMETHOD SetWindowTitlebarColor(nscolor aColor, bool aActive) override;
     virtual void SetDrawsInTitlebar(bool aState) override;
     virtual void UpdateThemeGeometries(const nsTArray<ThemeGeometry>& aThemeGeometries) override;
-    virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                                 uint32_t aNativeMessage,
                                                 uint32_t aModifierFlags,
                                                 nsIObserver* aObserver) override;
diff --git a/widget/cocoa/nsCocoaWindow.mm b/widget/cocoa/nsCocoaWindow.mm
index 03ed44e7c57aa1..6df829df6fe5f5 100644
--- a/widget/cocoa/nsCocoaWindow.mm
+++ b/widget/cocoa/nsCocoaWindow.mm
@@ -1550,13 +1550,14 @@ nsIntRect newBounds(NSToIntRound(aX), NSToIntRound(aY),
                   aWidth, aHeight, aRepaint, true);
 }
 
-NS_IMETHODIMP nsCocoaWindow::GetClientBoundsUntyped(nsIntRect &aRect)
+NS_IMETHODIMP nsCocoaWindow::GetClientBounds(mozilla::LayoutDeviceIntRect& aRect)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
   CGFloat scaleFactor = BackingScaleFactor();
   if (!mWindow) {
-    aRect = nsCocoaUtils::CocoaRectToGeckoRectDevPix(NSZeroRect, scaleFactor);
+    aRect = LayoutDeviceIntRect::FromUnknownRect(
+      nsCocoaUtils::CocoaRectToGeckoRectDevPix(NSZeroRect, scaleFactor));
     return NS_OK;
   }
 
@@ -1568,7 +1569,8 @@ nsIntRect newBounds(NSToIntRound(aX), NSToIntRound(aY),
     r = [mWindow contentRectForFrameRect:[mWindow frame]];
   }
 
-  aRect = nsCocoaUtils::CocoaRectToGeckoRectDevPix(r, scaleFactor);
+  aRect = LayoutDeviceIntRect::FromUnknownRect(
+    nsCocoaUtils::CocoaRectToGeckoRectDevPix(r, scaleFactor));
 
   return NS_OK;
 
@@ -1585,7 +1587,7 @@ nsIntRect newBounds(NSToIntRound(aX), NSToIntRound(aY),
   mBounds = nsCocoaUtils::CocoaRectToGeckoRectDevPix(frame, BackingScaleFactor());
 }
 
-NS_IMETHODIMP nsCocoaWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
+NS_IMETHODIMP nsCocoaWindow::GetScreenBounds(LayoutDeviceIntRect &aRect)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
@@ -1594,7 +1596,7 @@ nsIntRect newBounds(NSToIntRound(aX), NSToIntRound(aY),
   NS_ASSERTION(mWindow && mBounds == r, "mBounds out of sync!");
 #endif
 
-  aRect = mBounds;
+  aRect = LayoutDeviceIntRect::FromUnknownRect(mBounds);
   return NS_OK;
 
   NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
@@ -1978,16 +1980,17 @@ nsIntRect newBounds(NSToIntRound(aX), NSToIntRound(aY),
   NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0,0));
 }
 
-nsIntPoint nsCocoaWindow::GetClientOffsetUntyped()
+LayoutDeviceIntPoint nsCocoaWindow::GetClientOffset()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_RETURN;
 
-  nsIntRect clientRect;
-  GetClientBoundsUntyped(clientRect);
+  LayoutDeviceIntRect clientRect;
+  GetClientBounds(clientRect);
 
-  return clientRect.TopLeft() - mBounds.TopLeft();
+  return clientRect.TopLeft() -
+         LayoutDeviceIntPoint::FromUnknownPoint(mBounds.TopLeft());
 
-  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(nsIntPoint(0, 0));
+  NS_OBJC_END_TRY_ABORT_BLOCK_RETURN(LayoutDeviceIntPoint(0, 0));
 }
 
 LayoutDeviceIntSize
diff --git a/widget/gonk/nsScreenManagerGonk.cpp b/widget/gonk/nsScreenManagerGonk.cpp
index c43c12f073dfca..445dd4fe25bbbb 100644
--- a/widget/gonk/nsScreenManagerGonk.cpp
+++ b/widget/gonk/nsScreenManagerGonk.cpp
@@ -202,7 +202,7 @@ nsScreenGonk::GetRect(int32_t *outLeft,  int32_t *outTop,
     return NS_OK;
 }
 
-nsIntRect
+LayoutDeviceIntRect
 nsScreenGonk::GetRect()
 {
     return mVirtualBounds;
@@ -271,9 +271,9 @@ nsScreenGonk::SetRotation(uint32_t aRotation)
     uint32_t rotation = EffectiveScreenRotation();
     if (rotation == nsIScreen::ROTATION_90_DEG ||
         rotation == nsIScreen::ROTATION_270_DEG) {
-        mVirtualBounds = nsIntRect(0, 0,
-                                   mNaturalBounds.height,
-                                   mNaturalBounds.width);
+        mVirtualBounds = LayoutDeviceIntRect(0, 0,
+                                             mNaturalBounds.height,
+                                             mNaturalBounds.width);
     } else {
         mVirtualBounds = mNaturalBounds;
     }
@@ -292,7 +292,7 @@ nsScreenGonk::SetRotation(uint32_t aRotation)
 LayoutDeviceIntRect
 nsScreenGonk::GetNaturalBounds()
 {
-    return LayoutDeviceIntRect::FromUnknownRect(mNaturalBounds);
+    return mNaturalBounds;
 }
 
 uint32_t
@@ -304,7 +304,7 @@ nsScreenGonk::EffectiveScreenRotation()
 // NB: This isn't gonk-specific, but gonk is the only widget backend
 // that does this calculation itself, currently.
 static ScreenOrientationInternal
-ComputeOrientation(uint32_t aRotation, const nsIntSize& aScreenSize)
+ComputeOrientation(uint32_t aRotation, const LayoutDeviceIntSize& aScreenSize)
 {
     bool naturallyPortrait = (aScreenSize.height > aScreenSize.width);
     switch (aRotation) {
@@ -338,12 +338,12 @@ RotationToAngle(uint32_t aRotation)
 ScreenConfiguration
 nsScreenGonk::GetConfiguration()
 {
-    ScreenOrientationInternal orientation = ComputeOrientation(mScreenRotation,
-                                                               mNaturalBounds.Size());
+    ScreenOrientationInternal orientation =
+        ComputeOrientation(mScreenRotation, mNaturalBounds.Size());
 
     // NB: perpetuating colorDepth == pixelDepth illusion here, for
     // consistency.
-    return ScreenConfiguration(mVirtualBounds, orientation,
+    return ScreenConfiguration(mVirtualBounds.ToUnknownRect(), orientation,
                                RotationToAngle(mScreenRotation),
                                mColorDepth, mColorDepth);
 }
@@ -480,7 +480,7 @@ nsScreenGonk::EnableMirroring()
     nsWidgetInitData initData;
     initData.mScreenId = mId;
     RefPtr<nsWindow> window = new nsWindow();
-    window->Create(nullptr, nullptr, mNaturalBounds, &initData);
+    window->Create(nullptr, nullptr, mNaturalBounds.ToUnknownRect(), &initData);
     MOZ_ASSERT(static_cast<nsWindow*>(window)->GetScreen() == this);
 
     // Update mMirroringWidget on compositor thread
diff --git a/widget/gonk/nsScreenManagerGonk.h b/widget/gonk/nsScreenManagerGonk.h
index c7d60e8365dc4f..625df8a8a63665 100644
--- a/widget/gonk/nsScreenManagerGonk.h
+++ b/widget/gonk/nsScreenManagerGonk.h
@@ -53,6 +53,7 @@ class nsScreenGonk : public nsBaseScreen
 {
     typedef mozilla::hal::ScreenConfiguration ScreenConfiguration;
     typedef mozilla::GonkDisplay GonkDisplay;
+    typedef mozilla::LayoutDeviceIntRect LayoutDeviceIntRect;
 
 public:
     nsScreenGonk(uint32_t aId,
@@ -72,11 +73,11 @@ class nsScreenGonk : public nsBaseScreen
 
     uint32_t GetId();
     NotifyDisplayChangedEvent GetEventVisibility();
-    nsIntRect GetRect();
+    LayoutDeviceIntRect GetRect();
     float GetDpi();
     int32_t GetSurfaceFormat();
     ANativeWindow* GetNativeWindow();
-    mozilla::LayoutDeviceIntRect GetNaturalBounds();
+    LayoutDeviceIntRect GetNaturalBounds();
     uint32_t EffectiveScreenRotation();
     ScreenConfiguration GetConfiguration();
     bool IsPrimaryScreen();
@@ -127,8 +128,8 @@ class nsScreenGonk : public nsBaseScreen
     android::sp<ANativeWindow> mNativeWindow;
     float mDpi;
     int32_t mSurfaceFormat;
-    nsIntRect mNaturalBounds; // Screen bounds w/o rotation taken into account.
-    nsIntRect mVirtualBounds; // Screen bounds w/ rotation taken into account.
+    LayoutDeviceIntRect mNaturalBounds; // Screen bounds w/o rotation taken into account.
+    LayoutDeviceIntRect mVirtualBounds; // Screen bounds w/ rotation taken into account.
     uint32_t mScreenRotation;
     uint32_t mPhysicalScreenRotation;
     nsTArray<nsWindow*> mTopWindows;
diff --git a/widget/gonk/nsWindow.cpp b/widget/gonk/nsWindow.cpp
index ab8f5aac4cf62a..560e7bf8dd870b 100644
--- a/widget/gonk/nsWindow.cpp
+++ b/widget/gonk/nsWindow.cpp
@@ -353,7 +353,7 @@ nsWindow::Create(nsIWidget *aParent,
     mVisible = false;
 
     if (!aParent) {
-        mBounds = mScreen->GetRect();
+        mBounds = mScreen->GetRect().ToUnknownRect();
     }
 
     mComposer2D = HwcComposer2D::GetInstance();
@@ -854,10 +854,10 @@ nsWindow::GetGLFrameBufferFormat()
     return LOCAL_GL_NONE;
 }
 
-nsIntRect
-nsWindow::GetNaturalBoundsUntyped()
+LayoutDeviceIntRect
+nsWindow::GetNaturalBounds()
 {
-    return mScreen->GetNaturalBounds().ToUnknownRect();
+    return mScreen->GetNaturalBounds();
 }
 
 nsScreenGonk*
diff --git a/widget/gonk/nsWindow.h b/widget/gonk/nsWindow.h
index 5036a100b8463f..beaeb34e50e585 100644
--- a/widget/gonk/nsWindow.h
+++ b/widget/gonk/nsWindow.h
@@ -78,7 +78,7 @@ class nsWindow : public nsBaseWidget
     {
         return NS_OK;
     }
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset();
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset();
     void DispatchTouchInputViaAPZ(mozilla::MultiTouchInput& aInput);
     void DispatchTouchEventForAPZ(const mozilla::MultiTouchInput& aInput,
                                   const ScrollableLayerGuid& aGuid,
@@ -123,7 +123,7 @@ class nsWindow : public nsBaseWidget
 
     virtual uint32_t GetGLFrameBufferFormat() override;
 
-    virtual nsIntRect GetNaturalBoundsUntyped() override;
+    virtual LayoutDeviceIntRect GetNaturalBounds() override;
     virtual bool NeedsPaint();
 
     virtual Composer2D* GetComposer2D() override;
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
index 8ad8ddf4ee78b5..ea25935d95cc8c 100644
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -1481,40 +1481,40 @@ nsWindow::SetFocus(bool aRaise)
 }
 
 NS_IMETHODIMP
-nsWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
+nsWindow::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
     if (mIsTopLevel && mContainer) {
         // use the point including window decorations
         gint x, y;
         gdk_window_get_root_origin(gtk_widget_get_window(GTK_WIDGET(mContainer)), &x, &y);
-        aRect.MoveTo(GdkPointToDevicePixels({ x, y }).ToUnknownPoint());
+        aRect.MoveTo(GdkPointToDevicePixels({ x, y }));
     } else {
-        aRect.MoveTo(WidgetToScreenOffset().ToUnknownPoint());
+        aRect.MoveTo(WidgetToScreenOffset());
     }
     // mBounds.Size() is the window bounds, not the window-manager frame
     // bounds (bug 581863).  gdk_window_get_frame_extents would give the
     // frame bounds, but mBounds.Size() is returned here for consistency
     // with Resize.
-    aRect.SizeTo(mBounds.Size());
-    LOG(("GetScreenBoundsUntyped %d,%d | %dx%d\n",
+    aRect.SizeTo(LayoutDeviceIntSize::FromUnknownSize(mBounds.Size()));
+    LOG(("GetScreenBounds %d,%d | %dx%d\n",
          aRect.x, aRect.y, aRect.width, aRect.height));
     return NS_OK;
 }
 
-gfx::IntSize
+LayoutDeviceIntSize
 nsWindow::GetClientSize()
 {
-  return gfx::IntSize(mBounds.width, mBounds.height);
+  return LayoutDeviceIntSize(mBounds.width, mBounds.height);
 }
 
 NS_IMETHODIMP
-nsWindow::GetClientBoundsUntyped(nsIntRect &aRect)
+nsWindow::GetClientBounds(LayoutDeviceIntRect& aRect)
 {
     // GetBounds returns a rect whose top left represents the top left of the
     // outer bounds, but whose width/height represent the size of the inner
     // bounds (which is messed up).
-    GetBoundsUntyped(aRect);
-    aRect.MoveBy(GetClientOffsetUntyped());
+    GetBounds(aRect);
+    aRect.MoveBy(GetClientOffset());
 
     return NS_OK;
 }
@@ -1561,10 +1561,10 @@ nsWindow::UpdateClientOffset()
     mClientOffset = nsIntPoint(left, top);
 }
 
-nsIntPoint
-nsWindow::GetClientOffsetUntyped()
+LayoutDeviceIntPoint
+nsWindow::GetClientOffset()
 {
-    return mClientOffset;
+    return LayoutDeviceIntPoint::FromUnknownPoint(mClientOffset);
 }
 
 gboolean
diff --git a/widget/gtk/nsWindow.h b/widget/gtk/nsWindow.h
index 4a6aaa46738445..e69ad0ba8775ac 100644
--- a/widget/gtk/nsWindow.h
+++ b/widget/gtk/nsWindow.h
@@ -131,10 +131,10 @@ class nsWindow : public nsBaseWidget
     NS_IMETHOD         SetSizeMode(nsSizeMode aMode) override;
     NS_IMETHOD         Enable(bool aState) override;
     NS_IMETHOD         SetFocus(bool aRaise = false) override;
-    NS_IMETHOD         GetScreenBoundsUntyped(nsIntRect &aRect) override;
-    NS_IMETHOD         GetClientBoundsUntyped(nsIntRect &aRect) override;
-    virtual mozilla::gfx::IntSize GetClientSize() override;
-    virtual nsIntPoint GetClientOffsetUntyped() override;
+    NS_IMETHOD         GetScreenBounds(LayoutDeviceIntRect& aRect) override;
+    NS_IMETHOD         GetClientBounds(LayoutDeviceIntRect& aRect) override;
+    virtual LayoutDeviceIntSize GetClientSize() override;
+    virtual LayoutDeviceIntPoint GetClientOffset() override;
     NS_IMETHOD         SetCursor(nsCursor aCursor) override;
     NS_IMETHOD         SetCursor(imgIContainer* aCursor,
                                  uint32_t aHotspotX, uint32_t aHotspotY) override;
@@ -144,7 +144,7 @@ class nsWindow : public nsBaseWidget
     NS_IMETHOD         SetTitle(const nsAString& aTitle) override;
     NS_IMETHOD         SetIcon(const nsAString& aIconSpec) override;
     NS_IMETHOD         SetWindowClass(const nsAString& xulWinType) override;
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() override;
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
     NS_IMETHOD         EnableDragDrop(bool aEnable) override;
     NS_IMETHOD         CaptureMouse(bool aCapture) override;
     NS_IMETHOD         CaptureRollupEvents(nsIRollupListener *aListener,
@@ -227,7 +227,7 @@ class nsWindow : public nsBaseWidget
 
     void               NativeShow  (bool    aAction);
     void               SetHasMappedToplevel(bool aState);
-    mozilla::LayoutDeviceIntSize GetSafeWindowSize(mozilla::LayoutDeviceIntSize aSize);
+    LayoutDeviceIntSize GetSafeWindowSize(LayoutDeviceIntSize aSize);
 
     void               EnsureGrabs  (void);
     void               GrabPointer  (guint32 aTime);
@@ -269,7 +269,7 @@ class nsWindow : public nsBaseWidget
     bool               IsDestroyed() { return mIsDestroyed; }
 
     void               DispatchDragEvent(mozilla::EventMessage aMsg,
-                                         const mozilla::LayoutDeviceIntPoint& aRefPoint,
+                                         const LayoutDeviceIntPoint& aRefPoint,
                                          guint aTime);
     static void        UpdateDragStatus (GdkDragContext *aDragContext,
                                          nsIDragService *aDragService);
@@ -317,16 +317,16 @@ class nsWindow : public nsBaseWidget
 #endif
     NS_IMETHOD         ReparentNativeWidget(nsIWidget* aNewParent) override;
 
-    virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                                 uint32_t aNativeMessage,
                                                 uint32_t aModifierFlags,
                                                 nsIObserver* aObserver) override;
 
-    virtual nsresult SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
                                                nsIObserver* aObserver) override
     { return SynthesizeNativeMouseEvent(aPoint, GDK_MOTION_NOTIFY, 0, aObserver); }
 
-    virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
                                                       uint32_t aNativeMessage,
                                                       double aDeltaX,
                                                       double aDeltaY,
@@ -346,8 +346,8 @@ class nsWindow : public nsBaseWidget
 
     // From GDK
     int GdkCoordToDevicePixels(gint coord);
-    mozilla::LayoutDeviceIntPoint GdkPointToDevicePixels(GdkPoint point);
-    mozilla::LayoutDeviceIntPoint GdkEventCoordsToDevicePixels(gdouble x, gdouble y);
+    LayoutDeviceIntPoint GdkPointToDevicePixels(GdkPoint point);
+    LayoutDeviceIntPoint GdkEventCoordsToDevicePixels(gdouble x, gdouble y);
     nsIntRect GdkRectToDevicePixels(GdkRectangle rect);
 
 protected:
diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
index 88009edbd6b4b8..f72d4d3acb3bfd 100644
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -44,6 +44,7 @@
 #include "mozilla/MouseEvents.h"
 #include "GLConsts.h"
 #include "mozilla/unused.h"
+#include "mozilla/IMEStateManager.h"
 #include "mozilla/VsyncDispatcher.h"
 #include "mozilla/layers/APZCTreeManager.h"
 #include "mozilla/layers/APZEventState.h"
@@ -282,6 +283,8 @@ nsBaseWidget::FreeShutdownObserver()
 //-------------------------------------------------------------------------
 nsBaseWidget::~nsBaseWidget()
 {
+  IMEStateManager::WidgetDestroyed(this);
+
   if (mLayerManager &&
       mLayerManager->GetBackendType() == LayersBackend::LAYERS_BASIC) {
     static_cast<BasicLayerManager*>(mLayerManager.get())->ClearRetainerWidget();
@@ -801,8 +804,9 @@ NS_IMETHODIMP nsBaseWidget::MakeFullScreen(bool aFullScreen, nsIScreen* aScreen)
   HideWindowChrome(aFullScreen);
 
   if (aFullScreen) {
-    if (!mOriginalBounds)
-      mOriginalBounds = new nsIntRect();
+    if (!mOriginalBounds) {
+      mOriginalBounds = new CSSIntRect();
+    }
     *mOriginalBounds = GetScaledScreenBounds();
 
     // Move to top-left corner of screen and size to the screen dimensions
@@ -1307,18 +1311,18 @@ NS_METHOD nsBaseWidget::ResizeClient(double aX,
 * If the implementation of nsWindow supports borders this method MUST be overridden
 *
 **/
-NS_METHOD nsBaseWidget::GetClientBoundsUntyped(nsIntRect &aRect)
+NS_METHOD nsBaseWidget::GetClientBounds(LayoutDeviceIntRect &aRect)
 {
-  return GetBoundsUntyped(aRect);
+  return GetBounds(aRect);
 }
 
 /**
 * If the implementation of nsWindow supports borders this method MUST be overridden
 *
 **/
-NS_METHOD nsBaseWidget::GetBoundsUntyped(nsIntRect &aRect)
+NS_METHOD nsBaseWidget::GetBounds(LayoutDeviceIntRect &aRect)
 {
-  aRect = mBounds;
+  aRect = LayoutDeviceIntRect::FromUnknownRect(mBounds);
   return NS_OK;
 }
 
@@ -1327,12 +1331,12 @@ NS_METHOD nsBaseWidget::GetBoundsUntyped(nsIntRect &aRect)
 * this method must be overridden
 *
 **/
-NS_METHOD nsBaseWidget::GetScreenBoundsUntyped(nsIntRect &aRect)
+NS_METHOD nsBaseWidget::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
-  return GetBoundsUntyped(aRect);
+  return GetBounds(aRect);
 }
 
-NS_METHOD nsBaseWidget::GetRestoredBounds(LayoutDeviceIntRect &aRect)
+NS_METHOD nsBaseWidget::GetRestoredBounds(LayoutDeviceIntRect& aRect)
 {
   if (SizeMode() != nsSizeMode_Normal) {
     return NS_ERROR_FAILURE;
@@ -1340,10 +1344,10 @@ NS_METHOD nsBaseWidget::GetRestoredBounds(LayoutDeviceIntRect &aRect)
   return GetScreenBounds(aRect);
 }
 
-nsIntPoint
-nsBaseWidget::GetClientOffsetUntyped()
+LayoutDeviceIntPoint
+nsBaseWidget::GetClientOffset()
 {
-  return nsIntPoint(0, 0);
+  return LayoutDeviceIntPoint(0, 0);
 }
 
 NS_IMETHODIMP
@@ -1722,17 +1726,16 @@ nsBaseWidget::StartAsyncScrollbarDrag(const AsyncDragMetrics& aDragMetrics)
     NewRunnableMethod(mAPZC.get(), &APZCTreeManager::StartScrollbarDrag, guid, aDragMetrics));
 }
 
-nsIntRect
+CSSIntRect
 nsBaseWidget::GetScaledScreenBounds()
 {
-  nsIntRect bounds;
-  GetScreenBoundsUntyped(bounds);
+  LayoutDeviceIntRect bounds;
+  GetScreenBounds(bounds);
+
+  // *Dividing* a LayoutDeviceIntRect by a CSSToLayoutDeviceScale gives a
+  // CSSIntRect.
   CSSToLayoutDeviceScale scale = GetDefaultScale();
-  bounds.x = NSToIntRound(bounds.x / scale.scale);
-  bounds.y = NSToIntRound(bounds.y / scale.scale);
-  bounds.width = NSToIntRound(bounds.width / scale.scale);
-  bounds.height = NSToIntRound(bounds.height / scale.scale);
-  return bounds;
+  return RoundedToInt(bounds / scale);
 }
 
 already_AddRefed<nsIScreen>
@@ -1744,7 +1747,7 @@ nsBaseWidget::GetWidgetScreen()
     return nullptr;
   }
 
-  nsIntRect bounds = GetScaledScreenBounds();
+  CSSIntRect bounds = GetScaledScreenBounds();
   nsCOMPtr<nsIScreen> screen;
   screenManager->ScreenForRect(bounds.x, bounds.y,
                                bounds.width, bounds.height,
diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
index 372293d6c3492b..9579cbd3c627ff 100644
--- a/widget/nsBaseWidget.h
+++ b/widget/nsBaseWidget.h
@@ -98,6 +98,7 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
   typedef mozilla::layers::ScrollableLayerGuid ScrollableLayerGuid;
   typedef mozilla::layers::APZEventState APZEventState;
   typedef mozilla::layers::SetAllowedTouchBehaviorCallback SetAllowedTouchBehaviorCallback;
+  typedef mozilla::CSSIntRect CSSIntRect;
   typedef mozilla::ScreenRotation ScreenRotation;
 
   virtual ~nsBaseWidget();
@@ -187,15 +188,13 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
   NS_IMETHOD              MoveClient(double aX, double aY) override;
   NS_IMETHOD              ResizeClient(double aWidth, double aHeight, bool aRepaint) override;
   NS_IMETHOD              ResizeClient(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override;
-  NS_IMETHOD              GetBoundsUntyped(nsIntRect &aRect) override;
-  NS_IMETHOD              GetClientBoundsUntyped(nsIntRect &aRect) override;
-  NS_IMETHOD              GetScreenBoundsUntyped(nsIntRect &aRect) override;
-  NS_IMETHOD              GetRestoredBounds(mozilla::LayoutDeviceIntRect &aRect) override;
-  NS_IMETHOD              GetNonClientMargins(
-                            mozilla::LayoutDeviceIntMargin &margins) override;
-  NS_IMETHOD              SetNonClientMargins(
-                            mozilla::LayoutDeviceIntMargin &margins) override;
-  virtual nsIntPoint      GetClientOffsetUntyped() override;
+  NS_IMETHOD              GetBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetClientBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetScreenBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetRestoredBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
+  NS_IMETHOD              SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
+  virtual LayoutDeviceIntPoint GetClientOffset() override;
   NS_IMETHOD              EnableDragDrop(bool aEnable) override;
   NS_IMETHOD              GetAttention(int32_t aCycleCount) override;
   virtual bool            HasPendingInputEvent() override;
@@ -226,7 +225,7 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
   virtual bool            ComputeShouldAccelerate();
   NS_IMETHOD              GetToggledKeyState(uint32_t aKeyCode, bool* aLEDState) override { return NS_ERROR_NOT_IMPLEMENTED; }
   virtual nsIMEUpdatePreference GetIMEUpdatePreference() override { return nsIMEUpdatePreference(); }
-  NS_IMETHOD              OnDefaultButtonLoaded(const mozilla::LayoutDeviceIntRect& aButtonRect) override { return NS_ERROR_NOT_IMPLEMENTED; }
+  NS_IMETHOD              OnDefaultButtonLoaded(const LayoutDeviceIntRect& aButtonRect) override { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD              OverrideSystemMouseScrollSpeed(double aOriginalDeltaX,
                                                          double aOriginalDeltaY,
                                                          double& aOverriddenDeltaX,
@@ -282,15 +281,15 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
 
   nsPopupLevel PopupLevel() { return mPopupLevel; }
 
-  virtual mozilla::LayoutDeviceIntSize
-  ClientToWindowSize(const mozilla::LayoutDeviceIntSize& aClientSize) override
+  virtual LayoutDeviceIntSize
+  ClientToWindowSize(const LayoutDeviceIntSize& aClientSize) override
   {
     return aClientSize;
   }
 
   // return the widget's outside dimensions
   // in global coordinates in display pixel.
-  nsIntRect GetScaledScreenBounds();
+  CSSIntRect GetScaledScreenBounds();
 
   // return the screen the widget is in.
   already_AddRefed<nsIScreen> GetWidgetScreen();
@@ -383,7 +382,7 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
     return NS_ERROR_UNEXPECTED;
   }
 
-  virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                               uint32_t aNativeMessage,
                                               uint32_t aModifierFlags,
                                               nsIObserver* aObserver) override
@@ -392,14 +391,14 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
     return NS_ERROR_UNEXPECTED;
   }
 
-  virtual nsresult SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
                                              nsIObserver* aObserver) override
   {
     mozilla::widget::AutoObserverNotifier notifier(aObserver, "mouseevent");
     return NS_ERROR_UNEXPECTED;
   }
 
-  virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
                                                     uint32_t aNativeMessage,
                                                     double aDeltaX,
                                                     double aDeltaY,
@@ -509,7 +508,7 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference
   nsCursor          mCursor;
   nsBorderStyle     mBorderStyle;
   nsIntRect         mBounds;
-  nsIntRect*        mOriginalBounds;
+  CSSIntRect*       mOriginalBounds;
   // When this pointer is null, the widget is not clipped
   mozilla::UniquePtr<nsIntRect[]> mClipRects;
   uint32_t          mClipRectCount;
diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
index 2257ebbf07eb2a..59417e356c4654 100644
--- a/widget/nsIWidget.h
+++ b/widget/nsIWidget.h
@@ -332,6 +332,10 @@ class nsIWidget : public nsISupports {
     typedef mozilla::widget::SizeConstraints SizeConstraints;
     typedef mozilla::widget::TextEventDispatcher TextEventDispatcher;
     typedef mozilla::CompositorVsyncDispatcher CompositorVsyncDispatcher;
+    typedef mozilla::LayoutDeviceIntMargin LayoutDeviceIntMargin;
+    typedef mozilla::LayoutDeviceIntPoint LayoutDeviceIntPoint;
+    typedef mozilla::LayoutDeviceIntRect LayoutDeviceIntRect;
+    typedef mozilla::LayoutDeviceIntSize LayoutDeviceIntSize;
 
     // Used in UpdateThemeGeometries.
     struct ThemeGeometry {
@@ -808,13 +812,13 @@ class nsIWidget : public nsISupports {
      * @param aRect   On return it holds the  x, y, width and height of
      *                this widget.
      */
-    NS_IMETHOD GetBounds(mozilla::LayoutDeviceIntRect &aRect) {
-      nsIntRect tmp;
-      nsresult rv = GetBoundsUntyped(tmp);
-      aRect = mozilla::LayoutDeviceIntRect::FromUnknownRect(tmp);
+    NS_IMETHOD GetBounds(LayoutDeviceIntRect& aRect) = 0;
+    NS_IMETHOD GetBoundsUntyped(nsIntRect& aRect) {
+      LayoutDeviceIntRect tmp;
+      nsresult rv = GetBounds(tmp);
+      aRect = tmp.ToUnknownRect();
       return rv;
     }
-    NS_IMETHOD GetBoundsUntyped(nsIntRect &aRect) = 0;
 
     /**
      * Get this widget's outside dimensions in global coordinates. This
@@ -826,13 +830,13 @@ class nsIWidget : public nsISupports {
      * @param aRect   On return it holds the  x, y, width and height of
      *                this widget.
      */
-    NS_IMETHOD GetScreenBounds(mozilla::LayoutDeviceIntRect &aRect) {
-      nsIntRect tmp;
-      nsresult rv = GetScreenBoundsUntyped(tmp);
-      aRect = mozilla::LayoutDeviceIntRect::FromUnknownRect(tmp);
+    NS_IMETHOD GetScreenBounds(LayoutDeviceIntRect& aRect) = 0;
+    NS_IMETHOD GetScreenBoundsUntyped(nsIntRect& aRect) {
+      LayoutDeviceIntRect tmp;
+      nsresult rv = GetScreenBounds(tmp);
+      aRect = tmp.ToUnknownRect();
       return rv;
     }
-    NS_IMETHOD GetScreenBoundsUntyped(nsIntRect &aRect) = 0;
 
     /**
      * Similar to GetScreenBounds except that this function will always
@@ -846,7 +850,7 @@ class nsIWidget : public nsISupports {
      * @param aRect   On return it holds the  x, y, width and height of
      *                this widget.
      */
-    NS_IMETHOD GetRestoredBounds(mozilla::LayoutDeviceIntRect &aRect) = 0;
+    NS_IMETHOD GetRestoredBounds(mozilla::LayoutDeviceIntRect& aRect) = 0;
 
     /**
      * Get this widget's client area bounds, if the window has a 3D border
@@ -860,18 +864,18 @@ class nsIWidget : public nsISupports {
      * @param aRect   On return it holds the  x. y, width and height of
      *                the client area of this widget.
      */
-    NS_IMETHOD GetClientBounds(mozilla::LayoutDeviceIntRect &aRect) {
-      nsIntRect tmp;
-      nsresult rv = GetClientBoundsUntyped(tmp);
-      aRect = mozilla::LayoutDeviceIntRect::FromUnknownRect(tmp);
+    NS_IMETHOD GetClientBounds(mozilla::LayoutDeviceIntRect& aRect) = 0;
+    NS_IMETHOD GetClientBoundsUntyped(nsIntRect& aRect) {
+      LayoutDeviceIntRect tmp;
+      nsresult rv = GetClientBounds(tmp);
+      aRect = tmp.ToUnknownRect();
       return rv;
     }
-    NS_IMETHOD GetClientBoundsUntyped(nsIntRect &aRect) = 0;
 
     /**
      * Get the non-client area dimensions of the window.
      */
-    NS_IMETHOD GetNonClientMargins(mozilla::LayoutDeviceIntMargin &margins) = 0;
+    NS_IMETHOD GetNonClientMargins(LayoutDeviceIntMargin& aMargins) = 0;
 
     /**
      * Sets the non-client area dimensions of the window. Pass -1 to restore
@@ -885,32 +889,24 @@ class nsIWidget : public nsISupports {
      *  dimensions between zero and size < system default.
      *
      */
-    NS_IMETHOD SetNonClientMargins(mozilla::LayoutDeviceIntMargin &margins) = 0;
+    NS_IMETHOD SetNonClientMargins(LayoutDeviceIntMargin& aMargins) = 0;
 
     /**
      * Get the client offset from the window origin.
      *
-     * The untyped version exists temporarily to ease conversion to typed
-     * coordinates.
-     *
      * @return the x and y of the offset.
-     *
      */
-    virtual mozilla::LayoutDeviceIntPoint GetClientOffset() {
-      nsIntPoint tmp = GetClientOffsetUntyped();
-      return mozilla::LayoutDeviceIntPoint::FromUnknownPoint(tmp);
-    }
-    virtual nsIntPoint GetClientOffsetUntyped() = 0;
+    virtual LayoutDeviceIntPoint GetClientOffset() = 0;
 
     /**
      * Equivalent to GetClientBounds but only returns the size.
      */
-    virtual mozilla::gfx::IntSize GetClientSize() {
-      // Dependeing on the backend, overloading this method may be useful if
-      // if requesting the client offset is expensive.
-      mozilla::LayoutDeviceIntRect rect;
+    virtual LayoutDeviceIntSize GetClientSize() {
+      // Depending on the backend, overloading this method may be useful if
+      // requesting the client offset is expensive.
+      LayoutDeviceIntRect rect;
       GetClientBounds(rect);
-      return mozilla::gfx::IntSize(rect.width, rect.height);
+      return rect.Size();
     }
 
     /**
@@ -1004,7 +1000,7 @@ class nsIWidget : public nsISupports {
         nsCOMPtr<nsIWidget> mChild;
         uintptr_t mWindowID; // e10s specific, the unique plugin port id
         bool mVisible; // e10s specific, widget visibility
-        mozilla::LayoutDeviceIntRect mBounds;
+        LayoutDeviceIntRect mBounds;
         nsTArray<nsIntRect> mClipRegion;
     };
 
@@ -1366,15 +1362,15 @@ class nsIWidget : public nsISupports {
      *
      * @return screen coordinates stored in the x,y members
      */
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() = 0;
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset() = 0;
 
     /**
      * Given the specified client size, return the corresponding window size,
      * which includes the area for the borders and titlebar. This method
      * should work even when the window is not yet visible.
      */
-    virtual mozilla::LayoutDeviceIntSize ClientToWindowSize(
-                const mozilla::LayoutDeviceIntSize& aClientSize) = 0;
+    virtual LayoutDeviceIntSize ClientToWindowSize(
+                const LayoutDeviceIntSize& aClientSize) = 0;
 
     /**
      * Dispatches an event to the widget
@@ -1577,7 +1573,7 @@ class nsIWidget : public nsISupports {
      * @param aObserver the observer that will get notified once the events
      * have been dispatched.
      */
-    virtual nsresult SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                                 uint32_t aNativeMessage,
                                                 uint32_t aModifierFlags,
                                                 nsIObserver* aObserver) = 0;
@@ -1588,7 +1584,7 @@ class nsIWidget : public nsISupports {
      * @param aObserver the observer that will get notified once the events
      * have been dispatched.
      */
-    virtual nsresult SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
                                                nsIObserver* aObserver) = 0;
 
     /**
@@ -1614,7 +1610,7 @@ class nsIWidget : public nsISupports {
      * @param aObserver         The observer that will get notified once the
      *                          events have been dispatched.
      */
-    virtual nsresult SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
+    virtual nsresult SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
                                                       uint32_t aNativeMessage,
                                                       double aDeltaX,
                                                       double aDeltaY,
@@ -1852,7 +1848,7 @@ class nsIWidget : public nsISupports {
      * Call this method when a dialog is opened which has a default button.
      * The button's rectangle should be supplied in aButtonRect.
      */
-    NS_IMETHOD OnDefaultButtonLoaded(const mozilla::LayoutDeviceIntRect& aButtonRect) = 0;
+    NS_IMETHOD OnDefaultButtonLoaded(const LayoutDeviceIntRect& aButtonRect) = 0;
 
     /**
      * Compute the overridden system mouse scroll speed on the root content of
@@ -1944,7 +1940,7 @@ class nsIWidget : public nsISupports {
        if (!IsVisible()) {
            return false;
        }
-       mozilla::LayoutDeviceIntRect bounds;
+       LayoutDeviceIntRect bounds;
        nsresult rv = GetBounds(bounds);
        NS_ENSURE_SUCCESS(rv, false);
        return !bounds.IsEmpty();
@@ -1961,17 +1957,10 @@ class nsIWidget : public nsISupports {
      * No code outside of the composition pipeline should know or care
      * about this.  If you're not an agent of the compositor, you
      * probably shouldn't call this method.
-     *
-     * The untyped version exists temporarily to ease conversion to typed
-     * coordinates.
      */
-    virtual mozilla::LayoutDeviceIntRect GetNaturalBounds() {
-        nsIntRect tmp = GetNaturalBoundsUntyped();
-        return mozilla::LayoutDeviceIntRect::FromUnknownRect(tmp);
-    }
-    virtual nsIntRect GetNaturalBoundsUntyped() {
-        nsIntRect bounds;
-        GetBoundsUntyped(bounds);
+    virtual LayoutDeviceIntRect GetNaturalBounds() {
+        LayoutDeviceIntRect bounds;
+        GetBounds(bounds);
         return bounds;
     }
 
diff --git a/widget/qt/nsWindow.cpp b/widget/qt/nsWindow.cpp
index 12734fc66fc4c8..835cde2cd725c2 100644
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -1500,14 +1500,15 @@ void find_first_visible_parent(QWindow* aItem, QWindow*& aVisibleItem)
 }
 
 NS_IMETHODIMP
-nsWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
+nsWindow::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
-    aRect = gfx::IntRect(gfx::IntPoint(0, 0), mBounds.Size());
+    aRect = LayoutDeviceIntRect(LayoutDeviceIntPoint(0, 0),
+                                LayoutDeviceIntSize::FromUnknownSize(mBounds.Size()));
     if (mIsTopLevel) {
         QPoint pos = mWidget->position();
         aRect.MoveTo(pos.x(), pos.y());
     } else {
-        aRect.MoveTo(WidgetToScreenOffset().ToUnknownPoint());
+        aRect.MoveTo(WidgetToScreenOffset());
     }
     LOG(("GetScreenBounds %d %d | %d %d | %d %d\n",
          aRect.x, aRect.y,
diff --git a/widget/qt/nsWindow.h b/widget/qt/nsWindow.h
index bf193869fd5922..7b6dc75ef29af2 100644
--- a/widget/qt/nsWindow.h
+++ b/widget/qt/nsWindow.h
@@ -119,7 +119,7 @@ class nsWindow : public nsBaseWidget
     {
         return NS_OK;
     }
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset();
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset();
     NS_IMETHOD DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
                              nsEventStatus& aStatus);
     NS_IMETHOD CaptureRollupEvents(nsIRollupListener *aListener,
@@ -178,7 +178,7 @@ class nsWindow : public nsBaseWidget
     void DispatchDeactivateEvent(void);
     void DispatchActivateEventOnTopLevelWindow(void);
     void DispatchDeactivateEventOnTopLevelWindow(void);
-    void DispatchResizeEvent(mozilla::LayoutDeviceIntRect &aRect,
+    void DispatchResizeEvent(LayoutDeviceIntRect &aRect,
                              nsEventStatus &aStatus);
 
     // Remember the last sizemode so that we can restore it when
@@ -203,7 +203,7 @@ class nsWindow : public nsBaseWidget
                                    nsIWidget                  *aWidget,
                                    bool                        aActivate);
     NS_IMETHOD         SetSizeMode(nsSizeMode aMode);
-    NS_IMETHOD         GetScreenBoundsUntyped(nsIntRect &aRect);
+    NS_IMETHOD         GetScreenBounds(LayoutDeviceIntRect& aRect) override;
     NS_IMETHOD         SetHasTransparentBackground(bool aTransparent);
     NS_IMETHOD         GetHasTransparentBackground(bool& aTransparent);
     NS_IMETHOD         HideWindowChrome(bool aShouldHide);
diff --git a/widget/uikit/nsWindow.h b/widget/uikit/nsWindow.h
index d1b499a8937e31..e4ffad64adc593 100644
--- a/widget/uikit/nsWindow.h
+++ b/widget/uikit/nsWindow.h
@@ -47,7 +47,7 @@ class nsWindow :
         return mVisible;
     }
     NS_IMETHOD              SetFocus(bool aState=false) override;
-    virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset() override;
+    virtual LayoutDeviceIntPoint WidgetToScreenOffset() override;
 
     virtual void SetBackgroundColor(const nscolor &aColor) override;
     virtual void* GetNativeData(uint32_t aDataType) override;
@@ -61,7 +61,7 @@ class nsWindow :
     void                    EnteredFullScreen(bool aFullScreen);
     NS_IMETHOD              Resize(double aWidth, double aHeight, bool aRepaint) override;
     NS_IMETHOD              Resize(double aX, double aY, double aWidth, double aHeight, bool aRepaint) override;
-    NS_IMETHOD              GetScreenBoundsUntyped(nsIntRect &aRect) override;
+    NS_IMETHOD              GetScreenBounds(LayoutDeviceIntRect& aRect) override;
     void                    ReportMoveEvent();
     void                    ReportSizeEvent();
     void                    ReportSizeModeEvent(nsSizeMode aMode);
diff --git a/widget/uikit/nsWindow.mm b/widget/uikit/nsWindow.mm
index 654e3d9143912e..2621663b0babbb 100644
--- a/widget/uikit/nsWindow.mm
+++ b/widget/uikit/nsWindow.mm
@@ -779,7 +779,7 @@ - (void)drawRect:(CGRect)aRect inContext:(CGContextRef)aContext
 }
 
 NS_IMETHODIMP
-nsWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
+nsWindow::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
     LayoutDeviceIntPoint p = WidgetToScreenOffset();
 
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
index 978101f0bd3abc..95a51c9a9b0f58 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -1864,7 +1864,7 @@ NS_METHOD nsWindow::SetFocus(bool aRaise)
 // Return the window's full dimensions in screen coordinates.
 // If the window has a parent, converts the origin to an offset
 // of the parent's screen origin.
-NS_METHOD nsWindow::GetBoundsUntyped(nsIntRect &aRect)
+NS_METHOD nsWindow::GetBounds(LayoutDeviceIntRect& aRect)
 {
   if (mWnd) {
     RECT r;
@@ -1926,21 +1926,21 @@ NS_METHOD nsWindow::GetBoundsUntyped(nsIntRect &aRect)
     aRect.x = r.left;
     aRect.y = r.top;
   } else {
-    aRect = mBounds;
+    aRect = LayoutDeviceIntRect::FromUnknownRect(mBounds);
   }
   return NS_OK;
 }
 
 // Get this component dimension
-NS_METHOD nsWindow::GetClientBoundsUntyped(nsIntRect &aRect)
+NS_METHOD nsWindow::GetClientBounds(LayoutDeviceIntRect& aRect)
 {
   if (mWnd) {
     RECT r;
     VERIFY(::GetClientRect(mWnd, &r));
 
-    nsIntRect bounds;
-    GetBoundsUntyped(bounds);
-    aRect.MoveTo(bounds.TopLeft() + GetClientOffsetUntyped());
+    LayoutDeviceIntRect bounds;
+    GetBounds(bounds);
+    aRect.MoveTo(bounds.TopLeft() + GetClientOffset());
     aRect.width  = r.right - r.left;
     aRect.height = r.bottom - r.top;
 
@@ -1951,7 +1951,7 @@ NS_METHOD nsWindow::GetClientBoundsUntyped(nsIntRect &aRect)
 }
 
 // Like GetBounds, but don't offset by the parent
-NS_METHOD nsWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
+NS_METHOD nsWindow::GetScreenBounds(LayoutDeviceIntRect& aRect)
 {
   if (mWnd) {
     RECT r;
@@ -1961,9 +1961,9 @@ NS_METHOD nsWindow::GetScreenBoundsUntyped(nsIntRect &aRect)
     aRect.height = r.bottom - r.top;
     aRect.x = r.left;
     aRect.y = r.top;
-  } else
-    aRect = mBounds;
-
+  } else {
+    aRect = LayoutDeviceIntRect::FromUnknownRect(mBounds);
+  }
   return NS_OK;
 }
 
@@ -1993,19 +1993,19 @@ NS_METHOD nsWindow::GetRestoredBounds(LayoutDeviceIntRect &aRect)
   return NS_OK;
 }
 
-// return the x,y offset of the client area from the origin
-// of the window. If the window is borderless returns (0,0).
-nsIntPoint
-nsWindow::GetClientOffsetUntyped()
+// Return the x,y offset of the client area from the origin of the window. If
+// the window is borderless returns (0,0).
+LayoutDeviceIntPoint
+nsWindow::GetClientOffset()
 {
   if (!mWnd) {
-    return nsIntPoint(0, 0);
+    return LayoutDeviceIntPoint(0, 0);
   }
 
   RECT r1;
   GetWindowRect(mWnd, &r1);
   LayoutDeviceIntPoint pt = WidgetToScreenOffset();
-  return nsIntPoint(pt.x - r1.left, pt.y - r1.top);
+  return LayoutDeviceIntPoint(pt.x - r1.left, pt.y - r1.top);
 }
 
 void
diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h
index 122735eea1ab15..fdcd03de2d101d 100644
--- a/widget/windows/nsWindow.h
+++ b/widget/windows/nsWindow.h
@@ -81,7 +81,7 @@ class nsWindow : public nsWindowBase
 
   // nsWindowBase
   virtual void InitEvent(mozilla::WidgetGUIEvent& aEvent,
-                         mozilla::LayoutDeviceIntPoint* aPoint = nullptr) override;
+                         LayoutDeviceIntPoint* aPoint = nullptr) override;
   virtual bool DispatchWindowEvent(mozilla::WidgetGUIEvent* aEvent) override;
   virtual bool DispatchKeyboardEvent(mozilla::WidgetKeyboardEvent* aEvent) override;
   virtual bool DispatchWheelEvent(mozilla::WidgetWheelEvent* aEvent) override;
@@ -116,12 +116,12 @@ class nsWindow : public nsWindowBase
   NS_IMETHOD              Enable(bool aState);
   virtual bool            IsEnabled() const;
   NS_IMETHOD              SetFocus(bool aRaise);
-  NS_IMETHOD              GetBoundsUntyped(nsIntRect &aRect);
-  NS_IMETHOD              GetScreenBoundsUntyped(nsIntRect &aRect);
-  NS_IMETHOD              GetRestoredBounds(mozilla::LayoutDeviceIntRect &aRect) override;
-  NS_IMETHOD              GetClientBoundsUntyped(nsIntRect &aRect);
-  virtual nsIntPoint      GetClientOffsetUntyped() override;
-  void                    SetBackgroundColor(const nscolor &aColor);
+  NS_IMETHOD              GetBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetScreenBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetRestoredBounds(LayoutDeviceIntRect& aRect) override;
+  NS_IMETHOD              GetClientBounds(LayoutDeviceIntRect& aRect) override;
+  virtual LayoutDeviceIntPoint GetClientOffset() override;
+  void                    SetBackgroundColor(const nscolor& aColor);
   NS_IMETHOD              SetCursor(imgIContainer* aCursor,
                                     uint32_t aHotspotX, uint32_t aHotspotY);
   NS_IMETHOD              SetCursor(nsCursor aCursor);
@@ -142,8 +142,8 @@ class nsWindow : public nsWindowBase
   virtual void            FreeNativeData(void * data, uint32_t aDataType);
   NS_IMETHOD              SetTitle(const nsAString& aTitle);
   NS_IMETHOD              SetIcon(const nsAString& aIconSpec);
-  virtual mozilla::LayoutDeviceIntPoint WidgetToScreenOffset();
-  virtual mozilla::LayoutDeviceIntSize ClientToWindowSize(const mozilla::LayoutDeviceIntSize& aClientSize) override;
+  virtual LayoutDeviceIntPoint WidgetToScreenOffset();
+  virtual LayoutDeviceIntSize ClientToWindowSize(const LayoutDeviceIntSize& aClientSize) override;
   NS_IMETHOD              DispatchEvent(mozilla::WidgetGUIEvent* aEvent,
                                         nsEventStatus& aStatus);
   NS_IMETHOD              EnableDragDrop(bool aEnable);
@@ -156,7 +156,7 @@ class nsWindow : public nsWindowBase
                                           LayersBackend aBackendHint = mozilla::layers::LayersBackend::LAYERS_NONE,
                                           LayerManagerPersistence aPersistence = LAYER_MANAGER_CURRENT,
                                           bool* aAllowRetaining = nullptr);
-  NS_IMETHOD              OnDefaultButtonLoaded(const mozilla::LayoutDeviceIntRect& aButtonRect) override;
+  NS_IMETHOD              OnDefaultButtonLoaded(const LayoutDeviceIntRect& aButtonRect) override;
   NS_IMETHOD              OverrideSystemMouseScrollSpeed(double aOriginalDeltaX,
                                                          double aOriginalDeltaY,
                                                          double& aOverriddenDeltaX,
@@ -168,16 +168,16 @@ class nsWindow : public nsWindowBase
                                                    const nsAString& aCharacters,
                                                    const nsAString& aUnmodifiedCharacters,
                                                    nsIObserver* aObserver) override;
-  virtual nsresult        SynthesizeNativeMouseEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult        SynthesizeNativeMouseEvent(LayoutDeviceIntPoint aPoint,
                                                      uint32_t aNativeMessage,
                                                      uint32_t aModifierFlags,
                                                      nsIObserver* aObserver) override;
 
-  virtual nsresult        SynthesizeNativeMouseMove(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult        SynthesizeNativeMouseMove(LayoutDeviceIntPoint aPoint,
                                                     nsIObserver* aObserver) override
                           { return SynthesizeNativeMouseEvent(aPoint, MOUSEEVENTF_MOVE, 0, aObserver); }
 
-  virtual nsresult        SynthesizeNativeMouseScrollEvent(mozilla::LayoutDeviceIntPoint aPoint,
+  virtual nsresult        SynthesizeNativeMouseScrollEvent(LayoutDeviceIntPoint aPoint,
                                                            uint32_t aNativeMessage,
                                                            double aDeltaX,
                                                            double aDeltaY,
@@ -195,10 +195,8 @@ class nsWindow : public nsWindowBase
   virtual void            UpdateOpaqueRegion(const nsIntRegion& aOpaqueRegion);
 #endif // MOZ_XUL
   virtual nsIMEUpdatePreference GetIMEUpdatePreference();
-  NS_IMETHOD              GetNonClientMargins(
-                            mozilla::LayoutDeviceIntMargin &margins) override;
-  NS_IMETHOD              SetNonClientMargins(
-                            mozilla::LayoutDeviceIntMargin &margins) override;
+  NS_IMETHOD              GetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
+  NS_IMETHOD              SetNonClientMargins(LayoutDeviceIntMargin& aMargins) override;
   void                    SetDrawsInTitlebar(bool aState);
   already_AddRefed<mozilla::gfx::DrawTarget> StartRemoteDrawing() override;
   virtual void            EndRemoteDrawing() override;
@@ -517,11 +515,11 @@ class nsWindow : public nsWindowBase
 
   // Non-client margin settings
   // Pre-calculated outward offset applied to default frames
-  mozilla::LayoutDeviceIntMargin mNonClientOffset;
+  LayoutDeviceIntMargin mNonClientOffset;
   // Margins set by the owner
-  mozilla::LayoutDeviceIntMargin mNonClientMargins;
+  LayoutDeviceIntMargin mNonClientMargins;
   // Margins we'd like to set once chrome is reshown:
-  mozilla::LayoutDeviceIntMargin mFutureMarginsOnceChromeShows;
+  LayoutDeviceIntMargin mFutureMarginsOnceChromeShows;
   // Indicates we need to apply margins once toggling chrome into showing:
   bool                  mFutureMarginsToUse;
 
diff --git a/widget/windows/nsWindowBase.h b/widget/windows/nsWindowBase.h
index e1adbea5d22daa..7e00405a41bc36 100644
--- a/widget/windows/nsWindowBase.h
+++ b/widget/windows/nsWindowBase.h
@@ -43,7 +43,7 @@ class nsWindowBase : public nsBaseWidget
    * @param aPoint message position in physical coordinates.
    */
   virtual void InitEvent(mozilla::WidgetGUIEvent& aEvent,
-                         mozilla::LayoutDeviceIntPoint* aPoint = nullptr) = 0;
+                         LayoutDeviceIntPoint* aPoint = nullptr) = 0;
 
   /*
    * Dispatch a gecko event for this widget.
diff --git a/xpcom/glue/nsDeque.cpp b/xpcom/glue/nsDeque.cpp
index c5c31c9964a4b1..363eb95a51bbe7 100644
--- a/xpcom/glue/nsDeque.cpp
+++ b/xpcom/glue/nsDeque.cpp
@@ -13,37 +13,7 @@
 
 #include "mozilla/CheckedInt.h"
 
-/**
- * 07/02/2001  09:17p 509,104 clangref.pdf from openwatcom's site
- * Watcom C Language Reference Edition 11.0c
- * page 118 of 297
- *
- * The % symbol yields the remainder from the division of the first operand
- * by the second operand. The operands of % must have integral type.
- *
- * When both operands of % are positive, the result is a positive value
- * smaller than the second operand. When one or both operands is negative,
- * whether the result is positive or negative is implementation-defined.
- *
- */
-/* Ok, so first of all, C is underspecified. joy.
- * The following functions do not provide a correct implementation of modulus
- * They provide functionality for x>-y.
- * There are risks of 2*y being greater than max int, which is part of the
- * reason no multiplication is used and other operations are avoided.
- *
- * modasgn
- * @param x variable
- * @param y expression
- * approximately equivalent to x %= y
- *
- * modulus
- * @param x expression
- * @param y expression
- * approximately equivalent to x % y
- */
-#define modasgn(x,y) if (x<0) x+=y; x%=y
-#define modulus(x,y) ((x<0)?(x+y)%(y):(x)%(y))
+#define modulus(x,y) ((x)%(y))
 
 /**
  * Standard constructor
@@ -165,7 +135,7 @@ nsDeque::Erase()
 bool
 nsDeque::GrowCapacity()
 {
-  mozilla::CheckedInt<int32_t> newCapacity = mCapacity;
+  mozilla::CheckedInt<size_t> newCapacity = mCapacity;
   newCapacity *= 4;
 
   NS_ASSERTION(newCapacity.isValid(), "Overflow");
@@ -174,7 +144,7 @@ nsDeque::GrowCapacity()
   }
 
   // Sanity check the new byte size.
-  mozilla::CheckedInt<int32_t> newByteSize = newCapacity;
+  mozilla::CheckedInt<size_t> newByteSize = newCapacity;
   newByteSize *= sizeof(void*);
 
   NS_ASSERTION(newByteSize.isValid(), "Overflow");
@@ -259,8 +229,13 @@ nsDeque::Push(void* aItem, const fallible_t&)
 bool
 nsDeque::PushFront(void* aItem, const fallible_t&)
 {
-  mOrigin--;
-  modasgn(mOrigin, mCapacity);
+  
+  if (mOrigin == 0) {
+    mOrigin = mCapacity - 1;
+  } else {
+    mOrigin--;
+  }
+  
   if (mSize == mCapacity) {
     if (!GrowCapacity()) {
       return false;
@@ -284,7 +259,7 @@ nsDeque::Pop()
   void* result = 0;
   if (mSize > 0) {
     --mSize;
-    int32_t offset = modulus(mSize + mOrigin, mCapacity);
+    size_t offset = modulus(mSize + mOrigin, mCapacity);
     result = mData[offset];
     mData[offset] = 0;
     if (!mSize) {
@@ -360,40 +335,15 @@ nsDeque::PeekFront()
  * @return  void* or null
  */
 void*
-nsDeque::ObjectAt(int32_t aIndex) const
+nsDeque::ObjectAt(size_t aIndex) const
 {
   void* result = 0;
-  if (aIndex >= 0 && aIndex < mSize) {
+  if (aIndex < mSize) {
     result = mData[modulus(mOrigin + aIndex, mCapacity)];
   }
   return result;
 }
 
-void*
-nsDeque::RemoveObjectAt(int32_t aIndex)
-{
-  if (aIndex < 0 || aIndex >= mSize) {
-    return 0;
-  }
-  void* result = mData[modulus(mOrigin + aIndex, mCapacity)];
-
-  // "Shuffle down" all elements in the array by 1, overwritting the element
-  // being removed.
-  for (int32_t i = aIndex; i < mSize; ++i) {
-    mData[modulus(mOrigin + i, mCapacity)] =
-      mData[modulus(mOrigin + i + 1, mCapacity)];
-  }
-  mSize--;
-
-  return result;
-}
-
-void*
-nsDeque::Last() const
-{
-  return ObjectAt(mSize - 1);
-}
-
 /**
  * Call this method when you want to iterate all the
  * members of the container, passing a functor along
@@ -405,28 +355,7 @@ nsDeque::Last() const
 void
 nsDeque::ForEach(nsDequeFunctor& aFunctor) const
 {
-  for (int32_t i = 0; i < mSize; ++i) {
+  for (size_t i = 0; i < mSize; ++i) {
     aFunctor(ObjectAt(i));
   }
 }
-
-/**
- * Call this method when you want to iterate all the
- * members of the container, calling the functor you
- * passed with each member. This process will interrupt
- * if your function returns non 0 to this method.
- *
- * @param   aFunctor object to call for each member
- * @return  first nonzero result of aFunctor or 0.
- */
-const void*
-nsDeque::FirstThat(nsDequeFunctor& aFunctor) const
-{
-  for (int32_t i = 0; i < mSize; ++i) {
-    void* obj = aFunctor(ObjectAt(i));
-    if (obj) {
-      return obj;
-    }
-  }
-  return 0;
-}
diff --git a/xpcom/glue/nsDeque.h b/xpcom/glue/nsDeque.h
index 37186818476811..86410c79755444 100644
--- a/xpcom/glue/nsDeque.h
+++ b/xpcom/glue/nsDeque.h
@@ -74,7 +74,7 @@ class nsDeque
    *
    * @return  number of elements currently in the deque
    */
-  inline int32_t GetSize() const { return mSize; }
+  inline size_t GetSize() const { return mSize; }
 
   /**
    * Appends new member at the end of the deque.
@@ -138,20 +138,7 @@ class nsDeque
    * @param   index of desired item
    * @return  element in list
    */
-  void* ObjectAt(int aIndex) const;
-
-  /**
-   * Removes and returns the a member from the deque.
-   *
-   * @param   index of desired item
-   * @return  element which was removed
-   */
-  void* RemoveObjectAt(int aIndex);
-
-  /**
-   * Remove all items from container without destroying them.
-   */
-  void Empty();
+  void* ObjectAt(size_t aIndex) const;
 
   /**
    * Remove and delete all items from container.
@@ -160,8 +147,6 @@ class nsDeque
    */
   void Erase();
 
-  void* Last() const;
-
   /**
    * Call this method when you want to iterate all the
    * members of the container, passing a functor along
@@ -171,26 +156,13 @@ class nsDeque
    */
   void ForEach(nsDequeFunctor& aFunctor) const;
 
-  /**
-   * Call this method when you want to iterate all the
-   * members of the container, calling the functor you
-   * passed with each member. This process will interrupt
-   * if your function returns non 0 to this method.
-   *
-   * @param   aFunctor object to call for each member
-   * @return  first nonzero result of aFunctor or 0.
-   */
-  const void* FirstThat(nsDequeFunctor& aFunctor) const;
-
-  void SetDeallocator(nsDequeFunctor* aDeallocator);
-
   size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
 protected:
-  int32_t         mSize;
-  int32_t         mCapacity;
-  int32_t         mOrigin;
+  size_t         mSize;
+  size_t         mCapacity;
+  size_t         mOrigin;
   nsDequeFunctor* mDeallocator;
   void*           mBuffer[8];
   void**          mData;
@@ -213,5 +185,11 @@ class nsDeque
   nsDeque& operator=(const nsDeque& aOther);
 
   bool GrowCapacity();
+  void SetDeallocator(nsDequeFunctor* aDeallocator);
+
+  /**
+   * Remove all items from container without destroying them.
+   */
+  void Empty();
 };
 #endif
diff --git a/xpcom/glue/tests/gtest/TestNsDeque.cpp b/xpcom/glue/tests/gtest/TestNsDeque.cpp
new file mode 100644
index 00000000000000..40b648e5c43d90
--- /dev/null
+++ b/xpcom/glue/tests/gtest/TestNsDeque.cpp
@@ -0,0 +1,341 @@
+/* -*- Mode: C++; 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 "gtest/gtest.h"
+#include "nsDeque.h"
+#include "nsCRT.h"
+#include <stdio.h>
+
+/**************************************************************
+  Now define the token deallocator class...
+ **************************************************************/
+namespace TestNsDeque {
+  
+  class _Dealloc: public nsDequeFunctor 
+  {
+    virtual void* operator()(void* aObject) {
+      return 0;
+    }
+  };
+
+  static bool VerifyContents(const nsDeque& aDeque, const int* aContents, size_t aLength) 
+  {
+    for (size_t i=0; i<aLength; ++i) {
+      if (*(int*)aDeque.ObjectAt(i) != aContents[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  class Deallocator: public nsDequeFunctor
+  {
+    virtual void* operator()(void* aObject) 
+    {
+      if (aObject) 
+      {
+        // Set value to -1, to use in test function.
+        *((int*)aObject) = -1;
+      }
+
+      return nullptr;
+    }
+  };
+
+  class ForEachAdder: public nsDequeFunctor
+  {
+    virtual void* operator()(void* aObject) 
+    {
+      if (aObject) 
+      {
+        sum += *(int*)aObject;
+      }
+
+      return aObject;
+    }
+
+    private:
+     int sum = 0;
+    
+    public:
+     int GetSum() { return sum; }
+    
+  };
+}
+
+using namespace TestNsDeque;
+
+TEST(NsDeque, OriginalTest)
+{
+  const size_t size = 200;
+  int ints[size];
+  size_t i=0;
+  int temp;
+  nsDeque theDeque(new _Dealloc); //construct a simple one...
+ 
+  // ints = [0...199]
+  for (i=0;i<size;i++) { //initialize'em
+    ints[i]=static_cast<int>(i);
+  }
+  // queue = [0...69]
+  for (i=0;i<70;i++) {
+    theDeque.Push(&ints[i]);
+    temp=*(int*)theDeque.Peek();
+    EXPECT_EQ(static_cast<int>(i), temp) << "Verify end after push #1";
+    EXPECT_EQ(i + 1, theDeque.GetSize()) << "Verify size after push #1";
+  }
+
+  EXPECT_EQ(70u,theDeque.GetSize()) << "Verify overall size after pushes #1";
+
+  // queue = [0...14]
+  for (i=1;i<=55;i++) {
+    temp=*(int*)theDeque.Pop();
+    EXPECT_EQ(70-static_cast<int>(i),temp) << "Verify end after pop # 1";
+    EXPECT_EQ(70u - i,theDeque.GetSize()) << "Verify size after pop # 1";
+  }
+  EXPECT_EQ(15u,theDeque.GetSize()) << "Verify overall size after pops";
+
+  // queue = [0...14,0...54]
+  for (i=0;i<55;i++) {
+    theDeque.Push(&ints[i]);
+    temp=*(int*)theDeque.Peek();
+    EXPECT_EQ(static_cast<int>(i),temp) << "Verify end after push #2";
+    EXPECT_EQ(i + 15u + 1,theDeque.GetSize()) << "Verify size after push # 2";
+  }
+  EXPECT_EQ(70u,theDeque.GetSize()) << "Verify size after end of all pushes #2";
+
+  // queue = [0...14,0...19]
+  for (i=1;i<=35;i++) {
+    temp=*(int*)theDeque.Pop();
+    EXPECT_EQ(55-static_cast<int>(i),temp ) << "Verify end after pop # 2";
+    EXPECT_EQ(70u - i,theDeque.GetSize()) << "Verify size after pop #2";
+  }
+  EXPECT_EQ(35u,theDeque.GetSize()) << "Verify overall size after end of all pops #2";
+
+  // queue = [0...14,0...19,0...34]
+  for (i=0;i<35;i++) {
+    theDeque.Push(&ints[i]);
+    temp = *(int*)theDeque.Peek();
+    EXPECT_EQ(static_cast<int>(i),temp) << "Verify end after push # 3";
+    EXPECT_EQ(35u + 1u + i,theDeque.GetSize()) << "Verify size after push #3";
+  }
+
+  // queue = [0...14,0...19]
+  for (i=0;i<35;i++) {
+    temp=*(int*)theDeque.Pop();
+    EXPECT_EQ(34 - static_cast<int>(i), temp) << "Verify end after pop # 3";
+  }
+
+  // queue = [0...14]
+  for (i=0;i<20;i++) {
+    temp=*(int*)theDeque.Pop();
+    EXPECT_EQ(19 - static_cast<int>(i),temp) << "Verify end after pop # 4";
+  }
+
+  // queue = []
+  for (i=0;i<15;i++) {
+    temp=*(int*)theDeque.Pop();
+    EXPECT_EQ(14 - static_cast<int>(i),temp) << "Verify end after pop # 5";
+  }
+
+  EXPECT_EQ(0u,theDeque.GetSize()) << "Deque should finish empty.";
+}
+
+TEST(NsDeque, OriginalFlaw)
+{
+  int ints[200];
+  int i=0;
+  int temp;
+  nsDeque d(new _Dealloc);
+  /**
+   * Test 1. Origin near end, semi full, call Peek().
+   * you start, mCapacity is 8
+   */
+  for (i=0; i<30; i++)
+    ints[i]=i;
+
+  for (i=0; i<6; i++) {
+    d.Push(&ints[i]);
+    temp = *(int*)d.Peek();
+    EXPECT_EQ(i, temp) << "OriginalFlaw push #1";
+  }
+  EXPECT_EQ(6u, d.GetSize()) << "OriginalFlaw size check #1";
+
+  for (i=0; i<4; i++) {
+    temp=*(int*)d.PopFront();
+    EXPECT_EQ(i, temp) << "PopFront test";
+  }
+  // d = [4,5]
+  EXPECT_EQ(2u, d.GetSize()) << "OriginalFlaw size check #2";
+
+  for (i=0; i<4; i++) {
+    d.Push(&ints[6 + i]);
+  }
+
+  // d = [4...9]
+  for (i=4; i<=9; i++) {
+    temp=*(int*)d.PopFront();
+    EXPECT_EQ(i, temp) << "OriginalFlaw empty check";
+  }
+}
+
+TEST(NsDeque, TestObjectAt)
+{
+  nsDeque d;
+  const int count = 10;
+  int ints[count];
+  for (int i=0; i<count; i++) {
+    ints[i] = i;
+  }
+
+  for (int i=0; i<6; i++) {
+    d.Push(&ints[i]);
+  }
+  // d = [0...5]
+  d.PopFront();
+  d.PopFront();
+
+  // d = [2..5]
+  for (size_t i=2; i<=5; i++) {
+    int t = *(int*)d.ObjectAt(i-2);
+    EXPECT_EQ(static_cast<int>(i),t) << "Verify ObjectAt()";
+  }
+}
+
+TEST(NsDeque, TestPushFront)
+{
+  // PushFront has some interesting corner cases, primarily we're interested in whether:
+  // - wrapping around works properly
+  // - growing works properly
+
+  nsDeque d;
+
+  const int kPoolSize = 10;
+  const size_t kMaxSizeBeforeGrowth = 8;
+
+  int pool[kPoolSize];
+  for (int i = 0; i < kPoolSize; i++) {
+    pool[i] = i;
+  }
+
+  for (size_t i = 0; i < kMaxSizeBeforeGrowth; i++) {
+    d.PushFront(pool + i);
+  }
+
+  EXPECT_EQ(kMaxSizeBeforeGrowth, d.GetSize()) << "verify size";
+
+  static const int t1[] = {7,6,5,4,3,2,1,0};
+  EXPECT_TRUE(VerifyContents(d, t1, kMaxSizeBeforeGrowth)) << "verify pushfront 1";
+
+  // Now push one more so it grows
+  d.PushFront(pool + kMaxSizeBeforeGrowth);
+  EXPECT_EQ(kMaxSizeBeforeGrowth + 1, d.GetSize()) << "verify size";
+
+  static const int t2[] = {8,7,6,5,4,3,2,1,0};
+  EXPECT_TRUE(VerifyContents(d, t2, kMaxSizeBeforeGrowth + 1)) << "verify pushfront 2";
+
+  // And one more so that it wraps again
+  d.PushFront(pool + kMaxSizeBeforeGrowth + 1);
+  EXPECT_EQ(kMaxSizeBeforeGrowth + 2, d.GetSize()) << "verify size";
+
+  static const int t3[] = {9,8,7,6,5,4,3,2,1,0};
+  EXPECT_TRUE(VerifyContents(d, t3, kMaxSizeBeforeGrowth + 2)) <<"verify pushfront 3";
+}
+
+void CheckIfQueueEmpty(nsDeque& d)
+{
+  EXPECT_EQ(0u, d.GetSize())         << "Size should be 0";
+  EXPECT_EQ(nullptr, d.Pop())       <<  "Invalid operation should return nullptr";
+  EXPECT_EQ(nullptr, d.PopFront())  <<  "Invalid operation should return nullptr";
+  EXPECT_EQ(nullptr, d.Peek())      <<  "Invalid operation should return nullptr";
+  EXPECT_EQ(nullptr, d.PeekFront()) <<  "Invalid operation should return nullptr";
+  EXPECT_EQ(nullptr, d.ObjectAt(0u)) <<  "Invalid operation should return nullptr";
+}
+
+TEST(NsDeque,TestEmpty)
+{
+  // Make sure nsDeque gives sane results if it's empty.
+  nsDeque d;
+  size_t numberOfEntries = 8;
+
+  CheckIfQueueEmpty(d);
+
+  // Fill it up and drain it.
+  for (size_t i = 0; i < numberOfEntries; i++) {
+    d.Push((void*)0xAA);
+  }
+
+  EXPECT_EQ(numberOfEntries, d.GetSize());
+
+  for (size_t i = 0; i < numberOfEntries; i++) {
+    (void)d.Pop();
+  }
+
+  // Now check it again.
+  CheckIfQueueEmpty(d);
+}
+
+TEST(NsDeque,TestEraseMethod)
+{
+  nsDeque d;
+  const size_t numberOfEntries = 8;
+
+  // Fill it up before calling Erase
+  for (size_t i = 0; i < numberOfEntries; i++) {
+    d.Push((void*)0xAA);
+  }
+
+  // Call Erase
+  d.Erase();
+
+  // Now check it again.
+  CheckIfQueueEmpty(d);
+}
+
+TEST(NsDeque,TestEraseShouldCallDeallocator)
+{
+  nsDeque d(new Deallocator());
+  const size_t NumTestValues = 8;
+
+  int* testArray[NumTestValues];
+  for (size_t i=0; i < NumTestValues; i++)
+  {
+    testArray[i] = new int();
+    *(testArray[i]) = i;
+    d.Push((void*)testArray[i]);
+  }
+
+  d.Erase();
+
+  // Now check it again.
+  CheckIfQueueEmpty(d);
+  
+  for (size_t i=0; i < NumTestValues; i++)
+  {
+    EXPECT_EQ(-1, *(testArray[i])) << "Erase should call deallocator: " << *(testArray[i]);
+  }
+}
+
+TEST(NsDeque, TestForEach)
+{
+  nsDeque d(new Deallocator());
+  const size_t NumTestValues = 8;
+  int sum = 0;
+
+  int* testArray[NumTestValues];
+  for (size_t i=0; i < NumTestValues; i++)
+  {
+    testArray[i] = new int();
+    *(testArray[i]) = i;
+    sum += i;
+    d.Push((void*)testArray[i]);
+  }
+
+  ForEachAdder adder;
+  d.ForEach(adder);
+  EXPECT_EQ(sum, adder.GetSum()) << "For each should iterate over values";
+
+  d.Erase();
+}
diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build
index ac04a0b87f9f1b..33c58e20f2f639 100644
--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@@ -8,6 +8,7 @@ UNIFIED_SOURCES += [
     'TestArray.cpp',
     'TestFileUtils.cpp',
     'TestGCPostBarriers.cpp',
+    'TestNsDeque.cpp',
     'TestThreadUtils.cpp',
 ]
 
diff --git a/xpcom/tests/TestDeque.cpp b/xpcom/tests/TestDeque.cpp
deleted file mode 100644
index eeb17a71ac53c4..00000000000000
--- a/xpcom/tests/TestDeque.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/* -*- Mode: C++; 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 "TestHarness.h"
-#include "nsDeque.h"
-#include "nsCRT.h"
-#include <stdio.h>
-
-/**************************************************************
-  Now define the token deallocator class...
- **************************************************************/
-class _TestDeque {
-public:
-  int Test();
-private:
-  int OriginalTest();
-  int OriginalFlaw();
-  int AssignFlaw();
-  int TestRemove();
-  int TestPushFront();
-  int TestEmpty();
-};
-
-class _Dealloc: public nsDequeFunctor {
-  virtual void* operator()(void* aObject) {
-    return 0;
-  }
-};
-
-#define TEST(aCondition, aMsg) \
-  if (!(aCondition)) { fail("TestDeque: "#aMsg); return 1; }
-
-
-/**
- * conduct automated self test for this class
- *
- * @param
- * @return
- */
-int _TestDeque::Test() {
-  /* the old deque should have failed a bunch of these tests */
-  int results=0;
-  results+=OriginalTest();
-  results+=OriginalFlaw();
-  results+=AssignFlaw();
-  results+=TestRemove();
-  results+=TestPushFront();
-  results+=TestEmpty();
-  return results;
-}
-
-int _TestDeque::OriginalTest() {
-  const int size = 200;
-  int ints[size];
-  int i=0;
-  int temp;
-  nsDeque theDeque(new _Dealloc); //construct a simple one...
- 
-  // ints = [0...199]
-  for (i=0;i<size;i++) { //initialize'em
-    ints[i]=i;
-  }
-  // queue = [0...69]
-  for (i=0;i<70;i++) {
-    theDeque.Push(&ints[i]);
-    temp=*(int*)theDeque.Peek();
-    TEST(temp == i, "Verify end after push #1");
-    TEST(theDeque.GetSize() == i + 1, "Verify size after push #1");
-  }
-  TEST(theDeque.GetSize() == 70, "Verify overall size after pushes #1");
-  // queue = [0...14]
-  for (i=1;i<=55;i++) {
-    temp=*(int*)theDeque.Pop();
-    TEST(temp == 70-i, "Verify end after pop # 1");
-    TEST(theDeque.GetSize() == 70 - i, "Verify size after pop # 1");
-  }
-  TEST(theDeque.GetSize() == 15, "Verify overall size after pops");
-
-  // queue = [0...14,0...54]
-  for (i=0;i<55;i++) {
-    theDeque.Push(&ints[i]);
-    temp=*(int*)theDeque.Peek();
-    TEST(temp == i, "Verify end after push #2");
-    TEST(theDeque.GetSize() == i + 15 + 1, "Verify size after push # 2");
-  }
-  TEST(theDeque.GetSize() == 70, "Verify size after end of all pushes #2");
-
-  // queue = [0...14,0...19]
-  for (i=1;i<=35;i++) {
-    temp=*(int*)theDeque.Pop();
-    TEST(temp == 55-i, "Verify end after pop # 2");
-    TEST(theDeque.GetSize() == 70 - i, "Verify size after pop #2");
-  }
-  TEST(theDeque.GetSize() == 35, "Verify overall size after end of all pops #2");
-
-  // queue = [0...14,0...19,0...34]
-  for (i=0;i<35;i++) {
-    theDeque.Push(&ints[i]);
-    temp = *(int*)theDeque.Peek();
-    TEST(temp == i, "Verify end after push # 3");
-    TEST(theDeque.GetSize() == 35 + 1 + i, "Verify size after push #3");
-  }
-
-  // queue = [0...14,0...19]
-  for (i=0;i<35;i++) {
-    temp=*(int*)theDeque.Pop();
-    TEST(temp == 34 - i, "Verify end after pop # 3");
-  }
-
-  // queue = [0...14]
-  for (i=0;i<20;i++) {
-    temp=*(int*)theDeque.Pop();
-    TEST(temp == 19 - i, "Verify end after pop # 4");
-  }
-
-  // queue = []
-  for (i=0;i<15;i++) {
-    temp=*(int*)theDeque.Pop();
-    TEST(temp == 14 - i, "Verify end after pop # 5");
-  }
-
-  TEST(theDeque.GetSize() == 0, "Deque should finish empty.");
-
-  return 0;
-}
-
-int _TestDeque::OriginalFlaw() {
-  int ints[200];
-  int i=0;
-  int temp;
-  nsDeque d(new _Dealloc);
-  /**
-   * Test 1. Origin near end, semi full, call Peek().
-   * you start, mCapacity is 8
-   */
-  printf("fill array\n");
-  for (i=0; i<30; i++)
-    ints[i]=i;
-
-  for (i=0; i<6; i++) {
-    d.Push(&ints[i]);
-    temp = *(int*)d.Peek();
-    TEST(temp == i, "OriginalFlaw push #1");
-  }
-  TEST(d.GetSize() == 6, "OriginalFlaw size check #1");
-
-  for (i=0; i<4; i++) {
-    temp=*(int*)d.PopFront();
-    TEST(temp == i, "PopFront test");
-  }
-  // d = [4,5]
-  TEST(d.GetSize() == 2, "OriginalFlaw size check #2");
-
-  for (i=0; i<4; i++) {
-    d.Push(&ints[6 + i]);
-  }
-  // d = [4...9]
-
-  for (i=4; i<=9; i++) {
-    temp=*(int*)d.PopFront();
-    TEST(temp == i, "OriginalFlaw empty check");
-  }
-
-  return 0;
-}
-
-int _TestDeque::AssignFlaw() {
-  nsDeque src(new _Dealloc),dest(new _Dealloc);
-  return 0;
-}
-
-static bool VerifyContents(const nsDeque& aDeque, const int* aContents, int aLength) {
-  for (int i=0; i<aLength; ++i) {
-    if (*(int*)aDeque.ObjectAt(i) != aContents[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-int _TestDeque::TestRemove() {
-  nsDeque d;
-  const int count = 10;
-  int ints[count];
-  for (int i=0; i<count; i++) {
-    ints[i] = i;
-  }
-
-  for (int i=0; i<6; i++) {
-    d.Push(&ints[i]);
-  }
-  // d = [0...5]
-  d.PopFront();
-  d.PopFront();
-
-  // d = [2,5]
-  for (int i=2; i<=5; i++) {
-    int t = *(int*)d.ObjectAt(i-2);
-    TEST(t == i, "Verify ObjectAt()");
-  }
-
-  d.RemoveObjectAt(1);
-  // d == [2,4,5]
-  static const int t1[] = {2,4,5};
-  TEST(VerifyContents(d, t1, 3), "verify contents t1");
-
-  d.PushFront(&ints[1]);
-  d.PushFront(&ints[0]);
-  d.PushFront(&ints[7]);
-  d.PushFront(&ints[6]);
-  //  d == [6,7,0,1,2,4,5] // (0==mOrigin)
-  static const int t2[] = {6,7,0,1,2,4,5};
-  TEST(VerifyContents(d, t2, 7), "verify contents t2");
-
-  d.RemoveObjectAt(1);
-  //  d == [6,0,1,2,4,5] // (1==mOrigin)
-  static const int t3[] = {6,0,1,2,4,5};
-  TEST(VerifyContents(d, t3, 6), "verify contents t3");
-
-  d.RemoveObjectAt(5);
-  //  d == [6,0,1,2,4] // (1==mOrigin)
-  static const int t4[] = {6,0,1,2,4};
-  TEST(VerifyContents(d, t4, 5), "verify contents t4");
-
-  d.RemoveObjectAt(0);
-  //  d == [0,1,2,4] // (2==mOrigin)
-  static const int t5[] = {0,1,2,4};
-  TEST(VerifyContents(d, t5, 4), "verify contents t5");
-
-
-  return 0;
-}
-
-int _TestDeque::TestPushFront() {
-  // PushFront has some interesting corner cases, primarily we're interested in whether:
-  // - wrapping around works properly
-  // - growing works properly
-
-  nsDeque d;
-
-  const int kPoolSize = 10;
-  const int kMaxSizeBeforeGrowth = 8;
-
-  int pool[kPoolSize];
-  for (int i = 0; i < kPoolSize; i++) {
-    pool[i] = i;
-  }
-
-  for (int i = 0; i < kMaxSizeBeforeGrowth; i++) {
-    d.PushFront(pool + i);
-  }
-
-  TEST(d.GetSize() == kMaxSizeBeforeGrowth, "verify size");
-
-  static const int t1[] = {7,6,5,4,3,2,1,0};
-  TEST(VerifyContents(d, t1, kMaxSizeBeforeGrowth), "verify pushfront 1");
-
-  // Now push one more so it grows
-  d.PushFront(pool + kMaxSizeBeforeGrowth);
-  TEST(d.GetSize() == kMaxSizeBeforeGrowth + 1, "verify size");
-
-  static const int t2[] = {8,7,6,5,4,3,2,1,0};
-  TEST(VerifyContents(d, t2, kMaxSizeBeforeGrowth + 1), "verify pushfront 2");
-
-  // And one more so that it wraps again
-  d.PushFront(pool + kMaxSizeBeforeGrowth + 1);
-  TEST(d.GetSize() == kMaxSizeBeforeGrowth + 2, "verify size");
-
-  static const int t3[] = {9,8,7,6,5,4,3,2,1,0};
-  TEST(VerifyContents(d, t3, kMaxSizeBeforeGrowth + 2), "verify pushfront 3");
-
-  return 0;
-}
-
-int _TestDeque::TestEmpty() {
-  // Make sure nsDeque gives sane results if it's empty.
-  nsDeque d;
-
-  TEST(d.GetSize() == 0, "Size should be 0");
-  TEST(d.Pop() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.PopFront() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.Peek() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.PeekFront() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.ObjectAt(0) == nullptr, "Invalid operation should return nullptr");
-  TEST(d.Last() == nullptr, "Invalid operation should return nullptr");
-
-  // Fill it up and drain it.
-  for (size_t i = 0; i < 8; i++) {
-    d.Push((void*)0xAA);
-  }
-
-  for (size_t i = 0; i < 8; i++) {
-    (void)d.Pop();
-  }
-
-  // Now check it again.
-  TEST(d.GetSize() == 0, "Size should be 0");
-  TEST(d.Pop() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.PopFront() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.Peek() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.PeekFront() == nullptr, "Invalid operation should return nullptr");
-  TEST(d.ObjectAt(0) == nullptr, "Invalid operation should return nullptr");
-  TEST(d.Last() == nullptr, "Invalid operation should return nullptr");
-
-  return 0;
-}
-
-int main (void) {
-  ScopedXPCOM xpcom("TestDeque");
-  NS_ENSURE_FALSE(xpcom.failed(), 1);
-
-  _TestDeque test;
-  int result = test.Test();
-  TEST(result == 0, "All tests pass");
-  return 0;
-}
diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build
index c1bf0534009b7a..7f0019efd77658 100644
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -56,7 +56,6 @@ GeckoCppUnitTests([
     'TestCOMArray',
     'TestCOMPtr',
     'TestCOMPtrEq',
-    'TestDeque',
     'TestFile',
     'TestHashtables',
     'TestID',
diff --git a/xpcom/threads/BackgroundHangMonitor.cpp b/xpcom/threads/BackgroundHangMonitor.cpp
index 7e288a50927fd4..0769df62b35dd6 100644
--- a/xpcom/threads/BackgroundHangMonitor.cpp
+++ b/xpcom/threads/BackgroundHangMonitor.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 
 // Activate BHR only for one every BHR_BETA_MOD users.
-#define BHR_BETA_MOD 100;
+#define BHR_BETA_MOD 2;
 
 // Maximum depth of the call stack in the reported thread hangs. This value represents
 // the 99.9th percentile of the thread hangs stack depths reported by Telemetry.