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

Unified Diff: Source/core/css/resolver/MatchResult.h

Issue 418163003: Simplify watched selector handling and remove remnants of user stylesheets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cascade
Patch Set: use includeEmptyRules flag on MatchRequest Created 6 years, 4 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/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/MatchResult.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/MatchResult.h
diff --git a/Source/core/css/resolver/MatchResult.h b/Source/core/css/resolver/MatchResult.h
index 16253856704b818531822468c167bd9e0119f78f..ece7efd9f9cf23dd8d47a859292b482cc3803c2b 100644
--- a/Source/core/css/resolver/MatchResult.h
+++ b/Source/core/css/resolver/MatchResult.h
@@ -32,7 +32,6 @@
namespace blink {
class StylePropertySet;
-class StyleRule;
struct RuleRange {
RuleRange(int& firstRuleIndex, int& lastRuleIndex): firstRuleIndex(firstRuleIndex), lastRuleIndex(lastRuleIndex) { }
@@ -41,16 +40,13 @@ struct RuleRange {
};
struct MatchRanges {
- MatchRanges() : firstUARule(-1), lastUARule(-1), firstAuthorRule(-1), lastAuthorRule(-1), firstUserRule(-1), lastUserRule(-1) { }
+ MatchRanges() : firstUARule(-1), lastUARule(-1), firstAuthorRule(-1), lastAuthorRule(-1) { }
int firstUARule;
int lastUARule;
int firstAuthorRule;
int lastAuthorRule;
- int firstUserRule;
- int lastUserRule;
RuleRange UARuleRange() { return RuleRange(firstUARule, lastUARule); }
RuleRange authorRuleRange() { return RuleRange(firstAuthorRule, lastAuthorRule); }
- RuleRange userRuleRange() { return RuleRange(firstUserRule, lastUserRule); }
};
struct MatchedProperties {
@@ -84,11 +80,10 @@ class MatchResult {
public:
MatchResult() : isCacheable(true) { }
WillBeHeapVector<MatchedProperties, 64> matchedProperties;
- WillBeHeapVector<RawPtrWillBeMember<StyleRule>, 64> matchedRules;
MatchRanges ranges;
bool isCacheable;
- void addMatchedProperties(const StylePropertySet* properties, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
+ void addMatchedProperties(const StylePropertySet* properties, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
};
inline bool operator==(const MatchRanges& a, const MatchRanges& b)
@@ -96,9 +91,7 @@ inline bool operator==(const MatchRanges& a, const MatchRanges& b)
return a.firstUARule == b.firstUARule
&& a.lastUARule == b.lastUARule
&& a.firstAuthorRule == b.firstAuthorRule
- && a.lastAuthorRule == b.lastAuthorRule
- && a.firstUserRule == b.firstUserRule
- && a.lastUserRule == b.lastUserRule;
+ && a.lastAuthorRule == b.lastAuthorRule;
}
inline bool operator!=(const MatchRanges& a, const MatchRanges& b)
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | Source/core/css/resolver/MatchResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698