Merge inbound to mozilla-central. a=merge

xeonchen · Nov 6, 2018 · 8ea5d6d · 8ea5d6d
2 parents ca0dc06 + baad3cc
commit 8ea5d6d
Show file tree

Hide file tree

Showing 127 changed files with 1,363 additions and 692 deletions.
diff --git a/accessible/tests/browser/e10s/browser.ini b/accessible/tests/browser/e10s/browser.ini
@@ -34,6 +34,7 @@ skip-if = e10s && os == 'win' && debug # Bug 1338034, leaks
 [browser_treeupdate_ariadialog.js]
 [browser_treeupdate_ariaowns.js]
 [browser_treeupdate_canvas.js]
+skip-if = (os == 'win' && os_version == '10.0' && bits == 64 && !debug) #Bug 1462638 - Disabled on Win10 opt/pgo for frequent failures
 [browser_treeupdate_cssoverflow.js]
 [browser_treeupdate_doc.js]
 skip-if = e10s && os == 'win' # Bug 1288839

diff --git a/browser/components/translation/TranslationContentHandler.jsm b/browser/components/translation/TranslationContentHandler.jsm
@@ -78,8 +78,7 @@ TranslationContentHandler.prototype = {
       return;
 
     // Grab a 60k sample of text from the page.
-    let encoder = Cc["@mozilla.org/layout/documentEncoder;1?type=text/plain"]
-                    .createInstance(Ci.nsIDocumentEncoder);
+    let encoder = Cu.createDocumentEncoder("text/plain");
     encoder.init(content.document, "text/plain", encoder.SkipInvisibleContent);
     let string = encoder.encodeToStringWithMaxLength(60 * 1024);
 

diff --git a/chrome/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp
@@ -605,28 +605,6 @@ nsChromeRegistry::GetDirectionForLocale(const nsACString& aLocale)
   return uloc_isRightToLeft(locale.get());
 }
 
-NS_IMETHODIMP_(bool)
-nsChromeRegistry::WrappersEnabled(nsIURI *aURI)
-{
-  nsCOMPtr<nsIURL> chromeURL (do_QueryInterface(aURI));
-  if (!chromeURL)
-    return false;
-
-  bool isChrome = false;
-  nsresult rv = chromeURL->SchemeIs("chrome", &isChrome);
-  if (NS_FAILED(rv) || !isChrome)
-    return false;
-
-  nsAutoCString package;
-  rv = chromeURL->GetHostPort(package);
-  if (NS_FAILED(rv))
-    return false;
-
-  uint32_t flags;
-  rv = GetFlagsFromPackage(package, &flags);
-  return NS_SUCCEEDED(rv) && (flags & XPCNATIVEWRAPPERS);
-}
-
 already_AddRefed<nsChromeRegistry>
 nsChromeRegistry::GetSingleton()
 {

diff --git a/chrome/nsChromeRegistry.h b/chrome/nsChromeRegistry.h
@@ -49,8 +49,6 @@ class nsChromeRegistry : public nsIToolkitChromeRegistry,
   NS_IMETHOD MustLoadURLRemotely(nsIURI* url,
                                  bool* _retval) override;
 
-  // nsIChromeRegistry methods:
-  NS_IMETHOD_(bool) WrappersEnabled(nsIURI *aURI) override;
   NS_IMETHOD ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult) override;
 
   // nsChromeRegistry methods:

diff --git a/chrome/nsIChromeRegistry.idl b/chrome/nsIChromeRegistry.idl
@@ -38,11 +38,6 @@ interface nsIChromeRegistry : nsISupports
    * refresh the chrome list at runtime, looking for new packages/etc
    */
   void checkForNewChrome();
-
-  /**
-   * returns whether XPCNativeWrappers are enabled for aURI.
-   */
-  [notxpcom] boolean wrappersEnabled(in nsIURI aURI);
 };
 
 [scriptable, uuid(93251ddf-5e85-4172-ac2a-31780562974f)]

diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
@@ -277,6 +277,7 @@ devtools.jar:
     content/netmonitor/src/assets/styles/httpi.css (netmonitor/src/assets/styles/httpi.css)
     content/netmonitor/src/assets/styles/netmonitor.css (netmonitor/src/assets/styles/netmonitor.css)
     content/netmonitor/src/assets/styles/NetworkDetailsPanel.css (netmonitor/src/assets/styles/NetworkDetailsPanel.css)
