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

Side by Side Diff: sky/engine/core/dom/StyleEngine.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 unified diff | Download patch
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | sky/engine/core/dom/StyleEngine.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // updateGenericFontFamilySettings is used from WebSettingsImpl. 110 // updateGenericFontFamilySettings is used from WebSettingsImpl.
111 void updateGenericFontFamilySettings(); 111 void updateGenericFontFamilySettings();
112 112
113 void didDetach(); 113 void didDetach();
114 void resolverChanged(); 114 void resolverChanged();
115 unsigned resolverAccessCount() const; 115 unsigned resolverAccessCount() const;
116 116
117 PassRefPtr<CSSStyleSheet> createSheet(Element*, const String& text); 117 PassRefPtr<CSSStyleSheet> createSheet(Element*, const String& text);
118 void removeSheet(StyleSheetContents*); 118 void removeSheet(StyleSheetContents*);
119 119
120 void addScopedStyleResolver(const ScopedStyleResolver* resolver) { m_scopedS tyleResolvers.add(resolver); }
121 void removeScopedStyleResolver(const ScopedStyleResolver* resolver) { m_scop edStyleResolvers.remove(resolver); }
122 bool hasOnlyScopedResolverForDocument() const { return m_scopedStyleResolver s.size() == 1; }
123 void collectScopedStyleFeaturesTo(RuleFeatureSet&) const; 120 void collectScopedStyleFeaturesTo(RuleFeatureSet&) const;
124 121
125 private: 122 private:
126 // CSSFontSelectorClient implementation. 123 // CSSFontSelectorClient implementation.
127 virtual void fontsNeedUpdate(CSSFontSelector*) override; 124 virtual void fontsNeedUpdate(CSSFontSelector*) override;
128 125
129 private: 126 private:
130 StyleEngine(Document&); 127 StyleEngine(Document&);
131 128
132 StyleSheetCollection* ensureStyleSheetCollectionFor(TreeScope&); 129 StyleSheetCollection* ensureStyleSheetCollectionFor(TreeScope&);
(...skipping 13 matching lines...) Expand all
146 return m_documentStyleSheetCollection.get(); 143 return m_documentStyleSheetCollection.get();
147 } 144 }
148 145
149 RawPtr<Document> m_document; 146 RawPtr<Document> m_document;
150 147
151 // TODO(esprehn): Remove special separate collection for document. 148 // TODO(esprehn): Remove special separate collection for document.
152 OwnPtr<StyleSheetCollection> m_documentStyleSheetCollection; 149 OwnPtr<StyleSheetCollection> m_documentStyleSheetCollection;
153 150
154 typedef HashMap<RawPtr<TreeScope>, OwnPtr<StyleSheetCollection> > StyleSheet CollectionMap; 151 typedef HashMap<RawPtr<TreeScope>, OwnPtr<StyleSheetCollection> > StyleSheet CollectionMap;
155 StyleSheetCollectionMap m_styleSheetCollectionMap; 152 StyleSheetCollectionMap m_styleSheetCollectionMap;
156 typedef HashSet<RawPtr<const ScopedStyleResolver> > ScopedStyleResolverSet;
157 ScopedStyleResolverSet m_scopedStyleResolvers;
158 153
159 typedef ListHashSet<TreeScope*, 16> TreeScopeSet; 154 typedef ListHashSet<TreeScope*, 16> TreeScopeSet;
160 TreeScopeSet m_dirtyTreeScopes; 155 TreeScopeSet m_dirtyTreeScopes;
161 TreeScopeSet m_activeTreeScopes; 156 TreeScopeSet m_activeTreeScopes;
162 157
163 bool m_ignorePendingStylesheets; 158 bool m_ignorePendingStylesheets;
164 OwnPtr<StyleResolver> m_resolver; 159 OwnPtr<StyleResolver> m_resolver;
165 160
166 RefPtr<CSSFontSelector> m_fontSelector; 161 RefPtr<CSSFontSelector> m_fontSelector;
167 162
168 HashMap<AtomicString, RawPtr<StyleSheetContents> > m_textToSheetCache; 163 HashMap<AtomicString, RawPtr<StyleSheetContents> > m_textToSheetCache;
169 HashMap<RawPtr<StyleSheetContents>, AtomicString> m_sheetToTextCache; 164 HashMap<RawPtr<StyleSheetContents>, AtomicString> m_sheetToTextCache;
170 }; 165 };
171 166
172 } 167 }
173 168
174 #endif // SKY_ENGINE_CORE_DOM_STYLEENGINE_H_ 169 #endif // SKY_ENGINE_CORE_DOM_STYLEENGINE_H_
OLDNEW
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.cpp ('k') | sky/engine/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698