Title: [134214] trunk
- Revision
- 134214
- Author
- allan.jen...@digia.com
- Date
- 2012-11-12 05:11:42 -0800 (Mon, 12 Nov 2012)
Log Message
[Qt] Can not load MHTML documents
https://bugs.webkit.org/show_bug.cgi?id=101765
Reviewed by Simon Hausmann.
Source/WebCore:
Recognize common MHTML extensions so that we can recognize MHTML tests on the file-system.
Tested by existing mhtml/ tests.
* platform/qt/MIMETypeRegistryQt.cpp:
(WebCore):
Tools:
Enable MHTML feature.
* qmake/mkspecs/features/features.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (134213 => 134214)
--- trunk/Source/WebCore/ChangeLog 2012-11-12 12:45:00 UTC (rev 134213)
+++ trunk/Source/WebCore/ChangeLog 2012-11-12 13:11:42 UTC (rev 134214)
@@ -1,3 +1,17 @@
+2012-11-12 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ [Qt] Can not load MHTML documents
+ https://bugs.webkit.org/show_bug.cgi?id=101765
+
+ Reviewed by Simon Hausmann.
+
+ Recognize common MHTML extensions so that we can recognize MHTML tests on the file-system.
+
+ Tested by existing mhtml/ tests.
+
+ * platform/qt/MIMETypeRegistryQt.cpp:
+ (WebCore):
+
2012-11-12 Andreas Kling <akl...@apple.com>
Tighten vector in ResourceRequestBase::setResponseContentDispositionEncodingFallbackArray().
Modified: trunk/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp (134213 => 134214)
--- trunk/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp 2012-11-12 12:45:00 UTC (rev 134213)
+++ trunk/Source/WebCore/platform/qt/MIMETypeRegistryQt.cpp 2012-11-12 13:11:42 UTC (rev 134214)
@@ -53,6 +53,8 @@
{ "mp4", "video/mp4" },
{ "m4v", "video/mp4" },
{ "m4a", "audio/x-m4a" },
+ { "mht", "multipart/related" },
+ { "mhtml", "multipart/related" },
{ "mp3", "audio/mp3" },
{ "ogv", "video/ogg" },
{ "oga", "audio/ogg" },
Modified: trunk/Tools/ChangeLog (134213 => 134214)
--- trunk/Tools/ChangeLog 2012-11-12 12:45:00 UTC (rev 134213)
+++ trunk/Tools/ChangeLog 2012-11-12 13:11:42 UTC (rev 134214)
@@ -1,3 +1,14 @@
+2012-11-12 Allan Sandfeld Jensen <allan.jen...@digia.com>
+
+ [Qt] Can not load MHTML documents
+ https://bugs.webkit.org/show_bug.cgi?id=101765
+
+ Reviewed by Simon Hausmann.
+
+ Enable MHTML feature.
+
+ * qmake/mkspecs/features/features.pri:
+
2012-11-12 Tommy Widenflycht <tom...@google.com>
MediaStream API: Schedule the RTCDataChannel events to be triggered at idle state
Modified: trunk/Tools/qmake/mkspecs/features/features.pri (134213 => 134214)
--- trunk/Tools/qmake/mkspecs/features/features.pri 2012-11-12 12:45:00 UTC (rev 134213)
+++ trunk/Tools/qmake/mkspecs/features/features.pri 2012-11-12 13:11:42 UTC (rev 134214)
@@ -77,7 +77,7 @@
ENABLE_MEDIA_STATISTICS=0 \
ENABLE_MEDIA_STREAM=0 \
ENABLE_METER_ELEMENT=1 \
- ENABLE_MHTML=0 \
+ ENABLE_MHTML=1 \
ENABLE_MICRODATA=0 \
ENABLE_MUTATION_OBSERVERS=0 \
ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
