Merge beta to release to keep uplifts in sync a=merge

--HG--
extra : amend_source : d7882ea12d2846b8203bd25f055bdfd8fb978f1d

browser/components/nsBrowserContentHandler.js

@@ -514,6 +514,13 @@ nsBrowserContentHandler.prototype = {
             willRestoreSession = ss.isAutomaticRestoreEnabled();
 
             overridePage = Services.urlFormatter.formatURLPref("startup.homepage_override_url");
+            // Temporary hack for Firefox 49 to show whatsnew for zh-TW.
+            // See Bug #1292637
+            var locale = prefb.getCharPref("general.useragent.locale");
+            if (locale == "zh-TW") {
+              overridePage = "https://www.mozilla.org/zh-TW/firefox/49.0/whatsnew/";
+            }
+
             if (prefb.prefHasUserValue("app.update.postupdate"))
               overridePage = getPostUpdateOverridePage(overridePage);
 

toolkit/mozapps/extensions/internal/XPIProvider.jsm

@@ -894,6 +894,11 @@ var loadManifestFromWebManifest = Task.async(function*(aUri) {
     logger.warn("Ignoring applications property in manifest");
   }
 
+  // A * is illegal in strict_min_version
+  if (bss.strict_min_version && bss.strict_min_version.split(".").some(part => part == "*")) {
+    logger.warn("The use of '*' in strict_min_version is deprecated");
+  }
+
   let addon = new AddonInternal();
   addon.id = bss.id;
   addon.version = manifest.version;

toolkit/mozapps/extensions/test/xpcshell/test_webextension_install.js

@@ -175,3 +175,48 @@ add_task(function* test_two_ids() {
 
   addon.uninstall();
 });
+
+add_task(function* strict_min_star() {
+  const addonId = "strict_min_max@tests.mozilla.org";
+  const MANIFEST = {
+    name: "strict min star test",
+    description: "test strict min with star",
+    manifest_version: 2,
+    version: "1.0",
+  };
+
+  function flushAndRemove(file) {
+    // flush JAR cache and remove the file
+    Services.obs.notifyObservers(file, "flush-cache-entry", null);
+    file.remove(true);
+  }
+
+  // * in min will generate a warning
+  for (let version of ["0.*", "0.*.0"]) {
+    let apps = {
+      applications: {
+        gecko: {
+          id: addonId,
+          strict_min_version: version,
+        },
+      },
+    }
+    let testManifest = Object.assign(apps, MANIFEST);
+
+    let addonDir = writeWebManifestForExtension(testManifest, gTmpD,
+                                                "strict_min_star");
+    let { messages } = yield promiseConsoleOutput(function* () {
+      yield AddonManager.installTemporaryAddon(addonDir);
+    });
+    ok(messages.some(msg => msg.message.includes("The use of '*' in strict_min_version is deprecated")),
+       "Deprecation warning for strict_min_version with '*' was generated");
+
+    let addon = yield promiseAddonByID(addonId);
+
+    notEqual(addon, null, "Add-on is installed");
+    equal(addon.id, addonId, "Add-on has the expected id");
+
+    addon.uninstall();
+    flushAndRemove(addonDir);
+  }
+});

widget/windows/GfxInfo.cpp

@@ -901,6 +901,20 @@ GfxInfo::GetGfxDriverInfo()
       GfxDriverInfo::allFeatures, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
       DRIVER_EQUAL, V(8,783,2,2000), "FEATURE_FAILURE_BUG_1118695");
 
+    // Bug 1198815 and 1267970
+    APPEND_TO_DRIVER_BLOCKLIST_RANGE(OperatingSystem::Windows,
+      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorATI), GfxDriverInfo::allDevices,
+      nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
+      DRIVER_BETWEEN_INCLUSIVE, V(15,200,0,0), V(15,301,2301,1002),
+      "FEATURE_FAILURE_BUG_1198815_1267970", "15.200.0.0-15.301.2301.1002");
+
+    // Bug 1267970
+    APPEND_TO_DRIVER_BLOCKLIST_RANGE(OperatingSystem::Windows,
+      (nsAString&) GfxDriverInfo::GetDeviceVendor(VendorATI), GfxDriverInfo::allDevices,
+      nsIGfxInfo::FEATURE_HARDWARE_VIDEO_DECODING, nsIGfxInfo::FEATURE_BLOCKED_DRIVER_VERSION,
+      DRIVER_BETWEEN_INCLUSIVE, V(16,100,0,0), V(16,300,2311,0),
+      "FEATURE_FAILURE_BUG_1267970", "16.100.0.0-16.300.2311.0");
+
     /*
      * Bug 783517 - crashes in AMD driver on Windows 8
      */