third_party/WebKit/Source/core/html/forms/ImageInputType.cpp - Issue 1468023002: Rename imageSizeForLayoutObject() to imageSize()

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/html/forms/ImageInputType.cpp

Issue 1468023002: Rename imageSizeForLayoutObject() to imageSize() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Bring back ps#3 and fix nit 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:

Index: third_party/WebKit/Source/core/html/forms/ImageInputType.cpp

diff --git a/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp b/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp

index f7dc76e5507b1d587f5ecfa6f3871c83777a837a..a1286c18110267a826277a3c7536851a3612a9f5 100644

--- a/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp

+++ b/third_party/WebKit/Source/core/html/forms/ImageInputType.cpp

@@ -206,7 +206,7 @@ unsigned ImageInputType::height() const

// If the image is available, use its height.

HTMLImageLoader* imageLoader = element->imageLoader();

if (imageLoader && imageLoader->image())

- return imageLoader->image()->imageSizeForLayoutObject(element->layoutObject(), 1).height();

+ return imageLoader->image()->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr), 1).height();

}

element->document().updateLayout();

@@ -228,7 +228,7 @@ unsigned ImageInputType::width() const

// If the image is available, use its width.

HTMLImageLoader* imageLoader = element->imageLoader();

if (imageLoader && imageLoader->image())

- return imageLoader->image()->imageSizeForLayoutObject(element->layoutObject(), 1).width();

+ return imageLoader->image()->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr), 1).width();

}

element->document().updateLayout();