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

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

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

index a22b9cc1a84897ae9aac20b2c2f5c6902c3c568a..c01d6e8a694d113bb9324ae758a5da75e3e1510e 100644

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

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

@@ -83,7 +83,7 @@ void LayoutTextControl::adjustInnerEditorStyle(ComputedStyle& textBlockStyle) co

int LayoutTextControl::textBlockLogicalHeight() const

{

- return logicalHeight() - borderAndPaddingLogicalHeight();

+ return (logicalHeight() - borderAndPaddingLogicalHeight()).toInt();

}

int LayoutTextControl::textBlockLogicalWidth() const

@@ -95,7 +95,7 @@ int LayoutTextControl::textBlockLogicalWidth() const

if (innerEditor->layoutObject())

unitWidth -= innerEditor->layoutBox()->paddingStart() + innerEditor->layoutBox()->paddingEnd();

- return unitWidth;

+ return unitWidth.toInt();

}

void LayoutTextControl::updateFromElement()