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

Unified Diff: sky/engine/core/css/resolver/StyleResourceLoader.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/StyleResourceLoader.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/resolver/StyleResourceLoader.cpp
diff --git a/sky/engine/core/css/resolver/StyleResourceLoader.cpp b/sky/engine/core/css/resolver/StyleResourceLoader.cpp
index 22abbc1aaecaab0d1b4ac1f1f4a96a12930512ef..264bc522dc08c1aaed486dfc486a54e3e01981f6 100644
--- a/sky/engine/core/css/resolver/StyleResourceLoader.cpp
+++ b/sky/engine/core/css/resolver/StyleResourceLoader.cpp
@@ -42,32 +42,27 @@ StyleResourceLoader::StyleResourceLoader(ResourceFetcher* fetcher)
{
}
-static PassRefPtr<StyleImage> doLoadPendingImage(ResourceFetcher* fetcher, StylePendingImage* pendingImage, float deviceScaleFactor, const ResourceLoaderOptions& options)
+PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage* pendingImage, float deviceScaleFactor)
{
if (CSSImageValue* imageValue = pendingImage->cssImageValue())
- return imageValue->cachedImage(fetcher, options);
+ return imageValue->cachedImage(m_fetcher, ResourceFetcher::defaultResourceOptions());
if (CSSImageGeneratorValue* imageGeneratorValue
= pendingImage->cssImageGeneratorValue()) {
- imageGeneratorValue->loadSubimages(fetcher);
+ imageGeneratorValue->loadSubimages(m_fetcher);
return StyleGeneratedImage::create(imageGeneratorValue);
}
if (CSSCursorImageValue* cursorImageValue
= pendingImage->cssCursorImageValue())
- return cursorImageValue->cachedImage(fetcher, deviceScaleFactor);
+ return cursorImageValue->cachedImage(m_fetcher, deviceScaleFactor);
if (CSSImageSetValue* imageSetValue = pendingImage->cssImageSetValue())
- return imageSetValue->cachedImageSet(fetcher, deviceScaleFactor, options);
+ return imageSetValue->cachedImageSet(m_fetcher, deviceScaleFactor, ResourceFetcher::defaultResourceOptions());
return nullptr;
}
-PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage* pendingImage, float deviceScaleFactor)
-{
- return doLoadPendingImage(m_fetcher, pendingImage, deviceScaleFactor, ResourceFetcher::defaultResourceOptions());
-}
-
void StyleResourceLoader::loadPendingImages(RenderStyle* style, ElementStyleResources& elementStyleResources)
{
if (elementStyleResources.pendingImageProperties().isEmpty())
« no previous file with comments | « sky/engine/core/css/resolver/StyleResourceLoader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698