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

Unified Diff: Source/core/dom/StyleSheetCollection.h

Issue 85693009: Get rid of Reset and ResetStyleResolverAndFontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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
Index: Source/core/dom/StyleSheetCollection.h
diff --git a/Source/core/dom/StyleSheetCollection.h b/Source/core/dom/StyleSheetCollection.h
index 9c9023355ab0cefdf9a7596df7b225c655ea92e7..3db4f856bb7f4cfd547f065f5bf11d7814e1ab18 100644
--- a/Source/core/dom/StyleSheetCollection.h
+++ b/Source/core/dom/StyleSheetCollection.h
@@ -57,7 +57,7 @@ class StyleSheetCollectionBase {
WTF_MAKE_NONCOPYABLE(StyleSheetCollectionBase); WTF_MAKE_FAST_ALLOCATED;
public:
StyleSheetCollectionBase();
- ~StyleSheetCollectionBase();
+ virtual ~StyleSheetCollectionBase();
Vector<RefPtr<CSSStyleSheet> >& activeAuthorStyleSheets() { return m_activeAuthorStyleSheets; }
Vector<RefPtr<StyleSheet> >& styleSheetsForStyleSheetList() { return m_styleSheetsForStyleSheetList; }
@@ -77,6 +77,8 @@ protected:
class StyleSheetCollection : public StyleSheetCollectionBase {
public:
+ bool updateActiveStyleSheets(StyleEngine*, StyleResolverUpdateMode);
+
void addStyleSheetCandidateNode(Node*, bool createdByParser);
void removeStyleSheetCandidateNode(Node*, ContainerNode* scopingNode);
bool hasStyleSheetCandidateNodes() const { return !m_styleSheetCandidateNodes.isEmpty(); }
@@ -97,9 +99,7 @@ protected:
enum StyleResolverUpdateType {
Reconstruct,
- Reset,
Additive,
- ResetStyleResolverAndFontSelector
};
struct StyleSheetChange {
@@ -112,9 +112,10 @@ protected:
};
void analyzeStyleSheetChange(StyleResolverUpdateMode, const StyleSheetCollectionBase&, StyleSheetChange&);
- void resetAllRuleSetsInTreeScope(StyleResolver*);
void updateUsesRemUnits();
+ virtual void collectStyleSheets(StyleEngine*, StyleSheetCollectionBase&) = 0;
+
private:
static StyleResolverUpdateType compareStyleSheets(const Vector<RefPtr<CSSStyleSheet> >& oldStyleSheets, const Vector<RefPtr<CSSStyleSheet> >& newStylesheets, Vector<StyleSheetContents*>& addedSheets);
bool activeLoadingStyleSheetLoaded(const Vector<RefPtr<CSSStyleSheet> >& newStyleSheets);

Powered by Google App Engine
This is Rietveld 408576698