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

Unified Diff: sky/engine/core/dom/StyleEngine.cpp

Issue 836383005: Don't walk treescopes in updateActiveStyleSheets until the resolver exists. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove comments. Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/dom/StyleEngine.h ('k') | sky/engine/core/dom/StyleSheetCollection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/StyleEngine.cpp
diff --git a/sky/engine/core/dom/StyleEngine.cpp b/sky/engine/core/dom/StyleEngine.cpp
index 3c75e5bb591db05f7eaa7d0863ce0fb6068a5600..18d33911636c6d280789be3e118bd3095bbf5945 100644
--- a/sky/engine/core/dom/StyleEngine.cpp
+++ b/sky/engine/core/dom/StyleEngine.cpp
@@ -71,12 +71,10 @@ void StyleEngine::removeTreeScope(TreeScope& scope)
void StyleEngine::updateActiveStyleSheets()
{
ASSERT(!m_document->inStyleRecalc());
-
- if (!m_document->isActive())
- return;
+ ASSERT(m_resolver);
for (TreeScope* treeScope : m_activeTreeScopes)
- treeScope->styleSheets().updateActiveStyleSheets(this);
+ treeScope->styleSheets().updateActiveStyleSheets(*m_resolver);
}
void StyleEngine::appendActiveAuthorStyleSheets()
@@ -113,14 +111,10 @@ unsigned StyleEngine::resolverAccessCount() const
void StyleEngine::resolverChanged()
{
- // Don't bother updating, since we haven't loaded all our style info yet
- // and haven't calculated the style selector for the first time.
- if (!m_document->isActive()) {
- clearResolver();
+ if (!m_document->isActive())
return;
- }
-
- updateActiveStyleSheets();
+ if (m_resolver)
+ updateActiveStyleSheets();
}
void StyleEngine::clearFontCache()
« no previous file with comments | « sky/engine/core/dom/StyleEngine.h ('k') | sky/engine/core/dom/StyleSheetCollection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698