Changeset 85172 in webkit

Timestamp:

Apr 28, 2011 2:06:58 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

2011-04-26 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: Use CachedResource to retrieve charset-decoded stylesheet text
​https://bugs.webkit.org/show_bug.cgi?id=59326

Concrete CachedResource successors for stylesheets and scripts
can decode their content better than the generic approach we use.

• inspector/InspectorPageAgent.cpp: (WebCore::decodeSharedBuffer): (WebCore::prepareCachedResourceBuffer): (WebCore::cachedResourceDecoded): (WebCore::InspectorPageAgent::resourceContent): (WebCore::InspectorPageAgent::resourceData):
• inspector/InspectorStyleSheet.cpp: (WebCore::InspectorStyleSheet::originalStyleSheetText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorPageAgent.cpp (modified) (4 diffs)
• inspector/InspectorStyleSheet.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-26  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Use CachedResource to retrieve charset-decoded stylesheet text
+        https://bugs.webkit.org/show_bug.cgi?id=59326
+
+        Concrete CachedResource successors for stylesheets and scripts
+        can decode their content better than the generic approach we use.
+
+        * inspector/InspectorPageAgent.cpp:
+        (WebCore::decodeSharedBuffer):
+        (WebCore::prepareCachedResourceBuffer):
+        (WebCore::cachedResourceDecoded):
+        (WebCore::InspectorPageAgent::resourceContent):
+        (WebCore::InspectorPageAgent::resourceData):
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheet::originalStyleSheetText):
+
 2011-04-28  Jon Lee  <jonlee@apple.com>
 

trunk/Source/WebCore/inspector/InspectorPageAgent.cpp

@@ -36 +36 @@
 
 #include "Base64.h"
+#include "CachedCSSStyleSheet.h"
+#include "CachedResource.h"
 #include "CachedResourceLoader.h"
+#include "CachedScript.h"
 #include "Cookie.h"
 #include "CookieJar.h"
