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

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: Created 7 years, 2 months 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 if (styleResolverUpdateType == Reconstruct) { 163 if (styleResolverUpdateType == Reconstruct) {
164 document()->clearStyleResolver(); 164 document()->clearStyleResolver();
165 } else { 165 } else {
166 StyleResolver* styleResolver = document()->styleResolverIfExists(); 166 StyleResolver* styleResolver = document()->styleResolverIfExists();
167 ASSERT(styleResolver); 167 ASSERT(styleResolver);
168 // FIXME: We might have already had styles in child treescope. In this c ase, we cannot use buildScopedStyleTreeInDocumentOrder. 168 // FIXME: We might have already had styles in child treescope. In this c ase, we cannot use buildScopedStyleTreeInDocumentOrder.
169 // Need to change "false" to some valid condition. 169 // Need to change "false" to some valid condition.
170 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false); 170 styleResolver->setBuildScopedStyleTreeInDocumentOrder(false);
171 if (styleResolverUpdateType == Reset) { 171 if (styleResolverUpdateType == Reset) {
172 resetAllRuleSetsInTreeScope(styleResolver); 172 resetAllRuleSetsInTreeScope(styleResolver);
173 styleResolver->appendAuthorStyleSheets(0, activeCSSStyleSheets); 173 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleShe ets);
174 styleResolver->lazyAppendAuthorStyleSheets(0, activeCSSStyleSheets);
174 } else { 175 } else {
175 ASSERT(styleResolverUpdateType == Additive); 176 ASSERT(styleResolverUpdateType == Additive);
176 styleResolver->appendAuthorStyleSheets(m_activeAuthorStyleSheets.siz e(), activeCSSStyleSheets); 177 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), activeCSSStyleSheets);
177 } 178 }
178 } 179 }
179 m_scopingNodesForStyleScoped.didRemoveScopingNodes(); 180 m_scopingNodesForStyleScoped.didRemoveScopingNodes();
180 m_activeAuthorStyleSheets.swap(activeCSSStyleSheets); 181 m_activeAuthorStyleSheets.swap(activeCSSStyleSheets);
181 m_styleSheetsForStyleSheetList.swap(styleSheets); 182 m_styleSheetsForStyleSheetList.swap(styleSheets);
182 updateUsesRemUnits(); 183 updateUsesRemUnits();
183 184
184 return requiresFullStyleRecalc; 185 return requiresFullStyleRecalc;
185 } 186 }
186 187
187 } 188 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698