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

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

Issue 131403008: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months 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 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;
52 class StyleSheet; 51 class StyleSheet;
53 class StyleSheetCollection; 52 class StyleSheetCollection;
54 class StyleSheetContents; 53 class StyleSheetContents;
55 class StyleSheetList; 54 class StyleSheetList;
56 55
57 class StyleResolverChange { 56 class StyleResolverChange {
58 public: 57 public:
59 StyleResolverChange() 58 StyleResolverChange()
60 : m_needsRepaint(false) 59 : m_needsRepaint(false)
61 , m_needsStyleRecalc(false) 60 , m_needsStyleRecalc(false)
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 m_resolver->appendPendingAuthorStyleSheets(); 158 m_resolver->appendPendingAuthorStyleSheets();
160 } 159 }
161 return *m_resolver.get(); 160 return *m_resolver.get();
162 } 161 }
163 162
164 bool hasResolver() const { return m_resolver.get(); } 163 bool hasResolver() const { return m_resolver.get(); }
165 void clearResolver(); 164 void clearResolver();
166 void clearMasterResolver(); 165 void clearMasterResolver();
167 166
168 CSSFontSelector* fontSelector() { return m_fontSelector.get(); } 167 CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
169 void removeFontFaceRules(const Vector<const StyleRuleFontFace*>&);
170 // FIXME: still need to use resetFontSelector when GenericFontFamilySettings is changed.
171 void resetFontSelector(); 168 void resetFontSelector();
172 169
173 void didAttach(); 170 void didAttach();
174 void didDetach(); 171 void didDetach();
175 bool shouldClearResolver() const; 172 bool shouldClearResolver() const;
176 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode ); 173 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode );
177 unsigned resolverAccessCount() const; 174 unsigned resolverAccessCount() const;
178 175
179 void collectDocumentActiveStyleSheets(StyleSheetCollectionBase&); 176 void collectDocumentActiveStyleSheets(StyleSheetCollectionBase&);
180 void markDocumentDirty(); 177 void markDocumentDirty();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 unsigned m_lastResolverAccessCount; 236 unsigned m_lastResolverAccessCount;
240 Timer<StyleEngine> m_resolverThrowawayTimer; 237 Timer<StyleEngine> m_resolverThrowawayTimer;
241 OwnPtr<StyleResolver> m_resolver; 238 OwnPtr<StyleResolver> m_resolver;
242 239
243 RefPtr<CSSFontSelector> m_fontSelector; 240 RefPtr<CSSFontSelector> m_fontSelector;
244 }; 241 };
245 242
246 } 243 }
247 244
248 #endif 245 #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