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

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

Issue 82583005: Use removeFontFace to avoid resetting fontSelector. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years 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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // their dependency on Document* instead of grabbing one through StyleResolv er. 137 // their dependency on Document* instead of grabbing one through StyleResolv er.
138 Document& document() { return m_document; } 138 Document& document() { return m_document; }
139 139
140 // FIXME: It could be better to call appendAuthorStyleSheets() directly afte r we factor StyleResolver further. 140 // FIXME: It could be better to call appendAuthorStyleSheets() directly afte r we factor StyleResolver further.
141 // https://bugs.webkit.org/show_bug.cgi?id=108890 141 // https://bugs.webkit.org/show_bug.cgi?id=108890
142 void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyle Sheet> >&); 142 void appendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSStyle Sheet> >&);
143 void resetAuthorStyle(const ContainerNode*); 143 void resetAuthorStyle(const ContainerNode*);
144 void resetAtHostRules(const ShadowRoot*); 144 void resetAtHostRules(const ShadowRoot*);
145 void finishAppendAuthorStyleSheets(); 145 void finishAppendAuthorStyleSheets();
146 void resetFontSelector(); 146 void resetFontSelector();
147 void removeFontFaceRule(Vector<const StyleRuleFontFace*>& removedFontFace);
147 148
148 TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBounda ryCrossingRules; } 149 TreeBoundaryCrossingRules& treeBoundaryCrossingRules() { return m_treeBounda ryCrossingRules; }
149 void processScopedRules(const RuleSet& authorRules, const KURL&, ContainerNo de* scope = 0); 150 void processScopedRules(const RuleSet& authorRules, const KURL&, ContainerNo de* scope = 0);
150 151
151 void lazyAppendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSS tyleSheet> >&); 152 void lazyAppendAuthorStyleSheets(unsigned firstNew, const Vector<RefPtr<CSSS tyleSheet> >&);
152 void removePendingAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet> >&); 153 void removePendingAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet> >&);
153 void appendPendingAuthorStyleSheets(); 154 void appendPendingAuthorStyleSheets();
154 bool hasPendingAuthorStyleSheets() const { return m_pendingStyleSheets.size( ) > 0 || m_needCollectFeatures; } 155 bool hasPendingAuthorStyleSheets() const { return m_pendingStyleSheets.size( ) > 0 || m_needCollectFeatures; }
155 156
156 SelectorFilter& selectorFilter() { return m_selectorFilter; } 157 SelectorFilter& selectorFilter() { return m_selectorFilter; }
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 PseudoId ignoreDynamicPseudo = NOPSEUDO; 350 PseudoId ignoreDynamicPseudo = NOPSEUDO;
350 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches) 351 if (selectorChecker.match(selectorCheckingContext, ignoreDynamicPseudo, DOMSiblingTraversalStrategy()) == SelectorChecker::SelectorMatches)
351 return true; 352 return true;
352 } 353 }
353 return false; 354 return false;
354 } 355 }
355 356
356 } // namespace WebCore 357 } // namespace WebCore
357 358
358 #endif // StyleResolver_h 359 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698