wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Newton 2015-09-25 11:36:00 +02:00
parent 92113d4c99
commit 8d3167cc60
10 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/DecoderFactory.cpp
View File

@ -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)) {

1
image/build/nsImageModule.cpp
View File

@ -77,6 +77,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 }

BIN
layout/reftests/apng-mime/animated.apng Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 361 B

3
layout/reftests/apng-mime/expected.html Normal file
View File

@ -0,0 +1,3 @@
<!doctype html>
<title>apng expected</title>
<img src="animated.apng">

1
layout/reftests/apng-mime/reftest.list Normal file
View File

@ -0,0 +1 @@
== test.html expected.html

BIN
layout/reftests/apng-mime/static.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 100 B

6
layout/reftests/apng-mime/test.html Normal file
View File

@ -0,0 +1,6 @@
<!doctype html>
<title>apng test</title>
<picture>
<source type="video/vnd.mozilla.apng" srcset="animated.apng">
<img src="static.png">
</picture>

3
layout/reftests/reftest.list
View File

@ -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/

1
netwerk/mime/nsMimeTypes.h
View File

@ -94,6 +94,7 @@
#define IMAGE_JPG "image/jpg"
#define IMAGE_PJPEG "image/pjpeg"
#define IMAGE_PNG "image/png"
#define IMAGE_APNG "video/vnd.mozilla.apng"
#define IMAGE_X_PNG "image/x-png"
#define IMAGE_PPM "image/x-portable-pixmap"
#define IMAGE_XBM "image/x-xbitmap"

1
uriloader/exthandler/nsExternalHelperAppService.cpp
View File

@ -576,6 +576,7 @@ static 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" },