Changeset 147295 in webkit

Timestamp:

Mar 31, 2013 8:44:36 PM (11 years ago)

Author:

hayato@chromium.org

Message:

Text representation of pseudo elements, '::-webkit-distributed', is wrong in CSSSelector::selectorText().
​https://bugs.webkit.org/show_bug.cgi?id=113560

Reviewed by Dimitri Glazkov.

Source/WebCore:

Fix the text representation of distributed functional pseudo elements in CSSSelector::selectorText().

Test: fast/dom/shadow/distributed-pseudo-element-css-text.html

• css/CSSSelector.cpp:

(WebCore::CSSSelector::selectorText):

• css/CSSSelector.h:

(CSSSelector):

LayoutTests:

• fast/dom/shadow/distributed-pseudo-element-css-text-expected.txt: Added.
• fast/dom/shadow/distributed-pseudo-element-css-text.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/distributed-pseudo-element-css-text-expected.txt (added)
• LayoutTests/fast/dom/shadow/distributed-pseudo-element-css-text.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSSelector.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSSelector.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-31  Hayato Ito  <hayato@chromium.org>
+
+        Text representation of pseudo elements, '::-webkit-distributed', is wrong in CSSSelector::selectorText().
+        https://bugs.webkit.org/show_bug.cgi?id=113560
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/distributed-pseudo-element-css-text-expected.txt: Added.
+        * fast/dom/shadow/distributed-pseudo-element-css-text.html: Added.
+
 2013-03-31  Rafael Weinstein  <rafaelw@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-31  Hayato Ito  <hayato@chromium.org>
+
+        Text representation of pseudo elements, '::-webkit-distributed', is wrong in CSSSelector::selectorText().
+        https://bugs.webkit.org/show_bug.cgi?id=113560
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix the text representation of distributed functional pseudo elements in CSSSelector::selectorText().
+
+        Test: fast/dom/shadow/distributed-pseudo-element-css-text.html
+
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::selectorText):
+        * css/CSSSelector.h:
+        (CSSSelector):
+
 2013-03-31  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/css/CSSSelector.cpp

@@ -609 +609 @@
 }
 
-String CSSSelector::selectorText() const
+String CSSSelector::selectorText(const String& rightSide) const
 {
     StringBuilder str;
@@ -710 +710 @@
 
     if (const CSSSelector* tagHistory = cs->tagHistory()) {
-        String tagHistoryText = tagHistory->selectorText();
         switch (cs->relation()) {
         case CSSSelector::Descendant:
-            return tagHistoryText + " " + str.toString();
+            return tagHistory->selectorText(" " + str.toString() + rightSide);
         case CSSSelector::Child:
-            return tagHistoryText + " > " + str.toString();
+            return tagHistory->selectorText(" > " + str.toString() + rightSide);
         case CSSSelector::DirectAdjacent:
-            return tagHistoryText + " + " + str.toString();
+            return tagHistory->selectorText(" + " + str.toString() + rightSide);
         case CSSSelector::IndirectAdjacent:
-            return tagHistoryText + " ~ " + str.toString();
+            return tagHistory->selectorText(" ~ " + str.toString() + rightSide);
         case CSSSelector::SubSelector:
             ASSERT_NOT_REACHED();
         case CSSSelector::ShadowDescendant:
-            return tagHistoryText + str.toString();
+            return tagHistory->selectorText(str.toString() + rightSide);
 #if ENABLE(SHADOW_DOM)
         case CSSSelector::ShadowDistributed:
-            return tagHistoryText + "::-webkit-distributed(" + str.toString() + ")";
+            return tagHistory->selectorText("::-webkit-distributed(" + str.toString() + rightSide + ")");
 #endif
         }
     }
-
-    return str.toString();
+    return str.toString() + rightSide;
 }
 

trunk/Source/WebCore/css/CSSSelector.h

@@ -45 +45 @@
          * Re-create selector text from selector's data
          */
-        String selectorText() const;
+        String selectorText(const String& = "") const;
 
         // checks if the 2 selectors (including sub selectors) agree.