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

Unified Diff: sky/engine/core/dom/TreeScope.h

Issue 810893002: Remove global set of ScopedStyleResolvers. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « sky/engine/core/dom/StyleEngine.cpp ('k') | sky/engine/core/dom/TreeScope.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/TreeScope.h
diff --git a/sky/engine/core/dom/TreeScope.h b/sky/engine/core/dom/TreeScope.h
index cd8691bae1b2f92720bb1de23c6bbb74e23ba2a2..93adc1b448b276be3bed1623b498ee8e6524bfdb 100644
--- a/sky/engine/core/dom/TreeScope.h
+++ b/sky/engine/core/dom/TreeScope.h
@@ -113,9 +113,7 @@ public:
Element* getElementByAccessKey(const String& key) const;
- ScopedStyleResolver* scopedStyleResolver() const { return m_scopedStyleResolver.get(); }
- ScopedStyleResolver& ensureScopedStyleResolver();
- void clearScopedStyleResolver();
+ ScopedStyleResolver& scopedStyleResolver() const { return *m_scopedStyleResolver; }
protected:
TreeScope(ContainerNode&, Document&);
@@ -156,17 +154,15 @@ private:
RawPtr<Document> m_document;
RawPtr<TreeScope> m_parentTreeScope;
-#if !ENABLE(OILPAN)
- int m_guardRefCount;
-#endif
+ OwnPtr<ScopedStyleResolver> m_scopedStyleResolver;
OwnPtr<DocumentOrderedMap> m_elementsById;
OwnPtr<DocumentOrderedMap> m_imageMapsByName;
OwnPtr<DocumentOrderedMap> m_labelsByForAttribute;
- OwnPtr<ScopedStyleResolver> m_scopedStyleResolver;
-
mutable RefPtr<DOMSelection> m_selection;
+
+ int m_guardRefCount;
};
DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES(TreeScope)
« no previous file with comments | « sky/engine/core/dom/StyleEngine.cpp ('k') | sky/engine/core/dom/TreeScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698