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

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

Issue 42543007: StyleResolver should update RuleSets lazily. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Revised 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 * (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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 StyleResolver* styleResolver = document()->styleResolverIfExists(); 162 StyleResolver* styleResolver = document()->styleResolverIfExists();
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 || change.styleResolv erUpdateType == ResetStyleResolverAndFontSelector);
169 resetAllRuleSetsInTreeScope(styleResolver); 169 resetAllRuleSetsInTreeScope(styleResolver);
170 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec tor) 170 if (change.styleResolverUpdateType == ResetStyleResolverAndFontSelec tor)
171 styleResolver->resetFontSelector(); 171 styleResolver->resetFontSelector();
172 styleResolver->appendAuthorStyleSheets(0, activeCSSStyleSheets); 172 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe ets);
173 styleResolver->lazyAppendAuthorStyleSheets(0, activeCSSStyleSheets);
173 } else { 174 } else {
174 styleResolver->appendAuthorStyleSheets(m_activeAuthorStyleSheets.siz e(), activeCSSStyleSheets); 175 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), activeCSSStyleSheets);
175 } 176 }
176 } 177 }
177 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); 178 m_scopingNodesForStyleScoped.didRemoveScopingNodes();
178 m_activeAuthorStyleSheets.swap(activeCSSStyleSheets); 179 m_activeAuthorStyleSheets.swap(activeCSSStyleSheets);
179 m_styleSheetsForStyleSheetList.swap(styleSheets); 180 m_styleSheetsForStyleSheetList.swap(styleSheets);
180 updateUsesRemUnits(); 181 updateUsesRemUnits();
181 182
182 return change.requiresFullStyleRecalc; 183 return change.requiresFullStyleRecalc;
183 } 184 }
184 185
185 } 186 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698