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

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

Issue 1134173002: Get rid of TreeBoundaryCrossingRules. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Missing important UA rules. Created 5 years, 7 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/TreeBoundaryCrossingRules.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 8170d451d5f000a2093d6543a17758d4515bea2c..3c407d1cf66878b38a1624e82cd3e584fa180f41 100644
--- a/Source/core/css/resolver/MatchResult.h
+++ b/Source/core/css/resolver/MatchResult.h
@@ -59,21 +59,87 @@ WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::MatchedProperties);
namespace blink {
+using MatchedPropertiesVector = WillBeHeapVector<MatchedProperties, 64>;
+
+class MatchedPropertiesRange {
+public:
+ MatchedPropertiesRange(MatchedPropertiesVector::const_iterator begin, MatchedPropertiesVector::const_iterator end)
+ : m_begin(begin)
+ , m_end(end)
+ {
+ }
+
+ MatchedPropertiesVector::const_iterator begin() const { return m_begin; }
+ MatchedPropertiesVector::const_iterator end() const { return m_end; }
+
+private:
+ MatchedPropertiesVector::const_iterator m_begin;
+ MatchedPropertiesVector::const_iterator m_end;
+};
+
class MatchResult {
STACK_ALLOCATED();
public:
+ MatchResult() { m_rangeEnd.append(0); /* Alway add a UA range */ }
+
void addMatchedProperties(const StylePropertySet* properties, unsigned linkMatchType = CSSSelector::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
+ bool hasMatchedProperties() const { return m_matchedProperties.size(); }
+
+ void closeOriginOrScope(bool isUAOrigin = false);
+
+ void setIsCacheable(bool cacheable) { m_isCacheable = cacheable; }
+ bool isCacheable() const { return m_isCacheable; }
+
+ MatchedPropertiesRange allRules() const { return MatchedPropertiesRange(m_matchedProperties.begin(), m_matchedProperties.end()); }
+ MatchedPropertiesRange uaRules() const { return MatchedPropertiesRange(m_matchedProperties.begin(), m_matchedProperties.begin() + m_rangeEnd.first()); }
+ MatchedPropertiesRange authorRules() const { return MatchedPropertiesRange(m_matchedProperties.begin() + m_rangeEnd.first(), m_matchedProperties.end()); }
+
+ const MatchedPropertiesVector& matchedProperties() const { return m_matchedProperties; }
+
+private:
+ friend class ImportantAuthorRanges;
+ friend class ImportantAuthorRangeIterator;
+
+ MatchedPropertiesVector m_matchedProperties;
+ Vector<unsigned, 16> m_rangeEnd;
+ bool m_isCacheable = true;
+};
+
+class ImportantAuthorRangeIterator {
+public:
+ ImportantAuthorRangeIterator(const MatchResult& result, unsigned index)
+ : m_result(result)
+ , m_index(index) { }
+
+ MatchedPropertiesRange operator*() const
+ {
+ ASSERT(m_index);
+ return MatchedPropertiesRange(m_result.m_matchedProperties.begin() + m_result.m_rangeEnd[m_index - 1], m_result.m_matchedProperties.begin() + m_result.m_rangeEnd[m_index]);
+ }
+
+ ImportantAuthorRangeIterator& operator++()
+ {
+ ASSERT(m_index > 0);
+ --m_index;
+ return *this;
+ }
+
+ bool operator!=(const ImportantAuthorRangeIterator& other) const { return m_index != other.m_index || &m_result != &other.m_result; }
+
+private:
+ const MatchResult& m_result;
+ unsigned m_index;
+};
+
+class ImportantAuthorRanges {
+public:
+ explicit ImportantAuthorRanges(const MatchResult& result) : m_result(result) { }
- unsigned begin() const { return 0; }
- unsigned end() const { return matchedProperties.size(); }
- unsigned beginUA() const { return 0; }
- unsigned endUA() const { return uaEnd; }
- unsigned beginAuthor() const { return uaEnd; }
- unsigned endAuthor() const { return matchedProperties.size(); }
+ ImportantAuthorRangeIterator begin() const { return ImportantAuthorRangeIterator(m_result, m_result.m_rangeEnd.size() - 1); }
+ ImportantAuthorRangeIterator end() const { return ImportantAuthorRangeIterator(m_result, 0); }
- WillBeHeapVector<MatchedProperties, 64> matchedProperties;
- unsigned uaEnd = 0;
- bool isCacheable = true;
+private:
+ const MatchResult& m_result;
};
inline bool operator==(const MatchedProperties& a, const MatchedProperties& b)
« no previous file with comments | « Source/core/css/TreeBoundaryCrossingRules.cpp ('k') | Source/core/css/resolver/MatchResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698