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

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

Powered by Google App Engine
This is Rietveld 408576698