Bug 1641389 - Remove image.webp.enabled pref, always on by default. r…

…=tnikkel Differential Revision: https://phabricator.services.mozilla.com/D77182
dothq · May 28, 2020 · 994485e · 994485e
1 parent 6685919
commit 994485e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 21 deletions.
diff --git a/image/DecoderFactory.cpp b/image/DecoderFactory.cpp
@@ -7,6 +7,7 @@
 
 #include "nsMimeTypes.h"
 #include "mozilla/RefPtr.h"
+#include "mozilla/StaticPrefs_image.h"
 
 #include "AnimationSurfaceProvider.h"
 #include "Decoder.h"
@@ -76,8 +77,7 @@ DecoderType DecoderFactory::GetDecoderType(const char* aMimeType) {
     type = DecoderType::ICON;
 
     // WebP
-  } else if (!strcmp(aMimeType, IMAGE_WEBP) &&
-             StaticPrefs::image_webp_enabled()) {
+  } else if (!strcmp(aMimeType, IMAGE_WEBP)) {
     type = DecoderType::WEBP;
 
     // AVIF

diff --git a/image/build/nsImageModule.cpp b/image/build/nsImageModule.cpp
@@ -58,13 +58,8 @@ nsresult mozilla::image::EnsureModuleInitialized() {
   static ImageEnablementCookie kAVIFCookie = {
       mozilla::StaticPrefs::image_avif_enabled,
       NS_LITERAL_CSTRING("image/avif")};
-  static ImageEnablementCookie kWebPCookie = {
-      mozilla::StaticPrefs::image_webp_enabled,
-      NS_LITERAL_CSTRING("image/webp")};
   Preferences::RegisterCallbackAndCall(UpdateContentViewerRegistration,
                                        "image.avif.enabled", &kAVIFCookie);
-  Preferences::RegisterCallbackAndCall(UpdateContentViewerRegistration,
-                                       "image.webp.enabled", &kWebPCookie);
 
   mozilla::image::ShutdownTracker::Initialize();
   mozilla::image::ImageFactory::Initialize();

diff --git a/image/test/gtest/Common.cpp b/image/test/gtest/Common.cpp
@@ -36,12 +36,8 @@ AutoInitializeImageLib::AutoInitializeImageLib() {
   EXPECT_TRUE(NS_IsMainThread());
   sImageLibInitialized = true;
 
-  // Ensure WebP is enabled to run decoder tests.
-  nsresult rv = Preferences::SetBool("image.webp.enabled", true);
-  EXPECT_TRUE(rv == NS_OK);
-
   // Ensure AVIF is enabled to run decoder tests.
-  rv = Preferences::SetBool("image.avif.enabled", true);
+  nsresult rv = Preferences::SetBool("image.avif.enabled", true);
   EXPECT_TRUE(rv == NS_OK);
 
   // Ensure that ImageLib services are initialized.

diff --git a/image/test/mochitest/test_animation_operators.html b/image/test/mochitest/test_animation_operators.html
@@ -159,7 +159,7 @@
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-SpecialPowers.pushPrefEnv({"set": [["image.webp.enabled", true]]}, runTests);
+runTests();
 
 </script>
 </pre>

diff --git a/image/test/mochitest/test_discardAnimatedImage.html b/image/test/mochitest/test_discardAnimatedImage.html
@@ -37,8 +37,7 @@
 window.onload = function() {
   // Enable discarding for the test.
   SpecialPowers.pushPrefEnv({
-    'set':[['image.mem.discardable',true],
-           ['image.webp.enabled',true]]
+    'set':[['image.mem.discardable',true]]
   }, runTest);
 }
 

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -4589,12 +4589,6 @@
   value: -1
   mirror: once
 
-# Whether we attempt to decode WebP images or not.
-- name: image.webp.enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-
 # Whether we attempt to decode AVIF images or not.
 - name: image.avif.enabled
   type: RelaxedAtomicBool