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

Unified Diff: Source/core/loader/cache/CachedImage.cpp

Issue 22482004: Add support for the object-fit CSS property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Oops, sorry! Forgot to update UseCounter.cpp Created 7 years, 4 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
Index: Source/core/loader/cache/CachedImage.cpp
diff --git a/Source/core/loader/cache/CachedImage.cpp b/Source/core/loader/cache/CachedImage.cpp
index 7bdf2623a41084be53f0b46005b016df430c894d..b821d1c07d78868f9d059055506773d23c533e51 100644
--- a/Source/core/loader/cache/CachedImage.cpp
+++ b/Source/core/loader/cache/CachedImage.cpp
@@ -225,7 +225,7 @@ bool CachedImage::imageHasRelativeHeight() const
return false;
}
-LayoutSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float multiplier)
+LayoutSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float multiplier, SizeType sizeType)
{
ASSERT(!isPurgeable());
@@ -236,7 +236,7 @@ LayoutSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float
if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
imageSize = static_cast<BitmapImage*>(m_image.get())->sizeRespectingOrientation();
- else if (m_image->isSVGImage())
+ else if (m_image->isSVGImage() && sizeType == NormalSize)
imageSize = m_svgImageCache->imageSizeForRenderer(renderer);
else
imageSize = m_image->size();

Powered by Google App Engine
This is Rietveld 408576698