Changeset 19324 in webkit

Timestamp:

Jan 31, 2007 8:26:51 PM (17 years ago)

Author:

weinig

Message:

LayoutTests:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=12506
REGRESSION: Safari doesn't display hebrew text on a web page,
displayed correctly on Tiger

• fast/encoding/pseudo-tags-in-attributes-expected.txt: Added.
• fast/encoding/pseudo-tags-in-attributes.html: Added.

WebCore:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=12506
REGRESSION: Safari doesn't display hebrew text on a web page,
displayed correctly on Tiger

• loader/TextResourceDecoder.cpp: (WebCore::TextResourceDecoder::checkForHeadCharset): Skip over quoted attributes.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/encoding/pseudo-tags-in-attributes-expected.txt (added)
• LayoutTests/fast/encoding/pseudo-tags-in-attributes.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/TextResourceDecoder.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-01-31  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12506
+        REGRESSION: Safari doesn't display hebrew text on a web page,
+        displayed correctly on Tiger
+
+        * fast/encoding/pseudo-tags-in-attributes-expected.txt: Added.
+        * fast/encoding/pseudo-tags-in-attributes.html: Added.
+
 2007-01-31  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-31  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12506
+        REGRESSION: Safari doesn't display hebrew text on a web page,
+        displayed correctly on Tiger
+
+        * loader/TextResourceDecoder.cpp:
+        (WebCore::TextResourceDecoder::checkForHeadCharset): Skip over 
+        quoted attributes.
+
 2007-01-31  David Carson  <dacarson@gmail.com>
 

trunk/WebCore/loader/TextResourceDecoder.cpp

@@ -560 +560 @@
             }
             
+            // Find where the opening tag ends.
+            const char* tagContentStart = ptr;
+            if (!end) {
+                while (*ptr != '>') {
+                    if (*ptr == '\0')
+                        return false;
+                    if (*ptr == '\'' || *ptr == '"') {
+                        char quoteMark = *ptr;
+                        while (*ptr != quoteMark) {
+                            if (*ptr == '\0')
+                                return false;
+                            ++ptr;
+                        }
+                    }
+                    ++ptr;
+                }
+            }
+            
             if (!end && tag == metaTag) {
-                const char* end = ptr;
-                while (*end != '>' && *end != '\0')
-                    end++;
-                if (*end == '\0')
-                    break;
-                DeprecatedCString str(ptr, (end-ptr)+1);
+                DeprecatedCString str(tagContentStart, tagContentStart - ptr);
                 str = str.lower();
                 int pos = 0;