Bug 1160200 - APNG can't be used with type switching. r=mcaceres,r=jr…

…muizel
iaxat · Apr 20, 2016 · 21e4502 · 21e4502
1 parent 8da6e99
commit 21e4502
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 0 deletions.
diff --git a/image/DecoderFactory.cpp b/image/DecoderFactory.cpp
@@ -34,6 +34,8 @@ DecoderFactory::GetDecoderType(const char* aMimeType)
     type = DecoderType::PNG;
   } else if (!strcmp(aMimeType, IMAGE_X_PNG)) {
     type = DecoderType::PNG;
+  } else if (!strcmp(aMimeType, IMAGE_APNG)) {
+    type = DecoderType::PNG;
 
   // GIF
   } else if (!strcmp(aMimeType, IMAGE_GIF)) {

diff --git a/image/build/nsImageModule.cpp b/image/build/nsImageModule.cpp
@@ -78,6 +78,7 @@ static const mozilla::Module::CategoryEntry kImageCategories[] = {
   { "Gecko-Content-Viewers", IMAGE_BMP_MS, "@mozilla.org/content/document-loader-factory;1" },
   { "Gecko-Content-Viewers", IMAGE_ICON_MS, "@mozilla.org/content/document-loader-factory;1" },
   { "Gecko-Content-Viewers", IMAGE_PNG, "@mozilla.org/content/document-loader-factory;1" },
+  { "Gecko-Content-Viewers", IMAGE_APNG, "@mozilla.org/content/document-loader-factory;1" },
   { "Gecko-Content-Viewers", IMAGE_X_PNG, "@mozilla.org/content/document-loader-factory;1" },
   { "content-sniffing-services", "@mozilla.org/image/loader;1", "@mozilla.org/image/loader;1" },
   { nullptr }

diff --git a/layout/reftests/apng-mime/animated.apng b/layout/reftests/apng-mime/animated.apng
diff --git a/layout/reftests/apng-mime/expected.html b/layout/reftests/apng-mime/expected.html
@@ -0,0 +1,3 @@
+<!doctype html>
+<title>apng expected</title>
+<img src="animated.apng">
diff --git a/layout/reftests/apng-mime/reftest.list b/layout/reftests/apng-mime/reftest.list
@@ -0,0 +1 @@
+== test.html expected.html
diff --git a/layout/reftests/apng-mime/static.png b/layout/reftests/apng-mime/static.png
diff --git a/layout/reftests/apng-mime/test.html b/layout/reftests/apng-mime/test.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<title>apng test</title>
+<picture>
+<source type="image/apng" srcset="animated.apng">
+<img src="static.png">
+</picture>
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
@@ -19,6 +19,9 @@ include w3c-css/received/reftest.list
 include abs-pos/reftest.list
 include position-relative/reftest.list
 
+# apng-mime
+include apng-mime/reftest.list
+
 include async-scrolling/reftest.list
 
 # backgrounds/

diff --git a/netwerk/mime/nsMimeTypes.h b/netwerk/mime/nsMimeTypes.h
@@ -95,6 +95,7 @@
 #define IMAGE_JPG                           "image/jpg"
 #define IMAGE_PJPEG                         "image/pjpeg"
 #define IMAGE_PNG                           "image/png"
+#define IMAGE_APNG                          "image/apng"
 #define IMAGE_X_PNG                         "image/x-png"
 #define IMAGE_PPM                           "image/x-portable-pixmap"
 #define IMAGE_XBM                           "image/x-xbitmap"

diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -581,6 +581,7 @@ static const nsExtraMimeTypeEntry extraMimeEntries[] =
   { IMAGE_ICO, "ico,cur", "ICO Image" },
   { IMAGE_JPEG, "jpeg,jpg,jfif,pjpeg,pjp", "JPEG Image" },
   { IMAGE_PNG, "png", "PNG Image" },
+  { IMAGE_APNG, "apng", "APNG Image" },
   { IMAGE_TIFF, "tiff,tif", "TIFF Image" },
   { IMAGE_XBM, "xbm", "XBM Image" },
   { IMAGE_SVG_XML, "svg", "Scalable Vector Graphics" },