Merge fx-team to central, a=merge CLOSED TREE

browser/base/content/aboutNetError.xhtml

@@ -419,11 +419,11 @@
           // display debug information about the cert error.
           var errorCode = document.getElementById("errorCode");
           if (errorCode) {
-            errorCode.href = "#technicalInformation";
+            errorCode.href = "javascript:void(0)";
             errorCode.addEventListener("click", () => {
-              var div = document.getElementById("certificateErrorDebugInformation");
-              if (toggleDisplay(div) == "block") {
-                div.scrollIntoView({block: "start", behavior: "smooth"});
+              let debugInfo = document.getElementById("certificateErrorDebugInformation");
+              if (toggleDisplay(debugInfo) == "block") {
+                debugInfo.scrollIntoView({block: "start", behavior: "smooth"});
               }
             }, false);
           }
@@ -646,7 +646,6 @@
     </div>
 
     <div id="certificateErrorDebugInformation">
-      <a name="technicalInformation"></a>
       <button id="copyToClipboard">&certerror.copyToClipboard.label;</button>
       <div id="certificateErrorText"/>
       <button id="copyToClipboard">&certerror.copyToClipboard.label;</button>

browser/base/content/browser.js

@@ -6787,7 +6787,6 @@ var gIdentityHandler = {
 
     if (this._identityPopup.state == "open") {
       this.updateSitePermissions();
-      this._identityPopupMultiView.setHeightToFit();
     }
   },
 
@@ -7306,7 +7305,6 @@ var gIdentityHandler = {
     button.setAttribute("class", "identity-popup-permission-remove-button");
     button.addEventListener("command", () => {
       this._permissionList.removeChild(container);
-      this._identityPopupMultiView.setHeightToFit();
       if (aPermission.inUse &&
           ["camera", "microphone", "screen"].includes(aPermission.id)) {
         let windowId = this._sharingState.windowId;

browser/components/controlcenter/content/panel.inc.xul

@@ -16,7 +16,7 @@
 
   <panelmultiview id="identity-popup-multiView"
                   mainViewId="identity-popup-mainView">
-    <panelview id="identity-popup-mainView" flex="1">
+    <panelview id="identity-popup-mainView">
 
       <!-- Security Section -->
       <hbox id="identity-popup-security" class="identity-popup-section">

browser/components/customizableui/content/panelUI.xml

@@ -318,7 +318,7 @@
               break;
             case "popuphidden":
               this.removeAttribute("panelopen");
-              this._mainView.style.removeProperty("height");
+              this._mainView.style.removeProperty("max-height");
               this.showMainView();
               this._mainViewObserver.disconnect();
               break;
@@ -346,7 +346,7 @@
           // Ignore the mutation that'll fire when we set the height of
           // the main view.
           this.ignoreMutations = true;
-          this._mainView.style.height =
+          this._mainView.style.maxHeight =
             this.getBoundingClientRect().height + "px";
           this.ignoreMutations = false;
         ]]></body>

build/moz.configure/old.configure

@@ -155,6 +155,7 @@ def old_configure_options(*options):
 
 @old_configure_options(
     '--cache-file',
+    '--datadir',
     '--enable-accessibility',
     '--enable-address-sanitizer',
     '--enable-alsa',
@@ -260,6 +261,8 @@ def old_configure_options(*options):
     '--enable-webspeechtestbackend',
     '--enable-xul',
     '--enable-zipwriter',
+    '--includedir',
+    '--libdir',
     '--no-create',
     '--prefix',
     '--with-adjust-sdk-keyfile',

devtools/client/debugger/test/mochitest/browser.ini

@@ -119,6 +119,7 @@ support-files =
   doc_terminate-on-tab-close.html
   doc_watch-expressions.html
   doc_watch-expression-button.html
+  doc_whitespace-property-names.html
   doc_with-frame.html
   doc_worker-source-map.html
   doc_WorkerActor.attach-tab1.html
@@ -521,6 +522,8 @@ skip-if = e10s && debug
 skip-if = e10s && debug
 [browser_dbg_variables-view-07.js]
 skip-if = e10s && debug
+[browser_dbg_variables-view-08.js]
+skip-if = e10s && debug
 [browser_dbg_variables-view-accessibility.js]
 subsuite = clipboard
 skip-if = e10s && debug

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-06.js

@@ -121,7 +121,5 @@ var test = Task.async(function* () {
     }
   }
 
-  debugger;
-
   resumeDebuggerThenCloseAndFinish(panel);
 });

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-07.js

@@ -28,9 +28,11 @@ var test = Task.async(function* () {
   ok(scope, "Should get the current function's scope.");
 
   let proxy;
-  [...scope].forEach(function([name, value]) {
-    if(name === "proxy") proxy = value;
-  });
+  for (let [name, value] of scope) {
+    if (name === "proxy") {
+      proxy = value;
+    }
+  }
   ok(proxy, "Should have found the proxy variable");
 
   info("Expanding variable 'proxy'");
@@ -52,16 +54,16 @@ var test = Task.async(function* () {
       }
     } else {
       is(property, "<handler>", "There shouldn't be properties other than <target> and <handler>");
-      for(let [subprop, subdata] of data) if(subprop === "name") {
-        is(subdata.value, "handler", "The value of '<handler>' should be the [[ProxyHandler]]");
-        foundHandler = true;
+      for (let [subprop, subdata] of data) {
+        if(subprop === "name") {
+          is(subdata.value, "handler", "The value of '<handler>' should be the [[ProxyHandler]]");
+          foundHandler = true;
+        }
       }
     }
   }
   ok(foundTarget, "Should have found the '<target>' property containing the [[ProxyTarget]]");
   ok(foundHandler, "Should have found the '<handler>' property containing the [[ProxyHandler]]");
 
-  debugger;
-
   resumeDebuggerThenCloseAndFinish(panel);
 });

devtools/client/debugger/test/mochitest/browser_dbg_variables-view-08.js

@@ -0,0 +1,61 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/**
+ * Test that property values are not missing when the property names only contain whitespace.
+ */
+
+const TAB_URL = EXAMPLE_URL + "doc_whitespace-property-names.html";
+
+var test = Task.async(function* () {
+  let options = {
+    source: TAB_URL,
+    line: 1
+  };
+  var dbg = initDebugger(TAB_URL, options);
+  const [tab,, panel] = yield dbg;
+  const debuggerLineNumber = 24;
+  const scopes = waitForCaretAndScopes(panel, debuggerLineNumber);
+  callInTab(tab, "doPause");
+  yield scopes;
+
+  const variables = panel.panelWin.DebuggerView.Variables;
+  ok(variables, "Should get the variables view.");
+
+  const scope = [...variables][0];
+  ok(scope, "Should get the current function's scope.");
+
+  let obj;
+  for (let [name, value] of scope) {
+    if (name === "obj") {
+      obj = value;
+    }
+  }
+  ok(obj, "Should have found the 'obj' variable");
+
+  info("Expanding variable 'obj'");
+  let expanded = once(variables, "fetched");
+  obj.expand();
+  yield expanded;
+
+  let values = [" ", "\r", "\n", "\t", "\f", "\uFEFF", "\xA0"];
+  let count = values.length;
+
+  for (let [property, value] of obj) {
+    let index = values.indexOf(property);
+    if (index >= 0) {
+      --count;
+      is(value._nameString, property,
+         "The _nameString is different than the property name");
+      is(value._valueString, index + "",
+         "The _valueString is different than the stringified value");
+      is(value._valueLabel.getAttribute("value"), index + "",
+         "The _valueLabel value is different than the stringified value");
+    }
+  }
+  is(count, 0, "There are " + count + " missing properties");
+
+  resumeDebuggerThenCloseAndFinish(panel);
+});

devtools/client/debugger/test/mochitest/doc_whitespace-property-names.html

@@ -0,0 +1,29 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!DOCTYPE html>
+
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Debugger + Whitespace property name test page</title>
+  </head>
+
+  <body>
+    <script>
+    window.obj = {
+      " ": 0,
+      "\r": 1,
+      "\n": 2,
+      "\t": 3,
+      "\f": 4,
+      "\uFEFF": 5,
+      "\xA0": 6
+    };
+    window.doPause = function () {
+      var obj = window.obj;
+      debugger;
+    };
+    </script>
+  </body>
+
+</html>