Title: [108533] trunk/Source/WebCore
- Revision
- 108533
- Author
- vse...@chromium.org
- Date
- 2012-02-22 12:04:59 -0800 (Wed, 22 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/Source/WebCore/ChangeLog (108532 => 108533)
--- trunk/Source/WebCore/ChangeLog 2012-02-22 20:02:55 UTC (rev 108532)
+++ trunk/Source/WebCore/ChangeLog 2012-02-22 20:04:59 UTC (rev 108533)
@@ -1,3 +1,14 @@
+2012-02-22 Vsevolod Vlasov <vse...@chromium.org>
+
+ 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-22 Adrienne Walker <e...@google.com>
Unreviewed, rolling out r108518.
Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (108532 => 108533)
--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-02-22 20:02:55 UTC (rev 108532)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2012-02-22 20:04:59 UTC (rev 108533)
@@ -144,7 +144,8 @@
else if (DOMImplementation::isXMLMIMEType(mimeType)) {
decoder = TextResourceDecoder::create("application/xml");
decoder->useLenientXMLDecoding();
- }
+ } else
+ decoder = TextResourceDecoder::create("text/plain", "UTF-8");
return decoder;
}
@@ -181,6 +182,8 @@
return true;
case CachedResource::RawResource: {
SharedBuffer* buffer = cachedResource->data();
+ if (!buffer)
+ return false;
RefPtr<TextResourceDecoder> decoder = InspectorPageAgent::createDecoder(cachedResource->response().mimeType(), cachedResource->response().textEncodingName());
String content = decoder->decode(buffer->data(), buffer->size());
content += decoder->flush();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
