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

Unified Diff: sky/engine/core/rendering/style/StyleFetchedImageSet.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/style/StyleFetchedImageSet.cpp
diff --git a/sky/engine/core/rendering/style/StyleFetchedImageSet.cpp b/sky/engine/core/rendering/style/StyleFetchedImageSet.cpp
index 9e8d1fae35564d7d1730b41af0f37765f49b0d0f..7f5d1e9773094f09b4f26f439ed078b4c77a80d3 100644
--- a/sky/engine/core/rendering/style/StyleFetchedImageSet.cpp
+++ b/sky/engine/core/rendering/style/StyleFetchedImageSet.cpp
@@ -52,9 +52,9 @@ PassRefPtr<CSSValue> StyleFetchedImageSet::cssValue() const
return m_imageSetValue;
}
-bool StyleFetchedImageSet::canRender(const RenderObject& renderer, float multiplier) const
+bool StyleFetchedImageSet::canRender(const RenderObject& renderer) const
{
- return m_bestFitImage->canRender(renderer, multiplier);
+ return m_bestFitImage->canRender(renderer);
}
bool StyleFetchedImageSet::isLoaded() const
@@ -67,9 +67,9 @@ bool StyleFetchedImageSet::errorOccurred() const
return m_bestFitImage->errorOccurred();
}
-LayoutSize StyleFetchedImageSet::imageSize(const RenderObject* renderer, float multiplier) const
+LayoutSize StyleFetchedImageSet::imageSize(const RenderObject* renderer) const
{
- LayoutSize scaledImageSize = m_bestFitImage->imageSizeForRenderer(renderer, multiplier);
+ LayoutSize scaledImageSize = m_bestFitImage->imageSizeForRenderer(renderer);
scaledImageSize.scale(1 / m_imageScaleFactor);
return scaledImageSize;
}
@@ -94,9 +94,9 @@ bool StyleFetchedImageSet::usesImageContainerSize() const
return m_bestFitImage->usesImageContainerSize();
}
-void StyleFetchedImageSet::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& imageContainerSize, float imageContainerZoomFactor)
+void StyleFetchedImageSet::setContainerSizeForRenderer(const RenderObject* renderer, const IntSize& imageContainerSize)
{
- m_bestFitImage->setContainerSizeForRenderer(renderer, imageContainerSize, imageContainerZoomFactor);
+ m_bestFitImage->setContainerSizeForRenderer(renderer, imageContainerSize);
}
void StyleFetchedImageSet::addClient(RenderObject* renderer)
« no previous file with comments | « sky/engine/core/rendering/style/StyleFetchedImageSet.h ('k') | sky/engine/core/rendering/style/StyleGeneratedImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698