Changeset 133577 in webkit

Timestamp:

Nov 6, 2012 2:43:46 AM (11 years ago)

Author:

shinyak@chromium.org

Message:

[Shadow] Using isUnknownPseudoElement() for shadow pseudo id seems confusing
​https://bugs.webkit.org/show_bug.cgi?id=100826

Reviewed by Hajime Morita.

Source/WebCore:

We used isUnknownPseudoElement() for these 3 meanings: 1) the element is a custom pseudo-element (starting with 'x-'),
2) the element is a webkit custom pseudo-element (starting with '-webkit-'), and 3) the element has an unknown type.
We would like to distinguish them when parsing CSSSelector types. Also, we disable using (3) type for using
shadowPseudoId.

In this patch, we allow using WebKitCustomPseudoElement in AuthorShadowRoot, and CustomPseudoElement in
UAShadowRoot. However, we will disable them later.

Test: fast/dom/shadow/shadow-pseudo-id.html

• css/CSSGrammar.y.in: Now we can discard UNKNOWN type. It should not match anything.
• css/CSSParser.cpp:

(WebCore::CSSParser::updateSpecifiersWithElementName):
(WebCore::CSSParser::updateSpecifiers):

• css/CSSParserValues.h:

(WebCore::CSSParserSelector::isCustomPseudoElement):
(CSSParserSelector):

• css/CSSSelector.cpp:

(WebCore::CSSSelector::pseudoId):
(WebCore::CSSSelector::parsePseudoType):
(WebCore::CSSSelector::isCustomPseudoType): Returns true if the type is PseudoUserAgentCustomElement or PseudoWebKitCustomElement.
(WebCore::CSSSelector::extractPseudoType):

• css/CSSSelector.h:

(CSSSelector):
(WebCore::CSSSelector::isCustomPseudoElement):
(WebCore):

• css/CSSSelectorList.cpp:

(WebCore::SelectorHasInvalidSelectorFunctor::operator()): We will reject all selectors which were judged as
UNKNOWN before. i.e. It contians all three types for now.
(WebCore::CSSSelectorList::hasInvalidSelector): Renamed.

• css/CSSSelectorList.h:

(CSSSelectorList):

• css/RuleSet.cpp:

(WebCore::RuleSet::addRule):

• css/SelectorChecker.cpp:

(WebCore::SelectorChecker::checkSelector):

• dom/Element.cpp:

(WebCore::Element::setShadowPseudoId):

• dom/SelectorQuery.cpp:

(WebCore::SelectorQueryCache::add):

LayoutTests:

