diff -Nru firefox-55.0~b4+build2/accessible/base/DocManager.cpp firefox-55.0~b5+build1/accessible/base/DocManager.cpp
--- firefox-55.0~b4+build2/accessible/base/DocManager.cpp	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/accessible/base/DocManager.cpp	2017-06-27 05:25:27.000000000 +0000
@@ -92,10 +92,10 @@
   if (xpcDoc) {
     xpcDoc->Shutdown();
     mXPCDocumentCache.Remove(aDocument);
-  }
 
-  if (!HasXPCDocuments()) {
-    MaybeShutdownAccService(nsAccessibilityService::eXPCOM);
+    if (!HasXPCDocuments()) {
+      MaybeShutdownAccService(nsAccessibilityService::eXPCOM);
+    }
   }
 }
 
diff -Nru firefox-55.0~b4+build2/browser/app/profile/firefox.js firefox-55.0~b5+build1/browser/app/profile/firefox.js
--- firefox-55.0~b4+build2/browser/app/profile/firefox.js	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/app/profile/firefox.js	2017-06-27 05:25:28.000000000 +0000
@@ -1552,7 +1552,7 @@
 #endif
 
 // Enable blocking of e10s and e10s-multi for add-on users on beta/release.
-#ifdef RELEASE_OR_BETA
+#if defined(RELEASE_OR_BETA) && !defined(MOZ_DEV_EDITION)
 pref("extensions.e10sBlocksEnabling", true);
 pref("extensions.e10sMultiBlocksEnabling", true);
 #endif
diff -Nru firefox-55.0~b4+build2/browser/base/content/browser.js firefox-55.0~b5+build1/browser/base/content/browser.js
--- firefox-55.0~b4+build2/browser/base/content/browser.js	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/base/content/browser.js	2017-06-27 05:25:28.000000000 +0000
@@ -3467,7 +3467,9 @@
     this._toggleAffectedChrome();
   },
   onExit() {
+    gBrowser._allowTabChange = true;
     gBrowser.selectedTab = this._tabBeforePrintPreview;
+    gBrowser._allowTabChange = false;
     this._tabBeforePrintPreview = null;
     gInPrintPreviewMode = false;
     this._toggleAffectedChrome();
diff -Nru firefox-55.0~b4+build2/browser/base/content/test/tabs/browser_navigatePinnedTab.js firefox-55.0~b5+build1/browser/base/content/test/tabs/browser_navigatePinnedTab.js
--- firefox-55.0~b4+build2/browser/base/content/test/tabs/browser_navigatePinnedTab.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/base/content/test/tabs/browser_navigatePinnedTab.js	2017-06-27 05:25:28.000000000 +0000
@@ -31,7 +31,7 @@
 
   // Now check that opening a link that does create a new tab works,
   // and also that it nulls out the opener.
-  let pageLoadPromise = BrowserTestUtils.browserLoaded(appTab.linkedBrowser, "http://example.com/");
+  let pageLoadPromise = BrowserTestUtils.browserLoaded(appTab.linkedBrowser, false, "http://example.com/");
   await BrowserTestUtils.loadURI(appTab.linkedBrowser, "http://example.com/");
   info("Started loading example.com");
   await pageLoadPromise;
diff -Nru firefox-55.0~b4+build2/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js firefox-55.0~b5+build1/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js
--- firefox-55.0~b4+build2/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/base/content/test/tabs/browser_tabSwitchPrintPreview.js	2017-06-27 05:25:28.000000000 +0000
@@ -4,9 +4,11 @@
 /**
  * Verify that if we open a new tab and try to make it the selected tab while
  * print preview is up, that doesn't happen.
+ * Also check that we switch back to the original tab on exiting Print Preview.
  */
 add_task(async function() {
   await BrowserTestUtils.withNewTab(kURL1, async function(browser) {
+    let originalTab = gBrowser.selectedTab;
     let tab = BrowserTestUtils.addTab(gBrowser, kURL2);
     document.getElementById("cmd_printPreview").doCommand();
     gBrowser.selectedTab = tab;
@@ -16,8 +18,10 @@
     gBrowser.selectedTab = tab;
     isnot(gBrowser.selectedTab, tab, "Selected tab should still not be the tab we added");
     is(gBrowser.selectedTab, PrintPreviewListener._printPreviewTab, "Selected tab should still be the print preview tab");
-    PrintUtils.exitPrintPreview();
-    await BrowserTestUtils.waitForCondition(() => !gInPrintPreviewMode, "should be in print preview mode");
+    let tabSwitched = BrowserTestUtils.switchTab(gBrowser, () => { PrintUtils.exitPrintPreview(); });
+    await BrowserTestUtils.waitForCondition(() => !gInPrintPreviewMode, "should no longer be in print preview mode");
+    await tabSwitched;
+    is(gBrowser.selectedTab, originalTab, "Selected tab should be back to the original tab that we print previewed");
     await BrowserTestUtils.removeTab(tab);
   });
 });
diff -Nru firefox-55.0~b4+build2/browser/base/content/test/urlbar/browser_bug304198.js firefox-55.0~b5+build1/browser/base/content/test/urlbar/browser_bug304198.js
--- firefox-55.0~b4+build2/browser/base/content/test/urlbar/browser_bug304198.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/base/content/test/urlbar/browser_bug304198.js	2017-06-27 05:25:28.000000000 +0000
@@ -11,9 +11,9 @@
   partialURLTab = BrowserTestUtils.addTab(gBrowser);
   testURL = "http://example.org/browser/browser/base/content/test/urlbar/dummy_page.html";
 
-  let loaded1 = BrowserTestUtils.browserLoaded(deletedURLTab.linkedBrowser, testURL);
-  let loaded2 = BrowserTestUtils.browserLoaded(fullURLTab.linkedBrowser, testURL);
-  let loaded3 = BrowserTestUtils.browserLoaded(partialURLTab.linkedBrowser, testURL);
+  let loaded1 = BrowserTestUtils.browserLoaded(deletedURLTab.linkedBrowser, false, testURL);
+  let loaded2 = BrowserTestUtils.browserLoaded(fullURLTab.linkedBrowser, false, testURL);
+  let loaded3 = BrowserTestUtils.browserLoaded(partialURLTab.linkedBrowser, false, testURL);
   deletedURLTab.linkedBrowser.loadURI(testURL);
   fullURLTab.linkedBrowser.loadURI(testURL);
   partialURLTab.linkedBrowser.loadURI(testURL);
diff -Nru firefox-55.0~b4+build2/browser/base/content/test/urlbar/browser_pasteAndGo.js firefox-55.0~b5+build1/browser/base/content/test/urlbar/browser_pasteAndGo.js
--- firefox-55.0~b4+build2/browser/base/content/test/urlbar/browser_pasteAndGo.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/base/content/test/urlbar/browser_pasteAndGo.js	2017-06-27 05:25:28.000000000 +0000
@@ -27,7 +27,7 @@
       await cxmenuPromise;
       let menuitem = document.getAnonymousElementByAttribute(textBox,
         "anonid", "paste-and-go");
-      let browserLoadedPromise = BrowserTestUtils.browserLoaded(browser, url.replace(/\n/g, ""));
+      let browserLoadedPromise = BrowserTestUtils.browserLoaded(browser, false, url.replace(/\n/g, ""));
       EventUtils.synthesizeMouseAtCenter(menuitem, {});
       // Using toSource in order to get the newlines escaped:
       info("Paste and go, loading " + url.toSource());
diff -Nru firefox-55.0~b4+build2/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js firefox-55.0~b5+build1/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js
--- firefox-55.0~b4+build2/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/base/content/test/urlbar/browser_urlbarSearchSuggestions_opt-out.js	2017-06-27 05:25:28.000000000 +0000
@@ -56,7 +56,7 @@
 
   // Check the Change Options link.
   let changeOptionsLink = document.getElementById("search-suggestions-change-settings");
-  let prefsPromise = BrowserTestUtils.waitForLocationChange(gBrowser, "about:preferences#general-search");
+  let prefsPromise = BrowserTestUtils.waitForLocationChange(gBrowser, "about:preferences#search");
   changeOptionsLink.click();
   await prefsPromise;
   Assert.ok(!gURLBar.popup.popupOpen, "popup should be closed");
diff -Nru firefox-55.0~b4+build2/browser/components/extensions/test/browser/browser-common.ini firefox-55.0~b5+build1/browser/components/extensions/test/browser/browser-common.ini
--- firefox-55.0~b4+build2/browser/components/extensions/test/browser/browser-common.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/extensions/test/browser/browser-common.ini	2017-06-27 05:25:28.000000000 +0000
@@ -54,6 +54,7 @@
 [browser_ext_contextMenus_checkboxes.js]
 [browser_ext_contextMenus_commands.js]
 [browser_ext_contextMenus_icons.js]
+skip-if = os == 'win' && !debug # Bug 1351638
 [browser_ext_contextMenus_onclick.js]
 [browser_ext_contextMenus_radioGroups.js]
 [browser_ext_contextMenus_uninstall.js]
diff -Nru firefox-55.0~b4+build2/browser/components/extensions/test/browser/head_pageAction.js firefox-55.0~b5+build1/browser/components/extensions/test/browser/head_pageAction.js
--- firefox-55.0~b4+build2/browser/components/extensions/test/browser/head_pageAction.js	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/extensions/test/browser/head_pageAction.js	2017-06-27 05:25:28.000000000 +0000
@@ -114,7 +114,7 @@
         pageActionId = `${makeWidgetId(extension.id)}-page-action`;
       }
 
-      await promiseAnimationFrame();
+      await promiseAnimationFrame(currentWindow);
 
       checkDetails(expecting);
 
diff -Nru firefox-55.0~b4+build2/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js firefox-55.0~b5+build1/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js
--- firefox-55.0~b4+build2/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/extensions/test/xpcshell/test_ext_manifest_commands.js	2017-06-27 05:25:28.000000000 +0000
@@ -14,7 +14,7 @@
   });
 
   let expectedError = (
-    String.raw`commands.toggle-feature.suggested_key.default: Value must either: ` +
+    String.raw`commands.toggle-feature.suggested_key.default: Value "Shifty+Y" must either: ` +
     String.raw`match the pattern /^\s*(Alt|Ctrl|Command|MacCtrl)\s*\+\s*(Shift\s*\+\s*)?([A-Z0-9]|Comma|Period|Home|End|PageUp|PageDown|Space|Insert|Delete|Up|Down|Left|Right)\s*$/, ` +
     String.raw`match the pattern /^\s*((Alt|Ctrl|Command|MacCtrl)\s*\+\s*)?(Shift\s*\+\s*)?(F[1-9]|F1[0-2])\s*$/, or ` +
     String.raw`match the pattern /^(MediaNextTrack|MediaPlayPause|MediaPrevTrack|MediaStop)$/`
diff -Nru firefox-55.0~b4+build2/browser/components/newtab/tests/browser/browser.ini firefox-55.0~b5+build1/browser/components/newtab/tests/browser/browser.ini
--- firefox-55.0~b4+build2/browser/components/newtab/tests/browser/browser.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/newtab/tests/browser/browser.ini	2017-06-27 05:25:28.000000000 +0000
@@ -4,6 +4,6 @@
   dummy_page.html
 
 [browser_PreviewProvider.js]
-skip-if = os == 'linux' # bug 1343150
+skip-if = os == 'linux' || os == 'win' # bug 1343150
 [browser_remotenewtab_pageloads.js]
 [browser_newtab_overrides.js]
diff -Nru firefox-55.0~b4+build2/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js firefox-55.0~b5+build1/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js
--- firefox-55.0~b4+build2/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/places/tests/browser/browser_bookmarklet_windowOpen.js	2017-06-27 05:25:28.000000000 +0000
@@ -51,7 +51,7 @@
   let browser = tab.linkedBrowser;
   if (!browser.currentURI || browser.currentURI.spec != TEST_URL) {
     info("Waiting for browser load");
-    await BrowserTestUtils.browserLoaded(browser);
+    await BrowserTestUtils.browserLoaded(browser, false, TEST_URL);
   }
   is(browser.currentURI && browser.currentURI.spec, TEST_URL, "Tab with expected URL loaded.");
   info("Waiting to remove tab");
diff -Nru firefox-55.0~b4+build2/browser/components/search/content/search.xml firefox-55.0~b5+build1/browser/components/search/content/search.xml
--- firefox-55.0~b4+build2/browser/components/search/content/search.xml	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/search/content/search.xml	2017-06-27 05:25:28.000000000 +0000
@@ -1130,9 +1130,9 @@
 
       <handler event="popuphiding"><![CDATA[
         this._isHiding = true;
-        setTimeout(() => {
+        Services.tm.dispatchToMainThread(() => {
           this._isHiding = false;
-        }, 0);
+        });
       ]]></handler>
 
       <!-- This handles clicks on the topmost "Foo Search" header in the
diff -Nru firefox-55.0~b4+build2/browser/components/sessionstore/SessionStore.jsm firefox-55.0~b5+build1/browser/components/sessionstore/SessionStore.jsm
--- firefox-55.0~b4+build2/browser/components/sessionstore/SessionStore.jsm	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/components/sessionstore/SessionStore.jsm	2017-06-27 05:25:28.000000000 +0000
@@ -3255,7 +3255,6 @@
     }
 
     let tabbrowser = aWindow.gBrowser;
-    let tabsToRemove = overwriteTabs ? tabbrowser.browsers.length : 0;
     let newTabCount = winData.tabs.length;
     var tabs = [];
 
@@ -3266,11 +3265,20 @@
 
     // We need to keep track of the initially open tabs so that they
     // can be moved to the end of the restored tabs.
-    let initialTabs = [];
+    let initialTabs;
     if (!overwriteTabs && firstWindow) {
       initialTabs = Array.slice(tabbrowser.tabs);
     }
 
+    // Get rid of tabs that aren't needed anymore.
+    if (overwriteTabs) {
+      for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) {
+        if (!tabbrowser.tabs[i].selected) {
+          tabbrowser.removeTab(tabbrowser.tabs[i]);
+        }
+      }
+    }
+
     let restoreTabsLazily = this._prefBranch.getBoolPref("sessionstore.restore_tabs_lazily") &&
       this._prefBranch.getBoolPref("sessionstore.restore_on_demand");
 
@@ -3279,61 +3287,67 @@
 
       let userContextId = tabData.userContextId;
       let select = t == selectTab - 1;
-      let createLazyBrowser = restoreTabsLazily && !select && !tabData.pinned;
+      let tab;
 