+    content/netmonitor/src/assets/styles/CustomRequestPanel.css (netmonitor/src/assets/styles/CustomRequestPanel.css)
     content/netmonitor/src/assets/styles/RequestList.css (netmonitor/src/assets/styles/RequestList.css)
     content/netmonitor/src/assets/styles/StatisticsPanel.css (netmonitor/src/assets/styles/StatisticsPanel.css)
     content/netmonitor/src/assets/styles/StatusBar.css (netmonitor/src/assets/styles/StatusBar.css)

diff --git a/devtools/client/locales/en-US/netmonitor.properties b/devtools/client/locales/en-US/netmonitor.properties
@@ -1057,17 +1057,25 @@ netmonitor.context.perfTools.accesskey=A
 # as the title of the new custom request form
 netmonitor.custom.newRequest=New Request
 
+# LOCALIZATION NOTE (netmonitor.custom.newRequestMethodLabel): This is the label displayed
+# above the method text input field of the new custom request form
+netmonitor.custom.newRequestMethodLabel=Method
+
+# LOCALIZATION NOTE (netmonitor.custom.newRequestUrlLabel): This is the label displayed
+# above the url text input field of the new custom request form
+netmonitor.custom.newRequestUrlLabel=URL
+
 # LOCALIZATION NOTE (netmonitor.custom.query): This is the label displayed
 # above the query string entry in the custom request form
-netmonitor.custom.query=Query String:
+netmonitor.custom.query=Query String
 
 # LOCALIZATION NOTE (netmonitor.custom.headers): This is the label displayed
 # above the request headers entry in the custom request form
-netmonitor.custom.headers=Request Headers:
+netmonitor.custom.headers=Request Headers
 
 # LOCALIZATION NOTE (netmonitor.custom.postData): This is the label displayed
 # above the request body entry in the custom request form
-netmonitor.custom.postData=Request Body:
+netmonitor.custom.postData=Request Body
 
 # LOCALIZATION NOTE (netmonitor.custom.send): This is the label displayed
 # on the button which sends the custom request

diff --git a/devtools/client/netmonitor/src/assets/styles/CustomRequestPanel.css b/devtools/client/netmonitor/src/assets/styles/CustomRequestPanel.css
@@ -0,0 +1,138 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+.network-monitor .custom-method-and-url .custom-method-value-label {
+  grid-column: 1 / 1;
+  grid-row: 1 / 1;
+}
+
+.network-monitor .custom-method-and-url .custom-url-value{
+  grid-column: 2 / 2;
+  grid-row: 2 / 2;
+}
+
+.network-monitor .custom-method-and-url .custom-method-value {
+  grid-column: 1 / 1;
+  grid-row: 2 / 2;
+}
+
+
+.network-monitor .custom-method-and-url .custom-url-value-label {
+  grid-column: 2 / 2;
+  grid-row: 1 / 1 ;
+  margin-left: 12px;
+}
+
+.network-monitor .tabpanel-summary-container.custom-method-and-url {
+  display: grid;
+  grid-template-columns: auto 1fr;
+}
+
+.network-monitor .custom-method-and-url input {
+  font-weight: 400;
+  margin-top: 4px;
+  padding: 2px 3px;
+}
+
+.network-monitor .custom-request-panel textarea {
+  font-weight: 400;
+  margin-top: 4px;
+  padding: 8px;
+}
+
+.network-monitor .custom-method-and-url .custom-url-value {
+  margin-left: 12px;
+}
+
+.network-monitor .custom-request-panel {
+  padding-left: 0;
+  padding-right: 0;
+}
+
+.network-monitor .custom-request-panel > div:not(.custom-request) {
+  margin-bottom: 12px;
+  padding-left: 16px;
+  padding-right: 16px;
+}
+
+.network-monitor .custom-request {
+  flex-direction: row-reverse;
+  flex-wrap: wrap;
+  padding: 0;
+}
+
+.network-monitor .custom-request-panel .custom-request-label {
+  font-weight: 400;
+}
+
+.network-monitor .custom-request button {
+  align-self: flex-end;
+  height: 24px;
+  padding-left: 8px;
+  padding-right: 8px;
+  width: auto;
+}
+
+.network-monitor .custom-request #custom-request-send-button {
+  background-color: var(--blue-60);
+  color: white;
+  margin-left: 4px;
+  margin-right: 16px;
+}
+
+.network-monitor .custom-request .custom-header {
+  border-bottom-width: 1px;
+  border-style: solid;
+  border-width: 0;
+  flex: 1 0 100%;
+  height: 24px;
+  margin-bottom: 16px;
+  padding: 4px 16px;
+}
+
+:root.theme-dark .network-details-panel .custom-request-panel {
+  background-color: var(--grey-85);
+}
+
+:root.theme-dark .network-monitor #custom-request-close-button {
+  background-color: var(--toolbarbutton-background);
+  border: 1px solid var(--theme-splitter-color);
+}
+
+:root.theme-dark .network-monitor .custom-request-label.custom-header {
+  background-color: var(--grey-80);
+  border-bottom: 1px solid var(--theme-splitter-color);
+}
+
+:root.theme-dark .network-details-panel .custom-request-panel input,
+:root.theme-dark .network-details-panel .custom-request-panel textarea {
+  background-color: var(--grey-70);
+  border: 1px solid var(--grey-85);
+  color: white;
+}
+
+:root.theme-dark .network-monitor .custom-request-label {
+  color: var(--grey-40);
+}
+
+:root.theme-light .network-details-panel .custom-request-label.custom-header {
+  background-color: var(--grey-10);
+  border-bottom: 1px solid var(--grey-25);
+}
+
+:root.theme-light .network-monitor #custom-request-close-button {
+  background-color: var(--grey-20);
+}
+
+:root.theme-light .network-details-panel .custom-request-panel input,
+:root.theme-light .network-details-panel .custom-request-panel textarea {
+  background-color: white;
+  border: 1px solid var(--grey-25);
+  color: var(--grey-90);
+}
+
+:root.theme-light .network-monitor .custom-request-label {
+  color: var(--grey-60);
+}
diff --git a/devtools/client/netmonitor/src/assets/styles/netmonitor.css b/devtools/client/netmonitor/src/assets/styles/netmonitor.css
@@ -20,6 +20,7 @@
 @import "chrome://devtools/content/netmonitor/src/assets/styles/RequestList.css";
 @import "chrome://devtools/content/netmonitor/src/assets/styles/NetworkDetailsPanel.css";
 @import "chrome://devtools/content/netmonitor/src/assets/styles/StatisticsPanel.css";
