third_party/WebKit/Source/core/layout/LayoutButton.cpp - Issue 2261663002: Disallow cast/implicit conversion from LayoutUnit to int/unsigned

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

Issue 2261663002: Disallow cast/implicit conversion from LayoutUnit to int/unsigned (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: - Created 4 years, 4 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/LayoutBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5eeeeb81cddd5dbf54a8cbb32b111a0f6a22241c..d884ab70b802adb81c14db7e0869a87889e505a5 100644

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

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

@@ -100,9 +100,9 @@ int LayoutButton::baselinePosition(FontBaseline baseline, bool firstLine, LineDi

// even when we have the anonymous LayoutBlock child, we calculate the

// baseline for the empty case manually here.

if (direction == HorizontalLine) {

- return marginTop() + size().height() - borderBottom() - paddingBottom() - horizontalScrollbarHeight();

+ return (marginTop() + size().height() - borderBottom() - paddingBottom() - horizontalScrollbarHeight()).toInt();

}

- return marginRight() + size().width() - borderLeft() - paddingLeft() - verticalScrollbarWidth();

+ return (marginRight() + size().width() - borderLeft() - paddingLeft() - verticalScrollbarWidth()).toInt();

}

return LayoutFlexibleBox::baselinePosition(baseline, firstLine, direction, linePositionMode);

}