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

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

Issue 157853002: Revert of Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 m_resolver->appendPendingAuthorStyleSheets(); 161 m_resolver->appendPendingAuthorStyleSheets();
163 } 162 }
164 return *m_resolver.get(); 163 return *m_resolver.get();
165 } 164 }
166 165
167 bool hasResolver() const { return m_resolver.get(); } 166 bool hasResolver() const { return m_resolver.get(); }
168 void clearResolver(); 167 void clearResolver();
169 void clearMasterResolver(); 168 void clearMasterResolver();
170 169
171 CSSFontSelector* fontSelector() { return m_fontSelector.get(); } 170 CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
172 void removeFontFaceRules(const Vector<const StyleRuleFontFace*>&); 171 void resetFontSelector();
173 void clearFontCache();
174 // updateGenericFontFamilySettings is used from WebSettingsImpl.
175 void updateGenericFontFamilySettings();
176 172
177 void didDetach(); 173 void didDetach();
178 bool shouldClearResolver() const; 174 bool shouldClearResolver() const;
179 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode ); 175 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode );
180 unsigned resolverAccessCount() const; 176 unsigned resolverAccessCount() const;
181 177
182 void markDocumentDirty(); 178 void markDocumentDirty();
183 179
184 static PassRefPtr<CSSStyleSheet> createSheet(Element*, const String& text, T extPosition startPosition, bool createdByParser); 180 static PassRefPtr<CSSStyleSheet> createSheet(Element*, const String& text, T extPosition startPosition, bool createdByParser);
185 static void removeSheet(StyleSheetContents*); 181 static void removeSheet(StyleSheetContents*);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 bool m_ignorePendingStylesheets; 237 bool m_ignorePendingStylesheets;
242 bool m_didCalculateResolver; 238 bool m_didCalculateResolver;
243 OwnPtr<StyleResolver> m_resolver; 239 OwnPtr<StyleResolver> m_resolver;
244 240
245 RefPtr<CSSFontSelector> m_fontSelector; 241 RefPtr<CSSFontSelector> m_fontSelector;
246 }; 242 };
247 243
248 } 244 }
249 245
250 #endif 246 #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