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

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

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reset when Settings is changed 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
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 namespace WebCore { 43 namespace WebCore {
44 44
45 class CSSFontSelector; 45 class CSSFontSelector;
46 class CSSStyleSheet; 46 class CSSStyleSheet;
47 class FontSelector; 47 class FontSelector;
48 class Node; 48 class Node;
49 class RuleFeatureSet; 49 class RuleFeatureSet;
50 class ShadowTreeStyleSheetCollection; 50 class ShadowTreeStyleSheetCollection;
51 class StyleResolver; 51 class StyleResolver;
52 class StyleRuleFontFace;
52 class StyleSheet; 53 class StyleSheet;
53 class StyleSheetCollection; 54 class StyleSheetCollection;
54 class StyleSheetContents; 55 class StyleSheetContents;
55 class StyleSheetList; 56 class StyleSheetList;
56 57
57 class StyleResolverChange { 58 class StyleResolverChange {
58 public: 59 public:
59 StyleResolverChange() 60 StyleResolverChange()
60 : m_needsRepaint(false) 61 : m_needsRepaint(false)
61 , m_needsStyleRecalc(false) 62 , m_needsStyleRecalc(false)
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 m_resolver->appendPendingAuthorStyleSheets(); 158 m_resolver->appendPendingAuthorStyleSheets();
158 } 159 }
159 return *m_resolver.get(); 160 return *m_resolver.get();
160 } 161 }
161 162
162 bool hasResolver() const { return m_resolver.get(); } 163 bool hasResolver() const { return m_resolver.get(); }
163 void clearResolver(); 164 void clearResolver();
164 void clearMasterResolver(); 165 void clearMasterResolver();
165 166
166 CSSFontSelector* fontSelector() { return m_fontSelector.get(); } 167 CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
168 void removeFontFaceRules(const Vector<const StyleRuleFontFace*>&);
169 // FIXME: still need to use resetFontSelector when GenericFontFamilySettings is changed.
167 void resetFontSelector(); 170 void resetFontSelector();
168 171
169 void didAttach(); 172 void didAttach();
170 void didDetach(); 173 void didDetach();
171 bool shouldClearResolver() const; 174 bool shouldClearResolver() const;
172 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode ); 175 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode );
173 unsigned resolverAccessCount() const; 176 unsigned resolverAccessCount() const;
174 177
175 void collectDocumentActiveStyleSheets(StyleSheetCollectionBase&); 178 void collectDocumentActiveStyleSheets(StyleSheetCollectionBase&);
176 void markDocumentDirty() { m_dirtyTreeScopes.markDocument(); } 179 void markDocumentDirty() { m_dirtyTreeScopes.markDocument(); }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 unsigned m_lastResolverAccessCount; 236 unsigned m_lastResolverAccessCount;
234 Timer<StyleEngine> m_resolverThrowawayTimer; 237 Timer<StyleEngine> m_resolverThrowawayTimer;
235 OwnPtr<StyleResolver> m_resolver; 238 OwnPtr<StyleResolver> m_resolver;
236 239
237 RefPtr<CSSFontSelector> m_fontSelector; 240 RefPtr<CSSFontSelector> m_fontSelector;
238 }; 241 };
239 242
240 } 243 }
241 244
242 #endif 245 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698