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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 92466de..6720357 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -2635,7 +2635,3 @@ fast/workers/worker-crash-with-invalid-location.html
 # [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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index df5bcfb..18943a4 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-24  Vsevolod Vlasov  <vsevik@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-24  Andreas Kling  <awesomekling@apple.com>
 
         Miscellaneous CSSParser dodging in presentation attribute parsing.

diff --git a/Source/WebCore/inspector/InspectorPageAgent.cpp b/Source/WebCore/inspector/InspectorPageAgent.cpp
index fc1ece2..8e8b25a 100644 (file)
--- a/Source/WebCore/inspector/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/InspectorPageAgent.cpp
@@ -144,8 +144,7 @@ PassRefPtr<TextResourceDecoder> InspectorPageAgent::createDecoder(const String&
     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 @@ bool InspectorPageAgent::cachedResourceContent(CachedResource* cachedResource, S
             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;