third_party/WebKit/Source/core/layout/LayoutImage.cpp - Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1732563007: [NOT FOR COMMIT] Pass defaultObjectSize to get image size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « third_party/WebKit/Source/core/layout/ImageQualityController.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutImage.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImage.cpp

index d5c340de55a4910712edc687c6f42d7c54ba5126..e517e3271a1a26e398bbb9963315feea9a1f6399 100644

--- a/third_party/WebKit/Source/core/layout/LayoutImage.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutImage.cpp

@@ -122,7 +122,7 @@ void LayoutImage::imageChanged(WrappedImagePtr newImage, const IntRect* rect)

if (!m_didIncrementVisuallyNonEmptyPixelCount) {

// At a zoom level of 1 the image is guaranteed to have an integer size.

- view()->frameView()->incrementVisuallyNonEmptyPixelCount(flooredIntSize(m_imageResource->imageSize(1.0f)));

+ view()->frameView()->incrementVisuallyNonEmptyPixelCount(flooredIntSize(m_imageResource->defaultConcreteObjectSize(1.0f)));

m_didIncrementVisuallyNonEmptyPixelCount = true;

}

@@ -139,7 +139,7 @@ void LayoutImage::updateIntrinsicSizeIfNeeded(const LayoutSize& newSize)

void LayoutImage::invalidatePaintAndMarkForLayoutIfNeeded()

{

LayoutSize oldIntrinsicSize = intrinsicSize();

- LayoutSize newIntrinsicSize = m_imageResource->imageSize(style()->effectiveZoom());

+ LayoutSize newIntrinsicSize = m_imageResource->defaultConcreteObjectSize(style()->effectiveZoom());

updateIntrinsicSizeIfNeeded(newIntrinsicSize);

// In the case of generated image content using :before/:after/content, we might not be