+@import "chrome://devtools/content/netmonitor/src/assets/styles/CustomRequestPanel.css";
 @import "chrome://devtools/content/netmonitor/src/assets/styles/StatusCode.css";
 
 /* General */

diff --git a/devtools/client/netmonitor/src/components/CustomRequestPanel.js b/devtools/client/netmonitor/src/components/CustomRequestPanel.js
@@ -22,12 +22,17 @@ const {
   button,
   div,
   input,
+  label,
   textarea,
 } = dom;
 
 const CUSTOM_CANCEL = L10N.getStr("netmonitor.custom.cancel");
 const CUSTOM_HEADERS = L10N.getStr("netmonitor.custom.headers");
 const CUSTOM_NEW_REQUEST = L10N.getStr("netmonitor.custom.newRequest");
+const CUSTOM_NEW_REQUEST_METHOD_LABEL =
+    L10N.getStr("netmonitor.custom.newRequestMethodLabel");
+const CUSTOM_NEW_REQUEST_URL_LABEL =
+    L10N.getStr("netmonitor.custom.newRequestUrlLabel");
 const CUSTOM_POSTDATA = L10N.getStr("netmonitor.custom.postData");
 const CUSTOM_QUERY = L10N.getStr("netmonitor.custom.query");
 const CUSTOM_SEND = L10N.getStr("netmonitor.custom.send");
@@ -212,6 +217,12 @@ class CustomRequestPanel extends Component {
           className: "tabpanel-summary-container custom-method-and-url",
           id: "custom-method-and-url",
         },
