Merge mozilla-central to autoland. a=merge CLOSED TREE

dothq · Oct 2, 2018 · 9e3b348 · 9e3b348
2 parents a1c2ceb + fc5031a
commit 9e3b348
Show file tree

Hide file tree

Showing 57 changed files with 13,047 additions and 5,997 deletions.
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
@@ -498,18 +498,6 @@
                             key="key_viewSource"
                             command="View:PageSource"
                             accesskey="&pageSourceCmd.accesskey;"/>
-                  <menuitem id="menu_devtools_recordExecution"
-                            label="&devtoolsRecordExecution.label;"
-                            command="Tools:RecordExecution"
-                            hidden="true"/>
-                  <menuitem id="menu_devtools_saveRecording"
-                            label="&devtoolsSaveRecording.label;"
-                            command="Tools:SaveRecording"
-                            hidden="true"/>
-                  <menuitem id="menu_devtools_replayExecution"
-                            label="&devtoolsReplayExecution.label;"
-                            command="Tools:ReplayExecution"
-                            hidden="true"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
@@ -94,9 +94,6 @@
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
     <command id="Tools:Sanitize" oncommand="Sanitizer.showUI(window);"/>
-    <command id="Tools:RecordExecution" oncommand="BeginRecordExecution()"/>
-    <command id="Tools:SaveRecording" oncommand="SaveRecordedExecution()"/>
-    <command id="Tools:ReplayExecution" oncommand="BeginReplayExecution()"/>
     <command id="Tools:PrivateBrowsing"
       oncommand="OpenBrowserWindow({private: true});"/>
     <command id="History:UndoCloseTab" oncommand="undoCloseTab();"/>

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -7245,35 +7245,6 @@ function BrowserOpenAddonsMgr(aView) {
   });
 }
 
-function BeginRecordExecution() {
-  gBrowser.selectedTab = gBrowser.addWebTab("about:blank", { recordExecution: "*" });
-}
-
-function SaveRecordedExecution() {
-  let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-  let window = gBrowser.ownerGlobal;
-  fp.init(window, null, Ci.nsIFilePicker.modeSave);
-  fp.open(rv => {
-    if (rv == Ci.nsIFilePicker.returnOK || rv == Ci.nsIFilePicker.returnReplace) {
-      var tabParent = gBrowser.selectedTab.linkedBrowser.frameLoader.tabParent;
-      if (!tabParent || !tabParent.saveRecording(fp.file.path)) {
-        window.alert("Current tab is not recording");
-      }
-    }
-  });
-}
-
-function BeginReplayExecution() {
-  let fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
-  let window = gBrowser.ownerGlobal;
-  fp.init(window, null, Ci.nsIFilePicker.modeOpen);
-  fp.open(rv => {
-    if (rv == Ci.nsIFilePicker.returnOK || rv == Ci.nsIFilePicker.returnReplace) {
-      gBrowser.selectedTab = gBrowser.addWebTab(null, { replayExecution: fp.file.path });
-    }
-  });
-}
-
 function AddKeywordForSearchField() {
   let mm = gBrowser.selectedBrowser.messageManager;
 

diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
@@ -1554,6 +1554,7 @@ window._gBrowser = {
     opener,
     remoteType,
     sameProcessAsFrameLoader,
+    recordExecution,
   } = {}) {
     let isRemote = aBrowser.getAttribute("remote") == "true";
 
@@ -1627,6 +1628,14 @@ window._gBrowser = {
       aBrowser.removeAttribute("remoteType");
     }
 
+    if (recordExecution) {
+      aBrowser.setAttribute("recordExecution", recordExecution);
+
+      // Web Replay middleman processes need the default URL to be loaded in
+      // order to set up their rendering state.
+      aBrowser.setAttribute("nodefaultsrc", "false");
+    }
+
     // NB: This works with the hack in the browser constructor that
     // turns this normal property into a field.
     if (sameProcessAsFrameLoader) {

diff --git a/browser/components/payments/res/containers/address-form.js b/browser/components/payments/res/containers/address-form.js
@@ -44,7 +44,7 @@ export default class AddressForm extends PaymentStateSubscriberMixin(PaymentRequ
     this.persistCheckbox = new LabelledCheckbox();
     this.persistCheckbox.className = "persist-checkbox";
 
-    // Combination of AddressErrors and PayerErrorFields as keys
+    // Combination of AddressErrors and PayerErrors as keys
     this._errorFieldMap = {
       addressLine: "#street-address",
       city: "#address-level2",

diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -312,10 +312,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
 <!ENTITY webDeveloperMenu.label       "Web Developer">
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
-<!ENTITY devtoolsRecordExecution.label "Record Execution">
-<!ENTITY devtoolsSaveRecording.label "Save Recording">
-<!ENTITY devtoolsReplayExecution.label "Replay Execution">
-
 <!ENTITY inspectContextMenu.label     "Inspect Element">
 <!ENTITY inspectContextMenu.accesskey "Q">
 

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 89
+Version 90
 
-Comparison: https://github.com/devtools-html/debugger.html/compare/release-88...release-89
+Comparison: https://github.com/devtools-html/debugger.html/compare/release-89...release-90
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.2