Diff
Modified: trunk/Source/WebCore/ChangeLog (156514 => 156515)
--- trunk/Source/WebCore/ChangeLog 2013-09-26 23:32:16 UTC (rev 156514)
+++ trunk/Source/WebCore/ChangeLog 2013-09-26 23:36:09 UTC (rev 156515)
@@ -1,3 +1,18 @@
+2013-09-26 Benjamin Poulain <[email protected]>
+
+ Move CSS MatchRequest from StyleResolver to a private definition in ElementRuleCollector
+ https://bugs.webkit.org/show_bug.cgi?id=121986
+
+ Reviewed by Andreas Kling.
+
+ MatchRequest is an internal type of ElementRuleCollector now, move the definition
+ to ElementRuleCollector.
+
+ * css/DocumentRuleSets.h:
+ * css/ElementRuleCollector.h:
+ (WebCore::ElementRuleCollector::MatchRequest::MatchRequest):
+ * css/StyleResolver.h:
+
2013-09-26 Brent Fulgham <[email protected]>
[Windows] Unreviewed build fix after r156487.
Modified: trunk/Source/WebCore/css/DocumentRuleSets.h (156514 => 156515)
--- trunk/Source/WebCore/css/DocumentRuleSets.h 2013-09-26 23:32:16 UTC (rev 156514)
+++ trunk/Source/WebCore/css/DocumentRuleSets.h 2013-09-26 23:36:09 UTC (rev 156515)
@@ -36,7 +36,6 @@
class CSSStyleSheet;
class DocumentStyleSheetCollection;
class InspectorCSSOMWrappers;
-class MatchRequest;
class MediaQueryEvaluator;
class RuleSet;
class StyleScopeResolver;
Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (156514 => 156515)
--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-09-26 23:32:16 UTC (rev 156514)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2013-09-26 23:36:09 UTC (rev 156515)
@@ -63,6 +63,19 @@
return *rightToLeftDecl;
}
+class MatchRequest {
+public:
+ MatchRequest(RuleSet* ruleSet, bool includeEmptyRules = false, const ContainerNode* scope = 0)
+ : ruleSet(ruleSet)
+ , includeEmptyRules(includeEmptyRules)
+ , scope(scope)
+ {
+ }
+ const RuleSet* ruleSet;
+ const bool includeEmptyRules;
+ const ContainerNode* scope;
+};
+
StyleResolver::MatchResult& ElementRuleCollector::matchedResult()
{
ASSERT(m_mode == SelectorChecker::ResolvingStyle);
Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (156514 => 156515)
--- trunk/Source/WebCore/css/ElementRuleCollector.h 2013-09-26 23:32:16 UTC (rev 156514)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2013-09-26 23:36:09 UTC (rev 156515)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999 Lars Knoll ([email protected])
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 Apple Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -31,6 +31,7 @@
namespace WebCore {
class DocumentRuleSets;
+class MatchRequest;
class RenderRegion;
class RuleData;
class RuleSet;
Modified: trunk/Source/WebCore/css/StyleResolver.h (156514 => 156515)
--- trunk/Source/WebCore/css/StyleResolver.h 2013-09-26 23:32:16 UTC (rev 156514)
+++ trunk/Source/WebCore/css/StyleResolver.h 2013-09-26 23:36:09 UTC (rev 156515)
@@ -151,17 +151,6 @@
RenderScrollbar* scrollbar;
};
-class MatchRequest {
-public:
- MatchRequest(RuleSet* ruleSet, bool includeEmptyRules = false, const ContainerNode* scope = 0)
- : ruleSet(ruleSet)
- , includeEmptyRules(includeEmptyRules)
- , scope(scope) { }
- const RuleSet* ruleSet;
- const bool includeEmptyRules;
- const ContainerNode* scope;
-};
-
// This class selects a RenderStyle for a given element based on a collection of stylesheets.
class StyleResolver {
WTF_MAKE_NONCOPYABLE(StyleResolver); WTF_MAKE_FAST_ALLOCATED;
