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

Side by Side Diff: Source/core/dom/DocumentStyleSheetCollection.cpp

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 * (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) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 158
159 if (change.styleResolverUpdateType == Reconstruct) { 159 if (change.styleResolverUpdateType == Reconstruct) {
160 engine->clearResolver(); 160 engine->clearResolver();
161 } else { 161 } else {
162 StyleResolver* styleResolver = engine->resolverIfExists(); 162 StyleResolver* styleResolver = engine->resolverIfExists();
163 ASSERT(styleResolver); 163 ASSERT(styleResolver);
164 // FIXME: We might have already had styles in child treescope. In this c ase, we cannot use buildScopedStyleTreeInDocumentOrder. 164 // FIXME: We might have already had styles in child treescope. In this c ase, we cannot use buildScopedStyleTreeInDocumentOrder.
165 // Need to change "false" to some valid condition. 165 // Need to change "false" to some valid condition.
166 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); 166 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false);
167 if (change.styleResolverUpdateType != Additive) { 167 if (change.styleResolverUpdateType != Additive) {
168 ASSERT(change.styleResolverUpdateType == Reset || change.styleResolv erUpdateType == ResetStyleResolverAndFontSelector); 168 ASSERT(change.styleResolverUpdateType == Reset);
169 resetAllRuleSetsInTreeScope(styleResolver); 169 resetAllRuleSetsInTreeScope(styleResolver);
170 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec tor) 170 styleResolver->removeFontFaceRule(change.removedFontFace);
dglazkov 2013/11/25 16:27:29 I am curious why we couldn't just do extract+remov
tasak 2013/11/26 07:49:06 So is it ok to move removeFontFaceRule to analyzeS
171 styleResolver->resetFontSelector();
172 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe ets); 171 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe ets);
173 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho rStyleSheets()); 172 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAutho rStyleSheets());
174 } else { 173 } else {
175 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), collection.activeAuthorStyleSheets()); 174 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), collection.activeAuthorStyleSheets());
176 } 175 }
177 } 176 }
178 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); 177 m_scopingNodesForStyleScoped.didRemoveScopingNodes();
179 collection.swap(*this); 178 collection.swap(*this);
180 updateUsesRemUnits(); 179 updateUsesRemUnits();
181 180
182 return change.requiresFullStyleRecalc; 181 return change.requiresFullStyleRecalc;
183 } 182 }
184 183
185 } 184 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698