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

Unified Diff: Source/core/rendering/RenderImage.cpp

Issue 25105004: Use srcset's resource pixel density to determine intrinsic size (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cleantests
Patch Set: Fixed expected test results Created 7 years, 2 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/rendering/RenderImage.cpp
diff --git a/Source/core/rendering/RenderImage.cpp b/Source/core/rendering/RenderImage.cpp
index 18dc9758bb152265f0ab4e0bf82697667ae1fb58..81d3db8a9ee782e658d774ff0bdd84080335373e 100644
--- a/Source/core/rendering/RenderImage.cpp
+++ b/Source/core/rendering/RenderImage.cpp
@@ -59,6 +59,7 @@ RenderImage::RenderImage(Element* element)
, m_needsToSetSizeForAltText(false)
, m_didIncrementVisuallyNonEmptyPixelCount(false)
, m_isGeneratedContent(false)
+ , m_intrinsicSizeFactor(1.0f)
{
updateAltText();
}
@@ -610,4 +611,18 @@ RenderBox* RenderImage::embeddedContentBox() const
return 0;
}
+LayoutSize RenderImage::intrinsicSize() const OVERRIDE
+{
pdr. 2013/10/11 05:17:33 Can you add an assert here: ASSERT(m_imageResource
Yoav Weiss 2013/10/11 07:22:32 Sure
+ LayoutSize intrinsic = RenderReplaced::intrinsicSize();
+ ImageResource* cachedImage = m_imageResource->cachedImage();
+ if (cachedImage && cachedImage->image() && cachedImage->image()->isSVGImage())
pdr. 2013/10/11 05:17:33 I don't understand the cachedImage->image()->isSVG
Yoav Weiss 2013/10/11 07:22:32 It should. Applying it to bitmaps breaks them. Cur
+ intrinsic.scale(m_intrinsicSizeFactor);
+ return intrinsic;
+}
+
+LayoutSize RenderImage::unscaledIntrinsicSize() const
+{
+ return RenderReplaced::intrinsicSize();
+}
+
} // namespace WebCore

Powered by Google App Engine
This is Rietveld 408576698