⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 204591 in webkit


Ignore:
Timestamp:
Aug 17, 2016, 11:22:40 PM (10 years ago)
Author:
benjamin@webkit.org
Message:

[CSS] The parser should not get rid of empty namespace specification in front of element name selectors
​https://bugs.webkit.org/show_bug.cgi?id=160936

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

  • web-platform-tests/dom/nodes/ParentNode-querySelector-All-expected.txt:
  • web-platform-tests/dom/nodes/ParentNode-querySelector-All-xht-expected.txt:

Source/WebCore:

There are two places where you can specify an empty namespace
in selectors:

  • Element name (e.g. "|name")
  • Attribute name (e.g. "[|name]")

In the first case, if we have an empty namespace, the selector
should match that.
In the second case, the default namespace of attribute is already
empty so it is just the same as "[name]".

Our code was just discarding any empty namespace. This is fine
for attributes but for names that is transforming "|name" into "name"
which is invalid.

This patch updates those cases to differentiate:

  • Null prefix -> There was no namespace specified.
  • Empty prefix -> There was a namespace prefix and it is empty.

Test: fast/selectors/empty-namespace-with-element-selector.html

  • css/CSSGrammar.y.in:
  • css/CSSParser.cpp:

(WebCore::CSSParser::determineNameInNamespace):
(WebCore::CSSParser::rewriteSpecifiersWithNamespaceIfNeeded):
(WebCore::CSSParser::rewriteSpecifiersWithElementName):

  • css/CSSParser.h:
  • css/CSSSelector.cpp:

(WebCore::CSSSelector::selectorText):

  • css/CSSSelectorList.cpp:

(WebCore::SelectorNeedsNamespaceResolutionFunctor::operator()):

  • css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::determineNamespace): Deleted.

LayoutTests:

  • fast/css/css-selector-text-expected.txt:
  • fast/css/css-selector-text.html:
  • fast/css/css-set-selector-text-expected.txt:
  • fast/css/css-set-selector-text.html:
  • fast/selectors/empty-namespace-with-element-selector-expected.txt: Added.
  • fast/selectors/empty-namespace-with-element-selector.html: Added.