@@ -62 +65 @@
 namespace WebCore {
 
-PassOwnPtr<InspectorPageAgent> InspectorPageAgent::create(InstrumentingAgents* instrumentingAgents, Page* page, InjectedScriptManager* injectedScriptManager)
-{
-    return adoptPtr(new InspectorPageAgent(instrumentingAgents, page, injectedScriptManager));
-}
-
-void InspectorPageAgent::resourceContent(ErrorString* errorString, Frame* frame, const KURL& url, String* result)
-{
-    if (!frame) {
-        *errorString = "No frame to get resource content for";
-        return;
-    }
-
-    String textEncodingName;
-    RefPtr<SharedBuffer> buffer = InspectorPageAgent::resourceData(frame, url, &textEncodingName);
-
+static bool decodeSharedBuffer(PassRefPtr<SharedBuffer> buffer, const String& textEncodingName, String* result)
+{
     if (buffer) {
         TextEncoding encoding(textEncodingName);
@@ -82 +72 @@
             encoding = WindowsLatin1Encoding();
         *result = encoding.decode(buffer->data(), buffer->size());
-        return;
-    }
-    *errorString = "No resource with given URL found";
-}
-
-void InspectorPageAgent::resourceContentBase64(ErrorString* errorString, Frame* frame, const KURL& url, String* result)
-{
-    String textEncodingName;
-    RefPtr<SharedBuffer> data = InspectorPageAgent::resourceData(frame, url, &textEncodingName);
-    if (!data) {
-        *result = String();
-        *errorString = "No resource with given URL found";
-        return;
-    }
-
-    *result = base64Encode(data->data(), data->size());
-}
-
-PassRefPtr<SharedBuffer> InspectorPageAgent::resourceData(Frame* frame, const KURL& url, String* textEncodingName)
-{
-    FrameLoader* frameLoader = frame->loader();
-    DocumentLoader* loader = frameLoader->documentLoader();
-    if (equalIgnoringFragmentIdentifier(url, loader->url())) {
-        *textEncodingName = frame->document()->inputEncoding();
-        return frameLoader->documentLoader()->mainResourceData();
-    }
-
-    CachedResource* cachedResource = InspectorPageAgent::cachedResource(frame, url);
+        return true;
+    }
+    return false;
+}
+
+static bool prepareCachedResourceBuffer(CachedResource* cachedResource, bool* hasZeroSize)
+{
+    *hasZeroSize = false;
     if (!cachedResource)
-        return 0;
-
-    // Zero-sized resources don't have data at all -- so fake the empty buffer, insted of indicating error by returning 0.
-    if (!cachedResource->encodedSize())
-        return SharedBuffer::create();
+        return false;
+
+    // Zero-sized resources don't have data at all -- so fake the empty buffer, instead of indicating error by returning 0.
+    if (!cachedResource->encodedSize()) {
+        *hasZeroSize = true;
+        return true;
+    }
 
     if (cachedResource->isPurgeable()) {
@@ -125 +97 @@
         // inspector?
         if (!cachedResource->makePurgeable(false))
-            return 0;
-    }
+            return false;
+    }
+
+    return true;
+}
+
+static bool decodeCachedResource(CachedResource* cachedResource, String* result)
+{
+    bool hasZeroSize;
+    bool prepared = prepareCachedResourceBuffer(cachedResource, &hasZeroSize);
+    if (!prepared)
+        return false;
+
+    if (cachedResource) {
+        switch (cachedResource->type()) {
+        case CachedResource::CSSStyleSheet:
+            *result = static_cast<CachedCSSStyleSheet*>(cachedResource)->sheetText();
+            return true;
+        case CachedResource::Script:
+            *result = static_cast<CachedScript*>(cachedResource)->script();
+            return true;
+        default:
+            if (hasZeroSize) {
+                *result = "";
+                return true;
+            }
+            return decodeSharedBuffer(cachedResource->data(), cachedResource->encoding(), result);
+        }
+    }
+    return false;
+}
+
+PassOwnPtr<InspectorPageAgent> InspectorPageAgent::create(InstrumentingAgents* instrumentingAgents, Page* page, InjectedScriptManager* injectedScriptManager)
+{
+    return adoptPtr(new InspectorPageAgent(instrumentingAgents, page, injectedScriptManager));
+}
+
+void InspectorPageAgent::resourceContent(ErrorString* errorString, Frame* frame, const KURL& url, String* result)
+{
+    if (!frame) {
+        *errorString = "No frame to get resource content for";
+        return;
+    }
+
+    FrameLoader* frameLoader = frame->loader();
+    DocumentLoader* loader = frameLoader->documentLoader();
+    RefPtr<SharedBuffer> buffer;
+    bool success = false;
+    if (equalIgnoringFragmentIdentifier(url, loader->url())) {
+        String textEncodingName = frame->document()->inputEncoding();
+        buffer = frameLoader->documentLoader()->mainResourceData();
+        success = decodeSharedBuffer(buffer, textEncodingName, result);
+    }
+    if (!success)
+        success = decodeCachedResource(cachedResource(frame, url), result);
+
+    if (!success)
+        *errorString = "No resource with given URL found";
+}
+
+void InspectorPageAgent::resourceContentBase64(ErrorString* errorString, Frame* frame, const KURL& url, String* result)
+{
+    String textEncodingName;
+    RefPtr<SharedBuffer> data = InspectorPageAgent::resourceData(frame, url, &textEncodingName);
+    if (!data) {
+        *result = String();
+        *errorString = "No resource with given URL found";
+        return;
+    }
+
+    *result = base64Encode(data->data(), data->size());
+}
+
+PassRefPtr<SharedBuffer> InspectorPageAgent::resourceData(Frame* frame, const KURL& url, String* textEncodingName)
+{
+    RefPtr<SharedBuffer> buffer;
+    FrameLoader* frameLoader = frame->loader();
+    DocumentLoader* loader = frameLoader->documentLoader();
+    if (equalIgnoringFragmentIdentifier(url, loader->url())) {
+        *textEncodingName = frame->document()->inputEncoding();
+        buffer = frameLoader->documentLoader()->mainResourceData();
+        if (buffer)
+            return buffer;
+    }
+
+    CachedResource* cachedResource = InspectorPageAgent::cachedResource(frame, url);
+    if (!cachedResource)
+        return 0;
+
+    bool hasZeroSize;
+    bool prepared = prepareCachedResourceBuffer(cachedResource, &hasZeroSize);
+    if (!prepared)
+        return 0;
 
     *textEncodingName = cachedResource->encoding();
-    return cachedResource->data();
+    return hasZeroSize ? SharedBuffer::create() : cachedResource->data();
 }
 

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -46 +46 @@
 #include "Node.h"
 #include "StyleSheetList.h"
-#include "TextResourceDecoder.h"
 #include "WebKitCSSKeyframesRule.h"
 
@@ -1056 +1055 @@
 bool InspectorStyleSheet::originalStyleSheetText(String* result) const
 {
-    String rawText;
-    bool success = inlineStyleSheetText(&rawText);
+    bool success = inlineStyleSheetText(result);
     if (!success)
-        success = resourceStyleSheetText(&rawText);
-    if (success) {
-        CString cString = rawText.utf8();
-        RefPtr<TextResourceDecoder> decoder = TextResourceDecoder::create("text/css");
-        String sheetText = decoder->decode(cString.data(), cString.length());
-        sheetText += decoder->flush();
-        *result = sheetText;
-    }
+        success = resourceStyleSheetText(result);
     return success;
 }