Title: [108767] trunk
- Revision
- 108767
- Author
- [email protected]
- Date
- 2012-02-24 03:35:34 -0800 (Fri, 24 Feb 2012)
Log Message
Web Inspector: [Regression] network worker tests crash on qt.
https://bugs.webkit.org/show_bug.cgi?id=79263
Reviewed by Pavel Feldman.
* inspector/InspectorPageAgent.cpp:
(WebCore::InspectorPageAgent::createDecoder):
(WebCore::InspectorPageAgent::cachedResourceContent):
Modified Paths
Diff
Modified: trunk/LayoutTests/platform/qt/Skipped (108766 => 108767)
--- trunk/LayoutTests/platform/qt/Skipped 2012-02-24 11:25:18 UTC (rev 108766)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-02-24 11:35:34 UTC (rev 108767)
@@ -2635,7 +2635,3 @@
# [Qt] REGRESSION(r108112): sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.2_decodeURIComponent/S15.1.3.2_A1.2_T2.html crashes intermittently
# https://bugs.webkit.org/show_bug.cgi?id=79029
sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.2_decodeURIComponent/S15.1.3.2_A1.2_T2.html
-
-# Web Inspector: [Regression] network worker tests crash on qt.
-# https://bugs.webkit.org/show_bug.cgi?id=79263
-http/tests/inspector/network/network-embed.html
Modified: trunk/Source/WebCore/ChangeLog (108766 => 108767)
--- trunk/Source/WebCore/ChangeLog 2012-02-24 11:25:18 UTC (rev 108766)
+++ trunk/Source/WebCore/ChangeLog 2012-02-24 11:35:34 UTC (rev 108767)
@@ -1,3 +1,14 @@
+2012-02-24 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [Regression] network worker tests crash on qt.
+ https://bugs.webkit.org/show_bug.cgi?id=79263
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::createDecoder):
+ (WebCore::InspectorPageAgent::cachedResourceContent):
+
2012-02-24 Andreas Kling <[email protected]>
Miscellaneous CSSParser dodging in presentation attribute parsing.
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (108766 => 108767)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-02-24 11:25:18 UTC (rev 108766)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-02-24 11:35:34 UTC (rev 108767)
@@ -144,8 +144,7 @@
else if (DOMImplementation::isXMLMIMEType(mimeType)) {
decoder = TextResourceDecoder::create("application/xml");
decoder->useLenientXMLDecoding();
- } else
- decoder = TextResourceDecoder::create("text/plain", "UTF-8");
+ }
return decoder;
}
@@ -185,6 +184,9 @@
if (!buffer)
return false;
RefPtr<TextResourceDecoder> decoder = InspectorPageAgent::createDecoder(cachedResource->response().mimeType(), cachedResource->response().textEncodingName());
+ // We show content for raw resources only for certain mime types (text, html and xml). Otherwise decoder will be null.
+ if (!decoder)
+ return false;
String content = decoder->decode(buffer->data(), buffer->size());
content += decoder->flush();
*result = content;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
