Changeset 84777 in webkit

Timestamp:

Apr 25, 2011 8:51:35 AM (13 years ago)

Author:

apavlov@chromium.org

Message:

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

Reviewed by Yury Semikhatsky.

Web Inspector: CSS is parsed improperly when saved in UTF-8 with a BOM
​https://bugs.webkit.org/show_bug.cgi?id=59322

• inspector/styles/parse-utf8-bom-expected.txt: Added.
• inspector/styles/parse-utf8-bom.html: Added.
• inspector/styles/resources/parse-utf8-bom-main.css: Added. (h1): (h2):
• inspector/styles/resources/parse-utf8-bom-reset.css: Added.

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

Reviewed by Yury Semikhatsky.

Web Inspector: CSS is parsed improperly when saved in UTF-8 with a BOM
​https://bugs.webkit.org/show_bug.cgi?id=59322

Use TextResourceDecoder to determine external stylesheet charsets correctly.

Test: inspector/styles/parse-utf8-bom.html

• inspector/InspectorStyleSheet.cpp: (WebCore::InspectorStyleSheet::originalStyleSheetText):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/styles/parse-utf8-bom-expected.txt (added)
• LayoutTests/inspector/styles/parse-utf8-bom.html (added)
• LayoutTests/inspector/styles/resources/parse-utf8-bom-main.css (added)
• LayoutTests/inspector/styles/resources/parse-utf8-bom-reset.css (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorStyleSheet.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-25  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: CSS is parsed improperly when saved in UTF-8 with a BOM
+        https://bugs.webkit.org/show_bug.cgi?id=59322
+
+        * inspector/styles/parse-utf8-bom-expected.txt: Added.
+        * inspector/styles/parse-utf8-bom.html: Added.
+        * inspector/styles/resources/parse-utf8-bom-main.css: Added.
+        (h1):
+        (h2):
+        * inspector/styles/resources/parse-utf8-bom-reset.css: Added.
+
 2011-04-25  Jessie Berlin  <jberlin@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-25  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: CSS is parsed improperly when saved in UTF-8 with a BOM
+        https://bugs.webkit.org/show_bug.cgi?id=59322
+
+        Use TextResourceDecoder to determine external stylesheet charsets correctly.
+
+        Test: inspector/styles/parse-utf8-bom.html
+
+        * inspector/InspectorStyleSheet.cpp:
+        (WebCore::InspectorStyleSheet::originalStyleSheetText):
+
 2011-04-25  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp

@@ -46 +46 @@
 #include "Node.h"
 #include "StyleSheetList.h"
+#include "TextResourceDecoder.h"
 #include "WebKitCSSKeyframesRule.h"
 
@@ -1055 +1056 @@
 bool InspectorStyleSheet::originalStyleSheetText(String* result) const
 {
-    String text;
-    bool success = inlineStyleSheetText(&text);
+    String rawText;
+    bool success = inlineStyleSheetText(&rawText);
     if (!success)
-        success = resourceStyleSheetText(&text);
-    if (success)
-        *result = text;
+        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;
+    }
     return success;
 }