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

Side by Side Diff: Source/core/css/resolver/StyleResolver.h

Issue 66483002: fontSelector should be reset when removing stylesheets which has @font-face rule. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // FIXME: This only has 5 callers and should be removed. Callers should be e xplicit about 208 // FIXME: This only has 5 callers and should be removed. Callers should be e xplicit about
209 // their dependency on Document* instead of grabbing one through StyleResolv er. 209 // their dependency on Document* instead of grabbing one through StyleResolv er.
210 Document& document() { return m_document; } 210 Document& document() { return m_document; }
211 211
212 // FIXME: It could be better to call m_ruleSets.appendAuthorStyleSheets() di rectly after we factor StyleRsolver further. 212 // FIXME: It could be better to call m_ruleSets.appendAuthorStyleSheets() di rectly after we factor StyleRsolver further.
213 // https://bugs.webkit.org/show_bug.cgi?id=108890 213 // https://bugs.webkit.org/show_bug.cgi?id=108890
214 void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyle Sheet> >&); 214 void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyle Sheet> >&);
215 void resetAuthorStyle(const ContainerNode*); 215 void resetAuthorStyle(const ContainerNode*);
216 void resetAtHostRules(const ShadowRoot*); 216 void resetAtHostRules(const ShadowRoot*);
217 void finishAppendAuthorStyleSheets(); 217 void finishAppendAuthorStyleSheets();
218 void resetFontSelector();
218 219
219 DocumentRuleSets& ruleSets() { return m_ruleSets; } 220 DocumentRuleSets& ruleSets() { return m_ruleSets; }
220 const DocumentRuleSets& ruleSets() const { return m_ruleSets; } 221 const DocumentRuleSets& ruleSets() const { return m_ruleSets; }
221 SelectorFilter& selectorFilter() { return m_selectorFilter; } 222 SelectorFilter& selectorFilter() { return m_selectorFilter; }
222 223
223 void setBuildScopedStyleTreeInDocumentOrder(bool enabled) { m_styleTree.setB uildInDocumentOrder(enabled); } 224 void setBuildScopedStyleTreeInDocumentOrder(bool enabled) { m_styleTree.setB uildInDocumentOrder(enabled); }
224 bool buildScopedStyleTreeInDocumentOrder() const { return m_styleTree.buildI nDocumentOrder(); } 225 bool buildScopedStyleTreeInDocumentOrder() const { return m_styleTree.buildI nDocumentOrder(); }
225 226
226 ScopedStyleResolver* ensureScopedStyleResolver(const ContainerNode* scope) 227 ScopedStyleResolver* ensureScopedStyleResolver(const ContainerNode* scope)
227 { 228 {
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 PseudoId ignoreDynamicPseudo = NOPSEUDO; 381 PseudoId ignoreDynamicPseudo = NOPSEUDO;
381 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 382 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
382 return true; 383 return true;
383 } 384 }
384 return false; 385 return false;
385 } 386 }
386 387
387 } // namespace WebCore 388 } // namespace WebCore
388 389
389 #endif // StyleResolver_h 390 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698