Merge mozilla-central to mozilla-inbound. a=merge CLOSED TREE

browser/components/extensions/extension-mac.css

@@ -1,6 +1,6 @@
 button.browser-style,
 select.browser-style,
-.browser-style > input[type="checkbox"] + label::before {
+.browser-style > input[type="checkbox"] {
   border-radius: 4px;
 }
 

browser/components/newtab/lib/SearchShortcuts.jsm

@@ -7,9 +7,9 @@
 // that should be converted to search Topsites
 const SEARCH_SHORTCUTS = [
   {keyword: "@amazon", shortURL: "amazon", url: "https://amazon.com", searchIdentifier: /^amazon/},
-  {keyword: "@baidu", shortURL: "baidu", url: "https://baidu.com", searchIdentifier: /^baidu/},
+  {keyword: "@\u767E\u5EA6", shortURL: "baidu", url: "https://baidu.com", searchIdentifier: /^baidu/},
   {keyword: "@google", shortURL: "google", url: "https://google.com", searchIdentifier: /^google/},
-  {keyword: "@yandex", shortURL: "yandex", url: "https://yandex.com", searchIdentifier: /^yandex/}
+  {keyword: "@\u044F\u043D\u0434\u0435\u043A\u0441", shortURL: "yandex", url: "https://yandex.com", searchIdentifier: /^yandex/}
 ];
 this.SEARCH_SHORTCUTS = SEARCH_SHORTCUTS;
 

dom/serviceworkers/test/test_serviceworker_interfaces.js

@@ -159,6 +159,10 @@ var interfaceNamesInGlobalScope =
     "ImageBitmapRenderingContext",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "ImageData",
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    "MediaCapabilities",
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    "MediaCapabilitiesInfo",
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "MessageChannel",
 // IMPORTANT: Do not change this list without review from a DOM peer!

dom/tests/mochitest/general/test_interfaces.js

@@ -615,6 +615,10 @@ var interfaceNamesInGlobalScope =
     {name: "LocalMediaStream", insecureContext: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "Location", insecureContext: true},
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "MediaCapabilities", insecureContext: true},
+// IMPORTANT: Do not change this list without review from a DOM peer!
+    {name: "MediaCapabilitiesInfo", insecureContext: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "MediaDeviceInfo", insecureContext: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!

dom/workers/test/navigator_worker.js

@@ -14,6 +14,7 @@ var supportedProps = [
   "onLine",
   "language",
   "languages",
+  "mediaCapabilities",
   "hardwareConcurrency",
   { name: "storage", isSecureContext: true },
   "connection",

dom/workers/test/test_navigator_iframe.js

@@ -32,6 +32,11 @@ worker.onmessage = function(event) {
     return;
   }
 
+  if (args.name === "mediaCapabilities") {
+    is(typeof navigator.mediaCapabilities, typeof args.value, "mediaCapabilities type matches");
+    return;
+  }
+
   is(navigator[args.name], args.value,
      "Mismatched navigator string for " + args.name + "!");
 };

dom/workers/test/test_worker_interfaces.js

@@ -50,6 +50,8 @@ var ecmaGlobals =
     {name: "Intl", insecureContext: true},
     {name: "JSON", insecureContext: true},
     {name: "Map", insecureContext: true},
+    {name: "MediaCapabilities", insecureContext: true},
+    {name: "MediaCapabilitiesInfo", insecureContext: true},
     {name: "Math", insecureContext: true},
     {name: "NaN", insecureContext: true},
     {name: "Number", insecureContext: true},

modules/libpref/init/StaticPrefList.h

@@ -1016,7 +1016,7 @@ VARCACHE_PREF(
 VARCACHE_PREF(
   "media.media-capabilities.enabled",
    MediaCapabilitiesEnabled,
-  RelaxedAtomicBool, false
+  RelaxedAtomicBool, true
 )
 
 VARCACHE_PREF(

modules/libpref/init/all.js

@@ -555,7 +555,7 @@ pref("media.benchmark.vp9.threshold", 150);
 pref("media.benchmark.frames", 300);
 pref("media.benchmark.timeout", 1000);
 
-pref("media.media-capabilities.enabled", false);
+pref("media.media-capabilities.enabled", true);
 pref("media.media-capabilities.screen.enabled", false);
 
 #ifdef MOZ_WEBSPEECH

toolkit/components/search/nsSearchService.js

@@ -949,8 +949,8 @@ const ENGINE_ALIASES = new Map([
   ["ebay", ["@ebay"]],
   ["bing", ["@bing"]],
   ["ddg", ["@duckduckgo", "@ddg"]],
-  ["yandex", ["@yandex"]],
+  ["yandex", ["@\u044F\u043D\u0434\u0435\u043A\u0441", "@yandex"]],
-  ["baidu", ["@baidu"]],
+  ["baidu", ["@\u767E\u5EA6", "@baidu"]],
 ]);
 
 function getInternalAliases(engine) {