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

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: Patch for landing 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
« no previous file with comments | « Source/core/css/StyleSheetContents.cpp ('k') | Source/core/css/resolver/StyleResolver.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 * 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 // FIXME: This only has 5 callers and should be removed. Callers should be e xplicit about 135 // FIXME: This only has 5 callers and should be removed. Callers should be e xplicit about
136 // their dependency on Document* instead of grabbing one through StyleResolv er. 136 // their dependency on Document* instead of grabbing one through StyleResolv er.
137 Document& document() { return m_document; } 137 Document& document() { return m_document; }
138 138
139 // FIXME: It could be better to call appendAuthorStyleSheets() directly afte r we factor StyleResolver further. 139 // FIXME: It could be better to call appendAuthorStyleSheets() directly afte r we factor StyleResolver further.
140 // https://bugs.webkit.org/show_bug.cgi?id=108890 140 // https://bugs.webkit.org/show_bug.cgi?id=108890
141 void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyle Sheet> >&); 141 void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyle Sheet> >&);
142 void resetAuthorStyle(const ContainerNode*); 142 void resetAuthorStyle(const ContainerNode*);
143 void resetAtHostRules(const ShadowRoot*); 143 void resetAtHostRules(const ShadowRoot*);
144 void finishAppendAuthorStyleSheets(); 144 void finishAppendAuthorStyleSheets();
145 void resetFontSelector();
145 146
146 TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBounda ryCrossingRules; } 147 TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBounda ryCrossingRules; }
147 void processScopedRules(const RuleSet& authorRules, const KURL&, ContainerNo de* scope = 0); 148 void processScopedRules(const RuleSet& authorRules, const KURL&, ContainerNo de* scope = 0);
148 149
149 SelectorFilter& selectorFilter() { return m_selectorFilter; } 150 SelectorFilter& selectorFilter() { return m_selectorFilter; }
150 151
151 void setBuildScopedStyleTreeInDocumentOrder(bool enabled) { m_styleTree.setB uildInDocumentOrder(enabled); } 152 void setBuildScopedStyleTreeInDocumentOrder(bool enabled) { m_styleTree.setB uildInDocumentOrder(enabled); }
152 bool buildScopedStyleTreeInDocumentOrder() const { return m_styleTree.buildI nDocumentOrder(); } 153 bool buildScopedStyleTreeInDocumentOrder() const { return m_styleTree.buildI nDocumentOrder(); }
153 bool styleTreeHasOnlyScopedResolverForDocument() const { return m_styleTree. hasOnlyScopedResolverForDocument(); } 154 bool styleTreeHasOnlyScopedResolverForDocument() const { return m_styleTree. hasOnlyScopedResolverForDocument(); }
154 ScopedStyleResolver* styleTreeScopedStyleResolverForDocument() const { retur n m_styleTree.scopedStyleResolverForDocument(); } 155 ScopedStyleResolver* styleTreeScopedStyleResolverForDocument() const { retur n m_styleTree.scopedStyleResolverForDocument(); }
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 PseudoId ignoreDynamicPseudo = NOPSEUDO; 324 PseudoId ignoreDynamicPseudo = NOPSEUDO;
324 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 325 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
325 return true; 326 return true;
326 } 327 }
327 return false; 328 return false;
328 } 329 }
329 330
330 } // namespace WebCore 331 } // namespace WebCore
331 332
332 #endif // StyleResolver_h 333 #endif // StyleResolver_h
OLDNEW
« no previous file with comments | « Source/core/css/StyleSheetContents.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698