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

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

Issue 703563002: Remove shape-outside. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/css/resolver/StyleResourceLoader.h ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | 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 8b633457e4f9dc426cb632f2b3c78ed524b4fe4d..f872766af505e709834f8a31f3464d997308e21a 100644
--- a/sky/engine/core/css/resolver/StyleResourceLoader.cpp
+++ b/sky/engine/core/css/resolver/StyleResourceLoader.cpp
@@ -69,23 +69,6 @@ PassRefPtr<StyleImage> StyleResourceLoader::loadPendingImage(StylePendingImage*
return doLoadPendingImage(m_fetcher, pendingImage, deviceScaleFactor, ResourceFetcher::defaultResourceOptions());
}
-void StyleResourceLoader::loadPendingShapeImage(RenderStyle* renderStyle, ShapeValue* shapeValue, float deviceScaleFactor)
-{
- if (!shapeValue)
- return;
-
- StyleImage* image = shapeValue->image();
- if (!image || !image->isPendingImage())
- return;
-
- ResourceLoaderOptions options = ResourceFetcher::defaultResourceOptions();
- options.allowCredentials = DoNotAllowStoredCredentials;
- options.credentialsRequested = ClientDidNotRequestCredentials;
- options.corsEnabled = IsCORSEnabled;
-
- shapeValue->setImage(doLoadPendingImage(m_fetcher, toStylePendingImage(image), deviceScaleFactor, options));
-}
-
void StyleResourceLoader::loadPendingImages(RenderStyle* style, ElementStyleResources& elementStyleResources)
{
if (elementStyleResources.pendingImageProperties().isEmpty())
@@ -150,9 +133,6 @@ void StyleResourceLoader::loadPendingImages(RenderStyle* style, ElementStyleReso
}
break;
}
- case CSSPropertyShapeOutside:
- loadPendingShapeImage(style, style->shapeOutside(), elementStyleResources.deviceScaleFactor());
- break;
default:
ASSERT_NOT_REACHED();
}
« no previous file with comments | « sky/engine/core/css/resolver/StyleResourceLoader.h ('k') | sky/engine/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698