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

Unified Diff: sky/engine/core/rendering/RenderImageResource.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (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
Index: sky/engine/core/rendering/RenderImageResource.cpp
diff --git a/sky/engine/core/rendering/RenderImageResource.cpp b/sky/engine/core/rendering/RenderImageResource.cpp
index e551678e5df1d76138dee3f8678d4c1f43d22fa1..93423058cd4e76b63028ad52151f44c9c031cbf5 100644
--- a/sky/engine/core/rendering/RenderImageResource.cpp
+++ b/sky/engine/core/rendering/RenderImageResource.cpp
@@ -93,14 +93,14 @@ void RenderImageResource::setContainerSizeForRenderer(const IntSize& imageContai
{
ASSERT(m_renderer);
if (m_cachedImage)
- m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize, m_renderer->style()->effectiveZoom());
+ m_cachedImage->setContainerSizeForRenderer(m_renderer, imageContainerSize);
}
-LayoutSize RenderImageResource::getImageSize(float multiplier, ImageResource::SizeType type) const
+LayoutSize RenderImageResource::getImageSize(ImageResource::SizeType type) const
{
if (!m_cachedImage)
return LayoutSize();
- LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, multiplier, type);
+ LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, type);
if (m_renderer && m_renderer->isRenderImage())
size.scale(toRenderImage(m_renderer)->imageDevicePixelRatio());
return size;
« no previous file with comments | « sky/engine/core/rendering/RenderImageResource.h ('k') | sky/engine/core/rendering/RenderImageResourceStyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698