Title: [113960] trunk/Source/WebCore
- Revision
- 113960
- Author
- [email protected]
- Date
- 2012-04-12 03:52:14 -0700 (Thu, 12 Apr 2012)
Log Message
[Qt] Two canvas tests fail with QT_IMAGE_DECODER=0 setup
https://bugs.webkit.org/show_bug.cgi?id=83764
The following tests were failed after r108792:
- canvas-toDataURL-case-insensitive-mimetype.html
- toDataURL-supportedTypes.html
because supportedImageMIMETypesForEncoding wasn't filled
with MIME types in case of QT_IMAGE_DECODER=0 build setup.
Patch by Zoltan Horvath <[email protected]> on 2012-04-12
Reviewed by Csaba Osztrogonác.
Fixes existing tests.
* platform/MIMETypeRegistry.cpp:
(WebCore::initializeSupportedImageMIMETypesForEncoding):
Modified Paths
Property Changed
Diff
Modified: trunk/Source/WebCore/ChangeLog (113959 => 113960)
--- trunk/Source/WebCore/ChangeLog 2012-04-12 10:32:26 UTC (rev 113959)
+++ trunk/Source/WebCore/ChangeLog 2012-04-12 10:52:14 UTC (rev 113960)
@@ -1,3 +1,21 @@
+2012-04-12 Zoltan Horvath <[email protected]>
+
+ [Qt] Two canvas tests fail with QT_IMAGE_DECODER=0 setup
+ https://bugs.webkit.org/show_bug.cgi?id=83764
+
+ The following tests were failed after r108792:
+ - canvas-toDataURL-case-insensitive-mimetype.html
+ - toDataURL-supportedTypes.html
+ because supportedImageMIMETypesForEncoding wasn't filled
+ with MIME types in case of QT_IMAGE_DECODER=0 build setup.
+
+ Reviewed by Csaba Osztrogonác.
+
+ Fixes existing tests.
+
+ * platform/MIMETypeRegistry.cpp:
+ (WebCore::initializeSupportedImageMIMETypesForEncoding):
+
2012-04-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r113931.
Modified: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp (113959 => 113960)
--- trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2012-04-12 10:32:26 UTC (rev 113959)
+++ trunk/Source/WebCore/platform/MIMETypeRegistry.cpp 2012-04-12 10:52:14 UTC (rev 113960)
@@ -294,7 +294,7 @@
if (!mimeType.isEmpty())
supportedImageMIMETypesForEncoding->add(mimeType);
}
-#elif PLATFORM(GTK)
+#elif PLATFORM(GTK) || (PLATFORM(QT) && !USE(QT_IMAGE_DECODER))
supportedImageMIMETypesForEncoding->add("image/png");
supportedImageMIMETypesForEncoding->add("image/jpeg");
supportedImageMIMETypesForEncoding->add("image/tiff");
Property changes on: trunk/Source/WebCore/platform/MIMETypeRegistry.cpp
___________________________________________________________________
Added: svn:executable
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
