Diff
Modified: trunk/Source/WebCore/ChangeLog (139405 => 139406)
--- trunk/Source/WebCore/ChangeLog 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/ChangeLog 2013-01-11 06:18:34 UTC (rev 139406)
@@ -1,3 +1,34 @@
+2013-01-10 Dimitri Glazkov <[email protected]>
+
+ The word "selector" is somewhat redundant redundantly used in SelectorChecker.
+ https://bugs.webkit.org/show_bug.cgi?id=106413
+
+ In https://bugs.webkit.org/show_bug.cgi?id=105864, Antti suggested reducing some of the redundant uses of the word
+ "selector" in SelectorChecker. Here's a start.
+
+ Reviewed by Antti Koivisto.
+
+ Simple renames, no change in behavior.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::match): Renamed.
+ (WebCore):
+ (WebCore::SelectorChecker::fastCheck): Ditto,
+ (WebCore::SelectorChecker::checkOne): Ditto.
+ * css/SelectorChecker.h:
+ (SelectorChecker):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList): Changed to use new name.
+ (WebCore::StyleResolver::ruleMatches): Renamed from checkSelector to better match argument and return value.
+ (WebCore::StyleResolver::checkRegionSelector): Changed to use new names.
+ * css/StyleResolver.h:
+ (StyleResolver):
+ * dom/SelectorQuery.cpp:
+ (WebCore::SelectorDataList::matches): Ditto.
+ (WebCore::SelectorDataList::execute): Ditto.
+ * html/shadow/ContentSelectorQuery.cpp:
+ (WebCore::ContentSelectorChecker::checkContentSelector): Ditto.
+
2013-01-10 John J. Barton <[email protected]>
Web Inspector: Pass the script url to the script-preprocessor script
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (139405 => 139406)
--- trunk/Source/WebCore/css/SelectorChecker.cpp 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2013-01-11 06:18:34 UTC (rev 139406)
@@ -66,16 +66,16 @@
{
}
-bool SelectorChecker::checkSelector(CSSSelector* sel, Element* element, bool isFastCheckableSelector) const
+bool SelectorChecker::matches(CSSSelector* sel, Element* element, bool isFastCheckableSelector) const
{
if (isFastCheckableSelector && !element->isSVGElement()) {
if (!fastCheckRightmostSelector(sel, element, VisitedMatchDisabled))
return false;
- return fastCheckSelector(sel, element);
+ return fastCheck(sel, element);
}
PseudoId ignoreDynamicPseudo = NOPSEUDO;
- return checkSelector(SelectorCheckingContext(sel, element, SelectorChecker::VisitedMatchDisabled), ignoreDynamicPseudo) == SelectorMatches;
+ return match(SelectorCheckingContext(sel, element, SelectorChecker::VisitedMatchDisabled), ignoreDynamicPseudo) == SelectorMatches;
}
namespace {
@@ -162,7 +162,7 @@
return false;
}
-bool SelectorChecker::fastCheckSelector(const CSSSelector* selector, const Element* element) const
+bool SelectorChecker::fastCheck(const CSSSelector* selector, const Element* element) const
{
ASSERT(fastCheckRightmostSelector(selector, element, VisitedMatchEnabled));
@@ -246,10 +246,10 @@
// * SelectorFailsLocally - the selector fails for the element e
// * SelectorFailsAllSiblings - the selector fails for e and any sibling of e
// * SelectorFailsCompletely - the selector fails for e and any sibling or ancestor of e
-SelectorChecker::SelectorMatch SelectorChecker::checkSelector(const SelectorCheckingContext& context, PseudoId& dynamicPseudo) const
+SelectorChecker::Match SelectorChecker::match(const SelectorCheckingContext& context, PseudoId& dynamicPseudo) const
{
// first selector has to match
- if (!checkOneSelector(context, DOMSiblingTraversalStrategy()))
+ if (!checkOne(context, DOMSiblingTraversalStrategy()))
return SelectorFailsLocally;
if (context.selector->m_match == CSSSelector::PseudoElement) {
@@ -311,7 +311,7 @@
nextContext.elementStyle = 0;
nextContext.elementParentStyle = 0;
for (; nextContext.element; nextContext.element = nextContext.element->parentElement()) {
- SelectorMatch match = checkSelector(nextContext, ignoreDynamicPseudo);
+ Match match = this->match(nextContext, ignoreDynamicPseudo);
if (match == SelectorMatches || match == SelectorFailsCompletely)
return match;
if (nextContext.element == nextContext.scope)
@@ -326,7 +326,7 @@
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
nextContext.elementParentStyle = 0;
- return checkSelector(nextContext, ignoreDynamicPseudo);
+ return match(nextContext, ignoreDynamicPseudo);
case CSSSelector::DirectAdjacent:
if (m_mode == ResolvingStyle) {
@@ -339,7 +339,7 @@
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
nextContext.elementParentStyle = 0;
- return checkSelector(nextContext, ignoreDynamicPseudo);
+ return match(nextContext, ignoreDynamicPseudo);
case CSSSelector::IndirectAdjacent:
if (m_mode == ResolvingStyle) {
@@ -351,7 +351,7 @@
nextContext.elementStyle = 0;
nextContext.elementParentStyle = 0;
for (; nextContext.element; nextContext.element = nextContext.element->previousElementSibling()) {
- SelectorMatch match = checkSelector(nextContext, ignoreDynamicPseudo);
+ Match match = this->match(nextContext, ignoreDynamicPseudo);
if (match == SelectorMatches || match == SelectorFailsAllSiblings || match == SelectorFailsCompletely)
return match;
};
@@ -368,7 +368,7 @@
&& !(nextContext.hasScrollbarPseudo && nextContext.selector->m_match == CSSSelector::PseudoClass))
return SelectorFailsCompletely;
nextContext.isSubSelector = true;
- return checkSelector(nextContext, dynamicPseudo);
+ return match(nextContext, dynamicPseudo);
case CSSSelector::ShadowDescendant:
{
@@ -382,7 +382,7 @@
nextContext.isSubSelector = false;
nextContext.elementStyle = 0;
nextContext.elementParentStyle = 0;
- return checkSelector(nextContext, ignoreDynamicPseudo);
+ return match(nextContext, ignoreDynamicPseudo);
}
}
@@ -537,7 +537,7 @@
}
template<typename SiblingTraversalStrategy>
-bool SelectorChecker::checkOneSelector(const SelectorCheckingContext& context, const SiblingTraversalStrategy& siblingTraversalStrategy) const
+bool SelectorChecker::checkOne(const SelectorCheckingContext& context, const SiblingTraversalStrategy& siblingTraversalStrategy) const
{
Element* const & element = context.element;
CSSSelector* const & selector = context.selector;
@@ -584,7 +584,7 @@
// We select between :visited and :link when applying. We don't know which one applied (or not) yet.
if (subContext.selector->pseudoType() == CSSSelector::PseudoVisited || (subContext.selector->pseudoType() == CSSSelector::PseudoLink && subContext.visitedMatchType == VisitedMatchEnabled))
return true;
- if (!checkOneSelector(subContext, DOMSiblingTraversalStrategy()))
+ if (!checkOne(subContext, DOMSiblingTraversalStrategy()))
return true;
}
} else if (context.hasScrollbarPseudo) {
@@ -765,7 +765,7 @@
subContext.isSubSelector = true;
PseudoId ignoreDynamicPseudo = NOPSEUDO;
for (subContext.selector = selector->selectorList()->first(); subContext.selector; subContext.selector = CSSSelectorList::next(subContext.selector)) {
- if (checkSelector(subContext, ignoreDynamicPseudo) == SelectorMatches)
+ if (match(subContext, ignoreDynamicPseudo) == SelectorMatches)
return true;
}
}
@@ -974,7 +974,7 @@
PseudoId ignoreDynamicPseudo = NOPSEUDO;
CSSSelector* const & selector = context.selector;
for (subContext.selector = selector->selectorList()->first(); subContext.selector; subContext.selector = CSSSelectorList::next(subContext.selector)) {
- if (checkSelector(subContext, ignoreDynamicPseudo) == SelectorMatches)
+ if (match(subContext, ignoreDynamicPseudo) == SelectorMatches)
return true;
}
return false;
@@ -1133,6 +1133,6 @@
}
template
-bool SelectorChecker::checkOneSelector(const SelectorChecker::SelectorCheckingContext&, const ShadowDOMSiblingTraversalStrategy&) const;
+bool SelectorChecker::checkOne(const SelectorChecker::SelectorCheckingContext&, const ShadowDOMSiblingTraversalStrategy&) const;
}
Modified: trunk/Source/WebCore/css/SelectorChecker.h (139405 => 139406)
--- trunk/Source/WebCore/css/SelectorChecker.h 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/css/SelectorChecker.h 2013-01-11 06:18:34 UTC (rev 139406)
@@ -46,7 +46,7 @@
public:
explicit SelectorChecker(Document*);
- enum SelectorMatch { SelectorMatches, SelectorFailsLocally, SelectorFailsAllSiblings, SelectorFailsCompletely };
+ enum Match { SelectorMatches, SelectorFailsLocally, SelectorFailsAllSiblings, SelectorFailsCompletely };
enum VisitedMatchType { VisitedMatchDisabled, VisitedMatchEnabled };
enum Mode { ResolvingStyle = 0, CollectingRules, QueryingRules, SharingRules };
@@ -77,13 +77,13 @@
bool hasSelectionPseudo;
};
- bool checkSelector(CSSSelector*, Element*, bool isFastCheckableSelector = false) const;
- SelectorMatch checkSelector(const SelectorCheckingContext&, PseudoId&) const;
+ bool matches(CSSSelector*, Element*, bool isFastCheckableSelector = false) const;
+ Match match(const SelectorCheckingContext&, PseudoId&) const;
template<typename SiblingTraversalStrategy>
- bool checkOneSelector(const SelectorCheckingContext&, const SiblingTraversalStrategy&) const;
+ bool checkOne(const SelectorCheckingContext&, const SiblingTraversalStrategy&) const;
static bool isFastCheckableSelector(const CSSSelector*);
- bool fastCheckSelector(const CSSSelector*, const Element*) const;
+ bool fastCheck(const CSSSelector*, const Element*) const;
bool strictParsing() const { return m_strictParsing; }
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (139405 => 139406)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-01-11 06:18:34 UTC (rev 139406)
@@ -857,7 +857,7 @@
StyleRule* rule = ruleData.rule();
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willMatchRule(document(), rule, this);
- if (checkSelector(ruleData, options.scope)) {
+ if (ruleMatches(ruleData, options.scope)) {
// If the rule has no properties to apply, then ignore it in the non-debug mode.
const StylePropertySet* properties = rule->properties();
if (!properties || (properties->isEmpty() && !options.includeEmptyRules)) {
@@ -2238,7 +2238,7 @@
return m_ruleList.release();
}
-inline bool StyleResolver::checkSelector(const RuleData& ruleData, const ContainerNode* scope)
+inline bool StyleResolver::ruleMatches(const RuleData& ruleData, const ContainerNode* scope)
{
m_dynamicPseudo = NOPSEUDO;
@@ -2255,7 +2255,7 @@
return false;
if (!SelectorChecker::fastCheckRightmostAttributeSelector(m_element, ruleData.selector()))
return false;
- return m_selectorChecker.fastCheckSelector(ruleData.selector(), m_element);
+ return m_selectorChecker.fastCheck(ruleData.selector(), m_element);
}
// Slow path.
@@ -2264,7 +2264,7 @@
context.elementParentStyle = m_parentNode ? m_parentNode->renderStyle() : 0;
context.scope = scope;
context.pseudoStyle = m_pseudoStyle;
- SelectorChecker::SelectorMatch match = m_selectorChecker.checkSelector(context, m_dynamicPseudo);
+ SelectorChecker::Match match = m_selectorChecker.match(context, m_dynamicPseudo);
if (match != SelectorChecker::SelectorMatches)
return false;
if (m_pseudoStyle != NOPSEUDO && m_pseudoStyle != m_dynamicPseudo)
@@ -2280,7 +2280,7 @@
m_pseudoStyle = NOPSEUDO;
for (CSSSelector* s = regionSelector; s; s = CSSSelectorList::next(s))
- if (m_selectorChecker.checkSelector(s, regionElement))
+ if (m_selectorChecker.matches(s, regionElement))
return true;
return false;
Modified: trunk/Source/WebCore/css/StyleResolver.h (139405 => 139406)
--- trunk/Source/WebCore/css/StyleResolver.h 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/css/StyleResolver.h 2013-01-11 06:18:34 UTC (rev 139406)
@@ -365,7 +365,7 @@
void sortMatchedRules();
void sortAndTransferMatchedRules(MatchResult&);
- bool checkSelector(const RuleData&, const ContainerNode* scope);
+ bool ruleMatches(const RuleData&, const ContainerNode* scope);
bool checkRegionSelector(CSSSelector* regionSelector, Element* regionElement);
void applyMatchedProperties(const MatchResult&, const Element*);
enum StyleApplicationPass {
Modified: trunk/Source/WebCore/dom/SelectorQuery.cpp (139405 => 139406)
--- trunk/Source/WebCore/dom/SelectorQuery.cpp 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/dom/SelectorQuery.cpp 2013-01-11 06:18:34 UTC (rev 139406)
@@ -54,7 +54,7 @@
unsigned selectorCount = m_selectors.size();
for (unsigned i = 0; i < selectorCount; ++i) {
- if (selectorChecker.checkSelector(m_selectors[i].selector, targetElement, m_selectors[i].isFastCheckable))
+ if (selectorChecker.matches(m_selectors[i].selector, targetElement, m_selectors[i].isFastCheckable))
return true;
}
@@ -111,7 +111,7 @@
Element* element = rootNode->treeScope()->getElementById(selector->value());
if (!element || !(isTreeScopeRoot(rootNode) || element->isDescendantOf(rootNode)))
return;
- if (selectorChecker.checkSelector(m_selectors[0].selector, element, m_selectors[0].isFastCheckable))
+ if (selectorChecker.matches(m_selectors[0].selector, element, m_selectors[0].isFastCheckable))
matchedElements.append(element);
return;
}
@@ -123,7 +123,7 @@
if (n->isElementNode()) {
Element* element = static_cast<Element*>(n);
for (unsigned i = 0; i < selectorCount; ++i) {
- if (selectorChecker.checkSelector(m_selectors[i].selector, element, m_selectors[i].isFastCheckable)) {
+ if (selectorChecker.matches(m_selectors[i].selector, element, m_selectors[i].isFastCheckable)) {
matchedElements.append(element);
if (firstMatchOnly)
return;
Modified: trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp (139405 => 139406)
--- trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp 2013-01-11 06:17:07 UTC (rev 139405)
+++ trunk/Source/WebCore/html/shadow/ContentSelectorQuery.cpp 2013-01-11 06:18:34 UTC (rev 139406)
@@ -45,7 +45,7 @@
{
SelectorChecker::SelectorCheckingContext context(selector, toElement(siblings[nth].get()), SelectorChecker::VisitedMatchEnabled);
ShadowDOMSiblingTraversalStrategy strategy(siblings, nth);
- return m_selectorChecker.checkOneSelector(context, strategy);
+ return m_selectorChecker.checkOne(context, strategy);
}
void ContentSelectorDataList::initialize(const CSSSelectorList& selectors)
