third_party/WebKit/Source/core/layout/LayoutImageResource.h - 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/LayoutImageResource.h

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/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImageResource.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutImageResource.h

diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResource.h b/third_party/WebKit/Source/core/layout/LayoutImageResource.h

index 788e7949e0c5a5794722c6dc6fff3752b5f068cd..a4d99bafefd4009056c99ac61d6612b3e1c1770e 100644

--- a/third_party/WebKit/Source/core/layout/LayoutImageResource.h

+++ b/third_party/WebKit/Source/core/layout/LayoutImageResource.h

@@ -53,9 +53,8 @@

virtual bool hasImage() const { return m_cachedImage; }

void resetAnimation();

- bool maybeAnimated() const;

- virtual PassRefPtr<Image> image(const IntSize&) const

+ virtual PassRefPtr<Image> image(int /* width */ = 0, int /* height */ = 0) const

{

return m_cachedImage ? m_cachedImage->imageForLayoutObject(m_layoutObject) : Image::nullImage();

}