-      let url = "about:blank";
-      if (createLazyBrowser && tabData.entries && tabData.entries.length) {
-        // Let tabbrowser know the future URI because progress listeners won't
-        // get onLocationChange notification before the browser is inserted.
-        let activeIndex = (tabData.index || tabData.entries.length) - 1;
-        // Ensure the index is in bounds.
-        activeIndex = Math.min(activeIndex, tabData.entries.length - 1);
-        activeIndex = Math.max(activeIndex, 0);
-        url = tabData.entries[activeIndex].url;
+      // Re-use existing selected tab if possible to avoid the overhead of
+      // selecting a new tab.
+      if (select &&
+          tabbrowser.selectedTab.userContextId == userContextId) {
+        tab = tabbrowser.selectedTab;
+        if (!tabData.pinned) {
+          tabbrowser.unpinTab(tab);
+        }
+        tabbrowser.moveTabToEnd();
+        if (aWindow.gMultiProcessBrowser && !tab.linkedBrowser.isRemoteBrowser) {
+          tabbrowser.updateBrowserRemoteness(tab.linkedBrowser, true);
+        }
       }
 
-      // Setting noInitialLabel is a perf optimization. Rendering tab labels
-      // would make resizing the tabs more expensive as we're adding them.
-      // Each tab will get its initial label set in restoreTab.
-      let tab = tabbrowser.addTab(url,
-                                  { createLazyBrowser,
-                                    skipAnimation: true,
-                                    noInitialLabel: true,
-                                    userContextId,
-                                    skipBackgroundNotify: true });
-
-      if (select) {
-        // Select a new tab first to prevent the removeTab loop from changing
-        // the selected tab over and over again.
-        tabbrowser.selectedTab = tab;
-
-        // Remove superfluous tabs.
-        for (let i = 0; i < tabsToRemove; i++) {
-          tabbrowser.removeTab(tabbrowser.tabs[0]);
+      // Add a new tab if needed.
+      if (!tab) {
+        let createLazyBrowser = restoreTabsLazily && !select && !tabData.pinned;
+
+        let url = "about:blank";
+        if (createLazyBrowser && tabData.entries && tabData.entries.length) {
+          // Let tabbrowser know the future URI because progress listeners won't
+          // get onLocationChange notification before the browser is inserted.
+          let activeIndex = (tabData.index || tabData.entries.length) - 1;
+          // Ensure the index is in bounds.
+          activeIndex = Math.min(activeIndex, tabData.entries.length - 1);
+          activeIndex = Math.max(activeIndex, 0);
+          url = tabData.entries[activeIndex].url;
+        }
+
+        // Setting noInitialLabel is a perf optimization. Rendering tab labels
+        // would make resizing the tabs more expensive as we're adding them.
+        // Each tab will get its initial label set in restoreTab.
+        tab = tabbrowser.addTab(url,
+                                { createLazyBrowser,
+                                  skipAnimation: true,
+                                  noInitialLabel: true,
+                                  userContextId,
+                                  skipBackgroundNotify: true });
+
+        if (select) {
+          let leftoverTab = tabbrowser.selectedTab;
+          tabbrowser.selectedTab = tab;
+          tabbrowser.removeTab(leftoverTab);
         }
-        tabsToRemove = 0;
       }
 
       tabs.push(tab);
 
       if (tabData.hidden) {
-        tabbrowser.hideTab(tabs[t]);
+        tabbrowser.hideTab(tab);
       }
-    }
 
-    for (let i = 0; i < newTabCount; ++i) {
-      if (winData.tabs[i].pinned) {
-        tabbrowser.pinTab(tabs[i]);
-      } else {
-        // Pinned tabs are clustered at the start of the tab strip. As
-        // soon as we reach a tab that isn't pinned, we know there aren't
-        // any more for this window.
-        break;
+      if (tabData.pinned) {
+        tabbrowser.pinTab(tab);
       }
     }
 
-    if (!overwriteTabs && firstWindow) {
-      // Move the originally open tabs to the end
+    // Move the originally open tabs to the end.
+    if (initialTabs) {
       let endPosition = tabbrowser.tabs.length - 1;
       for (let i = 0; i < initialTabs.length; i++) {
         tabbrowser.unpinTab(initialTabs[i]);
diff -Nru firefox-55.0~b4+build2/browser/config/version_display.txt firefox-55.0~b5+build1/browser/config/version_display.txt
--- firefox-55.0~b4+build2/browser/config/version_display.txt	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/config/version_display.txt	2017-06-27 05:25:28.000000000 +0000
@@ -1 +1 @@
-55.0b4
+55.0b5
diff -Nru firefox-55.0~b4+build2/browser/extensions/clicktoplay-rollout/bootstrap.js firefox-55.0~b5+build1/browser/extensions/clicktoplay-rollout/bootstrap.js
--- firefox-55.0~b4+build2/browser/extensions/clicktoplay-rollout/bootstrap.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/extensions/clicktoplay-rollout/bootstrap.js	2017-06-27 05:25:28.000000000 +0000
@@ -130,9 +130,10 @@
 }
 
 function watchForPrefChanges() {
-  Preferences.observe(PREF_FLASH_STATE, function() {
+  Preferences.observe(PREF_FLASH_STATE, function prefWatcher() {
     let currentCohort = Preferences.get(PREF_COHORT_NAME, "unknown");
     setCohort(`user-changed-from-${currentCohort}`);
+    Preferences.ignore(PREF_FLASH_STATE, prefWatcher);
   });
 }
 
diff -Nru firefox-55.0~b4+build2/browser/extensions/clicktoplay-rollout/install.rdf.in firefox-55.0~b5+build1/browser/extensions/clicktoplay-rollout/install.rdf.in
--- firefox-55.0~b4+build2/browser/extensions/clicktoplay-rollout/install.rdf.in	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/browser/extensions/clicktoplay-rollout/install.rdf.in	2017-06-27 05:25:28.000000000 +0000
@@ -10,7 +10,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>clicktoplay-rollout@mozilla.org</em:id>
-    <em:version>1.1</em:version>
+    <em:version>1.2</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
diff -Nru firefox-55.0~b4+build2/browser/extensions/e10srollout/bootstrap.js firefox-55.0~b5+build1/browser/extensions/e10srollout/bootstrap.js
--- firefox-55.0~b4+build2/browser/extensions/e10srollout/bootstrap.js	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/extensions/e10srollout/bootstrap.js	2017-06-27 05:25:28.000000000 +0000
@@ -22,9 +22,16 @@
 // content processes to use and whether to allow addons for the experiment.
 const MULTI_EXPERIMENT = {
   "beta": { buckets: { 1: .5, 4: 1, }, // 1 process: 50%, 4 processes: 50%
-            addons: true },
+            addonsDisableExperiment: false },
+
   "release": { buckets: { 1: .2, 4: 1 }, // 1 process: 20%, 4 processes: 80%
-               addons: false },
+
+               // When on the "release" channel, getAddonsDisqualifyForMulti
+               // will return true if any addon installed is not a web extension.
+               // Therefore, this returns true if and only if all addons
+               // installed are web extensions or if no addons are installed
+               // at all.
+               get addonsDisableExperiment() { return getAddonsDisqualifyForMulti(); } }
 };
 
 const ADDON_ROLLOUT_POLICY = {
@@ -173,7 +180,7 @@
   //   the default number of content processes (1 on beta) but still in the
   //   test cohort.
   if (!(updateChannel in MULTI_EXPERIMENT) ||
-      (!MULTI_EXPERIMENT[updateChannel].addons && cohortPrefix) ||
+      MULTI_EXPERIMENT[updateChannel].addonsDisableExperiment ||
       !eligibleForMulti ||
       userOptedIn.multi ||
       disqualified) {
diff -Nru firefox-55.0~b4+build2/browser/extensions/e10srollout/install.rdf.in firefox-55.0~b5+build1/browser/extensions/e10srollout/install.rdf.in
--- firefox-55.0~b4+build2/browser/extensions/e10srollout/install.rdf.in	2017-06-25 16:05:00.000000000 +0000
+++ firefox-55.0~b5+build1/browser/extensions/e10srollout/install.rdf.in	2017-06-27 05:25:28.000000000 +0000
@@ -10,7 +10,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>e10srollout@mozilla.org</em:id>
-    <em:version>1.50</em:version>
+    <em:version>1.60</em:version>
     <em:type>2</em:type>
     <em:bootstrap>true</em:bootstrap>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
diff -Nru firefox-55.0~b4+build2/debian/changelog firefox-55.0~b5+build1/debian/changelog
--- firefox-55.0~b4+build2/debian/changelog	2017-06-25 16:09:18.000000000 +0000
+++ firefox-55.0~b5+build1/debian/changelog	2017-06-27 05:23:59.000000000 +0000
@@ -1,3 +1,9 @@
+firefox (55.0~b5+build1-0ubuntu0.17.04.1) zesty; urgency=medium
+
+  * New upstream release from the beta channel (FIREFOX_55_0b5_BUILD1)
+
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Tue, 27 Jun 2017 07:23:59 +0200
+
 firefox (55.0~b4+build2-0ubuntu0.17.04.1) zesty; urgency=medium
 
   * New upstream release from the beta channel (FIREFOX_55_0b4_BUILD2)
diff -Nru firefox-55.0~b4+build2/devtools/client/framework/test/browser.ini firefox-55.0~b5+build1/devtools/client/framework/test/browser.ini
--- firefox-55.0~b4+build2/devtools/client/framework/test/browser.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/devtools/client/framework/test/browser.ini	2017-06-27 05:25:29.000000000 +0000
@@ -39,6 +39,7 @@
 
 [browser_browser_toolbox.js]
 [browser_browser_toolbox_debugger.js]
+skip-if = debug # Bug 1282269
 [browser_devtools_api.js]
 [browser_devtools_api_destroy.js]
 [browser_devtools_shim.js]
diff -Nru firefox-55.0~b4+build2/devtools/client/inspector/rules/test/browser.ini firefox-55.0~b5+build1/devtools/client/inspector/rules/test/browser.ini
--- firefox-55.0~b4+build2/devtools/client/inspector/rules/test/browser.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/devtools/client/inspector/rules/test/browser.ini	2017-06-27 05:25:29.000000000 +0000
@@ -235,6 +235,7 @@
 [browser_rules_strict-search-filter_02.js]
 [browser_rules_strict-search-filter_03.js]
 [browser_rules_style-editor-link.js]
+skip-if = !debug # Bug 1309759
 [browser_rules_url-click-opens-new-tab.js]
 [browser_rules_urls-clickable.js]
 [browser_rules_user-agent-styles.js]
diff -Nru firefox-55.0~b4+build2/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js firefox-55.0~b5+build1/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
--- firefox-55.0~b4+build2/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js	2017-06-25 16:05:01.000000000 +0000
+++ firefox-55.0~b5+build1/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js	2017-06-27 05:25:29.000000000 +0000
@@ -95,7 +95,7 @@
                 min-height: 1px;">
       <img class="${imageClass}"
            style="height: ${imgHeight}px; max-height: 100%;"
-           src="${imageUrl}"/>
+           src="${encodeURI(imageUrl)}"/>
     </div>`;
 
   if (!hideDimensionLabel) {
diff -Nru firefox-55.0~b4+build2/dom/animation/test/crashtests/1373712-1.html firefox-55.0~b5+build1/dom/animation/test/crashtests/1373712-1.html
--- firefox-55.0~b4+build2/dom/animation/test/crashtests/1373712-1.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-55.0~b5+build1/dom/animation/test/crashtests/1373712-1.html	2017-06-27 05:25:29.000000000 +0000
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Bug 1373712 - Assertions of SpecifiedKeyframeArraysAreEqual(mKeyframes, keyframesCopy) with large color value
+</title>
+<meta charset="UTF-8">
+<script>
+document.documentElement.animate([{ "color": "hsl(63e292,41%,34%)" }]);
+</script>
+</head>
+</html>
diff -Nru firefox-55.0~b4+build2/dom/animation/test/crashtests/crashtests.list firefox-55.0~b5+build1/dom/animation/test/crashtests/crashtests.list
--- firefox-55.0~b4+build2/dom/animation/test/crashtests/crashtests.list	2017-06-25 16:05:01.000000000 +0000
+++ firefox-55.0~b5+build1/dom/animation/test/crashtests/crashtests.list	2017-06-27 05:25:29.000000000 +0000
@@ -29,3 +29,4 @@
 pref(dom.animations-api.core.enabled,true) load 1335998-1.html
 pref(dom.animations-api.core.enabled,true) load 1343589-1.html
 pref(dom.animations-api.core.enabled,true) load 1359658-1.html
+pref(dom.animations-api.core.enabled,true) load 1373712-1.html
diff -Nru firefox-55.0~b4+build2/dom/bindings/TypedArray.h firefox-55.0~b5+build1/dom/bindings/TypedArray.h
--- firefox-55.0~b4+build2/dom/bindings/TypedArray.h	2017-06-25 16:05:01.000000000 +0000
+++ firefox-55.0~b5+build1/dom/bindings/TypedArray.h	2017-06-27 05:25:30.000000000 +0000
@@ -45,7 +45,7 @@
   inline void TraceSelf(JSTracer* trc)
   {
     JS::UnsafeTraceRoot(trc, &mTypedObj, "TypedArray.mTypedObj");
-    JS::UnsafeTraceRoot(trc, &mTypedObj, "TypedArray.mWrappedObj");
+    JS::UnsafeTraceRoot(trc, &mWrappedObj, "TypedArray.mWrappedObj");
   }
 
 private:
diff -Nru firefox-55.0~b4+build2/dom/media/gmp/widevine-adapter/moz.build firefox-55.0~b5+build1/dom/media/gmp/widevine-adapter/moz.build
--- firefox-55.0~b4+build2/dom/media/gmp/widevine-adapter/moz.build	2017-06-25 16:05:02.000000000 +0000
+++ firefox-55.0~b5+build1/dom/media/gmp/widevine-adapter/moz.build	2017-06-27 05:25:31.000000000 +0000
@@ -29,3 +29,5 @@
 
 if CONFIG['CLANG_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+include('/ipc/chromium/chromium-config.mozbuild')
diff -Nru firefox-55.0~b4+build2/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp firefox-55.0~b5+build1/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp
--- firefox-55.0~b4+build2/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp	2017-06-25 16:05:03.000000000 +0000
+++ firefox-55.0~b5+build1/dom/media/gmp/widevine-adapter/WidevineDecryptor.cpp	2017-06-27 05:25:31.000000000 +0000
@@ -9,6 +9,7 @@
 #include "WidevineUtils.h"
 #include "WidevineFileIO.h"
 #include <stdarg.h>
+#include "base/time.h"
 
 using namespace cdm;
 using namespace std;
@@ -238,11 +239,7 @@
 Time
 WidevineDecryptor::GetCurrentWallTime()
 {
-  GMPTimestamp gmpTime = 0;
-  GMPGetCurrentTime(&gmpTime);
-  double t = (double)gmpTime / 1e3;
-  CDM_LOG("Decryptor::GetCurrentWallTime()= %lf", t);
-  return t;
+  return base::Time::Now().ToDoubleT();
 }
 
 void
diff -Nru firefox-55.0~b4+build2/dom/media/platforms/wrappers/H264Converter.cpp firefox-55.0~b5+build1/dom/media/platforms/wrappers/H264Converter.cpp
--- firefox-55.0~b4+build2/dom/media/platforms/wrappers/H264Converter.cpp	2017-06-25 16:05:03.000000000 +0000
+++ firefox-55.0~b5+build1/dom/media/platforms/wrappers/H264Converter.cpp	2017-06-27 05:25:31.000000000 +0000
@@ -136,32 +136,37 @@
   mDecodePromiseRequest.DisconnectIfExists();
   mDecodePromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
   mNeedKeyframe = true;
+  mPendingFrames.Clear();
 
   MOZ_RELEASE_ASSERT(mFlushPromise.IsEmpty(), "Previous flush didn't complete");
 
   /*
-      When we detect a change of content in the H264 stream, we first flush the
-    current decoder (1), shut it down (2) create a new decoder and initialize
-    it (3).
-    It is possible possible for H264Converter::Flush to be called during any of
-    those time.
+    When we detect a change of content in the H264 stream, we first drain the
+    current decoder (1), flush (2), shut it down (3) create a new decoder and
+    initialize it (4). It is possible for H264Converter::Flush to be called
+    during any of those times.
     If during (1):
-      - mFlushRequest will not be empty.
+      - mDrainRequest will not be empty.
       - The old decoder can still be used, with the current extradata as stored
         in mCurrentConfig.mExtraData.
 
     If during (2):
+      - mFlushRequest will not be empty.
+      - The old decoder can still be used, with the current extradata as stored
+        in mCurrentConfig.mExtraData.
+
+    If during (3):
       - mShutdownRequest won't be empty.
       - mDecoder is empty.
       - The old decoder is no longer referenced by the H264Converter.
 
-    If during (3):
+    If during (4):
       - mInitPromiseRequest won't be empty.
       - mDecoder is set but not usable yet.
   */
 
-  if (mFlushRequest.Exists() || mShutdownRequest.Exists() ||
-      mInitPromiseRequest.Exists()) {
+  if (mDrainRequest.Exists() || mFlushRequest.Exists() ||
+      mShutdownRequest.Exists() || mInitPromiseRequest.Exists()) {
     // We let the current decoder complete and will resume after.
     return mFlushPromise.Ensure(__func__);
   }
@@ -174,6 +179,7 @@
 RefPtr<MediaDataDecoder::DecodePromise>
 H264Converter::Drain()
 {
+  MOZ_RELEASE_ASSERT(!mDrainRequest.Exists());
   mNeedKeyframe = true;
   if (mDecoder) {
     return mDecoder->Drain();
@@ -186,17 +192,24 @@
 {
   mInitPromiseRequest.DisconnectIfExists();
   mDecodePromiseRequest.DisconnectIfExists();
+  mDecodePromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
+  mDrainRequest.DisconnectIfExists();
   mFlushRequest.DisconnectIfExists();
-  mShutdownRequest.DisconnectIfExists();
   mFlushPromise.RejectIfExists(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
-  mPendingSample = nullptr;
-  mNeedAVCC.reset();
+  mShutdownRequest.DisconnectIfExists();
 
   if (mShutdownPromise) {
     // We have a shutdown in progress, return that promise instead as we can't
     // shutdown a decoder twice.
     return mShutdownPromise.forget();
   }
+  return ShutdownDecoder();
+}
+
+RefPtr<ShutdownPromise>
+H264Converter::ShutdownDecoder()
+{
+  mNeedAVCC.reset();
   if (mDecoder) {
     RefPtr<MediaDataDecoder> decoder = mDecoder.forget();
     return decoder->Shutdown();
@@ -292,55 +305,46 @@
     CreateDecoder(mCurrentConfig, /* DecoderDoctorDiagnostics* */ nullptr);
 
   if (NS_SUCCEEDED(rv)) {
-    // Queue the incoming sample.
-    mPendingSample = aSample;
-
+    RefPtr<H264Converter> self = this;
+    RefPtr<MediaRawData> sample = aSample;
     mDecoder->Init()
-      ->Then(AbstractThread::GetCurrent()->AsTaskQueue(), __func__, this,
-             &H264Converter::OnDecoderInitDone,
-             &H264Converter::OnDecoderInitFailed)
+      ->Then(
+        AbstractThread::GetCurrent()->AsTaskQueue(),
+        __func__,
+        [self, sample, this](const TrackType aTrackType) {
+          mInitPromiseRequest.Complete();
+          mNeedAVCC =
+            Some(mDecoder->NeedsConversion() == ConversionRequired::kNeedAVCC);
+          mCanRecycleDecoder = Some(CanRecycleDecoder());
+
+          if (!mFlushPromise.IsEmpty()) {
+            // A Flush is pending, abort the current operation.
+            mFlushPromise.Resolve(true, __func__);
+            return;
+          }
+
+          DecodeFirstSample(sample);
+        },
+        [self, this](const MediaResult& aError) {
+          mInitPromiseRequest.Complete();
+
+          if (!mFlushPromise.IsEmpty()) {
+            // A Flush is pending, abort the current operation.
+            mFlushPromise.Reject(aError, __func__);
+            return;
+          }
+
+          mDecodePromise.Reject(
+            MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
+                        RESULT_DETAIL("Unable to initialize H264 decoder")),
+            __func__);
+        })
       ->Track(mInitPromiseRequest);
     return NS_ERROR_DOM_MEDIA_INITIALIZING_DECODER;
   }
   return rv;
 }
 
-void
-H264Converter::OnDecoderInitDone(const TrackType aTrackType)
-{
-  mInitPromiseRequest.Complete();
-  RefPtr<MediaRawData> sample = mPendingSample.forget();
-
-  mNeedAVCC =
-    Some(mDecoder->NeedsConversion() == ConversionRequired::kNeedAVCC);
-  mCanRecycleDecoder = Some(CanRecycleDecoder());
-
-  if (!mFlushPromise.IsEmpty()) {
-    // A Flush is pending, abort the current operation.
-    mFlushPromise.Resolve(true, __func__);
-    return;
-  }
-
-  DecodeFirstSample(sample);
-}
-
-void
-H264Converter::OnDecoderInitFailed(const MediaResult& aError)
-{
-  mInitPromiseRequest.Complete();
-
-  if (!mFlushPromise.IsEmpty()) {
-    // A Flush is pending, abort the current operation.
-    mFlushPromise.Reject(aError, __func__);
-    return;
-  }
-
-  mDecodePromise.Reject(
-    MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
-                RESULT_DETAIL("Unable to initialize H264 decoder")),
-    __func__);
-}
-
 bool
 H264Converter::CanRecycleDecoder() const
 {
@@ -353,7 +357,8 @@
 H264Converter::DecodeFirstSample(MediaRawData* aSample)
 {
   if (mNeedKeyframe && !aSample->mKeyframe) {
-    mDecodePromise.Resolve(DecodedData(), __func__);
+    mDecodePromise.Resolve(mPendingFrames, __func__);
+    mPendingFrames.Clear();
     return;
   }
 
@@ -373,7 +378,9 @@
     ->Then(AbstractThread::GetCurrent()->AsTaskQueue(), __func__,
            [self, this](const MediaDataDecoder::DecodedData& aResults) {
              mDecodePromiseRequest.Complete();
-             mDecodePromise.Resolve(aResults, __func__);
+             mPendingFrames.AppendElements(aResults);
+             mDecodePromise.Resolve(mPendingFrames, __func__);
+             mPendingFrames.Clear();
            },
            [self, this](const MediaResult& aError) {
              mDecodePromiseRequest.Complete();
@@ -411,20 +418,62 @@
     return NS_OK;
   }
 
-  RefPtr<MediaRawData> sample = aSample;
   MOZ_ASSERT(mCanRecycleDecoder.isSome());
   if (*mCanRecycleDecoder) {
     // Do not recreate the decoder, reuse it.
     UpdateConfigFromExtraData(extra_data);
-    if (!sample->mTrackInfo) {
-      sample->mTrackInfo = new TrackInfoSharedPtr(mCurrentConfig, 0);
+    if (!aSample->mTrackInfo) {
+      aSample->mTrackInfo = new TrackInfoSharedPtr(mCurrentConfig, 0);
     }
     mNeedKeyframe = true;
     return NS_OK;
   }
 
-  // The SPS has changed, signal to flush the current decoder and create a
-  // new one.
+  // The SPS has changed, signal to drain the current decoder and once done
+  // create a new one.
+  DrainThenFlushDecoder(aSample);
+  return NS_ERROR_DOM_MEDIA_INITIALIZING_DECODER;
+}
+
+void
+H264Converter::DrainThenFlushDecoder(MediaRawData* aPendingSample)
+{
+  RefPtr<MediaRawData> sample = aPendingSample;
+  RefPtr<H264Converter> self = this;
+  mDecoder->Drain()
+    ->Then(AbstractThread::GetCurrent()->AsTaskQueue(),
+           __func__,
+           [self, sample, this](const MediaDataDecoder::DecodedData& aResults) {
+             mDrainRequest.Complete();
+             if (!mFlushPromise.IsEmpty()) {
+               // A Flush is pending, abort the current operation.
+               mFlushPromise.Resolve(true, __func__);
+               return;
+             }
+             if (aResults.Length() > 0) {
+               mPendingFrames.AppendElements(aResults);
+               DrainThenFlushDecoder(sample);
+               return;
+             }
+             // We've completed the draining operation, we can now flush the
+             // decoder.
+             FlushThenShutdownDecoder(sample);
+           },
+           [self, this](const MediaResult& aError) {
+             mDrainRequest.Complete();
+             if (!mFlushPromise.IsEmpty()) {
+               // A Flush is pending, abort the current operation.
+               mFlushPromise.Reject(aError, __func__);
+               return;
+             }
+             mDecodePromise.Reject(aError, __func__);
+           })
+    ->Track(mDrainRequest);
+}
+
+void H264Converter::FlushThenShutdownDecoder(MediaRawData* aPendingSample)
+{
+  RefPtr<MediaRawData> sample = aPendingSample;
   RefPtr<H264Converter> self = this;
   mDecoder->Flush()
     ->Then(AbstractThread::GetCurrent()->AsTaskQueue(),
@@ -438,7 +487,7 @@
                return;
              }
 
-             mShutdownPromise = Shutdown();
+             mShutdownPromise = ShutdownDecoder();
              mShutdownPromise
                ->Then(AbstractThread::GetCurrent()->AsTaskQueue(),
                       __func__,
@@ -466,15 +515,14 @@
            },
            [self, this](const MediaResult& aError) {
              mFlushRequest.Complete();
-               if (!mFlushPromise.IsEmpty()) {
-                 // A Flush is pending, abort the current operation.
-                 mFlushPromise.Reject(aError, __func__);
-                 return;
-               }
-               mDecodePromise.Reject(aError, __func__);
+             if (!mFlushPromise.IsEmpty()) {
+               // A Flush is pending, abort the current operation.
+               mFlushPromise.Reject(aError, __func__);
+               return;
+             }
+             mDecodePromise.Reject(aError, __func__);
            })
     ->Track(mFlushRequest);
-  return NS_ERROR_DOM_MEDIA_INITIALIZING_DECODER;
 }
 
 void
diff -Nru firefox-55.0~b4+build2/dom/media/platforms/wrappers/H264Converter.h firefox-55.0~b5+build1/dom/media/platforms/wrappers/H264Converter.h
--- firefox-55.0~b4+build2/dom/media/platforms/wrappers/H264Converter.h	2017-06-25 16:05:02.000000000 +0000
+++ firefox-55.0~b5+build1/dom/media/platforms/wrappers/H264Converter.h	2017-06-27 05:25:31.000000000 +0000
@@ -71,12 +71,12 @@
   nsresult CheckForSPSChange(MediaRawData* aSample);
   void UpdateConfigFromExtraData(MediaByteBuffer* aExtraData);
 
-  void OnDecoderInitDone(const TrackType aTrackType);
-  void OnDecoderInitFailed(const MediaResult& aError);
-
   bool CanRecycleDecoder() const;
 
   void DecodeFirstSample(MediaRawData* aSample);
+  void DrainThenFlushDecoder(MediaRawData* aPendingSample);
+  void FlushThenShutdownDecoder(MediaRawData* aPendingSample);
+  RefPtr<ShutdownPromise> ShutdownDecoder();
 
   RefPtr<PlatformDecoderModule> mPDM;
   const VideoInfo mOriginalConfig;
@@ -86,12 +86,13 @@
   RefPtr<layers::KnowsCompositor> mKnowsCompositor;
   RefPtr<layers::ImageContainer> mImageContainer;
   const RefPtr<TaskQueue> mTaskQueue;
-  RefPtr<MediaRawData> mPendingSample;
   RefPtr<MediaDataDecoder> mDecoder;
   MozPromiseRequestHolder<InitPromise> mInitPromiseRequest;
   MozPromiseRequestHolder<DecodePromise> mDecodePromiseRequest;
   MozPromiseHolder<DecodePromise> mDecodePromise;
   MozPromiseRequestHolder<FlushPromise> mFlushRequest;
+  MediaDataDecoder::DecodedData mPendingFrames;
+  MozPromiseRequestHolder<DecodePromise> mDrainRequest;
   MozPromiseRequestHolder<ShutdownPromise> mShutdownRequest;
   RefPtr<ShutdownPromise> mShutdownPromise;
   MozPromiseHolder<FlushPromise> mFlushPromise;
diff -Nru firefox-55.0~b4+build2/dom/workers/test/serviceworkers/mochitest.ini firefox-55.0~b5+build1/dom/workers/test/serviceworkers/mochitest.ini
--- firefox-55.0~b4+build2/dom/workers/test/serviceworkers/mochitest.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/dom/workers/test/serviceworkers/mochitest.ini	2017-06-27 05:25:31.000000000 +0000
@@ -223,6 +223,7 @@
 [test_claim_oninstall.html]
 [test_controller.html]
 [test_cross_origin_url_after_redirect.html]
+skip-if = debug # Bug 1262224
 [test_csp_upgrade-insecure_intercept.html]
 [test_empty_serviceworker.html]
 [test_error_reporting.html]
diff -Nru firefox-55.0~b4+build2/extensions/cookie/nsPermissionManager.cpp firefox-55.0~b5+build1/extensions/cookie/nsPermissionManager.cpp
--- firefox-55.0~b4+build2/extensions/cookie/nsPermissionManager.cpp	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/extensions/cookie/nsPermissionManager.cpp	2017-06-27 05:25:32.000000000 +0000
@@ -3125,14 +3125,13 @@
   for (auto iter = mPermissionTable.Iter(); !iter.Done(); iter.Next()) {
     PermissionHashKey* entry = iter.Get();
 
-    // XXX: Is it worthwhile to have a shortcut Origin->Key implementation? as
-    // we could implement this without creating a codebase principal.
+    nsAutoCString permissionKey;
+    GetKeyForOrigin(entry->GetKey()->mOrigin, permissionKey);
 
-    // Fetch the principal for the given origin.
-    nsCOMPtr<nsIPrincipal> principal;
-    nsresult rv = GetPrincipalFromOrigin(entry->GetKey()->mOrigin,
-                                         getter_AddRefs(principal));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
+    // If the keys don't match, and we aren't getting the default "" key, then
+    // we can exit early. We have to keep looking if we're getting the default
+    // key, as we may see a preload permission which should be transmitted.
+    if (aPermissionKey != permissionKey && !aPermissionKey.IsEmpty()) {
       continue;
     }
 
@@ -3144,14 +3143,8 @@
         continue;
       }
 
-      // XXX: This performs extra work, such as in many cases re-computing the
-      // Origin (which we just computed the nsIPrincipal from). We may want to
-      // implement a custom version of this logic which avoids that extra work.
-      // See bug 1354700.
-      nsAutoCString permissionKey;
-      GetKeyForPermission(principal, mTypeArray[permEntry.mType].get(), permissionKey);
-
-      if (permissionKey == aPermissionKey) {
+      bool isPreload = IsPreloadPermission(mTypeArray[permEntry.mType].get());
+      if ((isPreload && aPermissionKey.IsEmpty()) || (!isPreload && aPermissionKey == permissionKey)) {
         aPerms.AppendElement(IPC::Permission(entry->GetKey()->mOrigin,
                                              mTypeArray.ElementAt(permEntry.mType),
                                              permEntry.mPermission,
@@ -3214,43 +3207,63 @@
 }
 
 /* static */ void
-nsPermissionManager::GetKeyForPrincipal(nsIPrincipal* aPrincipal, nsACString& aKey)
+nsPermissionManager::GetKeyForOrigin(const nsACString& aOrigin, nsACString& aKey)
 {
-  MOZ_ASSERT(aPrincipal);
   aKey.Truncate();
 
-  nsCOMPtr<nsIURI> uri;
-  nsresult rv = aPrincipal->GetURI(getter_AddRefs(uri));
-  if (NS_WARN_IF(NS_FAILED(rv) || !uri)) {
-    // NOTE: We don't propagate the error here, instead we produce the default
-    // "" permission key. This means that we can assign every principal a key,
-    // even if the GetURI operation on that principal is not meaningful.
-    aKey.Truncate();
+  // We only key origins for http, https, and ftp URIs. All origins begin with
+  // the URL which they apply to, which means that they should begin with their
+  // scheme in the case where they are one of these interesting URIs. We don't
+  // want to actually parse the URL here however, because this can be called on
+  // hot paths.
+  if (!StringBeginsWith(aOrigin, NS_LITERAL_CSTRING("http:")) &&
+      !StringBeginsWith(aOrigin, NS_LITERAL_CSTRING("https:")) &&
+      !StringBeginsWith(aOrigin, NS_LITERAL_CSTRING("ftp:"))) {
     return;
   }
 
-  nsAutoCString scheme;
-  rv = uri->GetScheme(scheme);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    // NOTE: Produce the default "" key as a fallback.
+  // We need to look at the originAttributes if they are present, to make sure
+  // to remove any which we don't want. We put the rest of the origin, not
+  // including the attributes, into the key.
+  OriginAttributes attrs;
+  if (!attrs.PopulateFromOrigin(aOrigin, aKey)) {
     aKey.Truncate();
     return;
   }
+  attrs.StripAttributes(OriginAttributes::STRIP_USER_CONTEXT_ID |
+                        OriginAttributes::STRIP_FIRST_PARTY_DOMAIN);
 
-  // URIs which have schemes other than http, https and ftp share the ""
-  // permission key.
-  if (scheme.EqualsLiteral("http") ||
-      scheme.EqualsLiteral("https") ||
-      scheme.EqualsLiteral("ftp")) {
-    rv = GetOriginFromPrincipal(aPrincipal, aKey);
-    if (NS_SUCCEEDED(rv)) {
-      return;
-    }
-  }
+#ifdef DEBUG
+  // Parse the origin string into a principal, and extract some useful
+  // information from it for assertions.
+  nsCOMPtr<nsIPrincipal> dbgPrincipal;
+  MOZ_ALWAYS_SUCCEEDS(GetPrincipalFromOrigin(aOrigin, getter_AddRefs(dbgPrincipal)));
+  nsCOMPtr<nsIURI> dbgUri;
+  MOZ_ALWAYS_SUCCEEDS(dbgPrincipal->GetURI(getter_AddRefs(dbgUri)));
+  nsAutoCString dbgScheme;
+  MOZ_ALWAYS_SUCCEEDS(dbgUri->GetScheme(dbgScheme));
+  MOZ_ASSERT(dbgScheme.EqualsLiteral("http") ||
+             dbgScheme.EqualsLiteral("https") ||
+             dbgScheme.EqualsLiteral("ftp"));
+  MOZ_ASSERT(dbgPrincipal->OriginAttributesRef() == attrs);
+#endif
 
-  // NOTE: Produce the default "" key as a fallback.
-  aKey.Truncate();
-  return;
+  // Append the stripped suffix to the output origin key.
+  nsAutoCString suffix;
+  attrs.CreateSuffix(suffix);
+  aKey.Append(suffix);
+}
+
+/* static */ void
+nsPermissionManager::GetKeyForPrincipal(nsIPrincipal* aPrincipal, nsACString& aKey)
+{
+  nsAutoCString origin;
+  nsresult rv = aPrincipal->GetOrigin(origin);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    aKey.Truncate();
+    return;
+  }
+  GetKeyForOrigin(origin, aKey);
 }
 
 /* static */ void
diff -Nru firefox-55.0~b4+build2/extensions/cookie/nsPermissionManager.h firefox-55.0~b5+build1/extensions/cookie/nsPermissionManager.h
--- firefox-55.0~b4+build2/extensions/cookie/nsPermissionManager.h	2017-06-25 16:05:03.000000000 +0000
+++ firefox-55.0~b5+build1/extensions/cookie/nsPermissionManager.h	2017-06-27 05:25:32.000000000 +0000
@@ -233,6 +233,22 @@
    * See `nsIPermissionManager::GetPermissionsWithKey` for more info on
    * permission keys.
    *
+   * Get the permission key corresponding to the given Origin. This method is
+   * like GetKeyForPrincipal, except that it avoids creating a nsIPrincipal
+   * object when you already have access to an origin string.
+   *
+   * If this method is passed a nonsensical origin string it may produce a
+   * nonsensical permission key result.
+   *
+   * @param aOrigin  The origin which the key is to be extracted from.
+   * @param aPermissionKey  A string which will be filled with the permission key.
+   */
+  static void GetKeyForOrigin(const nsACString& aOrigin, nsACString& aPermissionKey);
+
+  /**
+   * See `nsIPermissionManager::GetPermissionsWithKey` for more info on
+   * permission keys.
+   *
    * Get the permission key corresponding to the given Principal and type. This
    * method is intentionally infallible, as we want to provide an permission key
    * to every principal. Principals which don't have meaningful URIs with
diff -Nru firefox-55.0~b4+build2/gfx/vr/gfxVROculus.cpp firefox-55.0~b5+build1/gfx/vr/gfxVROculus.cpp
--- firefox-55.0~b4+build2/gfx/vr/gfxVROculus.cpp	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/gfxVROculus.cpp	2017-06-27 05:25:32.000000000 +0000
@@ -66,6 +66,7 @@
 static pfn_ovr_GetLastErrorInfo ovr_GetLastErrorInfo = nullptr;
 static pfn_ovr_GetVersionString ovr_GetVersionString = nullptr;
 static pfn_ovr_TraceMessage ovr_TraceMessage = nullptr;
+static pfn_ovr_IdentifyClient ovr_IdentifyClient = nullptr;
 static pfn_ovr_GetHmdDesc ovr_GetHmdDesc = nullptr;
 static pfn_ovr_GetTrackerCount ovr_GetTrackerCount = nullptr;
 static pfn_ovr_GetTrackerDesc ovr_GetTrackerDesc = nullptr;
@@ -75,12 +76,25 @@
 static pfn_ovr_SetTrackingOriginType ovr_SetTrackingOriginType = nullptr;
 static pfn_ovr_GetTrackingOriginType ovr_GetTrackingOriginType = nullptr;
 static pfn_ovr_RecenterTrackingOrigin ovr_RecenterTrackingOrigin = nullptr;
+static pfn_ovr_SpecifyTrackingOrigin ovr_SpecifyTrackingOrigin = nullptr;
 static pfn_ovr_ClearShouldRecenterFlag ovr_ClearShouldRecenterFlag = nullptr;
 static pfn_ovr_GetTrackingState ovr_GetTrackingState = nullptr;
+static pfn_ovr_GetDevicePoses ovr_GetDevicePoses = nullptr;
 static pfn_ovr_GetTrackerPose ovr_GetTrackerPose = nullptr;
 static pfn_ovr_GetInputState ovr_GetInputState = nullptr;
 static pfn_ovr_GetConnectedControllerTypes ovr_GetConnectedControllerTypes = nullptr;
+static pfn_ovr_GetTouchHapticsDesc ovr_GetTouchHapticsDesc = nullptr;
 static pfn_ovr_SetControllerVibration ovr_SetControllerVibration = nullptr;
+static pfn_ovr_SubmitControllerVibration ovr_SubmitControllerVibration = nullptr;
+static pfn_ovr_GetControllerVibrationState ovr_GetControllerVibrationState = nullptr;
+static pfn_ovr_TestBoundary ovr_TestBoundary = nullptr;
+static pfn_ovr_TestBoundaryPoint ovr_TestBoundaryPoint = nullptr;
+static pfn_ovr_SetBoundaryLookAndFeel ovr_SetBoundaryLookAndFeel = nullptr;
+static pfn_ovr_ResetBoundaryLookAndFeel ovr_ResetBoundaryLookAndFeel = nullptr;
+static pfn_ovr_GetBoundaryGeometry ovr_GetBoundaryGeometry = nullptr;
+static pfn_ovr_GetBoundaryDimensions ovr_GetBoundaryDimensions = nullptr;
+static pfn_ovr_GetBoundaryVisible ovr_GetBoundaryVisible = nullptr;
+static pfn_ovr_RequestBoundaryVisible ovr_RequestBoundaryVisible = nullptr;
 static pfn_ovr_GetTextureSwapChainLength ovr_GetTextureSwapChainLength = nullptr;
 static pfn_ovr_GetTextureSwapChainCurrentIndex ovr_GetTextureSwapChainCurrentIndex = nullptr;
 static pfn_ovr_GetTextureSwapChainDesc ovr_GetTextureSwapChainDesc = nullptr;
@@ -90,6 +104,8 @@
 static pfn_ovr_GetFovTextureSize ovr_GetFovTextureSize = nullptr;
 static pfn_ovr_GetRenderDesc ovr_GetRenderDesc = nullptr;
 static pfn_ovr_SubmitFrame ovr_SubmitFrame = nullptr;
+static pfn_ovr_GetPerfStats ovr_GetPerfStats = nullptr;
+static pfn_ovr_ResetPerfStats ovr_ResetPerfStats = nullptr;
 static pfn_ovr_GetPredictedDisplayTime ovr_GetPredictedDisplayTime = nullptr;
 static pfn_ovr_GetTimeInSeconds ovr_GetTimeInSeconds = nullptr;
 static pfn_ovr_GetBool ovr_GetBool = nullptr;
@@ -102,7 +118,8 @@
 static pfn_ovr_SetFloatArray ovr_SetFloatArray = nullptr;
 static pfn_ovr_GetString ovr_GetString = nullptr;
 static pfn_ovr_SetString ovr_SetString = nullptr;
-static pfn_ovr_GetBoundaryDimensions ovr_GetBoundaryDimensions = nullptr;
+static pfn_ovr_GetExternalCameras ovr_GetExternalCameras = nullptr;
+static pfn_ovr_SetExternalCameraProperties ovr_SetExternalCameraProperties = nullptr;
 
 #ifdef XP_WIN
 static pfn_ovr_CreateTextureSwapChainDX ovr_CreateTextureSwapChainDX = nullptr;
@@ -124,7 +141,7 @@
 
 #define OVR_PRODUCT_VERSION 1
 #define OVR_MAJOR_VERSION   1
-#define OVR_MINOR_VERSION   10
+#define OVR_MINOR_VERSION   15
 
 enum class OculusLeftControllerButtonType : uint16_t {
   LThumb,
@@ -240,6 +257,7 @@
   REQUIRE_FUNCTION(ovr_GetLastErrorInfo);
   REQUIRE_FUNCTION(ovr_GetVersionString);
   REQUIRE_FUNCTION(ovr_TraceMessage);
+  REQUIRE_FUNCTION(ovr_IdentifyClient);
   REQUIRE_FUNCTION(ovr_GetHmdDesc);
   REQUIRE_FUNCTION(ovr_GetTrackerCount);
   REQUIRE_FUNCTION(ovr_GetTrackerDesc);
@@ -249,12 +267,25 @@
   REQUIRE_FUNCTION(ovr_SetTrackingOriginType);
   REQUIRE_FUNCTION(ovr_GetTrackingOriginType);
   REQUIRE_FUNCTION(ovr_RecenterTrackingOrigin);
+  REQUIRE_FUNCTION(ovr_SpecifyTrackingOrigin);
   REQUIRE_FUNCTION(ovr_ClearShouldRecenterFlag);
   REQUIRE_FUNCTION(ovr_GetTrackingState);
+  REQUIRE_FUNCTION(ovr_GetDevicePoses);
   REQUIRE_FUNCTION(ovr_GetTrackerPose);
   REQUIRE_FUNCTION(ovr_GetInputState);
   REQUIRE_FUNCTION(ovr_GetConnectedControllerTypes);
+  REQUIRE_FUNCTION(ovr_GetTouchHapticsDesc);
   REQUIRE_FUNCTION(ovr_SetControllerVibration);
+  REQUIRE_FUNCTION(ovr_SubmitControllerVibration);
+  REQUIRE_FUNCTION(ovr_GetControllerVibrationState);
+  REQUIRE_FUNCTION(ovr_TestBoundary);
+  REQUIRE_FUNCTION(ovr_TestBoundaryPoint);
+  REQUIRE_FUNCTION(ovr_SetBoundaryLookAndFeel);
+  REQUIRE_FUNCTION(ovr_ResetBoundaryLookAndFeel);
+  REQUIRE_FUNCTION(ovr_GetBoundaryGeometry);
+  REQUIRE_FUNCTION(ovr_GetBoundaryDimensions);
+  REQUIRE_FUNCTION(ovr_GetBoundaryVisible);
+  REQUIRE_FUNCTION(ovr_RequestBoundaryVisible);
   REQUIRE_FUNCTION(ovr_GetTextureSwapChainLength);
   REQUIRE_FUNCTION(ovr_GetTextureSwapChainCurrentIndex);
   REQUIRE_FUNCTION(ovr_GetTextureSwapChainDesc);
@@ -264,6 +295,8 @@
   REQUIRE_FUNCTION(ovr_GetFovTextureSize);
   REQUIRE_FUNCTION(ovr_GetRenderDesc);
   REQUIRE_FUNCTION(ovr_SubmitFrame);
+  REQUIRE_FUNCTION(ovr_GetPerfStats);
+  REQUIRE_FUNCTION(ovr_ResetPerfStats);
   REQUIRE_FUNCTION(ovr_GetPredictedDisplayTime);
   REQUIRE_FUNCTION(ovr_GetTimeInSeconds);
   REQUIRE_FUNCTION(ovr_GetBool);
@@ -276,7 +309,8 @@
   REQUIRE_FUNCTION(ovr_SetFloatArray);
   REQUIRE_FUNCTION(ovr_GetString);
   REQUIRE_FUNCTION(ovr_SetString);
-  REQUIRE_FUNCTION(ovr_GetBoundaryDimensions);
+  REQUIRE_FUNCTION(ovr_GetExternalCameras);
+  REQUIRE_FUNCTION(ovr_SetExternalCameraProperties);
 
 #ifdef XP_WIN
 
@@ -439,14 +473,13 @@
 VRDisplayOculus::GetSensorState()
 {
   VRHMDSensorState result;
-  double frameDelta = 0.0f;
+  double predictedFrameTime = 0.0f;
   if (gfxPrefs::VRPosePredictionEnabled()) {
     // XXX We might need to call ovr_GetPredictedDisplayTime even if we don't use the result.
     // If we don't call it, the Oculus driver will spew out many warnings...
-    double predictedFrameTime = ovr_GetPredictedDisplayTime(mSession, 0);
-    frameDelta = predictedFrameTime - ovr_GetTimeInSeconds();
+    predictedFrameTime = ovr_GetPredictedDisplayTime(mSession, 0);
   }
-  result = GetSensorState(frameDelta);
+  result = GetSensorState(predictedFrameTime);
   result.inputFrameID = mDisplayInfo.mFrameId;
   result.position[1] -= mEyeHeight;
   mDisplayInfo.mLastSensorState[result.inputFrameID % kVRMaxLatencyFrames] = result;
@@ -454,11 +487,11 @@
 }
 
 VRHMDSensorState
-VRDisplayOculus::GetSensorState(double timeOffset)
+VRDisplayOculus::GetSensorState(double absTime)
 {
   VRHMDSensorState result;
 
-  ovrTrackingState state = ovr_GetTrackingState(mSession, timeOffset, true);
+  ovrTrackingState state = ovr_GetTrackingState(mSession, absTime, true);
   ovrPoseStatef& pose(state.HeadPose);
 
   result.timestamp = pose.TimeInSeconds;
@@ -764,6 +797,10 @@
   mContext->VSSetShader(mQuadVS, nullptr, 0);
   mContext->PSSetShader(mQuadPS, nullptr, 0);
   ID3D11ShaderResourceView* srView = aSource->GetShaderResourceView();
+  if (!srView) {
+    NS_WARNING("Failed to get SRV for Oculus");
+    return false;
+  }
   mContext->PSSetShaderResources(0 /* 0 == TexSlot::RGB */, 1, &srView);
   // XXX Use Constant from TexSlot in CompositorD3D11.cpp?
 
diff -Nru firefox-55.0~b4+build2/gfx/vr/gfxVROculus.h firefox-55.0~b5+build1/gfx/vr/gfxVROculus.h
--- firefox-55.0~b4+build2/gfx/vr/gfxVROculus.h	2017-06-25 16:05:05.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/gfxVROculus.h	2017-06-27 05:25:33.000000000 +0000
@@ -61,7 +61,7 @@
 
   already_AddRefed<layers::CompositingRenderTargetD3D11> GetNextRenderTarget();
 
-  VRHMDSensorState GetSensorState(double timeOffset);
+  VRHMDSensorState GetSensorState(double absTime);
 
   ovrHmdDesc mDesc;
   ovrSession mSession;
diff -Nru firefox-55.0~b4+build2/gfx/vr/gfxVROpenVR.cpp firefox-55.0~b5+build1/gfx/vr/gfxVROpenVR.cpp
--- firefox-55.0~b4+build2/gfx/vr/gfxVROpenVR.cpp	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/gfxVROpenVR.cpp	2017-06-27 05:25:32.000000000 +0000
@@ -178,18 +178,23 @@
 {
   ::vr::VREvent_t event;
   while (mVRSystem->PollNextEvent(&event, sizeof(event))) {
-    if (event.trackedDeviceIndex == ::vr::k_unTrackedDeviceIndex_Hmd) {
-      switch (event.eventType) {
+    switch (event.eventType) {
       case ::vr::VREvent_TrackedDeviceUserInteractionStarted:
         mDisplayInfo.mIsMounted = true;
         break;
       case ::vr::VREvent_TrackedDeviceUserInteractionEnded:
         mDisplayInfo.mIsMounted = false;
         break;
+      case ::vr::EVREventType::VREvent_DriverRequestedQuit:
+      case ::vr::EVREventType::VREvent_Quit:
+      case ::vr::EVREventType::VREvent_ProcessQuit:
+      case ::vr::EVREventType::VREvent_QuitAcknowledged:
+      case ::vr::EVREventType::VREvent_QuitAborted_UserPrompt:
+        mDisplayInfo.mIsConnected = false;
+        break;
       default:
         // ignore
         break;
-      }
     }
   }
 }
@@ -467,7 +472,6 @@
 VRControllerOpenVR::VibrateHapticComplete(uint32_t aPromiseID)
 {
   VRManager *vm = VRManager::Get();
-  MOZ_ASSERT(vm);
 
   CompositorThreadHolder::Loop()->PostTask(NewRunnableMethod<uint32_t>
     (vm, &VRManager::NotifyVibrateHapticCompleted, aPromiseID));
@@ -546,10 +550,12 @@
 void
 VRSystemManagerOpenVR::GetHMDs(nsTArray<RefPtr<VRDisplayHost>>& aHMDResult)
 {
-  if (!::vr::VR_IsHmdPresent()) {
-    if (mOpenVRHMD) {
-      mOpenVRHMD = nullptr;
-    }
+  if (!::vr::VR_IsHmdPresent() ||
+      (mOpenVRHMD && !mOpenVRHMD->GetIsConnected())) {
+    // OpenVR runtime could be quit accidentally,
+    // and we make it re-initialize.
+    mOpenVRHMD = nullptr;
+    mVRSystem = nullptr;
   } else if (mOpenVRHMD == nullptr) {
     ::vr::HmdError err;
 
diff -Nru firefox-55.0~b4+build2/gfx/vr/gfxVRPuppet.cpp firefox-55.0~b5+build1/gfx/vr/gfxVRPuppet.cpp
--- firefox-55.0~b4+build2/gfx/vr/gfxVRPuppet.cpp	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/gfxVRPuppet.cpp	2017-06-27 05:25:32.000000000 +0000
@@ -438,6 +438,10 @@
       mContext->VSSetShader(mQuadVS, nullptr, 0);
       mContext->PSSetShader(mQuadPS, nullptr, 0);
       ID3D11ShaderResourceView* srView = aSource->GetShaderResourceView();
+      if (!srView) {
+        NS_WARNING("Failed to get SRV for Puppet");
+        return false;
+      }
       mContext->PSSetShaderResources(0 /* 0 == TexSlot::RGB */, 1, &srView);
       // XXX Use Constant from TexSlot in CompositorD3D11.cpp?
 
diff -Nru firefox-55.0~b4+build2/gfx/vr/ipc/VRLayerChild.cpp firefox-55.0~b5+build1/gfx/vr/ipc/VRLayerChild.cpp
--- firefox-55.0~b4+build2/gfx/vr/ipc/VRLayerChild.cpp	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/ipc/VRLayerChild.cpp	2017-06-27 05:25:32.000000000 +0000
@@ -88,11 +88,10 @@
   mShSurfClient = nullptr;
 }
 
-mozilla::ipc::IPCResult
-VRLayerChild::Recv__delete__()
+void
+VRLayerChild::ActorDestroy(ActorDestroyReason aWhy)
 {
   mIPCOpen = false;
-  return IPC_OK();
 }
 
 } // namespace gfx
diff -Nru firefox-55.0~b4+build2/gfx/vr/ipc/VRLayerChild.h firefox-55.0~b5+build1/gfx/vr/ipc/VRLayerChild.h
--- firefox-55.0~b4+build2/gfx/vr/ipc/VRLayerChild.h	2017-06-25 16:05:05.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/ipc/VRLayerChild.h	2017-06-27 05:25:33.000000000 +0000
@@ -40,7 +40,7 @@
 protected:
   virtual ~VRLayerChild();
   void ClearSurfaces();
-  virtual mozilla::ipc::IPCResult Recv__delete__() override;
+  virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 
   uint32_t mVRDisplayID;
 
diff -Nru firefox-55.0~b4+build2/gfx/vr/ovr_capi_dynamic.h firefox-55.0~b5+build1/gfx/vr/ovr_capi_dynamic.h
--- firefox-55.0~b4+build2/gfx/vr/ovr_capi_dynamic.h	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/ovr_capi_dynamic.h	2017-06-27 05:25:32.000000000 +0000
@@ -59,15 +59,14 @@
 
 typedef int32_t ovrResult;
 
+
+
 typedef enum {
   ovrSuccess = 0,
-  ovrSuccess_NotVisible = 1000,
-  ovrSuccess_HMDFirmwareMismatch = 4100,
-  ovrSuccess_TrackerFirmwareMismatch = 4101,
-  ovrSuccess_ControllerFirmwareMismatch = 4104,
 } ovrSuccessType;
 
 typedef char ovrBool;
+typedef struct OVR_ALIGNAS(4) { float r, g, b, a; } ovrColorf;
 typedef struct OVR_ALIGNAS(4) { int x, y; } ovrVector2i;
 typedef struct OVR_ALIGNAS(4) { int w, h; } ovrSizei;
 typedef struct OVR_ALIGNAS(4) { ovrVector2i Pos; ovrSizei Size; } ovrRecti;
@@ -167,6 +166,12 @@
 
 typedef struct ovrHmdStruct* ovrSession;
 
+#ifdef XP_WIN
+typedef uint32_t ovrProcessId;
+#else
+typedef pid_t ovrProcessId;
+#endif
+
 typedef enum {
   ovrStatus_OrientationTracked    = 0x0001,
   ovrStatus_PositionTracked       = 0x0002,
@@ -215,7 +220,7 @@
 } ovrTimewarpProjectionDesc;
 
 typedef struct OVR_ALIGNAS(4) {
-  ovrVector3f HmdToEyeViewOffset[ovrEye_Count];
+  ovrVector3f HmdToEyeOffset[ovrEye_Count];
   float HmdSpaceToWorldScaleInMeters;
 } ovrViewScaleDesc;
 
@@ -236,32 +241,33 @@
 } ovrTextureBindFlags;
 
 typedef enum {
-  OVR_FORMAT_UNKNOWN,
-  OVR_FORMAT_B5G6R5_UNORM,
-  OVR_FORMAT_B5G5R5A1_UNORM,
-  OVR_FORMAT_B4G4R4A4_UNORM,
-  OVR_FORMAT_R8G8B8A8_UNORM,
-  OVR_FORMAT_R8G8B8A8_UNORM_SRGB,
-  OVR_FORMAT_B8G8R8A8_UNORM,
-  OVR_FORMAT_B8G8R8A8_UNORM_SRGB,
-  OVR_FORMAT_B8G8R8X8_UNORM,
-  OVR_FORMAT_B8G8R8X8_UNORM_SRGB,
-  OVR_FORMAT_R16G16B16A16_FLOAT,
-  OVR_FORMAT_D16_UNORM,
-  OVR_FORMAT_D24_UNORM_S8_UINT,
-  OVR_FORMAT_D32_FLOAT,
-  OVR_FORMAT_D32_FLOAT_S8X24_UINT,
-  OVR_FORMAT_BC1_UNORM,
-  OVR_FORMAT_BC1_UNORM_SRGB,
-  OVR_FORMAT_BC2_UNORM,
-  OVR_FORMAT_BC2_UNORM_SRGB,
-  OVR_FORMAT_BC3_UNORM,
-  OVR_FORMAT_BC3_UNORM_SRGB,
-  OVR_FORMAT_BC6H_UF16,
-  OVR_FORMAT_BC6H_SF16,
-  OVR_FORMAT_BC7_UNORM,
-  OVR_FORMAT_BC7_UNORM_SRGB,
-  OVR_FORMAT_R11G11B10_FLOAT,
+  OVR_FORMAT_UNKNOWN = 0,
+  OVR_FORMAT_B5G6R5_UNORM = 1,
+  OVR_FORMAT_B5G5R5A1_UNORM = 2,
+  OVR_FORMAT_B4G4R4A4_UNORM = 3,
+  OVR_FORMAT_R8G8B8A8_UNORM = 4,
+  OVR_FORMAT_R8G8B8A8_UNORM_SRGB = 5,
+  OVR_FORMAT_B8G8R8A8_UNORM = 6,
+  OVR_FORMAT_B8G8R8A8_UNORM_SRGB = 7,
+  OVR_FORMAT_B8G8R8X8_UNORM = 8,
+  OVR_FORMAT_B8G8R8X8_UNORM_SRGB = 9,
+  OVR_FORMAT_R16G16B16A16_FLOAT = 10,
+  OVR_FORMAT_R11G11B10_FLOAT = 25,
+  OVR_FORMAT_D16_UNORM = 11,
+  OVR_FORMAT_D24_UNORM_S8_UINT = 12,
+  OVR_FORMAT_D32_FLOAT = 13,
+  OVR_FORMAT_D32_FLOAT_S8X24_UINT = 14,
+  OVR_FORMAT_BC1_UNORM = 15,
+  OVR_FORMAT_BC1_UNORM_SRGB = 16,
+  OVR_FORMAT_BC2_UNORM = 17,
+  OVR_FORMAT_BC2_UNORM_SRGB = 18,
+  OVR_FORMAT_BC3_UNORM = 19,
+  OVR_FORMAT_BC3_UNORM_SRGB = 20,
+  OVR_FORMAT_BC6H_UF16 = 21,
+  OVR_FORMAT_BC6H_SF16 = 22,
+  OVR_FORMAT_BC7_UNORM = 23,
+  OVR_FORMAT_BC7_UNORM_SRGB = 24,
+
   OVR_FORMAT_ENUMSIZE = 0x7fffffff
 } ovrTextureFormat;
 
@@ -291,9 +297,10 @@
   int Width;
   int Height;
   unsigned int MiscFlags;
+  unsigned int MirrorOptions;
 } ovrMirrorTextureDesc;
 
-typedef void* ovrTextureSwapChain;
+typedef struct ovrTextureSwapChainData* ovrTextureSwapChain;
 typedef struct ovrMirrorTextureData* ovrMirrorTexture;
 
 typedef enum {
@@ -301,12 +308,10 @@
   ovrButton_B = 0x00000002,
   ovrButton_RThumb = 0x00000004,
   ovrButton_RShoulder = 0x00000008,
-  ovrButton_RMask = ovrButton_A | ovrButton_B | ovrButton_RThumb | ovrButton_RShoulder,
   ovrButton_X = 0x00000100,
   ovrButton_Y = 0x00000200,
   ovrButton_LThumb = 0x00000400,
   ovrButton_LShoulder = 0x00000800,
-  ovrButton_LMask = ovrButton_X | ovrButton_Y | ovrButton_LThumb | ovrButton_LShoulder,
   ovrButton_Up = 0x00010000,
   ovrButton_Down = 0x00020000,
   ovrButton_Left = 0x00040000,
@@ -317,6 +322,8 @@
   ovrButton_VolDown = 0x00800000,
   ovrButton_Home = 0x01000000,
   ovrButton_Private = ovrButton_VolUp | ovrButton_VolDown | ovrButton_Home,
+  ovrButton_RMask = ovrButton_A | ovrButton_B | ovrButton_RThumb | ovrButton_RShoulder,
+  ovrButton_LMask = ovrButton_X | ovrButton_Y | ovrButton_LThumb | ovrButton_LShoulder | ovrButton_Enter,
   ovrButton_EnumSize = 0x7fffffff
 } ovrButton;
 
@@ -335,9 +342,9 @@
   ovrTouch_LButtonMask = ovrTouch_X | ovrTouch_Y | ovrTouch_LThumb | ovrTouch_LThumbRest | ovrTouch_LIndexTrigger,
   ovrTouch_RIndexPointing = 0x00000020,
   ovrTouch_RThumbUp = 0x00000040,
-  ovrTouch_RPoseMask = ovrTouch_RIndexPointing | ovrTouch_RThumbUp,
   ovrTouch_LIndexPointing = 0x00002000,
   ovrTouch_LThumbUp = 0x00004000,
+  ovrTouch_RPoseMask = ovrTouch_RIndexPointing | ovrTouch_RThumbUp,
   ovrTouch_LPoseMask = ovrTouch_LIndexPointing | ovrTouch_LThumbUp,
   ovrTouch_EnumSize = 0x7fffffff
 } ovrTouch;
@@ -352,13 +359,17 @@
 } ovrTouchHapticsDesc;
 
 typedef enum {
-  ovrControllerType_None = 0x00,
-  ovrControllerType_LTouch = 0x01,
-  ovrControllerType_RTouch = 0x02,
-  ovrControllerType_Touch = 0x03,
-  ovrControllerType_Remote = 0x04,
-  ovrControllerType_XBox = 0x10,
-  ovrControllerType_Active = 0xff,
+  ovrControllerType_None = 0x0000,
+  ovrControllerType_LTouch = 0x0001,
+  ovrControllerType_RTouch = 0x0002,
+  ovrControllerType_Touch = (ovrControllerType_LTouch | ovrControllerType_RTouch),
+  ovrControllerType_Remote = 0x0004,
+  ovrControllerType_XBox = 0x0010,
+  ovrControllerType_Object0 = 0x0100,
+  ovrControllerType_Object1 = 0x0200,
+  ovrControllerType_Object2 = 0x0400,
+  ovrControllerType_Object3 = 0x0800,
+  ovrControllerType_Active = 0xffffffff,
   ovrControllerType_EnumSize = 0x7fffffff
 } ovrControllerType;
 
@@ -378,14 +389,35 @@
 } ovrHapticsPlaybackState;
 
 typedef enum {
+  ovrTrackedDevice_None = 0x0000,
   ovrTrackedDevice_HMD = 0x0001,
   ovrTrackedDevice_LTouch = 0x0002,
   ovrTrackedDevice_RTouch = 0x0004,
-  ovrTrackedDevice_Touch = 0x0006,
+  ovrTrackedDevice_Touch = (ovrTrackedDevice_LTouch | ovrTrackedDevice_RTouch),
+  ovrTrackedDevice_Object0 = 0x0010,
+  ovrTrackedDevice_Object1 = 0x0020,
+  ovrTrackedDevice_Object2 = 0x0040,
+  ovrTrackedDevice_Object3 = 0x0080,
   ovrTrackedDevice_All = 0xFFFF,
 } ovrTrackedDeviceType;
 
 typedef enum {
+  ovrBoundary_Outer = 0x0001,
+  ovrBoundary_PlayArea = 0x0100,
+} ovrBoundaryType;
+
+typedef struct {
+  ovrColorf Color;
+} ovrBoundaryLookAndFeel;
+
+typedef struct {
+  ovrBool IsTriggering;
+  float ClosestDistance;
+  ovrVector3f ClosestPoint;
+  ovrVector3f ClosestPointNormal;
+} ovrBoundaryTestResult;
+
+typedef enum {
   ovrHand_Left = 0,
   ovrHand_Right = 1,
   ovrHand_Count = 2,
@@ -403,11 +435,53 @@
   float IndexTriggerNoDeadzone[ovrHand_Count];
   float HandTriggerNoDeadzone[ovrHand_Count];
   ovrVector2f ThumbstickNoDeadzone[ovrHand_Count];
+  float IndexTriggerRaw[ovrHand_Count];
+  float HandTriggerRaw[ovrHand_Count];
+  ovrVector2f ThumbstickRaw[ovrHand_Count];
 } ovrInputState;
 
+typedef struct {
+  double LastChangedTime;
+  ovrFovPort FOVPort;
+  float VirtualNearPlaneDistanceMeters;
+  float VirtualFarPlaneDistanceMeters;
+  ovrSizei ImageSensorPixelResolution;
+  ovrMatrix4f LensDistortionMatrix;
+  double ExposurePeriodSeconds;
+  double ExposureDurationSeconds;
+} ovrCameraIntrinsics;
+
+typedef enum {
+  ovrCameraStatus_None = 0x0,
+  ovrCameraStatus_Connected = 0x1,
+  ovrCameraStatus_Calibrating = 0x2,
+  ovrCameraStatus_CalibrationFailed = 0x4,
+  ovrCameraStatus_Calibrated = 0x8,
+  ovrCameraStatus_EnumSize = 0x7fffffff
+} ovrCameraStatusFlags;
+
+typedef struct {
+  double LastChangedTimeSeconds;
+  unsigned int CameraStatusFlags;
+  ovrTrackedDeviceType AttachedToDevice;
+  ovrPosef RelativePose;
+  double LastExposureTimeSeconds;
+  double ExposureLatencySeconds;
+  double AdditionalLatencySeconds;
+} ovrCameraExtrinsics;
+
+#define OVR_EXTERNAL_CAMERA_NAME_SIZE 32
+typedef struct {
+  char Name[OVR_EXTERNAL_CAMERA_NAME_SIZE];
+  ovrCameraIntrinsics Intrinsics;
+  ovrCameraExtrinsics Extrinsics;
+} ovrExternalCamera;
+
 typedef enum {
   ovrInit_Debug          = 0x00000001,
   ovrInit_RequestVersion = 0x00000004,
+  ovrInit_Invisible      = 0x00000010,
+  ovrInit_MixedRendering = 0x00000020,
   ovrinit_WritableBits   = 0x00ffffff,
   ovrInit_EnumSize       = 0x7fffffff
 } ovrInitFlags;
@@ -441,9 +515,10 @@
 typedef void (OVR_PFN* pfn_ovr_GetLastErrorInfo)(ovrErrorInfo* errorInfo);
 typedef const char* (OVR_PFN* pfn_ovr_GetVersionString)();
 typedef int (OVR_PFN* pfn_ovr_TraceMessage)(int level, const char* message);
+typedef ovrResult (OVR_PFN* pfn_ovr_IdentifyClient)(const char* identity);
 typedef ovrHmdDesc (OVR_PFN* pfn_ovr_GetHmdDesc)(ovrSession session);
 typedef unsigned int (OVR_PFN* pfn_ovr_GetTrackerCount)(ovrSession session);
-typedef ovrTrackerDesc* (OVR_PFN* pfn_ovr_GetTrackerDesc)(ovrSession session, unsigned int trackerDescIndex);
+typedef ovrTrackerDesc (OVR_PFN* pfn_ovr_GetTrackerDesc)(ovrSession session, unsigned int trackerDescIndex);
 typedef ovrResult (OVR_PFN* pfn_ovr_Create)(ovrSession* pSession, ovrGraphicsLuid* pLuid);
 typedef void (OVR_PFN* pfn_ovr_Destroy)(ovrSession session);
 
@@ -457,16 +532,47 @@
 } ovrSessionStatus;
 
 typedef ovrResult (OVR_PFN* pfn_ovr_GetSessionStatus)(ovrSession session, ovrSessionStatus* sessionStatus);
-
 typedef ovrResult (OVR_PFN* pfn_ovr_SetTrackingOriginType)(ovrSession session, ovrTrackingOrigin origin);
 typedef ovrTrackingOrigin (OVR_PFN* pfn_ovr_GetTrackingOriginType)(ovrSession session);
 typedef ovrResult (OVR_PFN* pfn_ovr_RecenterTrackingOrigin)(ovrSession session);
+typedef ovrResult (OVR_PFN* pfn_ovr_SpecifyTrackingOrigin)(ovrSession session, ovrPosef originPose);
 typedef void (OVR_PFN* pfn_ovr_ClearShouldRecenterFlag)(ovrSession session);
 typedef ovrTrackingState (OVR_PFN* pfn_ovr_GetTrackingState)(ovrSession session, double absTime, ovrBool latencyMarker);
+typedef ovrResult  (OVR_PFN* pfn_ovr_GetDevicePoses)(ovrSession session,
+                                                     ovrTrackedDeviceType* deviceTypes,
+                                                     int deviceCount,
+                                                     double absTime,
+                                                     ovrPoseStatef* outDevicePoses);
 typedef ovrTrackerPose (OVR_PFN* pfn_ovr_GetTrackerPose)(ovrSession session, unsigned int trackerPoseIndex);
 typedef ovrResult (OVR_PFN* pfn_ovr_GetInputState)(ovrSession session, ovrControllerType controllerType, ovrInputState* inputState);
 typedef unsigned int (OVR_PFN* pfn_ovr_GetConnectedControllerTypes)(ovrSession session);
+typedef ovrTouchHapticsDesc (OVR_PFN* pfn_ovr_GetTouchHapticsDesc)(ovrSession session, ovrControllerType controllerType);
 typedef ovrResult (OVR_PFN* pfn_ovr_SetControllerVibration)(ovrSession session, ovrControllerType controllerType, float frequency, float amplitude);
+typedef ovrResult (OVR_PFN* pfn_ovr_SubmitControllerVibration)(ovrSession session,
+                                                               ovrControllerType controllerType,
+                                                               const ovrHapticsBuffer* buffer);
+typedef ovrResult (OVR_PFN* pfn_ovr_GetControllerVibrationState)(ovrSession session,
+                                                                 ovrControllerType controllerType,
+                                                                 ovrHapticsPlaybackState* outState);
+typedef ovrResult (OVR_PFN* pfn_ovr_TestBoundary)(ovrSession session,
+                                                  ovrTrackedDeviceType deviceBitmask,
+                                                  ovrBoundaryType boundaryType,
+                                                  ovrBoundaryTestResult* outTestResult);
+typedef ovrResult (OVR_PFN* pfn_ovr_TestBoundaryPoint)(ovrSession session,
+                                                       const ovrVector3f* point,
+                                                       ovrBoundaryType singleBoundaryType,
+                                                       ovrBoundaryTestResult* outTestResult);
+typedef ovrResult (OVR_PFN* pfn_ovr_SetBoundaryLookAndFeel)(ovrSession session, const ovrBoundaryLookAndFeel* lookAndFeel);
+typedef ovrResult (OVR_PFN* pfn_ovr_ResetBoundaryLookAndFeel)(ovrSession session);
+typedef ovrResult (OVR_PFN* pfn_ovr_GetBoundaryGeometry)(ovrSession session,
+                                                         ovrBoundaryType boundaryType,
+                                                         ovrVector3f* outFloorPoints,
+                                                         int* outFloorPointsCount);
+typedef ovrResult (OVR_PFN* pfn_ovr_GetBoundaryDimensions)(ovrSession session,
+                                                           ovrBoundaryType boundaryType,
+                                                           ovrVector3f* outDimensions);
+typedef ovrResult (OVR_PFN* pfn_ovr_GetBoundaryVisible)(ovrSession session, ovrBool* outIsVisible);
+typedef ovrResult (OVR_PFN* pfn_ovr_RequestBoundaryVisible)(ovrSession session, ovrBool visible);
 
 enum {
   ovrMaxLayerCount = 16
@@ -532,21 +638,56 @@
 typedef void (OVR_PFN* pfn_ovr_DestroyMirrorTexture)(ovrSession session, ovrMirrorTexture mirrorTexture);
 typedef ovrSizei(OVR_PFN* pfn_ovr_GetFovTextureSize)(ovrSession session, ovrEyeType eye, ovrFovPort fov, float pixelsPerDisplayPixel);
 typedef ovrEyeRenderDesc(OVR_PFN* pfn_ovr_GetRenderDesc)(ovrSession session, ovrEyeType eyeType, ovrFovPort fov);
-typedef ovrResult(OVR_PFN* pfn_ovr_SubmitFrame)(ovrSession session, unsigned int frameIndex,
+typedef ovrResult(OVR_PFN* pfn_ovr_SubmitFrame)(ovrSession session, long long frameIndex,
 	const ovrViewScaleDesc* viewScaleDesc,
 	ovrLayerHeader const * const * layerPtrList, unsigned int layerCount);
+
+typedef struct OVR_ALIGNAS(4) {
+  int HmdVsyncIndex;
+  int AppFrameIndex;
+  int AppDroppedFrameCount;
+  float AppMotionToPhotonLatency;
+  float AppQueueAheadTime;
+  float AppCpuElapsedTime;
+  float AppGpuElapsedTime;
+  int CompositorFrameIndex;
+  int CompositorDroppedFrameCount;
+  float CompositorLatency;
+  float CompositorCpuElapsedTime;
+  float CompositorGpuElapsedTime;
+  float CompositorCpuStartToGpuEndElapsedTime;
+  float CompositorGpuEndToVsyncElapsedTime;
+  ovrBool AswIsActive;
+  int AswActivatedToggleCount;
+  int AswPresentedFrameCount;
+  int AswFailedFrameCount;
+} ovrPerfStatsPerCompositorFrame;
+
+enum { ovrMaxProvidedFrameStats = 5 };
+
+typedef struct OVR_ALIGNAS(4) {
+  ovrPerfStatsPerCompositorFrame FrameStats[ovrMaxProvidedFrameStats];
+  int FrameStatsCount;
+  ovrBool AnyFrameStatsDropped;
+  float AdaptiveGpuPerformanceScale;
+  ovrBool AswIsAvailable;
+  ovrProcessId VisibleProcessId;
+} ovrPerfStats;
+
+typedef ovrResult (OVR_PFN* pfn_ovr_GetPerfStats)(ovrSession session, ovrPerfStats* outStats);
+typedef ovrResult (OVR_PFN* pfn_ovr_ResetPerfStats)(ovrSession session);
 typedef double (OVR_PFN* pfn_ovr_GetPredictedDisplayTime)(ovrSession session, long long frameIndex);
 typedef double (OVR_PFN* pfn_ovr_GetTimeInSeconds)();
 
-
 typedef enum {
   ovrPerfHud_Off = 0,
   ovrPerfHud_PerfSummary = 1,
   ovrPerfHud_LatencyTiming = 2,
   ovrPerfHud_AppRenderTiming = 3,
   ovrPerfHud_CompRenderTiming = 4,
+  ovrPerfHud_AswStats = 6,
   ovrPerfHud_VersionInfo = 5,
-  ovrPerfHud_Count = 6,
+  ovrPerfHud_Count = 7,
   ovrPerfHud_EnumSize = 0x7fffffff
 } ovrPerfHudMode;
 
@@ -565,13 +706,6 @@
   ovrDebugHudStereo_EnumSize = 0x7fffffff
 } ovrDebugHudStereoMode;
 
-typedef enum {
-  // Outer boundary - closely represents user setup walls
-  ovrBoundary_Outer = 0x0001,
-  // Play area - safe rectangular area inside outer boundary which can optionally be used to restrict user interactions and motion.
-  ovrBoundary_PlayArea = 0x0100,
-} ovrBoundaryType;
-
 typedef ovrBool(OVR_PFN* pfn_ovr_GetBool)(ovrSession session, const char* propertyName, ovrBool defaultVal);
 typedef ovrBool(OVR_PFN* pfn_ovr_SetBool)(ovrSession session, const char* propertyName, ovrBool value);
 typedef int (OVR_PFN* pfn_ovr_GetInt)(ovrSession session, const char* propertyName, int defaultVal);
@@ -586,13 +720,23 @@
   const char* defaultVal);
 typedef ovrBool (OVR_PFN* pfn_ovr_SetString)(ovrSession session, const char* propertyName,
   const char* value);
-typedef ovrResult (OVR_PFN* pfn_ovr_GetBoundaryDimensions)(ovrSession session,
-                                                           ovrBoundaryType boundaryType,
-                                                           ovrVector3f* outDimensions);
+
+typedef ovrResult (OVR_PFN* pfn_ovr_GetExternalCameras)(ovrSession session,
+                                                    ovrExternalCamera* cameras,
+                                                    unsigned int* inoutCameraCount);
+typedef ovrResult (OVR_PFN* pfn_ovr_SetExternalCameraProperties)(ovrSession session,
+                                                             const char* name,
+                                                             const ovrCameraIntrinsics* const intrinsics,
+                                                             const ovrCameraExtrinsics* const extrinsics);
+
+typedef enum {
+  ovrSuccess_NotVisible = 1000,
+  ovrSuccess_BoundaryInvalid = 1001,
+  ovrSuccess_DeviceUnavailable = 1002,
+} ovrSuccessTypes;
 
 typedef enum {
   ovrError_MemoryAllocationFailure = -1000,
-  ovrError_SocketCreationFailure = -1001,
   ovrError_InvalidSession = -1002,
   ovrError_Timeout = -1003,
   ovrError_NotInitialized = -1004,
@@ -604,10 +748,12 @@
   ovrError_InvalidHeadsetOrientation = -1011,
   ovrError_ClientSkippedDestroy = -1012,
   ovrError_ClientSkippedShutdown = -1013,
-  ovrError_AudioReservedBegin = -2000,
+  ovrError_ServiceDeadlockDetected = -1014,
+  ovrError_InvalidOperation = -1015,
+  ovrError_InsufficientArraySize = -1016,
+  ovrError_NoExternalCameraInfo = -1017,
   ovrError_AudioDeviceNotFound = -2001,
   ovrError_AudioComError = -2002,
-  ovrError_AudioReservedEnd = -2999,
   ovrError_Initialize = -3000,
   ovrError_LibLoad = -3001,
   ovrError_LibVersion = -3002,
@@ -629,49 +775,24 @@
   ovrError_HybridGraphicsNotSupported = -3018,
   ovrError_DisplayManagerInit = -3019,
   ovrError_TrackerDriverInit = -3020,
-  ovrError_InvalidBundleAdjustment = -4000,
-  ovrError_USBBandwidth = -4001,
-  ovrError_USBEnumeratedSpeed = -4002,
-  ovrError_ImageSensorCommError = -4003,
-  ovrError_GeneralTrackerFailure = -4004,
-  ovrError_ExcessiveFrameTruncation = -4005,
-  ovrError_ExcessiveFrameSkipping = -4006,
-  ovrError_SyncDisconnected = -4007,
-  ovrError_TrackerMemoryReadFailure = -4008,
-  ovrError_TrackerMemoryWriteFailure = -4009,
-  ovrError_TrackerFrameTimeout = -4010,
-  ovrError_TrackerTruncatedFrame = -4011,
-  ovrError_TrackerDriverFailure = -4012,
-  ovrError_TrackerNRFFailure = -4013,
-  ovrError_HardwareGone = -4014,
-  ovrError_NordicEnabledNoSync = -4015,
-  ovrError_NordicSyncNoFrames = -4016,
-  ovrError_CatastrophicFailure = -4017,
-  ovrError_HMDFirmwareMismatch = -4100,
-  ovrError_TrackerFirmwareMismatch = -4101,
-  ovrError_BootloaderDeviceDetected = -4102,
-  ovrError_TrackerCalibrationError = -4103,
-  ovrError_ControllerFirmwareMismatch = -4104,
-  ovrError_IMUTooManyLostSamples = -4200,
-  ovrError_IMURateError = -4201,
-  ovrError_FeatureReportFailure = -4202,
-  ovrError_Incomplete = -5000,
-  ovrError_Abandoned = -5001,
+  ovrError_LibSignCheck = -3021,
+  ovrError_LibPath = -3022,
+  ovrError_LibSymbols = -3023,
+  ovrError_RemoteSession = -3024,
+  ovrError_InitializeVulkan = -3025,
   ovrError_DisplayLost = -6000,
   ovrError_TextureSwapChainFull = -6001,
   ovrError_TextureSwapChainInvalid = -6002,
+  ovrError_GraphicsDeviceReset = -6003,
+  ovrError_DisplayRemoved = -6004,
+  ovrError_ContentProtectionNotAvailable = -6005,
+  ovrError_ApplicationInvisible = -6006,
+  ovrError_Disallowed = -6007,
+  ovrError_DisplayPluggedIncorrectly = -6008,
   ovrError_RuntimeException = -7000,
-  ovrError_MetricsUnknownApp = -90000,
-  ovrError_MetricsDuplicateApp = -90001,
-  ovrError_MetricsNoEvents = -90002,
-  ovrError_MetricsRuntime = -90003,
-  ovrError_MetricsFile = -90004,
-  ovrError_MetricsNoClientInfo = -90005,
-  ovrError_MetricsNoAppMetaData = -90006,
-  ovrError_MetricsNoApp = -90007,
-  ovrError_MetricsOafFailure = -90008,
-  ovrError_MetricsSessionAlreadyActive = -90009,
-  ovrError_MetricsSessionNotActive = -90010,
+  ovrError_NoCalibration = -9000,
+  ovrError_OldVersion = -9001,
+  ovrError_MisformattedBlock = -9002,
 } ovrErrorType;
 
 
@@ -723,17 +844,17 @@
 #define OVR_KEY_EYE_HEIGHT "EyeHeight" // float meters
 #define OVR_DEFAULT_EYE_HEIGHT 1.675f
 
-#if !defined(OVR_SUCCESS)
-#define OVR_SUCCESS(result) (result >= 0)
+#if !defined(OVR_SUCCESS)
+#define OVR_SUCCESS(result) (result >= 0)
 #endif
 
-#if !defined(OVR_UNQUALIFIED_SUCCESS)
-#define OVR_UNQUALIFIED_SUCCESS(result) (result == ovrSuccess)
+#if !defined(OVR_UNQUALIFIED_SUCCESS)
+#define OVR_UNQUALIFIED_SUCCESS(result) (result == ovrSuccess)
 #endif
 
-#if !defined(OVR_FAILURE)
-#define OVR_FAILURE(result) (!OVR_SUCCESS(result))
-#endif
+#if !defined(OVR_FAILURE)
+#define OVR_FAILURE(result) (!OVR_SUCCESS(result))
+#endif
 
 #ifdef __cplusplus
 }
diff -Nru firefox-55.0~b4+build2/gfx/vr/VRDisplayHost.cpp firefox-55.0~b5+build1/gfx/vr/VRDisplayHost.cpp
--- firefox-55.0~b4+build2/gfx/vr/VRDisplayHost.cpp	2017-06-25 16:05:04.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/VRDisplayHost.cpp	2017-06-27 05:25:32.000000000 +0000
@@ -41,6 +41,12 @@
   mDisplayInfo.mGroupMask = aGroupMask;
 }
 
+bool
+VRDisplayHost::GetIsConnected()
+{
+  return mDisplayInfo.mIsConnected;
+}
+
 void
 VRDisplayHost::AddLayer(VRLayerParent *aLayer)
 {
diff -Nru firefox-55.0~b4+build2/gfx/vr/VRDisplayHost.h firefox-55.0~b5+build1/gfx/vr/VRDisplayHost.h
--- firefox-55.0~b4+build2/gfx/vr/VRDisplayHost.h	2017-06-25 16:05:05.000000000 +0000
+++ firefox-55.0~b5+build1/gfx/vr/VRDisplayHost.h	2017-06-27 05:25:33.000000000 +0000
@@ -50,6 +50,7 @@
 
   bool CheckClearDisplayInfoDirty();
   void SetGroupMask(uint32_t aGroupMask);
+  bool GetIsConnected();
 
 protected:
   explicit VRDisplayHost(VRDeviceType aType);
diff -Nru firefox-55.0~b4+build2/js/src/wasm/WasmBaselineCompile.cpp firefox-55.0~b5+build1/js/src/wasm/WasmBaselineCompile.cpp
--- firefox-55.0~b4+build2/js/src/wasm/WasmBaselineCompile.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/js/src/wasm/WasmBaselineCompile.cpp	2017-06-27 05:25:36.000000000 +0000
@@ -2341,6 +2341,10 @@
         // frame size. Flush the constant pool in case it needs to be patched.
         MOZ_ASSERT(maxFramePushed_ >= localSize_);
         masm.flush();
+
+        // Precondition for patching.
+        if (masm.oom())
+            return false;
         masm.patchAdd32ToPtr(stackAddOffset_, Imm32(-int32_t(maxFramePushed_ - localSize_)));
 
         // Since we just overflowed the stack, to be on the safe side, pop the
diff -Nru firefox-55.0~b4+build2/js/src/wasm/WasmModule.cpp firefox-55.0~b5+build1/js/src/wasm/WasmModule.cpp
--- firefox-55.0~b4+build2/js/src/wasm/WasmModule.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/js/src/wasm/WasmModule.cpp	2017-06-27 05:25:37.000000000 +0000
@@ -961,8 +961,10 @@
         return false;
 
     auto globalSegment = GlobalSegment::create(metadata().globalDataLength);
-    if (!globalSegment)
+    if (!globalSegment) {
+        ReportOutOfMemory(cx);
         return false;
+    }
 
     SharedCode code(code_);
 
@@ -977,12 +979,16 @@
                                                    *bytecode_,
                                                    linkData_.linkData(Tier::Baseline),
                                                    metadata());
-            if (!codeSegment)
+            if (!codeSegment) {
+                ReportOutOfMemory(cx);
                 return false;
+            }
 
             code = js_new<Code>(Move(codeSegment), metadata());
-            if (!code)
+            if (!code) {
+                ReportOutOfMemory(cx);
                 return false;
+            }
         }
     }
 
diff -Nru firefox-55.0~b4+build2/js/xpconnect/src/XPCJSRuntime.cpp firefox-55.0~b5+build1/js/xpconnect/src/XPCJSRuntime.cpp
--- firefox-55.0~b4+build2/js/xpconnect/src/XPCJSRuntime.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/js/xpconnect/src/XPCJSRuntime.cpp	2017-06-27 05:25:36.000000000 +0000
@@ -155,12 +155,8 @@
 
   nsresult Dispatch()
   {
-      nsCOMPtr<nsIThread> thread = do_GetCurrentThread();
-      if (!thread) {
-          return NS_ERROR_FAILURE;
-      }
       nsCOMPtr<nsIRunnable> self(this);
-      return thread->IdleDispatch(self.forget());
+      return NS_IdleDispatchToCurrentThread(self.forget(), 1000);
   }
 
   void Start(bool aContinuation = false, bool aPurge = false)
diff -Nru firefox-55.0~b4+build2/l10n/changesets firefox-55.0~b5+build1/l10n/changesets
--- firefox-55.0~b4+build2/l10n/changesets	2017-06-25 16:18:45.000000000 +0000
+++ firefox-55.0~b5+build1/l10n/changesets	2017-06-27 05:39:45.000000000 +0000
@@ -1,95 +1,95 @@
-ach 674:3af234ecc70d
-af 1094:2d787686ecf9
-an 711:5c06a67c78d4
-ar 2535:8d6343a8a612
-as 806:c82f67762bb8
+ach 675:b83c6927009c
+af 1096:1868a5e0a7e1
+an 713:c0dbb76755e2
+ar 2540:f9689d351ffb
+as 807:d7e7fd4afec5
 ast 1962:5b37651ec44d
 az 813:7db88b158135
-be 2740:43427b529ecd
+be 2741:0beee55408c7
 bg 2299:34ed6d23ab8e
-bn-BD 1697:d05ed1e35e92
+bn-BD 1698:62b4d3996526
 bn-IN 1037:cd84ee209b9c
-br 2023:59fb781d78cb
-bs 716:343d22a4c090
-ca 3283:d816be07752a
-cak 710:3d5817e4247e
-cs 5171:668671915e96
-cy 1857:40b2f1c1dc2e
+br 2027:f05e6d9755a7
+bs 718:ce3923fa4e4c
+ca 3297:3f46717248c3
+cak 712:9f33acd457d6
+cs 5173:f804a56edb92
+cy 1861:1d84b39d3ec1
 da 2986:6f1eebdca9b5
 de 5751:0e66e39552ff
-dsb 1052:2aef2882148d
-el 2264:abce91c357fc
+dsb 1055:fa430bd39a10
+el 2266:68f03135f486
 en-GB 2628:78129c06467a
-en-ZA 698:55b47711c526
+en-ZA 701:305da1e4c844
 eo 1443:3ac9273c7a83
-es-AR 3950:e210426fd4fc
-es-CL 1525:b3ae6faabcee
-es-ES 5096:0702b6523f9d
-es-MX 1439:4a792a16820f
+es-AR 3958:b6844bd028d7
+es-CL 1526:0dd3f214b5f1
+es-ES 5098:0d6629322408
+es-MX 1441:40cba7a05451
 et 2466:2ea45bdf4fe0
-eu 2309:3bd4d08c38fb
-fa 1551:bcd06503574b
-ff 791:bbe2492ebb72
+eu 2311:3440dbc0b537
+fa 1553:a868928db045
+ff 792:d0b5e8aadd8e
 fi 3081:1fe70548998e
-fr 8223:fcdaedc4b8b6
+fr 8227:d1c544537637
 fy-NL 3543:108a89fc7a47
-ga-IE 2549:4cadafe37c61
-gd 2353:a6dd72232902
+ga-IE 2552:772fff5b15d4
+gd 2355:cb7d14c1ba9c
 gl 3619:b010da5934a5
-gn 344:2b773587a7ec
-gu-IN 1306:6284905040d5
-he 2297:3b58b63efa23
-hi-IN 1295:14e580c83875
-hr 2384:362bdf5b513e
-hsb 1237:558ce19453aa
-hu 3357:78c5747849aa
-hy-AM 1912:3a8947abc513
-id 2486:86e8337a335a
-is 2061:e07e9e59e2ee
-it 8082:7ffef3557fcb
-ja 3161:8aa58c60036e
-ja-JP-mac 2593:74991716bbd8
-ka 395:b2f753a8a642
-kab 703:745259c7a2cf
-kk 1457:6fae7c20d9d0
+gn 345:fe34a0c15af1
+gu-IN 1308:aa829dc55630
+he 2299:d825816e2a1f
+hi-IN 1297:522fb829b6ce
+hr 2386:0eb18e888d11
+hsb 1240:415c71c5013c
+hu 3360:c50dad4a753e
+hy-AM 1914:40ce9d379ccf
+id 2488:77de4dfaeb74
+is 2063:5cb483412d28
+it 8083:345293a4a66a
+ja 3163:dd5d3d2e7488
+ja-JP-mac 2595:efbf52c30cce
+ka 412:76ad7644c9e4
+kab 710:9fb16394cf3e
+kk 1466:7448392580d8
 km 993:3bf31b0b6d9e
-kn 1195:74f66f4447f3
-ko 2729:4d5cdf0e9e79
+kn 1197:fcff110ae161
+ko 2730:8a9565835f05
 lij 914:217da84c31d3
-lt 3845:a2b62a168a1f
+lt 3849:d5845c678450
 lv 1492:7586bb1362a7
-mai 881:44a7dad49987
+mai 882:101900421134
 mk 634:26b755e4f87b
-ml 1055:a3a120a47c4a
-mr 1285:a05803c9b2b9
-ms 939:7b1a64dd91aa
+ml 1056:8eae57fc065e
+mr 1287:31f98a9a02f3
+ms 940:e3025a6a34cc
 my 615:4a0dc350bdec
-nb-NO 3521:02b09848ef55
-nl 6427:d11239ee45e9
-nn-NO 2328:48d10ac20be5
-or 878:8c72ab67a44d
+nb-NO 3526:4c1e092d8bb2
+nl 6433:598d970e21c2
+nn-NO 2331:f31514245b06
+or 879:ba295ae267ae
 pa-IN 2408:51472df7ba3f
-pl 10170:4ee216defb78
-pt-BR 3486:7cf0629777d1
-pt-PT 6176:04bdbdf64970
-rm 1981:008096f2d677
-ro 2785:800eb5d0e85a
-ru 5028:e21c7d9b45c0
+pl 10210:a70af7a692b5
+pt-BR 3490:4af184e9865f
+pt-PT 6190:654dced80afe
+rm 1990:0776dc370887
+ro 2793:00b38e6cdd87
+ru 5032:c82857db791e
 si 1662:e807981f0305
-sk 4889:dd2f8ba31e27
-sl 3334:2e5b1c810f0a
-son 1005:d6407a4e7d57
+sk 4893:c5c49b90c7a8
+sl 3335:b42017f1e120
+son 1007:9ef620b48812
 sq 2604:f5ac8e9891db
-sr 1939:5cdb05f81c8d
-sv-SE 5598:b44f80276138
-ta 1116:7206764a62d6
+sr 1940:b72a5c5438f9
+sv-SE 5601:abbfd0aa7a25
+ta 1129:f4438a73018c
 te 1331:8487a8bd7b05
 th 1938:3fc47fd32b85
-tr 3091:ee7b7d52e4f4
+tr 3095:552617c2fce9
 uk 4038:4e7e9158f4ac
-ur 538:b2c8d3b33960
-uz 757:ddc530ab5cb7
-vi 1345:f6ce5cb86477
-xh 924:63df252f2ed5
-zh-CN 3462:d1721c470f9e
-zh-TW 3423:1d09834527da
+ur 539:336809ac7ff3
+uz 759:61659d250cb2
+vi 1347:1686595e4151
+xh 925:801f436177c9
+zh-CN 3468:ac3af9673f2a
+zh-TW 3430:08b44842dd52
diff -Nru firefox-55.0~b4+build2/layout/base/nsDocumentViewer.cpp firefox-55.0~b5+build1/layout/base/nsDocumentViewer.cpp
--- firefox-55.0~b4+build2/layout/base/nsDocumentViewer.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/layout/base/nsDocumentViewer.cpp	2017-06-27 05:25:37.000000000 +0000
@@ -409,8 +409,6 @@
   bool mInitializedForPrintPreview;
   bool mHidden;
   bool mPrintRelated; // Only use for asserts.
-  bool mPresShellDestroyed; // Only use for asserts.
-  bool mDestroyWasFull; // Only use for asserts.
 };
 
 namespace mozilla {
@@ -545,9 +543,7 @@
     mIsPageMode(false),
     mInitializedForPrintPreview(false),
     mHidden(false),
-    mPrintRelated(false),
-    mPresShellDestroyed(true),
-    mDestroyWasFull(false)
+    mPrintRelated(false)
 {
   PrepareToStartLoad();
 }
@@ -584,31 +580,16 @@
     mDocument->Destroy();
   }
 
-  nsIFrame* vmRootFrame =
-    mViewManager && mViewManager->GetRootView()
-      ? mViewManager->GetRootView()->GetFrame()
-      : nullptr;
-  nsIFrame* psRootFrame = mPresShell ? mPresShell->GetRootFrame() : nullptr;
-  MOZ_RELEASE_ASSERT(vmRootFrame == psRootFrame);
-
   NS_ASSERTION(!mPresShell && !mPresContext,
                "User did not call nsIContentViewer::Destroy");
   if (mPresShell || mPresContext) {
     // Make sure we don't hand out a reference to the content viewer to
     // the SHEntry!
     mSHEntry = nullptr;
-    mDestroyWasFull = false;
+
     Destroy();
-    MOZ_RELEASE_ASSERT(mDestroyWasFull);
   }
 
-  MOZ_RELEASE_ASSERT(mPresShellDestroyed);
-
-  MOZ_RELEASE_ASSERT(!mPresShell || !mPresShell->GetRootFrame());
-  MOZ_RELEASE_ASSERT(!mViewManager || !mViewManager->GetRootView() ||
-    (!mViewManager->GetRootView()->GetFrame() &&
-     !mViewManager->GetRootView()->GetFirstChild()));
-
   if (mSelectionListener) {
     mSelectionListener->Disconnect();
   }
@@ -727,7 +708,6 @@
     styleSet->Delete();
     return NS_ERROR_FAILURE;
   }
-  mPresShellDestroyed = false;
 
   // We're done creating the style set
   styleSet->EndUpdate();
@@ -1816,8 +1796,6 @@
   mViewManager = nullptr;
   mContainer = WeakPtr<nsDocShell>();
 
-  mDestroyWasFull = true;
-
   return NS_OK;
 }
 
@@ -4679,13 +4657,6 @@
 void
 nsDocumentViewer::DestroyPresShell()
 {
-  nsIFrame* vmRootFrame =
-    mViewManager && mViewManager->GetRootView()
-      ? mViewManager->GetRootView()->GetFrame()
-      : nullptr;
-  nsIFrame* psRootFrame = mPresShell ? mPresShell->GetRootFrame() : nullptr;
-  MOZ_RELEASE_ASSERT(vmRootFrame == psRootFrame);
-
   // Break circular reference (or something)
   mPresShell->EndObservingDocument();
 
@@ -4694,18 +4665,7 @@
     selection->RemoveSelectionListener(mSelectionListener);
 
   nsAutoScriptBlocker scriptBlocker;
-  bool hadRootFrame = !!mPresShell->GetRootFrame();
   mPresShell->Destroy();
-  mPresShellDestroyed = true;
-  MOZ_RELEASE_ASSERT(!mPresShell->GetRootFrame());
-  // destroying the frame tree via presshell destroy should have done this
-  if (hadRootFrame) {
-    MOZ_RELEASE_ASSERT(!mViewManager || !mViewManager->GetRootView());
-  }
-  MOZ_RELEASE_ASSERT(!mViewManager || !mViewManager->GetRootView() ||
-    (!mViewManager->GetRootView()->GetFrame() &&
-     !mViewManager->GetRootView()->GetFirstChild()));
-
   mPresShell = nullptr;
 }
 
diff -Nru firefox-55.0~b4+build2/layout/base/PresShell.cpp firefox-55.0~b5+build1/layout/base/PresShell.cpp
--- firefox-55.0~b4+build2/layout/base/PresShell.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/layout/base/PresShell.cpp	2017-06-27 05:25:37.000000000 +0000
@@ -1167,12 +1167,6 @@
 {
   // Do not add code before this line please!
   if (mHaveShutDown) {
-    // If we never got a root frame the root view could exist now still.
-    // In that case assert that it has no children and no frame.
-    MOZ_RELEASE_ASSERT(!mViewManager || !mViewManager->GetRootView() ||
-      (!mViewManager->GetRootView()->GetFrame() &&
-       !mViewManager->GetRootView()->GetFirstChild()));
-    MOZ_RELEASE_ASSERT(!mFrameConstructor || !mFrameConstructor->GetRootFrame());
     return;
   }
 
diff -Nru firefox-55.0~b4+build2/layout/base/tests/chrome/chrome.ini firefox-55.0~b5+build1/layout/base/tests/chrome/chrome.ini
--- firefox-55.0~b4+build2/layout/base/tests/chrome/chrome.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/layout/base/tests/chrome/chrome.ini	2017-06-27 05:25:36.000000000 +0000
@@ -23,6 +23,7 @@
 [test_bug504311.xul]
 [test_bug514660.xul]
 [test_bug533845.xul]
+skip-if = os == 'linux' && !debug # Bug 1208197
 [test_bug551434.html]
 [test_bug708062.html]
 [test_bug812817.xul]
diff -Nru firefox-55.0~b4+build2/layout/painting/nsImageRenderer.cpp firefox-55.0~b5+build1/layout/painting/nsImageRenderer.cpp
--- firefox-55.0~b4+build2/layout/painting/nsImageRenderer.cpp	2017-06-25 16:05:09.000000000 +0000
+++ firefox-55.0~b5+build1/layout/painting/nsImageRenderer.cpp	2017-06-27 05:25:37.000000000 +0000
@@ -19,6 +19,7 @@
 #include "nsIFrame.h"
 #include "nsRenderingContext.h"
 #include "nsStyleStructInlines.h"
+#include "nsSVGDisplayableFrame.h"
 #include "nsSVGEffects.h"
 #include "nsSVGIntegrationUtils.h"
 
@@ -192,11 +193,17 @@
       mImageElementSurface =
         nsLayoutUtils::SurfaceFromElement(property->GetReferencedElement());
       if (!mImageElementSurface.GetSourceSurface()) {
-        mPaintServerFrame = property->GetReferencedFrame();
-        if (!mPaintServerFrame) {
+        nsIFrame* paintServerFrame = property->GetReferencedFrame();
+        // If there's no referenced frame, or the referenced frame is
+        // non-displayable SVG, then we have nothing valid to paint.
+        if (!paintServerFrame ||
+            (paintServerFrame->IsFrameOfType(nsIFrame::eSVG) &&
+             !paintServerFrame->IsFrameOfType(nsIFrame::eSVGPaintServer) &&
+             !static_cast<nsSVGDisplayableFrame*>(do_QueryFrame(paintServerFrame)))) {
           mPrepareResult = DrawResult::BAD_IMAGE;
           return false;
         }
+        mPaintServerFrame = paintServerFrame;
       }
 
       mPrepareResult = DrawResult::SUCCESS;
diff -Nru firefox-55.0~b4+build2/layout/style/nsCSSParser.cpp firefox-55.0~b5+build1/layout/style/nsCSSParser.cpp
--- firefox-55.0~b4+build2/layout/style/nsCSSParser.cpp	2017-06-25 16:05:11.000000000 +0000
+++ firefox-55.0~b5+build1/layout/style/nsCSSParser.cpp	2017-06-27 05:25:39.000000000 +0000
@@ -6953,34 +6953,29 @@
 bool
 CSSParserImpl::ParseHue(float& aAngle)
 {
-  if (!GetToken(true)) {
-    REPORT_UNEXPECTED_EOF(PEColorHueEOF);
+  nsCSSValue value;
+  // <hue> = <number> | <angle>
+  // https://drafts.csswg.org/css-color/#typedef-hue
+  if (!ParseSingleTokenVariant(value,
+                               VARIANT_NUMBER | VARIANT_ANGLE,
+                               nullptr)) {
+    REPORT_UNEXPECTED_TOKEN(PEExpectedNumberOrAngle);
     return false;
   }
 
-  // <number>
-  if (mToken.mType == eCSSToken_Number) {
-    aAngle = mToken.mNumber;
-    return true;
-  }
-  UngetToken();
-
-  // <angle>
-  nsCSSValue angleValue;
-  // The '0' value is handled by <number> parsing, so use VARIANT_ANGLE flag
-  // instead of VARIANT_ANGLE_OR_ZERO.
-  if (ParseSingleTokenVariant(angleValue, VARIANT_ANGLE, nullptr)) {
+  float unclampedResult;
+  if (value.GetUnit() == eCSSUnit_Number) {
+    unclampedResult = value.GetFloatValue();
+  } else {
     // Convert double value of GetAngleValueInDegrees() to float.
-    aAngle = angleValue.GetAngleValueInDegrees();
-    // And then clamp it as finite values in float.
-    aAngle = mozilla::clamped(aAngle,
-                              -std::numeric_limits<float>::max(),
-                               std::numeric_limits<float>::max());
-    return true;
+    unclampedResult = value.GetAngleValueInDegrees();
   }
 
-  REPORT_UNEXPECTED_TOKEN(PEExpectedNumberOrAngle);
-  return false;
+  // Clamp it as finite values in float.
+  aAngle = mozilla::clamped(unclampedResult,
+                            -std::numeric_limits<float>::max(),
+                             std::numeric_limits<float>::max());
+  return true;
 }
 
 bool
diff -Nru firefox-55.0~b4+build2/layout/style/nsCSSValue.h firefox-55.0~b5+build1/layout/style/nsCSSValue.h
--- firefox-55.0~b4+build2/layout/style/nsCSSValue.h	2017-06-25 16:05:10.000000000 +0000
+++ firefox-55.0~b5+build1/layout/style/nsCSSValue.h	2017-06-27 05:25:39.000000000 +0000
@@ -1823,7 +1823,16 @@
     , mComponent2(aComponent2)
     , mComponent3(aComponent3)
     , mAlpha(aAlpha)
-  {}
+  {
+    // We may copy nsCSSValueFloatColor and do some comparisons on them.
+    // In order to get the correct result, we have to make sure each component
+    // is finite.
+    MOZ_ASSERT(mozilla::IsFinite(aComponent1) &&
+               mozilla::IsFinite(aComponent2) &&
+               mozilla::IsFinite(aComponent3) &&
+               mozilla::IsFinite(aAlpha),
+               "Caller must ensure color components are finite");
+  }
 
 private:
   // Private destructor, to discourage deletion outside of Release():
diff -Nru firefox-55.0~b4+build2/layout/style/test/property_database.js firefox-55.0~b5+build1/layout/style/test/property_database.js
--- firefox-55.0~b4+build2/layout/style/test/property_database.js	2017-06-25 16:05:10.000000000 +0000
+++ firefox-55.0~b5+build1/layout/style/test/property_database.js	2017-06-27 05:25:38.000000000 +0000
@@ -2828,7 +2828,7 @@
     other_values: [ "green", "#f3c", "#fed292", "rgba(45,300,12,2)", "transparent", "-moz-nativehyperlinktext", "rgba(255,128,0,0.5)", "#e0fc", "#10fcee72",
       /* css-color-4: */
       "rgb(100, 100.0, 100)", "rgb(300 300 300 / 200%)", "rgb(300.0 300.0 300.0 / 2.0)", "hsl(720, 200%, 200%, 2.0)", "hsla(720 200% 200% / 200%)",
-      "hsl(480deg, 20%, 30%, 0.3)", "hsl(55grad, 400%, 30%)", "hsl(0.5grad 400% 500% / 9.0)", "hsl(33rad 100% 90% / 4)", "hsl(0.33turn, 40%, 40%, 10%)",
+      "hsl(480deg, 20%, 30%, 0.3)", "hsl(55grad, 400%, 30%)", "hsl(0.5grad 400% 500% / 9.0)", "hsl(33rad 100% 90% / 4)", "hsl(0.33turn, 40%, 40%, 10%)", "hsl(63e292, 41%, 34%)",
     ],
     invalid_values: [ "#f", "#ff", "#fffff", "#fffffff", "#fffffffff",
       "rgb(100%, 0, 100%)", "rgba(100, 0, 100%, 30%)",
diff -Nru firefox-55.0~b4+build2/layout/svg/nsSVGIntegrationUtils.cpp firefox-55.0~b5+build1/layout/svg/nsSVGIntegrationUtils.cpp
--- firefox-55.0~b4+build2/layout/svg/nsSVGIntegrationUtils.cpp	2017-06-25 16:05:11.000000000 +0000
+++ firefox-55.0~b5+build1/layout/svg/nsSVGIntegrationUtils.cpp	2017-06-27 05:25:41.000000000 +0000
@@ -1244,6 +1244,13 @@
     return drawable.forget();
   }
 
+  if (aFrame->IsFrameOfType(nsIFrame::eSVG) &&
+      !static_cast<nsSVGDisplayableFrame*>(do_QueryFrame(aFrame))) {
+    MOZ_ASSERT_UNREACHABLE("We should prevent painting of unpaintable SVG "
+                           "before we get here");
+    return nullptr;
+  }
+
   // We don't want to paint into a surface as long as we don't need to, so we
   // set up a drawing callback.
   RefPtr<gfxDrawingCallback> cb =
diff -Nru firefox-55.0~b4+build2/mfbt/Poison.cpp firefox-55.0~b5+build1/mfbt/Poison.cpp
--- firefox-55.0~b4+build2/mfbt/Poison.cpp	2017-06-25 16:05:12.000000000 +0000
+++ firefox-55.0~b5+build1/mfbt/Poison.cpp	2017-06-27 05:25:41.000000000 +0000
@@ -129,7 +129,11 @@
 static bool
 ProbeRegion(uintptr_t aRegion, uintptr_t aSize)
 {
+#ifdef XP_SOLARIS
+  if (posix_madvise(reinterpret_cast<void*>(aRegion), aSize, POSIX_MADV_NORMAL)) {
+#else
   if (madvise(reinterpret_cast<void*>(aRegion), aSize, MADV_NORMAL)) {
+#endif
     return true;
   } else {
     return false;
diff -Nru firefox-55.0~b4+build2/mfbt/tests/TestPoisonArea.cpp firefox-55.0~b5+build1/mfbt/tests/TestPoisonArea.cpp
--- firefox-55.0~b4+build2/mfbt/tests/TestPoisonArea.cpp	2017-06-25 16:05:12.000000000 +0000
+++ firefox-55.0~b5+build1/mfbt/tests/TestPoisonArea.cpp	2017-06-27 05:25:41.000000000 +0000
@@ -269,7 +269,11 @@
 static bool
 ProbeRegion(uintptr_t aPage)
 {
+#ifdef XP_SOLARIS
+  return !!posix_madvise(reinterpret_cast<void*>(aPage), PageSize(), POSIX_MADV_NORMAL);
+#else
   return !!madvise(reinterpret_cast<void*>(aPage), PageSize(), MADV_NORMAL);
+#endif
 }
 
 static int
diff -Nru firefox-55.0~b4+build2/mobile/android/base/java/org/mozilla/gecko/GeckoActivityMonitor.java firefox-55.0~b5+build1/mobile/android/base/java/org/mozilla/gecko/GeckoActivityMonitor.java
--- firefox-55.0~b4+build2/mobile/android/base/java/org/mozilla/gecko/GeckoActivityMonitor.java	2017-06-25 16:05:11.000000000 +0000
+++ firefox-55.0~b5+build1/mobile/android/base/java/org/mozilla/gecko/GeckoActivityMonitor.java	2017-06-27 05:25:40.000000000 +0000
@@ -27,6 +27,13 @@
 
     private GeckoActivityMonitor() { }
 
+    private void updateActivity(final Activity activity) {
+        if (currentActivity.get() == null) {
+            appContext.onApplicationForeground();
+        }
+        currentActivity = new WeakReference<>(activity);
+    }
+
     public Activity getCurrentActivity() {
         return currentActivity.get();
     }
@@ -47,23 +54,23 @@
 
     @Override
     public void onActivityStarted(Activity activity) {
-        if (currentActivity.get() == null) {
-            appContext.onApplicationForeground();
-        }
-        currentActivity = new WeakReference<>(activity);
+        updateActivity(activity);
     }
 
     @Override
-    public void onActivityResumed(Activity activity) { }
+    public void onActivityResumed(Activity activity) {
+        updateActivity(activity);
+    }
 
     @Override
     public void onActivityPaused(Activity activity) { }
 
     @Override
     public void onActivityStopped(Activity activity) {
-        // onStop for the previous activity is called after onStart for the new activity, so if
-        // we're switching activities within our app, currentActivity should already refer to the
-        // next activity at this point.
+        // onStop for the previous activity is called after onStart/onResume for
+        // the new/resumed activity, so if we're switching activities within our
+        // app, mCurrentActivity should already refer to the next activity at
+        // this point.
         // If it doesn't, it means we've been backgrounded.
         if (currentActivity.get() == activity) {
             currentActivity.clear();
diff -Nru firefox-55.0~b4+build2/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java firefox-55.0~b5+build1/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
--- firefox-55.0~b4+build2/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java	2017-06-25 16:05:11.000000000 +0000
+++ firefox-55.0~b5+build1/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java	2017-06-27 05:25:39.000000000 +0000
@@ -337,7 +337,7 @@
             }
 
             final Uri data = intent.getData();
-            if (data != null && "file".equals(data.normalizeScheme().getScheme())) {
+            if (data != null && "file".equals(normalizeUriScheme(data).getScheme())) {
                 Log.w(LOGTAG, "Blocked intent with \"file://\" data scheme.");
                 return null;
             }
diff -Nru firefox-55.0~b4+build2/python/mozboot/mozboot/freebsd.py firefox-55.0~b5+build1/python/mozboot/mozboot/freebsd.py
--- firefox-55.0~b4+build2/python/mozboot/mozboot/freebsd.py	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/python/mozboot/mozboot/freebsd.py	2017-06-27 05:25:43.000000000 +0000
@@ -36,7 +36,6 @@
             'gconf2',
             'gtk2',
             'gtk3',
-            'libGL',
             'pulseaudio',
             'v4l_compat',
             'yasm',
diff -Nru firefox-55.0~b4+build2/SOURCE_CHANGESET firefox-55.0~b5+build1/SOURCE_CHANGESET
--- firefox-55.0~b4+build2/SOURCE_CHANGESET	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/SOURCE_CHANGESET	2017-06-27 05:25:55.000000000 +0000
@@ -1 +1 @@
-0a6a0148a61c5b2255f8b4272634efc1d1bd0c98
\ No newline at end of file
+af94af58d1f315f475fbe831bb48aecbeb9a0c61
\ No newline at end of file
diff -Nru firefox-55.0~b4+build2/taskcluster/ci/test/test-platforms.yml firefox-55.0~b5+build1/taskcluster/ci/test/test-platforms.yml
--- firefox-55.0~b4+build2/taskcluster/ci/test/test-platforms.yml	2017-06-25 16:05:14.000000000 +0000
+++ firefox-55.0~b5+build1/taskcluster/ci/test/test-platforms.yml	2017-06-27 05:25:43.000000000 +0000
@@ -67,6 +67,7 @@
         - opt-only-tests
         - desktop-screenshot-capture
         - headless
+        - talos
 
 # TODO: use 'pgo' and 'asan' labels here, instead of -pgo/opt
 linux64-pgo/opt:
diff -Nru firefox-55.0~b4+build2/taskcluster/ci/test/tests.yml firefox-55.0~b5+build1/taskcluster/ci/test/tests.yml
--- firefox-55.0~b4+build2/taskcluster/ci/test/tests.yml	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/taskcluster/ci/test/tests.yml	2017-06-27 05:25:55.000000000 +0000
@@ -53,7 +53,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -101,7 +100,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -132,6 +130,8 @@
             by-test-platform:
                 windows.*:
                     - mediatests/taskcluster_windows_config.py
+                macosx.*:
+                    - mediatests/taskcluster_posix_config.py
                 default:
                     - mediatests/taskcluster_posix_config.py
                     - remove_executables.py
@@ -158,6 +158,8 @@
             by-test-platform:
                 windows.*:
                     - mediatests/taskcluster_windows_config.py
+                macosx.*:
+                    - mediatests/taskcluster_posix_config.py
                 default:
                     - mediatests/taskcluster_posix_config.py
                     - remove_executables.py
@@ -183,6 +185,8 @@
             by-test-platform:
                 windows.*:
                     - mediatests/taskcluster_windows_config.py
+                macosx.*:
+                    - mediatests/taskcluster_posix_config.py
                 default:
                     - mediatests/taskcluster_posix_config.py
                     - remove_executables.py
@@ -256,7 +260,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -292,7 +295,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -353,7 +355,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -414,6 +415,8 @@
                     by-test-platform:
                         windows.*:
                             - marionette/windows_taskcluster_config.py
+                        macosx.*:
+                            - marionette/prod_config.py
                         default:
                             - marionette/prod_config.py
                             - remove_executables.py
@@ -448,6 +451,8 @@
                 no-read-buildbot-config: true
                 config:
                     by-test-platform:
+                        macosx.*: 
+                            - marionette/prod_config.py
                         default:
                             - marionette/prod_config.py
                             - remove_executables.py
@@ -475,6 +480,7 @@
             android.*: 20
             macosx.*: 5
             windows.*: 5
+            linux32/debug: 16
             linux.*: 10
     e10s:
         by-test-platform:
@@ -512,7 +518,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -546,7 +551,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -596,7 +600,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -710,6 +713,8 @@
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - unittests/mac_unittest.py
                 default:
                     - unittests/linux_unittest.py
                     - remove_executables.py
@@ -795,7 +800,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -851,7 +855,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -886,7 +889,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -943,7 +945,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -968,6 +969,8 @@
         no-read-buildbot-config: true
         config:
             by-test-platform:
+                macosx.*:
+                    - unittests/mac_unittest.py
                 default:
                     - unittests/linux_unittest.py
                     - remove_executables.py
@@ -995,6 +998,8 @@
             by-test-platform:
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
+                macosx.*:
+                    - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
@@ -1050,7 +1055,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -1111,7 +1115,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
@@ -1145,7 +1148,6 @@
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
                 macosx.*:
-                    - remove_executables.py
                     - unittests/mac_unittest.py
                 linux.*:
                     - unittests/linux_unittest.py
@@ -1193,8 +1195,12 @@
         script: desktop_unittest.py
         no-read-buildbot-config: true
         config:
-            - unittests/linux_unittest.py
-            - remove_executables.py
+            by-test-platform:
+                macosx.*:
+                    - unittests/mac_unittest.py
+                default:
+                    - unittests/linux_unittest.py
+                    - remove_executables.py
         extra-options:
             - --reftest-suite=reftest-stylo
 
@@ -1298,7 +1304,7 @@
     suite: talos
     try-name: g2
     treeherder-symbol: tc-T(g2)
-    max-run-time: 3600
+    max-run-time: 7200
     run-on-projects:
         by-test-platform:
             linux64-stylo/.*: ['mozilla-central', 'try']
@@ -1386,7 +1392,6 @@
         config:
             by-test-platform:
                 macosx.*:
-                    - remove_executables.py
                     - talos/mac_config.py
                 default:
                     - talos/linux_config.py
@@ -1522,6 +1527,8 @@
             by-test-platform:
                 windows.*:
                     - web_platform_tests/prod_config_windows_taskcluster.py
+                macosx.*:
+                    - web_platform_tests/prod_config.py
                 default:
                     - web_platform_tests/prod_config.py
                     - remove_executables.py
@@ -1552,6 +1559,8 @@
             by-test-platform:
                 windows.*:
                     - web_platform_tests/prod_config_windows_taskcluster.py
+                macosx.*:
+                    - web_platform_tests/prod_config.py
                 default:
                     - web_platform_tests/prod_config.py
                     - remove_executables.py
@@ -1573,6 +1582,8 @@
             by-test-platform:
                 windows.*:
                     - web_platform_tests/prod_config_windows_taskcluster.py
+                macosx.*:
+                    - web_platform_tests/prod_config.py
                 default:
                     - web_platform_tests/prod_config.py
                     - remove_executables.py
@@ -1627,7 +1638,6 @@
                         windows.*:
                             - unittests/win_taskcluster_unittest.py
                         macosx.*:
-                            - remove_executables.py
                             - unittests/mac_unittest.py
                         linux.*:
                             - unittests/linux_unittest.py
diff -Nru firefox-55.0~b4+build2/taskcluster/taskgraph/target_tasks.py firefox-55.0~b5+build1/taskcluster/taskgraph/target_tasks.py
--- firefox-55.0~b4+build2/taskcluster/taskgraph/target_tasks.py	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/taskcluster/taskgraph/target_tasks.py	2017-06-27 05:25:42.000000000 +0000
@@ -248,7 +248,8 @@
             # Don't do some nightlies on-push until it's ready.
             return False
         if platform in ('linux64', 'linux'):
-            if task.attributes['build_type'] == 'opt':
+            if task.attributes['build_type'] == 'opt' and \
+               task.attributes.get('unittest_suite') != 'talos':
                 return False
         # skip l10n, beetmover, balrog
         if task.kind in [
diff -Nru firefox-55.0~b4+build2/taskcluster/taskgraph/transforms/job/mozharness_test.py firefox-55.0~b5+build1/taskcluster/taskgraph/transforms/job/mozharness_test.py
--- firefox-55.0~b4+build2/taskcluster/taskgraph/transforms/job/mozharness_test.py	2017-06-25 16:05:13.000000000 +0000
+++ firefox-55.0~b5+build1/taskcluster/taskgraph/transforms/job/mozharness_test.py	2017-06-27 05:25:42.000000000 +0000
@@ -27,6 +27,7 @@
     'linux64-ccov': 'Ubuntu Code Coverage VM 12.04 x64',
     'linux64-jsdcov': 'Ubuntu Code Coverage VM 12.04 x64',
     'linux64-stylo': 'Ubuntu VM 12.04 x64',
+    'linux64-devedition-nightly': 'Ubuntu VM 12.04 x64 DevEdition',
     'macosx64': 'Rev7 MacOSX Yosemite 10.10.5',
     'macosx64-devedition': 'Rev7 MacOSX Yosemite 10.10.5 DevEdition',
     'android-4.3-arm7-api-15': 'Android 4.3 armv7 API 15+',
diff -Nru firefox-55.0~b4+build2/testing/marionette/client/marionette_driver/geckoinstance.py firefox-55.0~b5+build1/testing/marionette/client/marionette_driver/geckoinstance.py
--- firefox-55.0~b4+build2/testing/marionette/client/marionette_driver/geckoinstance.py	2017-06-25 16:05:14.000000000 +0000
+++ firefox-55.0~b5+build1/testing/marionette/client/marionette_driver/geckoinstance.py	2017-06-27 05:25:42.000000000 +0000
@@ -258,7 +258,6 @@
         Depending on self.runner_class, setting `clean` to True may also kill
         the emulator process in which this instance is running.
 
-        :param restart: If True, assume this is being called by restart method.
         :param clean: If True, also perform runner cleanup.
         """
         if self.runner:
@@ -391,17 +390,16 @@
 
         return runner_args
 
-    def close(self, restart=False, clean=False):
+    def close(self, clean=False):
         """
         Close the managed Gecko process.
 
         If `clean` is True and the Fennec instance is running in an
         emulator managed by mozrunner, this will stop the emulator.
 
-        :param restart: If True, assume this is being called by restart method.
         :param clean: If True, also perform runner cleanup.
         """
-        super(FennecInstance, self).close(restart, clean)
+        super(FennecInstance, self).close(clean)
         if clean and self.runner and self.runner.device.connected:
             self.runner.device.dm.remove_forward(
                 "tcp:{}".format(self.marionette_port))
diff -Nru firefox-55.0~b4+build2/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm firefox-55.0~b5+build1/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm
--- firefox-55.0~b4+build2/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/testing/mochitest/BrowserTestUtils/BrowserTestUtils.jsm	2017-06-27 05:25:44.000000000 +0000
@@ -262,6 +262,11 @@
    * @resolves When a load event is triggered for the browser.
    */
   browserLoaded(browser, includeSubFrames=false, wantLoad=null) {
+    // Passing a url as second argument is a common mistake we should prevent.
+    if (includeSubFrames && typeof includeSubFrames != "boolean") {
+      throw("The second argument to browserLoaded should be a boolean.");
+    }
+
     // If browser belongs to tabbrowser-tab, ensure it has been
     // inserted into the document.
     let tabbrowser = browser.ownerGlobal.gBrowser;
diff -Nru firefox-55.0~b4+build2/testing/mozharness/scripts/android_emulator_unittest.py firefox-55.0~b5+build1/testing/mozharness/scripts/android_emulator_unittest.py
--- firefox-55.0~b4+build2/testing/mozharness/scripts/android_emulator_unittest.py	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/testing/mozharness/scripts/android_emulator_unittest.py	2017-06-27 05:25:42.000000000 +0000
@@ -14,7 +14,6 @@
 import signal
 import socket
 import subprocess
-import telnetlib
 import time
 import tempfile
 
@@ -262,12 +261,6 @@
             self.info('stderr: %s' % str(err.strip()))
         return out
 
-    def _telnet_cmd(self, telnet, command):
-        telnet.write('%s\n' % command)
-        result = telnet.read_until('OK', 10)
-        self.info('%s: %s' % (command, result))
-        return result
-
     def _verify_adb(self):
         self.info('Verifying adb connectivity')
         self._run_with_timeout(180, [self.adb_path, 'wait-for-device'])
@@ -287,37 +280,6 @@
             return True
         return False
 
-    def _telnet_to_emulator(self):
-        port = self.emulator["emulator_port"]
-        telnet_ok = False
-        try:
-            tn = telnetlib.Telnet('localhost', port, 10)
-            if tn is not None:
-                self.info('Connected to port %d' % port)
-                res = tn.read_until('OK', 10)
-                self.info(res)
-                self._telnet_cmd(tn, 'avd status')
-                self._telnet_cmd(tn, 'redir list')
-                self._telnet_cmd(tn, 'network status')
-                tn.write('quit\n')
-                tn.read_all()
-                telnet_ok = True
-            else:
-                self.warning('Unable to connect to port %d' % port)
-        except socket.error, e:
-            self.info('Trying again after socket error: %s' % str(e))
-            pass
-        except EOFError:
-            self.info('Trying again after EOF')
-            pass
-        except:
-            self.info('Trying again after unexpected exception')
-            pass
-        finally:
-            if tn is not None:
-                tn.close()
-        return telnet_ok
-
     def _verify_emulator(self):
         adb_ok = self._verify_adb()
         if not adb_ok:
@@ -331,10 +293,6 @@
         if not boot_ok:
             self.warning('Unable to verify Android boot completion')
             return False
-        telnet_ok = self._retry(4, 30, self._telnet_to_emulator, "Verify telnet to emulator")
-        if not telnet_ok:
-            self.warning('Unable to telnet to emulator on port %d' % self.emulator["emulator_port"])
-            return False
         return True
 
     def _verify_emulator_and_restart_on_fail(self):
@@ -672,7 +630,7 @@
 
     def verify_emulator(self):
         '''
-        Check to see if the emulator can be contacted via adb and telnet.
+        Check to see if the emulator can be contacted via adb.
         If any communication attempt fails, kill the emulator, re-launch, and re-check.
         '''
         self.mkdir_p(self.query_abs_dirs()['abs_blob_upload_dir'])
diff -Nru firefox-55.0~b4+build2/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py firefox-55.0~b5+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py
--- firefox-55.0~b4+build2/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/testing/web-platform/tests/tools/wptrunner/wptrunner/executors/pytestrunner/runner.py	2017-06-27 05:25:46.000000000 +0000
@@ -56,6 +56,7 @@
                      "--verbose",  # show each individual subtest
                      "--capture", "no",  # enable stdout/stderr from tests
                      "--basetemp", cache,  # temporary directory
+                     "-p", "no:mozlog",
                      path],
                     plugins=plugins)
 
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/ExtensionParent.jsm firefox-55.0~b5+build1/toolkit/components/extensions/ExtensionParent.jsm
--- firefox-55.0~b4+build2/toolkit/components/extensions/ExtensionParent.jsm	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/ExtensionParent.jsm	2017-06-27 05:25:45.000000000 +0000
@@ -1243,7 +1243,7 @@
 let StartupCache = {
   DB_NAME: "ExtensionStartupCache",
 
-  SCHEMA_VERSION: 3,
+  SCHEMA_VERSION: 4,
 
   STORE_NAMES: Object.freeze(["locales", "manifests", "schemas"]),
 
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/schemas/manifest.json firefox-55.0~b5+build1/toolkit/components/extensions/schemas/manifest.json
--- firefox-55.0~b4+build2/toolkit/components/extensions/schemas/manifest.json	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/schemas/manifest.json	2017-06-27 05:25:45.000000000 +0000
@@ -168,13 +168,8 @@
             "type": "array",
             "default": [],
             "items": {
-              "choices": [
-                { "$ref": "Permission" },
-                {
-                  "type": "string",
-                  "deprecated": "Unknown permission ${value}"
-                }
-              ]
+              "$ref": "Permission",
+              "onError": "warn"
             },
             "optional": true
           },
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/Schemas.jsm firefox-55.0~b5+build1/toolkit/components/extensions/Schemas.jsm
--- firefox-55.0~b4+build2/toolkit/components/extensions/Schemas.jsm	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/Schemas.jsm	2017-06-27 05:25:47.000000000 +0000
@@ -1179,7 +1179,12 @@
     let n = choices.length - 1;
     choices[n] = `or ${choices[n]}`;
 
-    let message = `Value must either: ${choices.join(", ")}`;
+    let message;
+    if (typeof value === "object") {
+      message = `Value must either: ${choices.join(", ")}`;
+    } else {
+      message = `Value ${JSON.stringify(value)} must either: ${choices.join(", ")}`;
+    }
 
     return context.error(message, null);
   }
@@ -1710,7 +1715,7 @@
   static parseSchema(schema, path, extraProperties = []) {
     this.checkSchemaProperties(schema, path, extraProperties);
 
-    let items = Schemas.parseSchema(schema.items, path);
+    let items = Schemas.parseSchema(schema.items, path, ["onError"]);
 
     return new this(schema, items, schema.minItems || 0, schema.maxItems || Infinity);
   }
@@ -1720,6 +1725,7 @@
     this.itemType = itemType;
     this.minItems = minItems;
     this.maxItems = maxItems;
+    this.onError = schema.items.onError || null;
   }
 
   normalize(value, context) {
@@ -1733,7 +1739,12 @@
     for (let [i, element] of value.entries()) {
       element = context.withPath(String(i), () => this.itemType.normalize(element, context));
       if (element.error) {
-        return element;
+        if (this.onError == "warn") {
+          context.logError(element.error);
+        } else if (this.onError != "ignore") {
+          return element;
+        }
+        continue;
       }
       result.push(element.value);
     }
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/test/mochitest/test_ext_schema.html firefox-55.0~b5+build1/toolkit/components/extensions/test/mochitest/test_ext_schema.html
--- firefox-55.0~b4+build2/toolkit/components/extensions/test/mochitest/test_ext_schema.html	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/test/mochitest/test_ext_schema.html	2017-06-27 05:25:45.000000000 +0000
@@ -50,7 +50,7 @@
   });
 
   let messages = [
-    {message: /processing permissions\.0: Unknown permission "unknownPermission"/},
+    {message: /processing permissions\.0: Value "unknownPermission"/},
     {message: /processing unknown_property: An unexpected property was found in the WebExtension manifest/},
   ];
 
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js firefox-55.0~b5+build1/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js
--- firefox-55.0~b4+build2/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/test/xpcshell/test_ext_schemas.js	2017-06-27 05:25:48.000000000 +0000
@@ -1091,7 +1091,7 @@
   talliedErrors.length = 0;
 
   Assert.throws(() => root.choices.meh("frog"),
-                /Value must either: be one of \["foo", "bar", "baz"\], match the pattern \/florg\.\*meh\/, or be an integer value/);
+                /Value "frog" must either: be one of \["foo", "bar", "baz"\], match the pattern \/florg\.\*meh\/, or be an integer value/);
 
   Assert.throws(() => root.choices.meh(4),
                 /be a string value, or be at least 12/);
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/test/xpcshell/test_ext_unknown_permissions.js firefox-55.0~b5+build1/toolkit/components/extensions/test/xpcshell/test_ext_unknown_permissions.js
--- firefox-55.0~b4+build2/toolkit/components/extensions/test/xpcshell/test_ext_unknown_permissions.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/test/xpcshell/test_ext_unknown_permissions.js	2017-06-27 05:25:48.000000000 +0000
@@ -0,0 +1,30 @@
+"use strict";
+
+add_task(async function test_unknown_permissions() {
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: [
+        "activeTab",
+        "fooUnknownPermission",
+        "http://*/",
+        "chrome://favicon/",
+      ],
+    },
+  });
+
+  let {messages} = await promiseConsoleOutput(
+    () => extension.startup());
+
+  const {WebExtensionPolicy} = Cu.import("resource://gre/modules/Extension.jsm", {});
+
+  let policy = WebExtensionPolicy.getByID(extension.id);
+  Assert.deepEqual(Array.from(policy.permissions).sort(), ["activeTab", "http://*/*"]);
+
+  ok(messages.some(message => /Error processing permissions\.1: Value "fooUnknownPermission" must/.test(message)),
+     'Got expected error for "fooUnknownPermission"');
+
+  ok(messages.some(message => /Error processing permissions\.3: Value "chrome:\/\/favicon\/" must/.test(message)),
+     'Got expected error for "chrome://favicon/"');
+
+  await extension.unload();
+});
diff -Nru firefox-55.0~b4+build2/toolkit/components/extensions/test/xpcshell/xpcshell.ini firefox-55.0~b5+build1/toolkit/components/extensions/test/xpcshell/xpcshell.ini
--- firefox-55.0~b4+build2/toolkit/components/extensions/test/xpcshell/xpcshell.ini	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/extensions/test/xpcshell/xpcshell.ini	2017-06-27 05:25:48.000000000 +0000
@@ -86,6 +86,7 @@
 [test_ext_themes_supported_properties.js]
 [test_ext_topSites.js]
 skip-if = os == "android"
+[test_ext_unknown_permissions.js]
 [test_ext_legacy_extension_context.js]
 [test_ext_legacy_extension_embedding.js]
 [test_locale_converter.js]
diff -Nru firefox-55.0~b4+build2/toolkit/components/places/tests/browser/browser_bug399606.js firefox-55.0~b5+build1/toolkit/components/places/tests/browser/browser_bug399606.js
--- firefox-55.0~b4+build2/toolkit/components/places/tests/browser/browser_bug399606.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/places/tests/browser/browser_bug399606.js	2017-06-27 05:25:45.000000000 +0000
@@ -2,12 +2,10 @@
  * 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/. */
 
-gBrowser.selectedTab = BrowserTestUtils.addTab(gBrowser);
+add_task(async function() {
+  registerCleanupFunction(PlacesTestUtils.clearHistory);
 
-function test() {
-  waitForExplicitFinish();
-
-  var URIs = [
+  const URIS = [
     "http://example.com/tests/toolkit/components/places/tests/browser/399606-window.location.href.html",
     "http://example.com/tests/toolkit/components/places/tests/browser/399606-history.go-0.html",
     "http://example.com/tests/toolkit/components/places/tests/browser/399606-location.replace.html",
@@ -15,22 +13,19 @@
     "http://example.com/tests/toolkit/components/places/tests/browser/399606-httprefresh.html",
     "http://example.com/tests/toolkit/components/places/tests/browser/399606-window.location.html",
   ];
-  var hs = Cc["@mozilla.org/browser/nav-history-service;1"].
-           getService(Ci.nsINavHistoryService);
 
   // Create and add history observer.
-  var historyObserver = {
-    visitCount: [],
-    onBeginUpdateBatch() {},
-    onEndUpdateBatch() {},
-    onVisit(aURI, aVisitID, aTime, aSessionID, aReferringID,
-                      aTransitionType) {
+  let historyObserver = {
+    count: 0,
+    expectedURI: null,
+    onVisit(aURI) {
       info("Received onVisit: " + aURI.spec);
-      if (aURI.spec in this.visitCount)
-        this.visitCount[aURI.spec]++;
-      else
-        this.visitCount[aURI.spec] = 1;
+      if (aURI.equals(this.expectedURI)) {
+        this.count++;
+      }
     },
+    onBeginUpdateBatch() {},
+    onEndUpdateBatch() {},
     onTitleChanged() {},
     onDeleteURI() {},
     onClearHistory() {},
@@ -38,39 +33,23 @@
     onDeleteVisits() {},
     QueryInterface: XPCOMUtils.generateQI([Ci.nsINavHistoryObserver])
   };
-  hs.addObserver(historyObserver);
-
-  function confirm_results() {
-    gBrowser.removeCurrentTab();
-    hs.removeObserver(historyObserver, false);
-    for (let aURI in historyObserver.visitCount) {
-      is(historyObserver.visitCount[aURI], 1,
-         "onVisit has been received right number of times for " + aURI);
-    }
-    PlacesTestUtils.clearHistory().then(finish);
-  }
-
-  var loadCount = 0;
-  function handleLoad(aEvent) {
-    loadCount++;
-    info("new load count is " + loadCount);
 
-    if (loadCount == 3) {
-      gBrowser.removeEventListener("DOMContentLoaded", handleLoad, true);
-      gBrowser.loadURI("about:blank");
-      executeSoon(check_next_uri);
-    }
+  async function promiseLoadedThreeTimes(uri) {
+    historyObserver.count = 0;
+    historyObserver.expectedURI = Services.io.newURI(uri);
+    let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser);
+    PlacesUtils.history.addObserver(historyObserver);
+    gBrowser.loadURI(uri);
+    await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, uri);
+    await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, uri);
+    await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser, false, uri);
+    PlacesUtils.history.removeObserver(historyObserver);
+    await BrowserTestUtils.removeTab(tab);
   }
 
-  function check_next_uri() {
-    if (URIs.length) {
-      let uri = URIs.shift();
-      loadCount = 0;
-      gBrowser.addEventListener("DOMContentLoaded", handleLoad, true);
-      gBrowser.loadURI(uri);
-    } else {
-      confirm_results();
-    }
+  for (let uri of URIS) {
+    await promiseLoadedThreeTimes(uri);
+    is(historyObserver.count, 1,
+      "onVisit has been received right number of times for " + uri);
   }
-  executeSoon(check_next_uri);
-}
+});
diff -Nru firefox-55.0~b4+build2/toolkit/components/places/tests/browser/browser_bug461710.js firefox-55.0~b5+build1/toolkit/components/places/tests/browser/browser_bug461710.js
--- firefox-55.0~b4+build2/toolkit/components/places/tests/browser/browser_bug461710.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/components/places/tests/browser/browser_bug461710.js	2017-06-27 05:25:48.000000000 +0000
@@ -4,55 +4,49 @@
 const prefix = "http://example.com/tests/toolkit/components/places/tests/browser/461710_";
 
 add_task(async function() {
+  registerCleanupFunction(PlacesTestUtils.clearHistory);
   let contentPage = prefix + "iframe.html";
-  let normalWindow = await BrowserTestUtils.openNewBrowserWindow();
 
-  let browser = normalWindow.gBrowser.selectedBrowser;
-  BrowserTestUtils.loadURI(browser, contentPage);
-  await BrowserTestUtils.browserLoaded(browser, contentPage);
+  let normalWindow = await BrowserTestUtils.openNewBrowserWindow();
+  let normalBrowser = normalWindow.gBrowser.selectedBrowser;
+  await BrowserTestUtils.loadURI(normalBrowser, contentPage);
+  await BrowserTestUtils.browserLoaded(normalBrowser, false, contentPage);
 
   let privateWindow = await BrowserTestUtils.openNewBrowserWindow({private: true});
-
-  browser = privateWindow.gBrowser.selectedBrowser;
-  BrowserTestUtils.loadURI(browser, contentPage);
-  await BrowserTestUtils.browserLoaded(browser, contentPage);
+  let privateBrowser = privateWindow.gBrowser.selectedBrowser;
+  BrowserTestUtils.loadURI(privateBrowser, contentPage);
+  await BrowserTestUtils.browserLoaded(privateBrowser, false, contentPage);
 
   let tests = [{
-    win: normalWindow,
+    private: false,
     topic: "uri-visit-saved",
     subtest: "visited_page.html"
   }, {
-    win: normalWindow,
+    private: false,
     topic: "visited-status-resolution",
     subtest: "link_page.html",
     color: kRed,
     message: "Visited link coloring should work outside of private mode"
   }, {
-    win: privateWindow,
+    private: true,
     topic: "visited-status-resolution",
     subtest: "link_page-2.html",
     color: kBlue,
     message: "Visited link coloring should not work inside of private mode"
   }, {
-    win: normalWindow,
+    private: false,
     topic: "visited-status-resolution",
     subtest: "link_page-3.html",
     color: kRed,
     message: "Visited link coloring should work outside of private mode"
   }];
 
-  let visited_page_url = prefix + tests[0].subtest;
+  let uri = Services.io.newURI(prefix + tests[0].subtest);
   for (let test of tests) {
-    let promise = new Promise(resolve => {
-      let uri = NetUtil.newURI(visited_page_url);
-      Services.obs.addObserver(function observe(aSubject) {
-        if (uri.equals(aSubject.QueryInterface(Ci.nsIURI))) {
-          Services.obs.removeObserver(observe, test.topic);
-          resolve();
-        }
-      }, test.topic);
-    });
-    ContentTask.spawn(test.win.gBrowser.selectedBrowser, prefix + test.subtest, async function(aSrc) {
+    let promise = TestUtils.topicObserved(test.topic,
+      subject => uri.equals(subject.QueryInterface(Ci.nsIURI)));
+    let browser = test.private ? privateBrowser : normalBrowser;
+    await ContentTask.spawn(browser, prefix + test.subtest, async function(aSrc) {
       content.document.getElementById("iframe").src = aSrc;
     });
     await promise;
@@ -62,7 +56,7 @@
       // have been updated, because it only tells us that messages to update links
       // have been dispatched. We must still wait for the actual links to update.
       await BrowserTestUtils.waitForCondition(async function() {
-        let color = await ContentTask.spawn(test.win.gBrowser.selectedBrowser, null, async function() {
+        let color = await ContentTask.spawn(browser, null, async function() {
           let iframe = content.document.getElementById("iframe");
           let elem = iframe.contentDocument.getElementById("link");
           return content.QueryInterface(Ci.nsIInterfaceRequestor)
@@ -77,6 +71,8 @@
     }
   }
 
-  await BrowserTestUtils.closeWindow(normalWindow);
+  let promisePBExit = TestUtils.topicObserved("last-pb-context-exited");
   await BrowserTestUtils.closeWindow(privateWindow);
+  await promisePBExit;
+  await BrowserTestUtils.closeWindow(normalWindow);
 });
diff -Nru firefox-55.0~b4+build2/toolkit/content/aboutTelemetry.js firefox-55.0~b5+build1/toolkit/content/aboutTelemetry.js
--- firefox-55.0~b4+build2/toolkit/content/aboutTelemetry.js	2017-06-25 16:05:16.000000000 +0000
+++ firefox-55.0~b5+build1/toolkit/content/aboutTelemetry.js	2017-06-27 05:25:45.000000000 +0000
@@ -236,7 +236,13 @@
         } else {
           // Show the data choices preferences on desktop.
           let mainWindow = getMainWindowWithPreferencesPane();
-          mainWindow.openPreferences("privacy-reports", {origin: "aboutTelemetry"});
+          // The advanced subpanes are only supported in the old organization,
+          // which will be removed by bug 1349689.
+          if (Preferences.get("browser.preferences.useOldOrganization")) {
+            mainWindow.openAdvancedPreferences("dataChoicesTab", {origin: "aboutTelemetry"});
+          } else {
+            mainWindow.openPreferences("privacy-reports", {origin: "aboutTelemetry"});
+          }
         }
       });
     }
diff -Nru firefox-55.0~b4+build2/uriloader/exthandler/nsExternalHelperAppService.cpp firefox-55.0~b5+build1/uriloader/exthandler/nsExternalHelperAppService.cpp
--- firefox-55.0~b4+build2/uriloader/exthandler/nsExternalHelperAppService.cpp	2017-06-25 16:05:18.000000000 +0000
+++ firefox-55.0~b5+build1/uriloader/exthandler/nsExternalHelperAppService.cpp	2017-06-27 05:25:49.000000000 +0000
@@ -1287,7 +1287,6 @@
   MOZ_ASSERT(XRE_IsContentProcess(), "in child process");
   // Remove our request from the child loadGroup
   RetargetLoadNotifications(request);
-  MaybeCloseWindow();
 }
 
 NS_IMETHODIMP nsExternalAppHandler::SetWebProgressListener(nsIWebProgressListener2 * aWebProgressListener)
diff -Nru firefox-55.0~b4+build2/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js firefox-55.0~b5+build1/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js
--- firefox-55.0~b4+build2/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js	2017-06-25 16:05:18.000000000 +0000
+++ firefox-55.0~b5+build1/uriloader/exthandler/tests/mochitest/browser_auto_close_window.js	2017-06-27 05:25:49.000000000 +0000
@@ -47,33 +47,41 @@
 add_task(async function simple_navigation() {
   // Tests that simple navigation gives us the right windowContext (that is,
   // the window that we're using).
-  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, function* (browser) {
+  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, async function(browser) {
     let dialogAppeared = promiseHelperAppDialog();
-    yield BrowserTestUtils.synthesizeMouseAtCenter("#regular_load", {}, browser);
-    let windowContext = yield dialogAppeared;
+    await BrowserTestUtils.synthesizeMouseAtCenter("#regular_load", {}, browser);
+    let windowContext = await dialogAppeared;
 
     is(windowContext.gBrowser.selectedBrowser.currentURI.spec, URL,
        "got the right windowContext");
   });
 });
 
+// Given a browser pointing to download_page.html, clicks on the link that
+// opens with target="_blank" (i.e. a new tab) and ensures that we
+// automatically open and close that tab.
+async function testNewTab(browser) {
+  let targetURL = browser.currentURI.spec;
+  let dialogAppeared = promiseHelperAppDialog();
+  let tabOpened = BrowserTestUtils.waitForEvent(gBrowser.tabContainer, "TabOpen").then((event) => {
+    return [ event.target, BrowserTestUtils.tabRemoved(event.target) ];
+  });
+
+  await BrowserTestUtils.synthesizeMouseAtCenter("#target_blank", {}, browser);
+
+  let windowContext = await dialogAppeared;
+  is(windowContext.gBrowser.selectedBrowser.currentURI.spec, targetURL,
+     "got the right windowContext");
+  let [ tab, closed ] = await tabOpened;
+  await closed;
+  is(tab.linkedBrowser, null, "tab was opened and closed");
+}
+
 add_task(async function target_blank() {
   // Tests that a link with target=_blank opens a new tab and closes it,
   // returning the window that we're using for navigation.
-  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, function* (browser) {
-    let dialogAppeared = promiseHelperAppDialog();
-    let tabOpened = BrowserTestUtils.waitForEvent(gBrowser.tabContainer, "TabOpen").then((event) => {
-      return [ event.target, BrowserTestUtils.tabRemoved(event.target) ];
-    });
-
-    yield BrowserTestUtils.synthesizeMouseAtCenter("#target_blank", {}, browser);
-
-    let windowContext = yield dialogAppeared;
-    is(windowContext.gBrowser.selectedBrowser.currentURI.spec, URL,
-       "got the right windowContext");
-    let [ tab, closed ] = yield tabOpened;
-    yield closed;
-    is(tab.linkedBrowser, null, "tab was opened and closed");
+  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, async function(browser) {
+    await testNewTab(browser);
   });
 });
 
@@ -82,23 +90,42 @@
   // width and a height in window.open) opens a new window for the load,
   // realizes that we need to close that window and returns the *original*
   // window as the window context.
-  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, function* (browser) {
+  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, async function(browser) {
     let dialogAppeared = promiseHelperAppDialog();
     let windowOpened = BrowserTestUtils.waitForNewWindow(false);
 
-    yield BrowserTestUtils.synthesizeMouseAtCenter("#new_window", {}, browser);
+    await BrowserTestUtils.synthesizeMouseAtCenter("#new_window", {}, browser);
 
-    let windowContext = yield dialogAppeared;
+    let windowContext = await dialogAppeared;
     is(windowContext.gBrowser.selectedBrowser.currentURI.spec, URL,
        "got the right windowContext");
-    let win = yield windowOpened;
+    let win = await windowOpened;
 
     // The window should close on its own. If not, this test will time out.
-    yield BrowserTestUtils.domWindowClosed(win);
+    await BrowserTestUtils.domWindowClosed(win);
     ok(win.closed, "window was opened and closed");
   });
 });
 
+add_task(async function nested_window_opens() {
+  // Tests that the window auto-closing feature works if the download is
+  // initiated by a window that, itself, has an opener (see bug 1373109).
+  await BrowserTestUtils.withNewTab({ gBrowser, url: URL }, async function(outerBrowser) {
+    BrowserTestUtils.synthesizeMouseAtCenter("#open_in_new_tab", {}, outerBrowser);
+    let secondTab = await BrowserTestUtils.waitForNewTab(gBrowser, null, true);
+    let nestedBrowser = secondTab.linkedBrowser;
+
+    await ContentTask.spawn(nestedBrowser, null, function() {
+      ok(content.opener, "this window has an opener");
+    });
+
+    await testNewTab(nestedBrowser);
+
+    isnot(secondTab.linkedBrowser, null, "the page that triggered the download is still open");
+    await BrowserTestUtils.removeTab(secondTab);
+  });
+});
+
 add_task(async function cleanup() {
   // Unregister our factory from XPCOM and restore the original CID.
   registrar.unregisterFactory(MOCK_HELPERAPP_DIALOG_CID, mockHelperAppService);
diff -Nru firefox-55.0~b4+build2/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js firefox-55.0~b5+build1/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js
--- firefox-55.0~b4+build2/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js	2017-06-27 05:25:45.000000000 +0000
@@ -1,17 +1,17 @@
 let testURL = "http://example.com/browser/" +
   "uriloader/exthandler/tests/mochitest/protocolHandler.html";
 
-add_task(function*() {
+add_task(async function() {
   // Load a page registering a protocol handler.
   let browser = gBrowser.selectedBrowser;
   browser.loadURI(testURL);
-  yield BrowserTestUtils.browserLoaded(browser, testURL);
+  await BrowserTestUtils.browserLoaded(browser, false, testURL);
 
   // Register the protocol handler by clicking the notificationbar button.
   let notificationValue = "Protocol Registration: testprotocol";
   let getNotification = () =>
     gBrowser.getNotificationBox().getNotificationWithValue(notificationValue);
-  yield BrowserTestUtils.waitForCondition(getNotification);
+  await BrowserTestUtils.waitForCondition(getNotification);
   let notification = getNotification();
   let button =
     notification.getElementsByClassName("notification-button-default")[0];
@@ -43,29 +43,29 @@
 
   let promiseTabOpened =
     BrowserTestUtils.waitForNewTab(gBrowser, expectedURL);
-  yield BrowserTestUtils.synthesizeMouseAtCenter(link, {button: 1}, browser);
-  let tab = yield promiseTabOpened;
+  await BrowserTestUtils.synthesizeMouseAtCenter(link, {button: 1}, browser);
+  let tab = await promiseTabOpened;
   gBrowser.selectedTab = tab;
   is(gURLBar.value, expectedURL,
      "the expected URL is displayed in the location bar");
-  yield BrowserTestUtils.removeTab(tab);
+  await BrowserTestUtils.removeTab(tab);
 
   // Shift-click the testprotocol link and check the new window.
   let newWindowPromise = BrowserTestUtils.waitForNewWindow();
-  yield BrowserTestUtils.synthesizeMouseAtCenter(link, {shiftKey: true},
+  await BrowserTestUtils.synthesizeMouseAtCenter(link, {shiftKey: true},
                                                  browser);
-  let win = yield newWindowPromise;
-  yield BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
-  yield BrowserTestUtils.waitForCondition(() => win.gBrowser.currentURI.spec == expectedURL);
+  let win = await newWindowPromise;
+  await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
+  await BrowserTestUtils.waitForCondition(() => win.gBrowser.currentURI.spec == expectedURL);
   is(win.gURLBar.value, expectedURL,
      "the expected URL is displayed in the location bar");
-  yield BrowserTestUtils.closeWindow(win);
+  await BrowserTestUtils.closeWindow(win);
 
   // Click the testprotocol link and check the url in the current tab.
   let loadPromise = BrowserTestUtils.browserLoaded(browser);
-  yield BrowserTestUtils.synthesizeMouseAtCenter(link, {}, browser);
-  yield loadPromise;
-  yield BrowserTestUtils.waitForCondition(() => gURLBar.value != testURL);
+  await BrowserTestUtils.synthesizeMouseAtCenter(link, {}, browser);
+  await loadPromise;
+  await BrowserTestUtils.waitForCondition(() => gURLBar.value != testURL);
   is(gURLBar.value, expectedURL,
      "the expected URL is displayed in the location bar");
 
diff -Nru firefox-55.0~b4+build2/uriloader/exthandler/tests/mochitest/download_page.html firefox-55.0~b5+build1/uriloader/exthandler/tests/mochitest/download_page.html
--- firefox-55.0~b4+build2/uriloader/exthandler/tests/mochitest/download_page.html	2017-06-25 16:05:17.000000000 +0000
+++ firefox-55.0~b5+build1/uriloader/exthandler/tests/mochitest/download_page.html	2017-06-27 05:25:46.000000000 +0000
@@ -15,4 +15,5 @@
   <a href="download.bin" id="regular_load">regular load</a>
   <a href="download.bin" id="target_blank" target="_blank">target blank</a>
   <a href="#" onclick="launch_download(); return false" id="new_window">new window</a>
+  <a href="#" onclick="window.open('download_page.html?newwin'); return false" id="open_in_new_tab">click to reopen</a>
 </body>
diff -Nru firefox-55.0~b4+build2/view/nsView.cpp firefox-55.0~b5+build1/view/nsView.cpp
--- firefox-55.0~b4+build2/view/nsView.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/view/nsView.cpp	2017-06-27 05:25:45.000000000 +0000
@@ -68,10 +68,6 @@
 
   bool printRelated = mViewManager && mViewManager->GetPrintRelated();
 
-  if (mViewManager && (mViewManager->GetRootView() == this)) {
-    MOZ_RELEASE_ASSERT(!GetFirstChild());
-  }
-
   while (GetFirstChild())
   {
     nsView* child = GetFirstChild();
@@ -476,8 +472,6 @@
     {
       aChild->SetNextSibling(mFirstChild);
       mFirstChild = aChild;
-      MOZ_RELEASE_ASSERT(!mFirstChild || mFrame ||
-        mFirstChild->GetViewManager() != GetViewManager());
     }
     aChild->SetParent(this);
 
diff -Nru firefox-55.0~b4+build2/xpcom/threads/nsThreadUtils.cpp firefox-55.0~b5+build1/xpcom/threads/nsThreadUtils.cpp
--- firefox-55.0~b4+build2/xpcom/threads/nsThreadUtils.cpp	2017-06-25 16:05:26.000000000 +0000
+++ firefox-55.0~b5+build1/xpcom/threads/nsThreadUtils.cpp	2017-06-27 05:25:46.000000000 +0000
@@ -370,6 +370,11 @@
 {
   nsCOMPtr<nsIRunnable> event(Move(aEvent));
   NS_ENSURE_TRUE(event, NS_ERROR_INVALID_ARG);
+
+  //XXX Using current thread for now as the nsIEventTarget.
+  nsIEventTarget* target = NS_GetCurrentThread();
+  NS_ENSURE_STATE(target);
+
   nsCOMPtr<nsIIdleRunnable> idleEvent = do_QueryInterface(event);
 
   if (!idleEvent) {
@@ -377,9 +382,7 @@
     event = do_QueryInterface(idleEvent);
     MOZ_DIAGNOSTIC_ASSERT(event);
   }
-
-  //XXX Using current thread for now as the nsIEventTarget.
-  idleEvent->SetTimer(aTimeout, NS_GetCurrentThread());
+  idleEvent->SetTimer(aTimeout, target);
 
   return NS_IdleDispatchToCurrentThread(event.forget());
 }