Merge mozilla-inbound to mozilla-central. a=merge

mozilla · Nov 28, 2018 · e1e8f2e · e1e8f2e
2 parents 2febd96 + 495265a
commit e1e8f2e
Show file tree

Hide file tree

Showing 187 changed files with 2,926 additions and 1,424 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/browser/components/extensions/schemas/menus.json b/browser/components/extensions/schemas/menus.json
@@ -113,6 +113,12 @@
             "optional": true,
             "description": "The URL of the page where the menu item was clicked. This property is not set if the click occured in a context where there is no current page, such as in a launcher context menu."
           },
+          "frameId": {
+           "type": "integer",
+           "optional": true,
+           "minimum": 0,
+           "description": "The id of the frame of the element where the context menu was clicked."
+          },
           "frameUrl": {
             "type": "string",
             "optional": true,

diff --git a/browser/components/payments/res/containers/address-form.js b/browser/components/payments/res/containers/address-form.js
@@ -412,12 +412,12 @@ export default class AddressForm extends PaymentStateSubscriberMixin(PaymentRequ
         return paymentDetails.shippingAddressErrors;
       }
       case "selectedPayerAddress": {
-        return paymentDetails.payer;
+        return paymentDetails.payerErrors;
       }
       case "basic-card-page|billingAddressGUID": {
         // `paymentMethod` can be null.
-        return (paymentDetails.paymentMethod
-                && paymentDetails.paymentMethod.billingAddress) || {};
+        return (paymentDetails.paymentMethodErrors
+                && paymentDetails.paymentMethodErrors.billingAddress) || {};
       }
       default: {
         throw new Error("Unknown selectedStateKey");

diff --git a/browser/components/payments/res/debugging.js b/browser/components/payments/res/debugging.js
@@ -53,8 +53,8 @@ let REQUEST_1 = {
         },
       },
     ],
-    payer: {},
-    paymentMethod: {},
+    payerErrors: {},
+    paymentMethodErrors: {},
     shippingAddressErrors: {},
     shippingOptions: [
       {
@@ -135,8 +135,8 @@ let REQUEST_2 = {
         },
       },
     ],
-    payer: {},
-    paymentMethod: {},
+    payerErrors: {},
+    paymentMethoErrors: {},
     shippingAddressErrors: {},
     shippingOptions: [
       {
@@ -487,7 +487,7 @@ let buttonActions = {
   setBasicCardErrors() {
     let request = Object.assign({}, requestStore.getState().request);
     request.paymentDetails = Object.assign({}, requestStore.getState().request.paymentDetails);
-    request.paymentDetails.paymentMethod = {
+    request.paymentDetails.paymentMethodErrors = {
       cardNumber: "",
       cardholderName: "",
       cardSecurityCode: "",
@@ -530,7 +530,7 @@ let buttonActions = {
   setPayerErrors() {
     let request = Object.assign({}, requestStore.getState().request);
     request.paymentDetails = Object.assign({}, requestStore.getState().request.paymentDetails);
-    request.paymentDetails.payer = {
+    request.paymentDetails.payerErrors = {
       email: "Only @mozilla.com emails are supported",
       name: "Payer name must start with M",
       phone: "Payer area codes must start with 1",

diff --git a/browser/components/payments/res/mixins/PaymentStateSubscriberMixin.js b/browser/components/payments/res/mixins/PaymentStateSubscriberMixin.js
@@ -46,8 +46,8 @@ export let requestStore = new PaymentsStore({
       id: null,
       totalItem: {label: null, amount: {currency: null, value: 0}},
       displayItems: [],
-      payer: {},
-      paymentMethod: null,
+      payerErrors: {},
+      paymentMethodErrors: null,
       shippingAddressErrors: {},
       shippingOptions: [],
       modifiers: null,

diff --git a/browser/components/payments/test/mochitest/test_address_form.html b/browser/components/payments/test/mochitest/test_address_form.html
@@ -708,7 +708,7 @@
   await form.requestStore.setState({
     request: {
       paymentDetails: {
-        paymentMethod: {
+        paymentMethodErrors: {
           billingAddress: {
             addressLine: "Billing Street address needs to start with a D",
             city: "Billing City needs to start with a B",
@@ -753,7 +753,7 @@
     },
     request: {
       paymentDetails: {
-        payer: {
+        payerErrors: {
           email: "Email must be @mozilla.org",
           name: "Name needs to start with a W",
           phone: "Telephone needs to start with a 1",
@@ -771,7 +771,7 @@
 
   function checkValidationMessage(selector, property) {
     is(form.form.querySelector(selector).validationMessage,
-       state.request.paymentDetails.payer[property],
+       state.request.paymentDetails.payerErrors[property],
        "Validation message should match for " + selector);
   }
 
@@ -786,7 +786,7 @@
   await form.requestStore.setState({
     request: {
       paymentDetails: {
-        payer: {},
+        payerErrors: {},
       },
       paymentOptions: {},
     },

diff --git a/browser/components/payments/test/mochitest/test_address_picker.html b/browser/components/payments/test/mochitest/test_address_picker.html
@@ -256,10 +256,10 @@
   info("Set billing address and payer errors which aren't relevant to this picker");
   let requestWithNonShippingAddressErrors = deepClone(request);
   Object.assign(requestWithNonShippingAddressErrors.paymentDetails, {
-    payer: {
+    payerErrors: {
       name: "Your name is too short",
     },
-    paymentMethod: {
+    paymentMethodErrors: {
       billingAddress: {
         country: "Your billing country is not supported",
       },

diff --git a/browser/components/urlbar/tests/browser/browser.ini b/browser/components/urlbar/tests/browser/browser.ini
@@ -9,6 +9,7 @@ support-files =
 [browser_UrlbarInput_formatValue.js]
 [browser_UrlbarInput_overflow.js]
 [browser_UrlbarInput_tooltip.js]
+skip-if = asan # Bug 1504985
 [browser_UrlbarInput_trimURLs.js]
 subsuite = clipboard
 [browser_UrlbarInput_unit.js]

diff --git a/browser/modules/AsyncTabSwitcher.jsm b/browser/modules/AsyncTabSwitcher.jsm
@@ -748,6 +748,7 @@ class AsyncTabSwitcher {
         if (time != -1) {
           TelemetryStopwatch.finish("FX_TAB_SWITCH_COMPOSITE_E10S_MS", this.window);
           this.log("DEBUG: tab switch time including compositing = " + time);
+          this._tabSwitchStopWatchRunning = false;
         }
       }
       this.addMarker("AsyncTabSwitch:Composited");

diff --git a/build/automation.py.in b/build/automation.py.in
@@ -504,7 +504,7 @@ class Automation(object):
              debuggerInfo = None, symbolsPath = None,
              timeout = -1, maxTime = None, onLaunch = None,
              detectShutdownLeaks = False, screenshotOnFail=False, testPath=None, bisectChunk=None,
-             valgrindPath=None, valgrindArgs=None, valgrindSuppFiles=None, outputHandler=None):
+             valgrindPath=None, valgrindArgs=None, valgrindSuppFiles=None, outputHandler=None, e10s=True):
     """
     Run the app, log the duration it took to execute, return the status code.
     Kills the app if it runs for longer than |maxTime| seconds, or outputs nothing for |timeout| seconds.