merge mozilla-inbound to mozilla-central a=merge

addon-sdk/source/test/fixtures/native-addon-test/index.js

@@ -21,7 +21,12 @@ exports.dummyModule = require('./dir/dummy');
 exports.eventCore = require('sdk/event/core');
 exports.promise = require('sdk/core/promise');
 
-exports.localJSM  = require('./dir/test.jsm');
+if (module.uri.startsWith("file:"))
+  // We can't load the same file multiple times with different URLs, so
+  // skip this one.
+  exports.localJSM = { test: "this is a jsm" };
+else
+  exports.localJSM = require('./dir/test.jsm');
 exports.promisejsm = require('modules/Promise.jsm').Promise;
 exports.require = require;
 

browser/app/profile/firefox.js

@@ -1105,7 +1105,8 @@ pref("security.sandbox.content.level", 1);
 // its Windows/Mac counterpart, but on Linux it's an integer which means:
 // 0 -> "no sandbox"
 // 1 -> "content sandbox using seccomp-bpf when available"
-// 2 -> "seccomp-bpf + file broker"
+// 2 -> "seccomp-bpf + write file broker"
+// 3 -> "seccomp-bpf + read/write file brokering"
 // Content sandboxing on Linux is currently in the stage of
 // 'just getting it enabled', which includes a very permissive whitelist. We
 // enable seccomp-bpf on nightly to see if everything is running, or if we need
@@ -1117,8 +1118,9 @@ pref("security.sandbox.content.level", 1);
 //
 // This setting may not be required anymore once we decide to permanently
 // enable the content sandbox.
-pref("security.sandbox.content.level", 2);
+pref("security.sandbox.content.level", 3);
 pref("security.sandbox.content.write_path_whitelist", "");
+pref("security.sandbox.content.read_path_whitelist", "");
 pref("security.sandbox.content.syscall_whitelist", "");
 #endif
 

browser/base/content/test/plugins/browser.ini

@@ -22,7 +22,6 @@ support-files =
   plugin_bug820497.html
   plugin_clickToPlayAllow.html
   plugin_clickToPlayDeny.html
-  plugin_data_url.html
   plugin_favorfallback.html
   plugin_hidden_to_visible.html
   plugin_iframe.html
@@ -58,8 +57,6 @@ tags = blocklist
 [browser_CTP_crashreporting.js]
 skip-if = !crashreporter
 tags = blocklist
-[browser_CTP_data_urls.js]
-tags = blocklist
 [browser_CTP_drag_drop.js]
 tags = blocklist
 [browser_CTP_favorfallback.js]

browser/base/content/urlbarBindings.xml

@@ -1693,13 +1693,15 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
           if (enable) {
             this.oneOffSearchButtons.telemetryOrigin = "urlbar";
             this.oneOffSearchButtons.style.display = "-moz-box";
-            this.oneOffSearchButtons.popup = this;
+            // Set .textbox first, since the popup setter will cause
+            // a _rebuild call that uses it.
             this.oneOffSearchButtons.textbox = this.input;
+            this.oneOffSearchButtons.popup = this;
           } else {
             this.oneOffSearchButtons.telemetryOrigin = null;
             this.oneOffSearchButtons.style.display = "none";
-            this.oneOffSearchButtons.popup = null;
             this.oneOffSearchButtons.textbox = null;
+            this.oneOffSearchButtons.popup = null;
           }
         ]]></body>
       </method>

browser/components/search/content/search.xml

@@ -102,8 +102,10 @@
           // use the popup binding below, so null-check oneOffButtons.
           if (oneOffButtons) {
             oneOffButtons.telemetryOrigin = "searchbar";
-            oneOffButtons.popup = this.textbox.popup;
+            // Set .textbox first, since the popup setter will cause
+            // a _rebuild call that uses it.
             oneOffButtons.textbox = this.textbox;
+            oneOffButtons.popup = this.textbox.popup;
           }
         }, {capturing: true, once: true});
       ]]></constructor>

browser/themes/shared/incontentprefs-old/preferences.inc.css

@@ -386,7 +386,7 @@ description > html|a {
   border-radius: 50%;
   list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg);
   margin-inline-end: 15px;
-  image-rendering: -moz-crisp-edges;
+  image-rendering: auto;
   border: 1px solid transparent;
 }
 

browser/themes/shared/incontentprefs/preferences.inc.css

@@ -406,7 +406,7 @@ groupbox {
   border-radius: 50%;
   list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg);
   margin-inline-end: 15px;
-  image-rendering: -moz-crisp-edges;
+  image-rendering: auto;
   border: 1px solid transparent;
 }
 

devtools/client/debugger/new/debugger.css

@@ -1316,7 +1316,8 @@ html[dir="rtl"] .managed-tree .tree .node > div {
   border-top-color: transparent;
 }
 
-.source-footer .tab.active path, .source-footer .tab:hover path {
+.source-footer .tab.active path,
+.source-footer .tab:hover path {
   fill: var(--theme-body-color);
 }
 .outline-list {