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

Unified Diff: Source/core/css/parser/CSSParserValues.h

Issue 1317743006: Move CSSParserSelector out of CSSParserValues.h/cpp (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « Source/core/css/parser/CSSParserSelector.cpp ('k') | Source/core/css/parser/CSSParserValues.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSParserValues.h
diff --git a/Source/core/css/parser/CSSParserValues.h b/Source/core/css/parser/CSSParserValues.h
index c44e7b12eacab4f4e7463d21e47cc4c5a49da182..3ff1b879263a84733bd76b739e211e7e670da503 100644
--- a/Source/core/css/parser/CSSParserValues.h
+++ b/Source/core/css/parser/CSSParserValues.h
@@ -23,7 +23,6 @@
#include "core/CSSValueKeywords.h"
#include "core/css/CSSPrimitiveValue.h"
-#include "core/css/CSSSelector.h"
#include "core/css/CSSValueList.h"
#include "core/css/parser/CSSParserString.h"
#include "core/css/parser/CSSParserTokenRange.h"
@@ -128,62 +127,6 @@ public:
CSSParserTokenRange args;
};
-class CSSParserSelector {
- WTF_MAKE_NONCOPYABLE(CSSParserSelector); WTF_MAKE_FAST_ALLOCATED(CSSParserSelector);
-public:
- CSSParserSelector();
- explicit CSSParserSelector(const QualifiedName&, bool isImplicit = false);
-
- static PassOwnPtr<CSSParserSelector> create() { return adoptPtr(new CSSParserSelector); }
- static PassOwnPtr<CSSParserSelector> create(const QualifiedName& name, bool isImplicit = false) { return adoptPtr(new CSSParserSelector(name, isImplicit)); }
-
- ~CSSParserSelector();
-
- PassOwnPtr<CSSSelector> releaseSelector() { return m_selector.release(); }
-
- CSSSelector::Relation relation() const { return m_selector->relation(); }
- void setValue(const AtomicString& value) { m_selector->setValue(value); }
- void setAttribute(const QualifiedName& value, CSSSelector::AttributeMatchType matchType) { m_selector->setAttribute(value, matchType); }
- void setArgument(const AtomicString& value) { m_selector->setArgument(value); }
- void setNth(int a, int b) { m_selector->setNth(a, b); }
- void setMatch(CSSSelector::Match value) { m_selector->setMatch(value); }
- void setRelation(CSSSelector::Relation value) { m_selector->setRelation(value); }
- void setForPage() { m_selector->setForPage(); }
- void setRelationIsAffectedByPseudoContent() { m_selector->setRelationIsAffectedByPseudoContent(); }
- bool relationIsAffectedByPseudoContent() const { return m_selector->relationIsAffectedByPseudoContent(); }
-
- void updatePseudoType(const AtomicString& value, bool hasArguments = false) const { m_selector->updatePseudoType(value, hasArguments); }
-
- void adoptSelectorVector(Vector<OwnPtr<CSSParserSelector>>& selectorVector);
- void setSelectorList(PassOwnPtr<CSSSelectorList>);
-
- bool hasHostPseudoSelector() const;
-
- CSSSelector::PseudoType pseudoType() const { return m_selector->pseudoType(); }
-
- // TODO(esprehn): This set of cases doesn't make sense, why PseudoShadow but not a check for ::content or /deep/ ?
- bool crossesTreeScopes() const { return pseudoType() == CSSSelector::PseudoWebKitCustomElement || pseudoType() == CSSSelector::PseudoCue || pseudoType() == CSSSelector::PseudoShadow; }
-
- bool isSimple() const;
- bool hasShadowPseudo() const;
-
- CSSParserSelector* tagHistory() const { return m_tagHistory.get(); }
- void setTagHistory(PassOwnPtr<CSSParserSelector> selector) { m_tagHistory = selector; }
- void clearTagHistory() { m_tagHistory.clear(); }
- void insertTagHistory(CSSSelector::Relation before, PassOwnPtr<CSSParserSelector>, CSSSelector::Relation after);
- void appendTagHistory(CSSSelector::Relation, PassOwnPtr<CSSParserSelector>);
- void prependTagSelector(const QualifiedName&, bool tagIsImplicit = false);
-
-private:
- OwnPtr<CSSSelector> m_selector;
- OwnPtr<CSSParserSelector> m_tagHistory;
-};
-
-inline bool CSSParserSelector::hasShadowPseudo() const
-{
- return m_selector->relation() == CSSSelector::ShadowPseudo;
-}
-
inline void CSSParserValue::setFromNumber(double value, CSSPrimitiveValue::UnitType unit)
{
id = CSSValueInvalid;
« no previous file with comments | « Source/core/css/parser/CSSParserSelector.cpp ('k') | Source/core/css/parser/CSSParserValues.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698