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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp

Issue 1427943002: Wrap SVGImage for container during paint (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use IntSize for SVGImageForContainer Created 5 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
Index: third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
index 12c68f3da4ebaa6283d8fb409af357ea2b24e4cf..814efdf517e990c45492caf6999c03f1461c7fbf 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp
@@ -61,18 +61,12 @@ void LayoutImageResourceStyleImage::shutdown()
m_cachedImage = 0;
}
-PassRefPtr<Image> LayoutImageResourceStyleImage::image(const IntSize& size) const
+PassRefPtr<Image> LayoutImageResourceStyleImage::image(const IntSize& size, float zoom) const
{
// Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.
if (m_styleImage->isPendingImage())
return nullptr;
- return m_styleImage->image(m_layoutObject, size);
-}
-
-void LayoutImageResourceStyleImage::setContainerSizeForLayoutObject(const IntSize& size)
-{
- ASSERT(m_layoutObject);
- m_styleImage->setContainerSizeForLayoutObject(m_layoutObject, size, m_layoutObject->style()->effectiveZoom());
+ return m_styleImage->image(m_layoutObject, size, zoom);
}
DEFINE_TRACE(LayoutImageResourceStyleImage)

Powered by Google App Engine
This is Rietveld 408576698