• fast/dom/shadow/shadow-nested-pseudo-id.html: Fixed a testcase so that shadowPseudoId starts with 'x-'.
• fast/dom/shadow/shadow-pseudo-id-expected.html: Added.
• fast/dom/shadow/shadow-pseudo-id.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/shadow-nested-pseudo-id.html (modified) (2 diffs)
• LayoutTests/fast/dom/shadow/shadow-pseudo-id-expected.html (added)
• LayoutTests/fast/dom/shadow/shadow-pseudo-id.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSGrammar.y.in (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (3 diffs)
• Source/WebCore/css/CSSParserValues.h (modified) (1 diff)
• Source/WebCore/css/CSSSelector.cpp (modified) (3 diffs)
• Source/WebCore/css/CSSSelector.h (modified) (4 diffs)
• Source/WebCore/css/CSSSelectorList.cpp (modified) (1 diff)
• Source/WebCore/css/CSSSelectorList.h (modified) (1 diff)
• Source/WebCore/css/RuleSet.cpp (modified) (1 diff)
• Source/WebCore/css/SelectorChecker.cpp (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/SelectorQuery.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-06  Shinya Kawanaka  <shinyak@chromium.org>
+
+        [Shadow] Using isUnknownPseudoElement() for shadow pseudo id seems confusing
+        https://bugs.webkit.org/show_bug.cgi?id=100826
+
+        Reviewed by Hajime Morita.
+
+        * fast/dom/shadow/shadow-nested-pseudo-id.html: Fixed a testcase so that shadowPseudoId starts with 'x-'.
+        * fast/dom/shadow/shadow-pseudo-id-expected.html: Added.
+        * fast/dom/shadow/shadow-pseudo-id.html: Added.
+
 2012-11-06  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/LayoutTests/fast/dom/shadow/shadow-nested-pseudo-id.html

@@ -5 +5 @@
 <style>
 
-p::-shadow-child {
+p::x-shadow-child {
   color: red;
 }
 
-a::-nested-shadow-child {
+a::x-nested-shadow-child {
   color: blue;
 }
 
-p::-shadow-child::-nested-shadow-child {
+p::x-shadow-child::x-nested-shadow-child {
   background-color: green;
 }
@@ -40 +40 @@
     
 var host = document.getElementById("host");
-var tuple = buildShadowWithOneChild(host, "a", "-shadow-child");
+var tuple = buildShadowWithOneChild(host, "a", "x-shadow-child");
 shouldBe("window.getComputedStyle(tuple.shadowChild).color", "'rgb(255, 0, 0)'");
-var shadowTuple = buildShadowWithOneChild(tuple.shadowChild, "b", "-nested-shadow-child");
+var shadowTuple = buildShadowWithOneChild(tuple.shadowChild, "b", "x-nested-shadow-child");
 shouldBe("window.getComputedStyle(shadowTuple.shadowChild).color", "'rgb(0, 0, 255)'");
 shouldBe("window.getComputedStyle(shadowTuple.shadowChild).backgroundColor", "'rgb(0, 128, 0)'");

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-06  Shinya Kawanaka  <shinyak@chromium.org>
+
+        [Shadow] Using isUnknownPseudoElement() for shadow pseudo id seems confusing
+        https://bugs.webkit.org/show_bug.cgi?id=100826
+
+        Reviewed by Hajime Morita.
+
+        We used isUnknownPseudoElement() for these 3 meanings: 1) the element is a custom pseudo-element (starting with 'x-'),
+        2) the element is a webkit custom pseudo-element (starting with '-webkit-'), and 3) the element has an unknown type.
+        We would like to distinguish them when parsing CSSSelector types. Also, we disable using (3) type for using
+        shadowPseudoId.
+
+        In this patch, we allow using WebKitCustomPseudoElement in AuthorShadowRoot, and CustomPseudoElement in
+        UAShadowRoot. However, we will disable them later.
+
+        Test: fast/dom/shadow/shadow-pseudo-id.html
+
+        * css/CSSGrammar.y.in: Now we can discard UNKNOWN type. It should not match anything.
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::updateSpecifiersWithElementName):
+        (WebCore::CSSParser::updateSpecifiers):
+        * css/CSSParserValues.h:
+        (WebCore::CSSParserSelector::isCustomPseudoElement):
+        (CSSParserSelector):
+        * css/CSSSelector.cpp:
+        (WebCore::CSSSelector::pseudoId):
+        (WebCore::CSSSelector::parsePseudoType):
+        (WebCore::CSSSelector::isCustomPseudoType): Returns true if the type is PseudoUserAgentCustomElement or PseudoWebKitCustomElement.
+        (WebCore::CSSSelector::extractPseudoType):
+        * css/CSSSelector.h:
+        (CSSSelector):
+        (WebCore::CSSSelector::isCustomPseudoElement):
+        (WebCore):
+        * css/CSSSelectorList.cpp:
+        (WebCore::SelectorHasInvalidSelectorFunctor::operator()): We will reject all selectors which were judged as
+        UNKNOWN before. i.e. It contians all three types for now.
+        (WebCore::CSSSelectorList::hasInvalidSelector): Renamed.
+        * css/CSSSelectorList.h:
+        (CSSSelectorList):
+        * css/RuleSet.cpp:
+        (WebCore::RuleSet::addRule):
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkSelector):
+        * dom/Element.cpp:
+        (WebCore::Element::setShadowPseudoId):
+        * dom/SelectorQuery.cpp:
+        (WebCore::SelectorQueryCache::add):
+
 2012-11-06  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/css/CSSGrammar.y.in