Location:
trunk
Files:
2 added
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r204563 r204591  
     12016-08-17  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        [CSS] The parser should not get rid of empty namespace specification in front of element name selectors
     4        https://bugs.webkit.org/show_bug.cgi?id=160936
     5
     6        Reviewed by Chris Dumez.
     7
     8        * fast/css/css-selector-text-expected.txt:
     9        * fast/css/css-selector-text.html:
     10        * fast/css/css-set-selector-text-expected.txt:
     11        * fast/css/css-set-selector-text.html:
     12        * fast/selectors/empty-namespace-with-element-selector-expected.txt: Added.
     13        * fast/selectors/empty-namespace-with-element-selector.html: Added.
     14
    1152016-08-17  Chris Fleizach  <cfleizach@apple.com>
    216

  • trunk/LayoutTests/fast/css/css-selector-text-expected.txt

    r202358 r204591  
    2727PASS parseThenSerializeRule('*|* { }') is '*|* { }'
    2828PASS parseThenSerializeRule('n|* { }') is 'n|* { }'
     29PASS parseThenSerializeRule('|a { }') is '|a { }'
     30PASS parseThenSerializeRule('|* { }') is '|* { }'
    2931PASS parseThenSerializeRule('[*|a] { }') is '[*|a] { }'
    3032PASS parseThenSerializeRule('[n|a] { }') is '[n|a] { }'
     33PASS parseThenSerializeRule('[|a] { }') is '[a] { }'
    3134
    3235PASS parseThenSerializeRule('a:active { }') is 'a:active { }'
    … …  
    254257
    255258PASS parseThenSerializeRule('*:active { }') is ':active { }'
    256 PASS parseThenSerializeRule('|a { }') is 'a { }'
    257259
    258260PASS parseThenSerializeRule('input[type=file]:focus { }') is 'input[type="file"]:focus { }'

  • trunk/LayoutTests/fast/css/css-selector-text.html

    r202358 r204591  
    7878testSelectorRoundTrip('*|*');
    7979testSelectorRoundTrip('n|*');
     80testSelectorRoundTrip('|a');
     81testSelectorRoundTrip('|*');
    8082testSelectorRoundTrip('[*|a]');
    8183testSelectorRoundTrip('[n|a]');
     84shouldBe("parseThenSerializeRule('[|a] { }')", "'[a] { }'");
    8285
    8386debug('');
    … …  
    355358
    356359shouldBe("parseThenSerializeRule('*:active { }')", "':active { }'");
    357 shouldBe("parseThenSerializeRule('|a { }')", "'a { }'");
    358360
    359361debug('');

  • trunk/LayoutTests/fast/css/css-set-selector-text-expected.txt

    r202358 r204591  
    3939PASS setThenReadSelectorText('[*|a]') is '[*|a]'
    4040PASS setThenReadSelectorText('[n|a]') is '[n|a]'
     41PASS setThenReadSelectorText('|*') is '|*'
     42PASS setThenReadSelectorText('[*|a]') is '[*|a]'
     43PASS setThenReadSelectorText('[n|a]') is '[n|a]'
     44PASS setThenReadSelectorText('[|a]') is '[a]'
    4145
    4246PASS setThenReadSelectorText('a:active') is 'a:active'
    … …  
    249253
    250254PASS setThenReadSelectorText('*:active') is ':active'
    251 PASS setThenReadSelectorText('|a') is 'a'
    252255
    253256PASS setThenReadSelectorText('input[type=file]:focus') is 'input[type="file"]:focus'

  • trunk/LayoutTests/fast/css/css-set-selector-text.html

    r202358 r204591  
    9797testSelectorRoundTrip('[*|a]');
    9898testSelectorRoundTrip('[n|a]');
     99testSelectorRoundTrip('|*');
     100testSelectorRoundTrip('[*|a]');
     101testSelectorRoundTrip('[n|a]');
     102shouldBe("setThenReadSelectorText('[|a]')", "'[a]'");
    99103
    100104debug('');
    … …  
    352356
    353357shouldBe("setThenReadSelectorText('*:active')", "':active'");
    354 shouldBe("setThenReadSelectorText('|a')", "'a'");
    355358
    356359debug('');

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r204543 r204591  
     12016-08-17  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        [CSS] The parser should not get rid of empty namespace specification in front of element name selectors
     4        https://bugs.webkit.org/show_bug.cgi?id=160936
     5
     6        Reviewed by Chris Dumez.
     7
     8        * web-platform-tests/dom/nodes/ParentNode-querySelector-All-expected.txt:
     9        * web-platform-tests/dom/nodes/ParentNode-querySelector-All-xht-expected.txt:
     10
    1112016-08-16  Chris Dumez  <cdumez@apple.com>
    212

  • trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/ParentNode-querySelector-All-expected.txt

    r204522 r204591  
    604604PASS Document.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    605605PASS Document.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    606 FAIL Document.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    607 FAIL Document.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    608 FAIL Document.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    609 FAIL Document.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     606PASS Document.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     607PASS Document.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     608PASS Document.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     609PASS Document.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    610610PASS Document.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    611611PASS Document.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    … …  
    10221022PASS Detached Element.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    10231023PASS Detached Element.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    1024 FAIL Detached Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1025 FAIL Detached Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    1026 FAIL Detached Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1027 FAIL Detached Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     1024PASS Detached Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1025PASS Detached Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1026PASS Detached Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     1027PASS Detached Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    10281028PASS Detached Element.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    10291029PASS Detached Element.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    … …  
    14381438PASS Fragment.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    14391439PASS Fragment.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    1440 FAIL Fragment.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1441 FAIL Fragment.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    1442 FAIL Fragment.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1443 FAIL Fragment.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     1440PASS Fragment.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1441PASS Fragment.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1442PASS Fragment.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     1443PASS Fragment.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    14441444PASS Fragment.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    14451445PASS Fragment.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    … …  
    18541854PASS In-document Element.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    18551855PASS In-document Element.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    1856 FAIL In-document Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1857 FAIL In-document Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    1858 FAIL In-document Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1859 FAIL In-document Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     1856PASS In-document Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1857PASS In-document Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1858PASS In-document Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     1859PASS In-document Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    18601860PASS In-document Element.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    18611861PASS In-document Element.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div

  • trunk/LayoutTests/imported/w3c/web-platform-tests/dom/nodes/ParentNode-querySelector-All-xht-expected.txt

    r204522 r204591  
    604604PASS Document.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    605605PASS Document.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    606 FAIL Document.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    607 FAIL Document.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    608 FAIL Document.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    609 FAIL Document.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     606PASS Document.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     607PASS Document.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     608PASS Document.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     609PASS Document.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    610610PASS Document.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    611611PASS Document.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    … …  
    10221022PASS Detached Element.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    10231023PASS Detached Element.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    1024 FAIL Detached Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1025 FAIL Detached Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    1026 FAIL Detached Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1027 FAIL Detached Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     1024PASS Detached Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1025PASS Detached Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1026PASS Detached Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     1027PASS Detached Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    10281028PASS Detached Element.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    10291029PASS Detached Element.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    … …  
    14381438PASS Fragment.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    14391439PASS Fragment.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    1440 FAIL Fragment.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1441 FAIL Fragment.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    1442 FAIL Fragment.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1443 FAIL Fragment.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     1440PASS Fragment.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1441PASS Fragment.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1442PASS Fragment.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     1443PASS Fragment.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    14441444PASS Fragment.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    14451445PASS Fragment.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    … …  
    18541854PASS In-document Element.querySelectorAll: Namespace selector, matching element with any namespace: #any-namespace *|div
    18551855PASS In-document Element.querySelector: Namespace selector, matching element with any namespace: #any-namespace *|div
    1856 FAIL In-document Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1857 FAIL In-document Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
    1858 FAIL In-document Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the expected number of matches. expected 1 but got 4
    1859 FAIL In-document Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |* assert_equals: The method should return the first match. expected "no-namespace-div3" but got "no-namespace-div1"
     1856PASS In-document Element.querySelectorAll: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1857PASS In-document Element.querySelector: Namespace selector, matching div elements in no namespace only: #no-namespace |div
     1858PASS In-document Element.querySelectorAll: Namespace selector, matching any elements in no namespace only: #no-namespace |*
     1859PASS In-document Element.querySelector: Namespace selector, matching any elements in no namespace only: #no-namespace |*
    18601860PASS In-document Element.querySelectorAll: Descendant combinator, matching element that is a descendant of an element with id: #descendant div
    18611861PASS In-document Element.querySelector: Descendant combinator, matching element that is a descendant of an element with id: #descendant div

  • trunk/Source/WebCore/ChangeLog

    r204589 r204591  
     12016-08-17  Benjamin Poulain  <benjamin@webkit.org>
     2
     3        [CSS] The parser should not get rid of empty namespace specification in front of element name selectors
     4        https://bugs.webkit.org/show_bug.cgi?id=160936
     5
     6        Reviewed by Chris Dumez.
     7
     8        There are two places where you can specify an empty namespace
     9        in selectors:
     10            - Element name (e.g. "|name")
     11            - Attribute name (e.g. "[|name]")
     12        In the first case, if we have an empty namespace, the selector
     13        should match that.
     14        In the second case, the default namespace of attribute is already
     15        empty so it is just the same as "[name]".
     16
     17        Our code was just discarding any empty namespace. This is fine
     18        for attributes but for names that is transforming "|name" into "name"
     19        which is invalid.
     20
     21        This patch updates those cases to differentiate:
     22        - Null prefix -> There was no namespace specified.
     23        - Empty prefix -> There was a namespace prefix and it is empty.
     24
     25        Test: fast/selectors/empty-namespace-with-element-selector.html
     26
     27        * css/CSSGrammar.y.in:
     28        * css/CSSParser.cpp:
     29        (WebCore::CSSParser::determineNameInNamespace):
     30        (WebCore::CSSParser::rewriteSpecifiersWithNamespaceIfNeeded):
     31        (WebCore::CSSParser::rewriteSpecifiersWithElementName):
     32        * css/CSSParser.h:
     33        * css/CSSSelector.cpp:
     34        (WebCore::CSSSelector::selectorText):
     35        * css/CSSSelectorList.cpp:
     36        (WebCore::SelectorNeedsNamespaceResolutionFunctor::operator()):
     37        * css/StyleSheetContents.cpp:
     38        (WebCore::StyleSheetContents::determineNamespace): Deleted.
     39
    1402016-08-17  Chris Dumez  <cdumez@apple.com>
    241

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

    r203269 r204591  
    11661166
    11671167namespace_selector:
    1168     '|' { $$.clear(); }
     1168    '|' {
     1169        static LChar emptyString = '\0';
     1170        $$.init(&emptyString, 0);
     1171    }
    11691172    | '*' '|' { static LChar star = '*'; $$.init(&star, 1); }
    11701173    | IDENT '|'
    … …  
    11771180    | element_name specifier_list {
    11781181        $$ = $2;
    1179         if ($$)
    1180             parser->rewriteSpecifiersWithElementName(nullAtom, $1, *$$);
     1182        if ($$) {
     1183            QualifiedName elementName(nullAtom, $1, parser->m_defaultNamespace);
     1184            parser->rewriteSpecifiersWithElementName(elementName, *$$);
     1185        }
    11811186    }
    11821187    | specifier_list {

  • trunk/Source/WebCore/css/CSSParser.cpp

    r204566 r204591  
    1309013090QualifiedName CSSParser::determineNameInNamespace(const AtomicString& prefix, const AtomicString& localName)
    1309113091{
     13092    if (prefix.isNull())
     13093        return QualifiedName(nullAtom, localName, nullAtom); // No namespace. If an element/attribute has a namespace, we won't match it.
     13094    if (prefix.isEmpty())
     13095        return QualifiedName(emptyAtom, localName, emptyAtom); // Empty namespace.
     13096    if (prefix == starAtom)
     13097        return QualifiedName(prefix, localName, starAtom); // We'll match any namespace.
     13098
    1309213099    if (!m_styleSheet)
    1309313100        return QualifiedName(prefix, localName, m_defaultNamespace);
    … …  
    1309713104void CSSParser::rewriteSpecifiersWithNamespaceIfNeeded(CSSParserSelector& specifiers)
    1309813105{
    13099     if (m_defaultNamespace != starAtom || specifiers.isCustomPseudoElement())
    13100         rewriteSpecifiersWithElementName(nullAtom, starAtom, specifiers, /*tagIsForNamespaceRule*/true);
    13101 }
    13102 
    13103 void CSSParser::rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector& specifiers, bool tagIsForNamespaceRule)
    13104 {
    13105     AtomicString determinedNamespace = namespacePrefix != nullAtom && m_styleSheet ? m_styleSheet->determineNamespace(namespacePrefix) : m_defaultNamespace;
    13106     QualifiedName tag(namespacePrefix, elementName, determinedNamespace);
    13107 
     13106    if (m_defaultNamespace != starAtom || specifiers.isCustomPseudoElement()) {
     13107        QualifiedName elementName(nullAtom, starAtom, m_defaultNamespace);
     13108        rewriteSpecifiersWithElementName(elementName, specifiers, /*tagIsForNamespaceRule*/true);
     13109    }
     13110}
     13111
     13112void CSSParser::rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector& specifiers)
     13113{
     13114    QualifiedName tag(determineNameInNamespace(namespacePrefix, elementName));
     13115    rewriteSpecifiersWithElementName(tag, specifiers, false);
     13116}
     13117
     13118void CSSParser::rewriteSpecifiersWithElementName(const QualifiedName& tag, CSSParserSelector& specifiers, bool tagIsForNamespaceRule)
     13119{
    1310813120    if (!specifiers.isCustomPseudoElement()) {
    1310913121        if (tag == anyQName())

  • trunk/Source/WebCore/css/CSSParser.h

    r204566 r204591  
    404404    QualifiedName determineNameInNamespace(const AtomicString& prefix, const AtomicString& localName);
    405405
    406     void rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector&, bool isNamespacePlaceholder = false);
     406    void rewriteSpecifiersWithElementName(const AtomicString& namespacePrefix, const AtomicString& elementName, CSSParserSelector&);
     407    void rewriteSpecifiersWithElementName(const QualifiedName& tagName, CSSParserSelector&, bool isNamespacePlaceholder = false);
    407408    void rewriteSpecifiersWithNamespaceIfNeeded(CSSParserSelector&);
    408409    std::unique_ptr<CSSParserSelector> rewriteSpecifiers(std::unique_ptr<CSSParserSelector>, std::unique_ptr<CSSParserSelector>);

  • trunk/Source/WebCore/css/CSSSelector.cpp

    r204466 r204591  
    669669            str.append('[');
    670670            const AtomicString& prefix = cs->attribute().prefix();
    671             if (!prefix.isNull()) {
     671            if (!prefix.isEmpty()) {
    672672                str.append(prefix);
    673673                str.append('|');

  • trunk/Source/WebCore/css/CSSSelectorList.cpp

    r195304 r204591  
    174174    bool operator()(const CSSSelector* selector)
    175175    {
    176         if (selector->match() == CSSSelector::Tag && selector->tagQName().prefix() != nullAtom && selector->tagQName().prefix() != starAtom)
    177             return true;
    178         if (selector->isAttributeSelector() && selector->attribute().prefix() != nullAtom && selector->attribute().prefix() != starAtom)
     176        if (selector->match() == CSSSelector::Tag && !selector->tagQName().prefix().isEmpty() && selector->tagQName().prefix() != starAtom)
     177            return true;
     178        if (selector->isAttributeSelector() && !selector->attribute().prefix().isEmpty() && selector->attribute().prefix() != starAtom)
    179179            return true;
    180180        return false;

  • trunk/Source/WebCore/css/StyleSheetContents.cpp

    r201441 r204591  
    280280const AtomicString& StyleSheetContents::determineNamespace(const AtomicString& prefix)
    281281{
    282     if (prefix.isNull())
    283         return nullAtom; // No namespace. If an element/attribute has a namespace, we won't match it.
    284     if (prefix == starAtom)
    285         return starAtom; // We'll match any namespace.
    286282    PrefixNamespaceURIMap::const_iterator it = m_namespaces.find(prefix);
    287283    if (it == m_namespaces.end())
Note: See TracChangeset for help on using the changeset viewer.