Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(866)

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSSelectorParser.cpp

Issue 1616423003: Fix selector namespace prefix resolution. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/parser/CSSSelectorParser.h" 5 #include "core/css/parser/CSSSelectorParser.h"
6 6
7 #include "core/css/CSSSelectorList.h" 7 #include "core/css/CSSSelectorList.h"
8 #include "core/css/StyleSheetContents.h" 8 #include "core/css/StyleSheetContents.h"
9 #include "core/frame/UseCounter.h" 9 #include "core/frame/UseCounter.h"
10 #include "platform/RuntimeEnabledFeatures.h" 10 #include "platform/RuntimeEnabledFeatures.h"
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 compoundPseudoElement = simpleSelector->pseudoType(); 297 compoundPseudoElement = simpleSelector->pseudoType();
298 298
299 if (compoundSelector) 299 if (compoundSelector)
300 compoundSelector = addSimpleSelectorToCompound(compoundSelector.rele ase(), simpleSelector.release()); 300 compoundSelector = addSimpleSelectorToCompound(compoundSelector.rele ase(), simpleSelector.release());
301 else 301 else
302 compoundSelector = simpleSelector.release(); 302 compoundSelector = simpleSelector.release();
303 } 303 }
304 304
305 if (!compoundSelector) { 305 if (!compoundSelector) {
306 AtomicString namespaceURI = determineNamespace(namespacePrefix); 306 AtomicString namespaceURI = determineNamespace(namespacePrefix);
307 if (namespaceURI.isNull()) 307 if (namespaceURI.isNull()) {
308 m_failedParsing = true;
rune 2016/01/22 11:50:30 There's a separate CL (https://codereview.chromium
308 return nullptr; 309 return nullptr;
310 }
309 return CSSParserSelector::create(QualifiedName(namespacePrefix, elementN ame, namespaceURI)); 311 return CSSParserSelector::create(QualifiedName(namespacePrefix, elementN ame, namespaceURI));
310 } 312 }
311 prependTypeSelectorIfNeeded(namespacePrefix, elementName, compoundSelector.g et()); 313 prependTypeSelectorIfNeeded(namespacePrefix, elementName, compoundSelector.g et());
312 return splitCompoundAtImplicitShadowCrossingCombinator(compoundSelector.rele ase()); 314 return splitCompoundAtImplicitShadowCrossingCombinator(compoundSelector.rele ase());
313 } 315 }
314 316
315 PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeSimpleSelector(CSSParser TokenRange& range) 317 PassOwnPtr<CSSParserSelector> CSSSelectorParser::consumeSimpleSelector(CSSParser TokenRange& range)
316 { 318 {
317 const CSSParserToken& token = range.peek(); 319 const CSSParserToken& token = range.peek();
318 OwnPtr<CSSParserSelector> selector; 320 OwnPtr<CSSParserSelector> selector;
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 696
695 const AtomicString& CSSSelectorParser::defaultNamespace() const 697 const AtomicString& CSSSelectorParser::defaultNamespace() const
696 { 698 {
697 if (!m_styleSheet) 699 if (!m_styleSheet)
698 return starAtom; 700 return starAtom;
699 return m_styleSheet->defaultNamespace(); 701 return m_styleSheet->defaultNamespace();
700 } 702 }
701 703
702 const AtomicString& CSSSelectorParser::determineNamespace(const AtomicString& pr efix) 704 const AtomicString& CSSSelectorParser::determineNamespace(const AtomicString& pr efix)
703 { 705 {
706 if (prefix.isNull())
707 return defaultNamespace();
708 if (prefix.isEmpty())
709 return emptyAtom; // No namespace. If an element/attribute has a namespa ce, we won't match it.
710 if (prefix == starAtom)
711 return starAtom; // We'll match any namespace.
704 if (!m_styleSheet) 712 if (!m_styleSheet)
705 return defaultNamespace(); 713 return nullAtom; // Cannot resolve prefix to namespace without a stylesh eet, syntax error.
706 return m_styleSheet->determineNamespace(prefix); 714 return m_styleSheet->namespaceURIFromPrefix(prefix);
707 } 715 }
708 716
709 void CSSSelectorParser::prependTypeSelectorIfNeeded(const AtomicString& namespac ePrefix, const AtomicString& elementName, CSSParserSelector* compoundSelector) 717 void CSSSelectorParser::prependTypeSelectorIfNeeded(const AtomicString& namespac ePrefix, const AtomicString& elementName, CSSParserSelector* compoundSelector)
710 { 718 {
711 if (elementName.isNull() && defaultNamespace() == starAtom && !compoundSelec tor->needsImplicitShadowCombinatorForMatching()) 719 if (elementName.isNull() && defaultNamespace() == starAtom && !compoundSelec tor->needsImplicitShadowCombinatorForMatching())
712 return; 720 return;
713 721
714 AtomicString determinedElementName = elementName.isNull() ? starAtom : eleme ntName; 722 AtomicString determinedElementName = elementName.isNull() ? starAtom : eleme ntName;
715 AtomicString namespaceURI = determineNamespace(namespacePrefix); 723 AtomicString namespaceURI = determineNamespace(namespacePrefix);
716 if (namespaceURI.isNull()) { 724 if (namespaceURI.isNull()) {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 771
764 if (!splitAfter || !splitAfter->tagHistory()) 772 if (!splitAfter || !splitAfter->tagHistory())
765 return compoundSelector; 773 return compoundSelector;
766 774
767 OwnPtr<CSSParserSelector> secondCompound = splitAfter->releaseTagHistory(); 775 OwnPtr<CSSParserSelector> secondCompound = splitAfter->releaseTagHistory();
768 secondCompound->appendTagHistory(secondCompound->pseudoType() == CSSSelector ::PseudoSlotted ? CSSSelector::ShadowSlot : CSSSelector::ShadowPseudo, compoundS elector); 776 secondCompound->appendTagHistory(secondCompound->pseudoType() == CSSSelector ::PseudoSlotted ? CSSSelector::ShadowSlot : CSSSelector::ShadowPseudo, compoundS elector);
769 return secondCompound.release(); 777 return secondCompound.release();
770 } 778 }
771 779
772 } // namespace blink 780 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSParser.cpp ('k') | third_party/WebKit/Source/core/dom/CSSSelectorWatch.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698