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

Unified Diff: Source/core/css/RuleSet.cpp

Issue 322803004: Make all CSSSelector data members private (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix win dbg build error Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/css/RuleSet.cpp
diff --git a/Source/core/css/RuleSet.cpp b/Source/core/css/RuleSet.cpp
index f778214644d891a16664c7cc495d8391b6e75406..cbffa4b7dfa0328f04a9b2d07ac3a8626726db49 100644
--- a/Source/core/css/RuleSet.cpp
+++ b/Source/core/css/RuleSet.cpp
@@ -53,7 +53,7 @@ using namespace HTMLNames;
static inline bool isSelectorMatchingHTMLBasedOnRuleHash(const CSSSelector& selector)
{
- if (selector.m_match == CSSSelector::Tag) {
+ if (selector.match() == CSSSelector::Tag) {
const AtomicString& selectorNamespace = selector.tagQName().namespaceURI();
if (selectorNamespace != starAtom && selectorNamespace != xhtmlNamespaceURI)
return false;
@@ -65,7 +65,7 @@ static inline bool isSelectorMatchingHTMLBasedOnRuleHash(const CSSSelector& sele
}
if (SelectorChecker::isCommonPseudoClassSelector(selector))
return true;
- return selector.m_match == CSSSelector::Id || selector.m_match == CSSSelector::Class;
+ return selector.match() == CSSSelector::Id || selector.match() == CSSSelector::Class;
}
static inline bool selectorListContainsUncommonAttributeSelector(const CSSSelector* selector)
@@ -115,7 +115,7 @@ static inline bool containsUncommonAttributeSelector(const CSSSelector& selector
static inline PropertyWhitelistType determinePropertyWhitelistType(const AddRuleFlags addRuleFlags, const CSSSelector& selector)
{
for (const CSSSelector* component = &selector; component; component = component->tagHistory()) {
- if (component->pseudoType() == CSSSelector::PseudoCue || (component->m_match == CSSSelector::PseudoElement && component->value() == TextTrackCue::cueShadowPseudoId()))
+ if (component->pseudoType() == CSSSelector::PseudoCue || (component->match() == CSSSelector::PseudoElement && component->value() == TextTrackCue::cueShadowPseudoId()))
return PropertyWhitelistCue;
if (component->pseudoType() == CSSSelector::PseudoFirstLetter)
return PropertyWhitelistFirstLetter;
@@ -151,7 +151,7 @@ void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const R
static void extractValuesforSelector(const CSSSelector* selector, AtomicString& id, AtomicString& className, AtomicString& customPseudoElementName, AtomicString& tagName)
{
- switch (selector->m_match) {
+ switch (selector->match()) {
case CSSSelector::Id:
id = selector->value();
break;
@@ -162,6 +162,8 @@ static void extractValuesforSelector(const CSSSelector* selector, AtomicString&
if (selector->tagQName().localName() != starAtom)
tagName = selector->tagQName().localName();
break;
+ default:
+ break;
}
if (selector->isCustomPseudoElement())
customPseudoElementName = selector->value();

Powered by Google App Engine
This is Rietveld 408576698