Merge mozilla-inbound to mozilla-central. a=merge
authorDorel Luca <dluca@mozilla.com>
Sun, 23 Sep 2018 00:43:29 +0300
changeset 493544 221c18ebe962
parent 493530 10a051fd297c (current diff)
parent 493543 99b4f09fa32c (diff)
child 493548 64e035443955
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone64.0a1
first release with
nightly linux32
221c18ebe962 / 64.0a1 / 20180922220057 / files
nightly linux64
221c18ebe962 / 64.0a1 / 20180922220057 / files
nightly mac
221c18ebe962 / 64.0a1 / 20180922220057 / files
nightly win32
221c18ebe962 / 64.0a1 / 20180922220057 / files
nightly win64
221c18ebe962 / 64.0a1 / 20180922220057 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-inbound to mozilla-central. a=merge
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -1070,17 +1070,17 @@ pref("browser.dom.window.dump.enabled", 
 pref("browser.dom.window.dump.enabled", true, sticky);
 #endif
 
 // Controls whether EventEmitter module throws dump message on each emit
 pref("toolkit.dump.emit", false);
 
 // Enable recording/replaying executions.
 #if defined(XP_MACOSX) && defined(NIGHTLY_BUILD)
-pref("devtools.recordreplay.enabled", false);
+pref("devtools.recordreplay.enabled", true);
 pref("devtools.recordreplay.enableRewinding", true);
 #endif
 
 // view source
 pref("view_source.syntax_highlight", true);
 pref("view_source.wrap_long_lines", false);
 pref("view_source.editor.path", "");
 // allows to add further arguments to the editor; use the %LINE% placeholder
--- a/toolkit/components/extensions/test/mochitest/mochitest-common.ini
+++ b/toolkit/components/extensions/test/mochitest/mochitest-common.ini
@@ -105,16 +105,17 @@ skip-if = (toolkit == 'android') # bug 1
 [test_ext_sendmessage_frameId.html]
 [test_ext_sendmessage_no_receiver.html]
 [test_ext_sendmessage_reply.html]
 [test_ext_sendmessage_reply2.html]
 skip-if = true # Bug 1258897
 [test_ext_storage_manager_capabilities.html]
 scheme=https
 [test_ext_subframes_privileges.html]
+skip-if = os == 'android' || verify # bug 1489771
 [test_ext_test.html]
 [test_ext_unlimitedStorage.html]
 [test_ext_unlimitedStorage_legacy_persistent_indexedDB.html]
 # IndexedDB persistent storage mode is not allowed on Fennec from a non-chrome privileged code
 # (it has only been enabled for apps and privileged code). See Bug 1119462 for additional info.
 skip-if = os == 'android'
 [test_ext_web_accessible_resources.html]
 skip-if = os == 'android' && debug # bug 1397615
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -76,32 +76,35 @@ var snapshotFormatters = {
                                               "/" +
                                               data.maxContentProcesses;
     } else {
       $("contentprocesses-row").hidden = true;
     }
 
     if (Services.policies) {
       let policiesText = "";
+      let aboutPolicies = "about:policies";
       switch (data.policiesStatus) {
         case Services.policies.INACTIVE:
           policiesText = strings.GetStringFromName("policies.inactive");
           break;
 
         case Services.policies.ACTIVE:
           policiesText = strings.GetStringFromName("policies.active");
+          aboutPolicies += "#active";
           break;
 
         default:
           policiesText = strings.GetStringFromName("policies.error");
+          aboutPolicies += "#errors";
           break;
       }
 
       if (data.policiesStatus != Services.policies.INACTIVE) {
-        let activePolicies = $.new("a", policiesText, null, {href: "about:policies"});
+        let activePolicies = $.new("a", policiesText, null, {href: aboutPolicies});
         $("policies-status").appendChild(activePolicies);
       } else {
         $("policies-status").textContent = policiesText;
       }
     } else {
       $("policies-status-row").hidden = true;
     }