+          label({
+            className: "custom-method-value-label custom-request-label",
+            htmlFor: "custom-method-value",
+          },
+            CUSTOM_NEW_REQUEST_METHOD_LABEL,
+          ),
           input({
             className: "custom-method-value",
             id: "custom-method-value",
@@ -221,6 +232,12 @@ class CustomRequestPanel extends Component {
               this.updateCustomRequestFields(evt, request, updateRequest),
             value: method,
           }),
+          label({
+            className: "custom-url-value-label custom-request-label",
+            htmlFor: "custom-url-value",
+          },
+            CUSTOM_NEW_REQUEST_URL_LABEL,
+          ),
           input({
             className: "custom-url-value",
             id: "custom-url-value",
@@ -234,7 +251,10 @@ class CustomRequestPanel extends Component {
           className: "tabpanel-summary-container custom-section",
           id: "custom-query",
         },
-          div({ className: "custom-request-label" }, CUSTOM_QUERY),
+          label({
+            className: "custom-request-label",
+            htmlFor: "custom-query-value",
+          }, CUSTOM_QUERY),
           textarea({
             className: "tabpanel-summary-input",
             id: "custom-query-value",
@@ -249,7 +269,10 @@ class CustomRequestPanel extends Component {
           id: "custom-headers",
           className: "tabpanel-summary-container custom-section",
         },
-          div({ className: "custom-request-label" }, CUSTOM_HEADERS),
+          label({
+            className: "custom-request-label",
+            htmlFor: "custom-headers-value",
+          }, CUSTOM_HEADERS),
           textarea({
             className: "tabpanel-summary-input",
             id: "custom-headers-value",
@@ -264,7 +287,10 @@ class CustomRequestPanel extends Component {
           id: "custom-postdata",
           className: "tabpanel-summary-container custom-section",
         },
-          div({ className: "custom-request-label" }, CUSTOM_POSTDATA),
+          label({
+            className: "custom-request-label",
+            htmlFor: "custom-postdata-value",
+          }, CUSTOM_POSTDATA),
           textarea({
             className: "tabpanel-summary-input",
             id: "custom-postdata-value",

diff --git a/devtools/client/shared/components/Frame.js b/devtools/client/shared/components/Frame.js
@@ -123,12 +123,7 @@ class Frame extends Component {
       frame = this.props.frame;
     }
 
-    // If the resource was loaded by browser-loader.js, `frame.source` looks like:
-    // resource://devtools/shared/base-loader.js -> resource://devtools/path/to/file.js .
-    // What's needed is only the last part after " -> ".
-    const source = frame.source
-      ? String(frame.source).split(" -> ").pop()
-      : "";
+    const source = frame.source || "";
     const line = frame.line != void 0 ? Number(frame.line) : null;
     const column = frame.column != void 0 ? Number(frame.column) : null;
 

diff --git a/devtools/client/shared/components/StackTrace.js b/devtools/client/shared/components/StackTrace.js
@@ -57,7 +57,7 @@ class StackTrace extends Component {
         }), "\n");
       }
 
-      const source = s.filename.split(" -> ").pop();
+      const source = s.filename;
       frames.push("\t", Frame({
         key: `${i}-frame`,
         frame: {

diff --git a/devtools/client/shared/components/test/mochitest/test_stack-trace.html b/devtools/client/shared/components/test/mochitest/test_stack-trace.html
@@ -36,7 +36,7 @@
       {
         asyncCause: "because",
         functionName: "loadFunc",
-        filename: "http://myfile.com/loader.js -> http://myfile.com/loadee.js",
+        filename: "http://myfile.com/loadee.js",
         lineNumber: 10,
       },
     ];

diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -328,7 +328,7 @@ skip-if = true #	Bug 1404382
 [browser_webconsole_network_attach.js]
 [browser_webconsole_network_exceptions.js]
 [browser_webconsole_network_messages_expand.js]
-skip-if = (os == 'linux') || (os == 'win' && os_version == '10.0' && debug && bits == 64)  # Bug 1429361, disabled on Linux/Win for frequent failures
+skip-if = true  # Bug 1438979
 [browser_webconsole_network_messages_openinnet.js]
 [browser_webconsole_network_messages_status_code.js]
 [browser_webconsole_network_requests_from_chrome.js]

diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp
@@ -2188,16 +2188,15 @@ FragmentOrElement::GetMarkup(bool aIncludeSelf, nsAString& aMarkup)
   nsCOMPtr<nsIDocumentEncoder> docEncoder = doc->GetCachedEncoder();
   if (!docEncoder) {
     docEncoder =
-      do_CreateInstance(PromiseFlatCString(
-        nsDependentCString(NS_DOC_ENCODER_CONTRACTID_BASE) +
+      do_createDocumentEncoder(PromiseFlatCString(
         NS_ConvertUTF16toUTF8(contentType)
       ).get());
   }
   if (!docEncoder) {
     // This could be some type for which we create a synthetic document.  Try
     // again as XML
     contentType.AssignLiteral("application/xml");
-    docEncoder = do_CreateInstance(NS_DOC_ENCODER_CONTRACTID_BASE "application/xml");
+    docEncoder = do_createDocumentEncoder("application/xml");
     // Don't try to cache the encoder since it would point to a different
     // contentType once it has been reinitialized.
     tryToCacheEncoder = false;