Changeset 60880 in webkit

Timestamp:

Jun 8, 2010 9:44:14 PM (14 years ago)

Author:

yuzo@google.com

Message:

2010-05-18 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Fix for Bug 34529 - [CSSOM] issues with cssText and selectorText
Add U16_LENGTH that is needed to implement CSS character serialization.
​https://bugs.webkit.org/show_bug.cgi?id=34529

• wtf/unicode/qt4/UnicodeQt4.h:
• wtf/unicode/wince/UnicodeWince.h:

2010-05-18 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Fix for Bug 34529 - [CSSOM] issues with cssText and selectorText
​https://bugs.webkit.org/show_bug.cgi?id=34529

• fast/css/selector-text-escape-expected.txt: Added.
• fast/css/selector-text-escape.html: Added.

2010-05-18 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Shinichiro Hamaji.

Fix for Bug 34529 - [CSSOM] issues with cssText and selectorText
Serialize selector as per ​http://dev.w3.org/csswg/cssom/#serializing-selectors
Without this patch, for example, selectors containing ':' or '.' are not properly serialized.
​https://bugs.webkit.org/show_bug.cgi?id=34529

Test: fast/css/selector-text-escape.html

• Android.mk:
• CMakeLists.txt:
• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSOMUtils.cpp: Added. (WebCore::appendCharacter): (WebCore::serializeCharacter): (WebCore::serializeCharacterAsCodePoint): (WebCore::serializeIdentifier): (WebCore::serializeString):
• css/CSSOMUtils.h: Added.
• css/CSSSelector.cpp: (WebCore::CSSSelector::selectorText):

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h (modified) (1 diff)
• JavaScriptCore/wtf/unicode/wince/UnicodeWince.h (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/selector-text-escape-expected.txt (added)
• LayoutTests/fast/css/selector-text-escape.html (added)
• WebCore/Android.mk (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCore/css/CSSOMUtils.cpp (added)
• WebCore/css/CSSOMUtils.h (added)
• WebCore/css/CSSSelector.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-05-18  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fix for Bug 34529 -  [CSSOM] issues with cssText and selectorText
+        Add U16_LENGTH that is needed to implement CSS character serialization.
+        https://bugs.webkit.org/show_bug.cgi?id=34529
+
+        * wtf/unicode/qt4/UnicodeQt4.h:
+        * wtf/unicode/wince/UnicodeWince.h:
+
 2010-06-08  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h

@@ -74 +74 @@
 #define U16_LEAD(supplementary) (UChar)(((supplementary)>>10)+0xd7c0)
 #define U16_TRAIL(supplementary) (UChar)(((supplementary)&0x3ff)|0xdc00)
+#define U16_LENGTH(c) ((uint32_t)(c) <= 0xffff ? 1 : 2)
 
 #define U_IS_SURROGATE(c) (((c)&0xfffff800)==0xd800)

trunk/JavaScriptCore/wtf/unicode/wince/UnicodeWince.h

@@ -39 +39 @@
 #define U16_LEAD(supplementary) (UChar)(((supplementary) >> 10) + 0xd7c0)
 #define U16_TRAIL(supplementary) (UChar)(((supplementary) & 0x3ff) | 0xdc00)
+#define U16_LENGTH(c) ((uint32_t)(c) <= 0xffff ? 1 : 2)
 
 #define U_IS_SURROGATE(c) (((c) & 0xfffff800) == 0xd800)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-05-18  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fix for Bug 34529 -  [CSSOM] issues with cssText and selectorText
+        https://bugs.webkit.org/show_bug.cgi?id=34529
+
+        * fast/css/selector-text-escape-expected.txt: Added.
+        * fast/css/selector-text-escape.html: Added.
+
 2010-06-08  Zhenyao Mo  <zmo@google.com>
 

trunk/WebCore/Android.mk

@@ -45 +45 @@
         css/CSSMediaRule.cpp \
         css/CSSMutableStyleDeclaration.cpp \
+        css/CSSOMUtils.cpp \
         css/CSSPageRule.cpp \
         css/CSSParser.cpp \

trunk/WebCore/CMakeLists.txt

@@ -706 +706 @@
     css/CSSMediaRule.cpp
     css/CSSMutableStyleDeclaration.cpp
+    css/CSSOMUtils.cpp
     css/CSSPageRule.cpp
     css/CSSParser.cpp

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-18  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fix for Bug 34529 -  [CSSOM] issues with cssText and selectorText
+        Serialize selector as per http://dev.w3.org/csswg/cssom/#serializing-selectors
+        Without this patch, for example, selectors containing ':' or '.' are not properly serialized.
+        https://bugs.webkit.org/show_bug.cgi?id=34529
+
+        Test: fast/css/selector-text-escape.html
+
+        * Android.mk:
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSOMUtils.cpp: Added.
+        (WebCore::appendCharacter):
+        (WebCore::serializeCharacter):
+        (WebCore::serializeCharacterAsCodePoint):
+        (WebCore::serializeIdentifier):
+        (WebCore::serializeString):
+        * css/CSSOMUtils.h: Added.
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::selectorText):
+
 2010-06-08  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/GNUmakefile.am

@@ -642 +642 @@
         WebCore/css/CSSMutableStyleDeclaration.h \
         WebCore/css/CSSNamespace.h \
+        WebCore/css/CSSOMUtils.cpp \
+        WebCore/css/CSSOMUtils.h \
         WebCore/css/CSSPageRule.cpp \
         WebCore/css/CSSPageRule.h \

trunk/WebCore/WebCore.gypi

@@ -966 +966 @@
             'css/CSSMutableStyleDeclaration.h',
             'css/CSSNamespace.h',
+            'css/CSSOMUtils.cpp',
+            'css/CSSOMUtils.h',
             'css/CSSPageRule.cpp',
             'css/CSSPageRule.h',

trunk/WebCore/WebCore.pro

@@ -406 +406 @@
     css/CSSMediaRule.cpp \
     css/CSSMutableStyleDeclaration.cpp \
+    css/CSSOMUtils.cpp \
     css/CSSPageRule.cpp \
     css/CSSParser.cpp \
@@ -1142 +1143 @@
     css/CSSMediaRule.h \
     css/CSSMutableStyleDeclaration.h \
+    css/CSSOMUtils.h \
     css/CSSPageRule.h \
     css/CSSParser.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -27474 +27474 @@
                         </File>
                         <File
+                                RelativePath="..\css\CSSOMUtils.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\css\CSSOMUtils.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\css\CSSNamespace.h"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5068 +5068 @@
                 F916C48D0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */; };
                 F916C48E0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */; };
