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

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: Fix fast/text/international/ regression 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
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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 m_resolver->appendPendingAuthorStyleSheets(); 162 m_resolver->appendPendingAuthorStyleSheets();
162 } 163 }
163 return *m_resolver.get(); 164 return *m_resolver.get();
164 } 165 }
165 166
166 bool hasResolver() const { return m_resolver.get(); } 167 bool hasResolver() const { return m_resolver.get(); }
167 void clearResolver(); 168 void clearResolver();
168 void clearMasterResolver(); 169 void clearMasterResolver();
169 170
170 CSSFontSelector* fontSelector() { return m_fontSelector.get(); } 171 CSSFontSelector* fontSelector() { return m_fontSelector.get(); }
171 void resetFontSelector(); 172 void removeFontFaceRules(const Vector<const StyleRuleFontFace*>&);
173 void clearFontCache();
174 // updateGenericFontFamilySettings is used from WebSettingsImpl.
175 void updateGenericFontFamilySettings();
172 176
173 void didAttach(); 177 void didAttach();
174 void didDetach(); 178 void didDetach();
175 bool shouldClearResolver() const; 179 bool shouldClearResolver() const;
176 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode ); 180 StyleResolverChange resolverChanged(RecalcStyleTime, StyleResolverUpdateMode );
177 unsigned resolverAccessCount() const; 181 unsigned resolverAccessCount() const;
178 182
179 void markDocumentDirty(); 183 void markDocumentDirty();
180 184
181 static PassRefPtr<CSSStyleSheet> createSheet(Element*, const String& text, T extPosition startPosition, bool createdByParser); 185 static PassRefPtr<CSSStyleSheet> createSheet(Element*, const String& text, T extPosition startPosition, bool createdByParser);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 unsigned m_lastResolverAccessCount; 245 unsigned m_lastResolverAccessCount;
242 Timer<StyleEngine> m_resolverThrowawayTimer; 246 Timer<StyleEngine> m_resolverThrowawayTimer;
243 OwnPtr<StyleResolver> m_resolver; 247 OwnPtr<StyleResolver> m_resolver;
244 248
245 RefPtr<CSSFontSelector> m_fontSelector; 249 RefPtr<CSSFontSelector> m_fontSelector;
246 }; 250 };
247 251
248 } 252 }
249 253
250 #endif 254 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698