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

Unified Diff: sky/engine/core/css/resolver/StyleResolver.cpp

Issue 825433003: Put the StyleResourceLoader on the stack. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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/css/resolver/StyleResolver.h ('k') | sky/engine/core/css/resolver/StyleResourceLoader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleResolver.cpp
diff --git a/sky/engine/core/css/resolver/StyleResolver.cpp b/sky/engine/core/css/resolver/StyleResolver.cpp
index ae0a105825120f6a1ccf66f29e78ab31cb27fe4c..2b2f43701c6383e2ef90eb565d142aa1dc766bab 100644
--- a/sky/engine/core/css/resolver/StyleResolver.cpp
+++ b/sky/engine/core/css/resolver/StyleResolver.cpp
@@ -60,6 +60,7 @@
#include "sky/engine/core/css/resolver/StyleBuilder.h"
#include "sky/engine/core/css/resolver/StyleResolverState.h"
#include "sky/engine/core/css/resolver/StyleResolverStats.h"
+#include "sky/engine/core/css/resolver/StyleResourceLoader.h"
#include "sky/engine/core/dom/NodeRenderStyle.h"
#include "sky/engine/core/dom/StyleEngine.h"
#include "sky/engine/core/dom/Text.h"
@@ -117,7 +118,6 @@ static RuleSet& defaultStyles()
StyleResolver::StyleResolver(Document& document)
: m_document(document)
- , m_styleResourceLoader(document.fetcher())
, m_styleResolverStatsSequence(0)
, m_accessCount(0)
{
@@ -202,10 +202,10 @@ PassRefPtr<RenderStyle> StyleResolver::styleForDocument(Document& document)
return documentStyle.release();
}
-// Start loading resources referenced by this style.
void StyleResolver::loadPendingResources(StyleResolverState& state)
{
- m_styleResourceLoader.loadPendingResources(state.style(), state.elementStyleResources());
+ StyleResourceLoader loader(document().fetcher());
+ loader.loadPendingResources(state.style(), state.elementStyleResources());
document().styleEngine()->fontSelector()->fontLoader()->loadPendingFonts();
}
« no previous file with comments | « sky/engine/core/css/resolver/StyleResolver.h ('k') | sky/engine/core/css/resolver/StyleResourceLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698