+                F98FFF4411A2676200F548E8 /* CSSOMUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F98FFF4211A2676200F548E8 /* CSSOMUtils.cpp */; };
+                F98FFF4511A2676200F548E8 /* CSSOMUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = F98FFF4311A2676200F548E8 /* CSSOMUtils.h */; };
                 F9F0ED7A0DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */; };
                 FA0B1F8611125CEE007F9839 /* RenderMathMLMath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA0B1F8211125CEE007F9839 /* RenderMathMLMath.cpp */; };
@@ -10660 +10662 @@
                 F916C48B0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSXMLHttpRequestProgressEvent.cpp; sourceTree = "<group>"; };
                 F916C48C0DB510F80076CD83 /* JSXMLHttpRequestProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequestProgressEvent.h; sourceTree = "<group>"; };
+                F98FFF4211A2676200F548E8 /* CSSOMUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSOMUtils.cpp; sourceTree = "<group>"; };
+                F98FFF4311A2676200F548E8 /* CSSOMUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSOMUtils.h; sourceTree = "<group>"; };
                 F9F0ED770DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = XMLHttpRequestProgressEvent.h; sourceTree = "<group>"; };
                 F9F0ED780DB50CA200D16DB9 /* XMLHttpRequestProgressEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = XMLHttpRequestProgressEvent.idl; sourceTree = "<group>"; };
@@ -16113 +16117 @@
                         isa = PBXGroup;
                         children = (
+                                F98FFF4211A2676200F548E8 /* CSSOMUtils.cpp */,
+                                F98FFF4311A2676200F548E8 /* CSSOMUtils.h */,
                                 93CA4C9C09DF93FA00DF8677 /* maketokenizer */,
                                 A80E6CDA0A1989CA007FB8C5 /* Counter.h */,
@@ -19446 +19452 @@
                                 4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */,
                                 4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */,
+                                F98FFF4511A2676200F548E8 /* CSSOMUtils.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -21748 +21755 @@
                                 A7BBE26611AFB3F20005EA03 /* JSHTMLMeterElement.cpp in Sources */,
                                 B6B0540911B68F10002564C5 /* IDBObjectStoreImpl.cpp in Sources */,
+                                F98FFF4411A2676200F548E8 /* CSSOMUtils.cpp in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/WebCore/css/CSSSelector.cpp

@@ -26 +26 @@
 #include "CSSSelector.h"
 
-#include "wtf/Assertions.h"
+#include "CSSOMUtils.h"
 #include "HTMLNames.h"
-
+#include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
 #include <wtf/StdLibExtras.h>
@@ -586 +586 @@
         if (cs->m_match == CSSSelector::Id) {
             str += "#";
-            str += cs->m_value;
+            serializeIdentifier(cs->m_value, str);
         } else if (cs->m_match == CSSSelector::Class) {
             str += ".";
-            str += cs->m_value;
+            serializeIdentifier(cs->m_value, str);
         } else if (cs->m_match == CSSSelector::PseudoClass || cs->m_match == CSSSelector::PagePseudoClass) {
             str += ":";
@@ -641 +641 @@
             }
             if (cs->m_match != CSSSelector::Set) {
-                str += "\"";
-                str += cs->m_value;
-                str += "\"]";
+                serializeString(cs->m_value, str);
+                str += "]";
             }
         }