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

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

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

index eb1a8260179b81039b035d7b71c08e89f7762374..fd10fa350e7f43f5e4a35d895794ef467635ca2f 100644

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

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

@@ -388,7 +388,7 @@ int LayoutTableCell::cellBaselinePosition() const

int firstLineBaseline = firstLineBoxBaseline();

if (firstLineBaseline != -1)

return firstLineBaseline;

- return borderBefore() + paddingBefore() + contentLogicalHeight();

+ return (borderBefore() + paddingBefore() + contentLogicalHeight()).toInt();

}

void LayoutTableCell::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)

@@ -1011,8 +1011,8 @@ void LayoutTableCell::scrollbarsChanged(bool horizontalScrollbarChanged, bool ve

totalHeight -= scrollbarHeight;

LayoutUnit newBeforePadding = (totalHeight - heightWithoutIntrinsicPadding) / 2;

LayoutUnit newAfterPadding = totalHeight - heightWithoutIntrinsicPadding - newBeforePadding;

- setIntrinsicPaddingBefore(newBeforePadding);

- setIntrinsicPaddingAfter(newAfterPadding);

+ setIntrinsicPaddingBefore(newBeforePadding.toInt());

+ setIntrinsicPaddingAfter(newAfterPadding.toInt());

} else {

setIntrinsicPaddingAfter(intrinsicPaddingAfter() - scrollbarHeight);

}