Merge mozilla-central to autoland. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Thu, 15 Aug 2019 22:38:37 +0300
changeset 488330 c99af9d2e6381e171166f7b31629cc3539252cfa
parent 488329 2a6b7a24fdb3e082e98563107dfae018cb02ebe3 (current diff)
parent 488251 b283a7ef186c216d765631f6cb1260a3fa2ee42c (diff)
child 488331 9b89f970d46b0c966e7f523171cee853cb47407c
push id36440
push userncsoregi@mozilla.com
push dateFri, 16 Aug 2019 03:57:48 +0000
treeherdermozilla-central@a58b7dc85887 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland. CLOSED TREE
--- a/browser/components/customizableui/test/browser_901207_searchbar_in_panel.js
+++ b/browser/components/customizableui/test/browser_901207_searchbar_in_panel.js
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 logActiveElement();
 
 async function waitForSearchBarFocus() {
   let searchbar = document.getElementById("searchbar");
-  await waitForCondition(function() {
+  await TestUtils.waitForCondition(function() {
     logActiveElement();
     return document.activeElement === searchbar.textbox.inputField;
   });
 }
 
 // Ctrl+K should open the menu panel and focus the search bar if the search bar is in the panel.
 add_task(async function check_shortcut_when_in_closed_overflow_panel_closed() {
   CustomizableUI.addWidgetToArea(
@@ -60,45 +60,45 @@ add_task(async function check_shortcut_w
     !navbar.hasAttribute("overflowing"),
     "Should start with a non-overflowing toolbar."
   );
   ok(CustomizableUI.inDefaultState, "Should start in default state.");
 
   Services.prefs.setBoolPref("browser.search.widget.inNavBar", true);
 
   window.resizeTo(kForceOverflowWidthPx, window.outerHeight);
-  await waitForCondition(() => {
+  await TestUtils.waitForCondition(() => {
     return (
       navbar.getAttribute("overflowing") == "true" &&
       !navbar.querySelector("#search-container")
     );
   });
   ok(
     !navbar.querySelector("#search-container"),
     "Search container should be overflowing"
   );
 
   let shownPanelPromise = promiseOverflowShown(window);
   sendWebSearchKeyCommand();
   await shownPanelPromise;
 
   let chevron = document.getElementById("nav-bar-overflow-button");
-  await waitForCondition(() => chevron.open);
+  await TestUtils.waitForCondition(() => chevron.open);
 
   await waitForSearchBarFocus();
 
   let hiddenPanelPromise = promiseOverflowHidden(window);
   EventUtils.synthesizeKey("KEY_Escape");
   await hiddenPanelPromise;
 
   Services.prefs.setBoolPref("browser.search.widget.inNavBar", false);
 
   navbar = document.getElementById(CustomizableUI.AREA_NAVBAR);
   window.resizeTo(this.originalWindowWidth, window.outerHeight);
-  await waitForCondition(() => !navbar.hasAttribute("overflowing"));
+  await TestUtils.waitForCondition(() => !navbar.hasAttribute("overflowing"));
   ok(
     !navbar.hasAttribute("overflowing"),
     "Should not have an overflowing toolbar."
   );
 });
 
 // Ctrl+K should focus the search bar if it is in the navbar and not overflowing.
 add_task(async function check_shortcut_when_not_in_overflow() {
--- a/security/mac/hardenedruntime/developer.entitlements.xml
+++ b/security/mac/hardenedruntime/developer.entitlements.xml
@@ -18,21 +18,22 @@
     <key>com.apple.security.cs.allow-jit</key><false/>
 
     <!-- Firefox needs to create executable pages (without MAP_JIT) -->
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
 
     <!-- Code paged in from disk should match the signature at page-in time -->
     <key>com.apple.security.cs.disable-executable-page-protection</key><false/>
 
-    <!-- Do not allow loading unsigned libraries -->
-    <key>com.apple.security.cs.disable-library-validation</key><false/>
+    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
+    <key>com.apple.security.cs.disable-library-validation</key><true/>
 
     <!-- Allow dyld environment variables. Needed because Firefox uses
-         dyld variables to load libaries from within the .app bundle. -->
+         dyld variables (such as @executable_path) to load libaries from
+         within the .app bundle. -->
     <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
 
     <!-- Allow debuggers to attach to running executables -->
     <key>com.apple.security.get-task-allow</key><true/>
 
     <!-- Firefox needs to access the microphone on sites the user allows -->
     <key>com.apple.security.device.audio-input</key><true/>
 
--- a/security/mac/hardenedruntime/production.entitlements.xml
+++ b/security/mac/hardenedruntime/production.entitlements.xml
@@ -15,21 +15,22 @@
     <key>com.apple.security.cs.allow-jit</key><false/>
 
     <!-- Firefox needs to create executable pages (without MAP_JIT) -->
     <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
 
     <!-- Code paged in from disk should match the signature at page in-time -->
     <key>com.apple.security.cs.disable-executable-page-protection</key><false/>
 
-    <!-- Do not allow loading unsigned libraries -->
-    <key>com.apple.security.cs.disable-library-validation</key><false/>
+    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
+    <key>com.apple.security.cs.disable-library-validation</key><true/>
 
     <!-- Allow dyld environment variables. Needed because Firefox uses
-         dyld variables to load libaries from within the .app bundle. -->
+         dyld variables (such as @executable_path) to load libaries from
+         within the .app bundle. -->
     <key>com.apple.security.cs.allow-dyld-environment-variables</key><true/>
 
     <!-- Don't allow debugging of the executable. Debuggers will be prevented
          from attaching to running executables. Notarization does not permit
          access to get-task-allow (as documented by Apple) so this must be
          disabled on notarized builds. -->
     <key>com.apple.security.get-task-allow</key><false/>
 
--- a/taskcluster/scripts/misc/wrench-windows-tests.sh
+++ b/taskcluster/scripts/misc/wrench-windows-tests.sh
@@ -7,17 +7,17 @@ set -x -e -v
 # tool in the WebRender repository.
 # The builds involved require a number of dependencies to be available,
 # which is all handled below.
 
 cd $GECKO_PATH
 
 # This will download the rustc, MSVC, and wrench-deps artifacts.
 . taskcluster/scripts/misc/tooltool-download.sh
-export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin
+export PATH=$PATH:$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin
 
 .  taskcluster/scripts/misc/vs-setup.sh
 
 # Move the wrench-deps vendored crates into place
 mv ${MOZ_FETCHES_DIR}/wrench-deps/{vendor,.cargo} gfx/wr
 cd gfx/wr
 
 # This is needed for the WebRender standalone reftests
--- a/testing/web-platform/meta/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
@@ -3,25 +3,16 @@
   [Https downgrade track => No headers]
     expected: NOTRUN
 
   [Https downgrade font => No headers]
     expected: NOTRUN
 
   [Https downgrade prefetch => No headers]
     bug: [https://bugzilla.mozilla.org/show_bug.cgi?id=1568717, https://bugzilla.mozilla.org/show_bug.cgi?id=1569098]
-    expected:
-      if (os == "linux") and not sw-e10s and debug and not webrender: [PASS, TIMEOUT, FAIL]
-      if (os == "linux") and sw-e10s: [FAIL, PASS, TIMEOUT]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [FAIL, PASS, TIMEOUT]
-      if (os == "linux") and not debug and (bits == 32): [PASS, TIMEOUT, FAIL]
-      if os == "win": [PASS, TIMEOUT, FAIL]
-      if os == "mac": [PASS, TIMEOUT, FAIL]
-      if (os == "android") and debug: [PASS, FAIL]
-      if (os == "android") and not debug: [PASS, FAIL]
-      FAIL
+    expected: [PASS, FAIL, TIMEOUT]
 
   [Https downgrade stylesheet => No headers]
     expected: TIMEOUT
 
   [Https downgrade image => No headers]
     expected: NOTRUN
 
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini
@@ -1,5 +1,5 @@
 [pointerevent_coordinates_when_locked.html]
   [mouse Test pointerevent coordinates when pointer is locked]
     expected:
-      if webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
+      if webrender and (os == "linux"): ["PASS", "FAIL"]
 
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
@@ -1,6 +1,3 @@
 [pointerevent_movementxy_with_pointerlock.html]
   [mouse pointerevent movementX/Y with pointerlock test]
-    expected:
-      if webrender and (os == "win") and debug: FAIL
-      if not webrender and (os == "android") and debug: FAIL
-
+    expected: [PASS, FAIL]