@@ -1308 +1308 @@
         $$->setValue($3);
         // FIXME: This call is needed to force selector to compute the pseudoType early enough.
-        $$->pseudoType();
+        CSSSelector::PseudoType type = $$->pseudoType();
+        if (type == CSSSelector::PseudoUnknown)
+            $$ = 0;
     }
     // use by :-webkit-any.

trunk/Source/WebCore/css/CSSParser.cpp

@@ -10258 +10258 @@
     AtomicString determinedNamespace = namespacePrefix != nullAtom && m_styleSheet ? m_styleSheet->determineNamespace(namespacePrefix) : m_defaultNamespace;
     QualifiedName tag = QualifiedName(namespacePrefix, elementName, determinedNamespace);
-    if (!specifiers->isUnknownPseudoElement()) {
+    if (!specifiers->isCustomPseudoElement()) {
         specifiers->setTag(tag);
         return;
@@ -10267 +10267 @@
     while (history->tagHistory()) {
         history = history->tagHistory();
-        if (history->isUnknownPseudoElement() || history->hasShadowDescendant())
+        if (history->isCustomPseudoElement() || history->hasShadowDescendant())
             lastShadowDescendant = history;
     }
@@ -10286 +10286 @@
 CSSParserSelector* CSSParser::updateSpecifiers(CSSParserSelector* specifiers, CSSParserSelector* newSpecifier)
 {
-    if (newSpecifier->isUnknownPseudoElement()) {
+    if (newSpecifier->isCustomPseudoElement()) {
         // Unknown pseudo element always goes at the top of selector chain.
         newSpecifier->appendTagHistory(CSSSelector::ShadowDescendant, sinkFloatingSelector(specifiers));
         return newSpecifier;
     }
-    if (specifiers->isUnknownPseudoElement()) {
+    if (specifiers->isCustomPseudoElement()) {
         // Specifiers for unknown pseudo element go right behind it in the chain.
         specifiers->insertTagHistory(CSSSelector::SubSelector, sinkFloatingSelector(newSpecifier), CSSSelector::ShadowDescendant);

trunk/Source/WebCore/css/CSSParserValues.h

@@ -192 +192 @@
 
     CSSSelector::PseudoType pseudoType() const { return m_selector->pseudoType(); }
-    bool isUnknownPseudoElement() const { return m_selector->isUnknownPseudoElement(); }
+    bool isCustomPseudoElement() const { return m_selector->isCustomPseudoElement(); }
+
     bool isSimple() const { return !m_tagHistory && m_selector->isSimple(); }
     bool hasShadowDescendant() const;

trunk/Source/WebCore/css/CSSSelector.cpp

@@ -219 +219 @@
     case PseudoInRange:
     case PseudoOutOfRange:
+    case PseudoUserAgentCustomElement:
+    case PseudoWebKitCustomElement:
         return NOPSEUDO;
     case PseudoNotParsed:
@@ -388 +390 @@
     HashMap<AtomicStringImpl*, CSSSelector::PseudoType>* nameToPseudoType = nameToPseudoTypeMap();
     HashMap<AtomicStringImpl*, CSSSelector::PseudoType>::iterator slot = nameToPseudoType->find(name.impl());
-    return slot == nameToPseudoType->end() ? PseudoUnknown : slot->value;
-}
-
-bool CSSSelector::isUnknownPseudoType(const AtomicString& name)
-{
-    return parsePseudoType(name) == PseudoUnknown;
+
+    if (slot != nameToPseudoType->end())
+        return slot->value;
+
+    if (name.startsWith("-webkit-"))
+        return PseudoWebKitCustomElement;
+    if (name.startsWith("x-"))
+        return PseudoUserAgentCustomElement;
+
+    return PseudoUnknown;
+}
+
+bool CSSSelector::isCustomPseudoType(const AtomicString& name)
+{
+    CSSSelector::PseudoType type = parsePseudoType(name);
+    return type == PseudoUserAgentCustomElement || type == PseudoWebKitCustomElement;
 }
 
@@ -421 +433 @@
     case PseudoScrollbarTrackPiece:
     case PseudoSelection:
+    case PseudoUserAgentCustomElement:
+    case PseudoWebKitCustomElement:
         element = true;
         break;

trunk/Source/WebCore/css/CSSSelector.h

@@ -155 +155 @@
             PseudoInRange,
             PseudoOutOfRange,
+            PseudoUserAgentCustomElement,
+            PseudoWebKitCustomElement,
         };
 
@@ -184 +186 @@
 
         static PseudoType parsePseudoType(const AtomicString&);
-        static bool isUnknownPseudoType(const AtomicString&);
+        static bool isCustomPseudoType(const AtomicString&);        
         static PseudoId pseudoId(PseudoType);
 
@@ -212 +214 @@
         bool matchesPseudoElement() const;
         bool isUnknownPseudoElement() const;
+        bool isCustomPseudoElement() const;
         bool isSiblingSelector() const;
         bool isAttributeSelector() const;
@@ -290 +293 @@
 {
     return m_match == PseudoElement && m_pseudoType == PseudoUnknown;
+}
+
+inline bool CSSSelector::isCustomPseudoElement() const
+{
+    return m_match == PseudoElement && (m_pseudoType == PseudoUserAgentCustomElement || m_pseudoType == PseudoWebKitCustomElement);
 }
 

trunk/Source/WebCore/css/CSSSelectorList.cpp

@@ -198 +198 @@
 }
 
-class SelectorHasUnknownPseudoElementFunctor {
+class SelectorHasInvalidSelectorFunctor {
 public:
     bool operator()(CSSSelector* selector)
     {
-        return selector->isUnknownPseudoElement();
+        return selector->isUnknownPseudoElement() || selector->isCustomPseudoElement();
     }
 };
 
-bool CSSSelectorList::hasUnknownPseudoElements() const
-{
-    SelectorHasUnknownPseudoElementFunctor functor;
+bool CSSSelectorList::hasInvalidSelector() const
+{
+    SelectorHasInvalidSelectorFunctor functor;
     return forEachSelector(functor, this);
 }

trunk/Source/WebCore/css/CSSSelectorList.h

@@ -60 +60 @@
 
     bool selectorsNeedNamespaceResolution();
-    bool hasUnknownPseudoElements() const;
+    bool hasInvalidSelector() const;
 
     String selectorsText() const;

trunk/Source/WebCore/css/RuleSet.cpp

@@ -230 +230 @@
         return;
     }
-    if (selector->isUnknownPseudoElement()) {
+    if (selector->isCustomPseudoElement()) {
         addToRuleSet(selector->value().impl(), m_shadowPseudoElementRules, ruleData);
         return;

trunk/Source/WebCore/css/SelectorChecker.cpp

@@ -447 +447 @@
 
     if (context.selector->m_match == CSSSelector::PseudoElement) {
-        if (context.selector->isUnknownPseudoElement()) {
+        if (context.selector->isCustomPseudoElement()) {
             if (context.element->shadowPseudoId() != context.selector->value())
                 return SelectorFailsLocally;

trunk/Source/WebCore/dom/Element.cpp

@@ -1360 +1360 @@
 void Element::setShadowPseudoId(const AtomicString& id, ExceptionCode& ec)
 {
-    if (!CSSSelector::isUnknownPseudoType(id)) {
+    if (!CSSSelector::isCustomPseudoType(id)) {
         ec = SYNTAX_ERR;
         return;

trunk/Source/WebCore/dom/SelectorQuery.cpp

@@ -181 +181 @@
     parser.parseSelector(selectors, selectorList);
 
-    if (!selectorList.first() || selectorList.hasUnknownPseudoElements()) {
+    if (!selectorList.first() || selectorList.hasInvalidSelector()) {
         ec = SYNTAX_ERR;
         return 0;