third_party/WebKit/Source/core/layout/LayoutInline.cpp - Issue 1656743002: Removing more implicit LayoutUnit construction

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

Issue 1656743002: Removing more implicit LayoutUnit construction (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix additional test Created 4 years, 11 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:

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

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

index 14a20e037890730c8c7a8b1f3645d6c0faf07bfb..a4c0baaf6e75d3d87b54f5d1938f6406c77fbb18 100644

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

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

@@ -709,7 +709,7 @@ LayoutUnit LayoutInline::offsetTop() const

static LayoutUnit computeMargin(const LayoutInline* layoutObject, const Length& margin)

{

if (margin.isFixed())

- return margin.value();

+ return LayoutUnit(margin.value());

if (margin.hasPercent())

return minimumValueForLength(margin, std::max(LayoutUnit(), layoutObject->containingBlock()->availableLogicalWidth()));

return LayoutUnit();

@@ -1426,8 +1426,8 @@ void LayoutInline::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)

container = this;

FloatPoint absPos = container->localToAbsolute();

- region.bounds.setX(absPos.x() + region.bounds.x());

- region.bounds.setY(absPos.y() + region.bounds.y());

+ region.bounds.setX(LayoutUnit(absPos.x() + region.bounds.x()));

+ region.bounds.setY(LayoutUnit(absPos.y() + region.bounds.y()));

regions.append(region);

}