Merge inbound to mozilla-central. a=merge

aosmond · Aug 8, 2018 · 5629338 · 5629338
2 parents 5962fb2 + 20bdd17
commit 5629338
Show file tree

Hide file tree

Showing 245 changed files with 2,495 additions and 12,704 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/browser/base/content/browser-ctrlTab.js b/browser/base/content/browser-ctrlTab.js
@@ -9,15 +9,6 @@
  * Tab previews utility, produces thumbnails
  */
 var tabPreviews = {
-  init: function tabPreviews_init() {
-    if (this._selectedTab)
-      return;
-    this._selectedTab = gBrowser.selectedTab;
-
-    gBrowser.tabContainer.addEventListener("TabSelect", this);
-    gBrowser.tabContainer.addEventListener("SSTabRestored", this);
-  },
-
   get aspectRatio() {
     let { PageThumbUtils } = ChromeUtils.import("resource://gre/modules/PageThumbUtils.jsm", {});
     let [ width, height ] = PageThumbUtils.getThumbnailSize(window);
@@ -70,33 +61,6 @@ var tabPreviews = {
     });
     return canvas;
   },
-
-  handleEvent: function tabPreviews_handleEvent(event) {
-    switch (event.type) {
-      case "TabSelect":
-        if (this._selectedTab &&
-            this._selectedTab.parentNode &&
-            !this._pendingUpdate) {
-          // Generate a thumbnail for the tab that was selected.
-          // The timeout keeps the UI snappy and prevents us from generating thumbnails
-          // for tabs that will be closed. During that timeout, don't generate other
-          // thumbnails in case multiple TabSelect events occur fast in succession.
-          this._pendingUpdate = true;
-          setTimeout(function(self, aTab) {
-            self._pendingUpdate = false;
-            if (aTab.parentNode &&
-                !aTab.hasAttribute("busy") &&
-                !aTab.hasAttribute("pending"))
-              self.capture(aTab, true);
-          }, 2000, this, this._selectedTab);
-        }
-        this._selectedTab = event.target;
-        break;
-      case "SSTabRestored":
-        this.capture(event.target, true);
-        break;
-    }
-  }
 };
 
 var tabPreviewPanelHelper = {
@@ -206,8 +170,6 @@ var ctrlTab = {
 
   init: function ctrlTab_init() {
     if (!this._recentlyUsedTabs) {
-      tabPreviews.init();
-
       this._initRecentlyUsedTabs();
       this._init(true);
     }

diff --git a/browser/base/content/test/general/browser_gZipOfflineChild.js b/browser/base/content/test/general/browser_gZipOfflineChild.js
@@ -18,6 +18,8 @@ registerCleanupFunction(function() {
 // offline cache events.
 //
 function contentTask() {
+  ChromeUtils.import("resource://gre/modules/Timer.jsm");
+
   let resolve;
   let promise = new Promise(r => { resolve = r; });
 

diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js
@@ -24,6 +24,8 @@ const whitelist = {
   ]),
   modules: new Set([
     "chrome://mochikit/content/ShutdownLeaksCollector.jsm",
+    "resource://specialpowers/specialpowers.js",
+    "resource://specialpowers/specialpowersAPI.js",
 
     // General utilities
     "resource://gre/modules/AppConstants.jsm",

diff --git a/browser/base/content/test/popupNotifications/browser_displayURI.js b/browser/base/content/test/popupNotifications/browser_displayURI.js
@@ -92,6 +92,7 @@ add_task(async function test_displayURI_camera() {
 
 add_task(async function test_displayURI_geo_blob() {
   await check(async function() {
+    Cu.importGlobalProperties(["Blob"]);
     let text = "<script>navigator.geolocation.getCurrentPosition(() => {})</script>";
     let blob = new Blob([text], {type: "text/html"});
     let url = content.URL.createObjectURL(blob);
@@ -101,6 +102,7 @@ add_task(async function test_displayURI_geo_blob() {
 
 add_task(async function test_displayURI_camera_blob() {
   await check(async function() {
+    Cu.importGlobalProperties(["Blob"]);
     let text = "<script>navigator.mediaDevices.getUserMedia({video: true, fake: true})</script>";
     let blob = new Blob([text], {type: "text/html"});
     let url = content.URL.createObjectURL(blob);

diff --git a/browser/base/content/test/webrtc/get_user_media_content_script.js b/browser/base/content/test/webrtc/get_user_media_content_script.js
@@ -3,6 +3,7 @@
 
 /* eslint-env mozilla/frame-script */
 
+ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 XPCOMUtils.defineLazyServiceGetter(this, "MediaManagerService",
                                    "@mozilla.org/mediaManagerService;1",

diff --git a/browser/components/newtab/test/browser/browser_topsites_section.js b/browser/components/newtab/test/browser/browser_topsites_section.js
@@ -65,7 +65,7 @@ test_newtab({
   // it should be able to click the topsites edit button to reveal the edit topsites modal and overlay.
   test: async function topsites_add() {
     let nativeInputValueSetter = Object.getOwnPropertyDescriptor(content.window.HTMLInputElement.prototype, "value").set;
-    let event = new Event("input", {bubbles: true});
+    let event = new content.Event("input", {bubbles: true});
 
     // Find the add topsites button
     content.document.querySelector(".top-sites .section-top-bar .context-menu-button").click();

diff --git a/browser/components/payments/content/paymentDialogFrameScript.js b/browser/components/payments/content/paymentDialogFrameScript.js
@@ -90,12 +90,12 @@ let PaymentFrameScript = {
       },
 
       getDefaultPreferences() {
-        let prefValues = {
+        let prefValues = Cu.cloneInto({
           saveCreditCardDefaultChecked:
             Services.prefs.getBoolPref(SAVE_CREDITCARD_DEFAULT_PREF, false),
           saveAddressDefaultChecked:
             Services.prefs.getBoolPref(SAVE_ADDRESS_DEFAULT_PREF, false),
-        };
+        }, waivedContent);
         return prefValues;
       },
     };

diff --git a/browser/components/uitour/test/head.js b/browser/components/uitour/test/head.js
@@ -323,7 +323,7 @@ function loadUITourTestPage(callback, host = "https://example.org/") {
               let callbacksCalled = 0;
               let resolveCallbackPromise;
               let allCallbacksCalledPromise = new Promise(resolve => resolveCallbackPromise = resolve);
-              let argumentsWithFunctions = contentArgs.args.map((arg, index) => {
+              let argumentsWithFunctions = Cu.cloneInto(contentArgs.args.map((arg, index) => {
                 if (arg === "" && contentArgs.fnIndices.includes(index)) {
                   return function() {
                     callbacksCalled++;
@@ -334,9 +334,9 @@ function loadUITourTestPage(callback, host = "https://example.org/") {
                   };
                 }
                 return arg;
-              });
+              }), content, {cloneFunctions: true});
               let rv = contentWin.Mozilla.UITour[contentArgs.methodName].apply(contentWin.Mozilla.UITour,
-                                                                        argumentsWithFunctions);
+                                                                               argumentsWithFunctions);
               if (contentArgs.fnIndices.length) {
                 await allCallbacksCalledPromise;
               }

diff --git a/config/external/nspr/pr/moz.build b/config/external/nspr/pr/moz.build
@@ -93,8 +93,12 @@ elif CONFIG['OS_TARGET'] == 'WINNT':
       DEFINES['DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS'] = True
     if CONFIG['CPU_ARCH'] == 'x86_64':
         DEFINES['_AMD64_'] = True
-    else:
+    elif CONFIG['CPU_ARCH'] == 'x86':
         DEFINES['_X86_'] = True
+    elif CONFIG['CPU_ARCH'] == 'aarch64':
+        DEFINES['_ARM64_'] = True
+    else:
+        error('Unsupported CPU_ARCH value: %s' % CONFIG['CPU_ARCH'])
 else:
     error('Not a supported OS_TARGET for NSPR in moz.build: "%s". Use --with-system-nspr' % CONFIG['OS_TARGET'])
 

diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/new/README.mozilla
@@ -1,9 +1,9 @@
 This is the debugger.html project output.
 See https://github.com/devtools-html/debugger.html
 
-Version 78
+Version 79
 
-Comparison: https://github.com/devtools-html/debugger.html/compare/release-77...release-78
+Comparison: https://github.com/devtools-html/debugger.html/compare/release-78...release-79
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.2