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

Side by Side Diff: Source/core/dom/StyleEngine.h

Issue 87503003: Moving fontSelector from StyleResolver to StyleEngine. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/dom/DocumentStyleSheetCollection.cpp ('k') | Source/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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 } else if (m_resolver->hasPendingAuthorStyleSheets()) { 156 } else if (m_resolver->hasPendingAuthorStyleSheets()) {
157 m_resolver->appendPendingAuthorStyleSheets(); 157 m_resolver->appendPendingAuthorStyleSheets();
158 } 158 }
159 return *m_resolver.get(); 159 return *m_resolver.get();
160 } 160 }
161 161
162 bool hasResolver() const { return m_resolver.get(); } 162 bool hasResolver() const { return m_resolver.get(); }
163 void clearResolver(); 163 void clearResolver();
164 void clearMasterResolver(); 164 void clearMasterResolver();
165 165
166 CSSFontSelector* fontSelector(); 166 CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
167 void resetFontSelector();
168
167 void didAttach(); 169 void didAttach();
168 void didDetach(); 170 void didDetach();
169 bool shouldClearResolver() const; 171 bool shouldClearResolver() const;
170 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode ); 172 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode );
171 unsigned resolverAccessCount() const; 173 unsigned resolverAccessCount() const;
172 174
173 void collectDocumentActiveStyleSheets(StyleSheetCollectionBase&); 175 void collectDocumentActiveStyleSheets(StyleSheetCollectionBase&);
174 void markDocumentDirty() { m_dirtyTreeScopes.markDocument(); } 176 void markDocumentDirty() { m_dirtyTreeScopes.markDocument(); }
175 177
176 private: 178 private:
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 bool m_usesFirstLineRules; 226 bool m_usesFirstLineRules;
225 bool m_usesFirstLetterRules; 227 bool m_usesFirstLetterRules;
226 bool m_usesRemUnits; 228 bool m_usesRemUnits;
227 unsigned m_maxDirectAdjacentSelectors; 229 unsigned m_maxDirectAdjacentSelectors;
228 230
229 bool m_ignorePendingStylesheets; 231 bool m_ignorePendingStylesheets;
230 bool m_didCalculateResolver; 232 bool m_didCalculateResolver;
231 unsigned m_lastResolverAccessCount; 233 unsigned m_lastResolverAccessCount;
232 Timer<StyleEngine> m_resolverThrowawayTimer; 234 Timer<StyleEngine> m_resolverThrowawayTimer;
233 OwnPtr<StyleResolver> m_resolver; 235 OwnPtr<StyleResolver> m_resolver;
236
237 RefPtr<CSSFontSelector> m_fontSelector;
234 }; 238 };
235 239
236 } 240 }
237 241
238 #endif 242 #endif
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentStyleSheetCollection.cpp ('k') | Source/core/dom/StyleEngine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698