third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.cpp - Issue 1431973002: Revert of Make LayoutImageResource::image() parameter explicit

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/LayoutImageResourceStyleImage.cpp

Issue 1431973002: Revert of Make LayoutImageResource::image() parameter explicit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

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

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

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

index 12c68f3da4ebaa6283d8fb409af357ea2b24e4cf..aff05ffbcc9fc7ce4c7579dc2e3f7cc3fe793700 100644

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

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

@@ -61,12 +61,12 @@

m_cachedImage = 0;

}

-PassRefPtr<Image> LayoutImageResourceStyleImage::image(const IntSize& size) const

+PassRefPtr<Image> LayoutImageResourceStyleImage::image(int width, int height) const

{

// Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.

if (m_styleImage->isPendingImage())

return nullptr;

- return m_styleImage->image(m_layoutObject, size);

+ return m_styleImage->image(m_layoutObject, IntSize(width, height));

}

void LayoutImageResourceStyleImage::setContainerSizeForLayoutObject(const IntSize& size)