third_party/WebKit/Source/core/layout/LayoutMeter.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/LayoutMeter.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/LayoutMeter.cpp

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

index 209e03109da2a9d152a1c11b6655833baa145183..8cf7a3dffedd7d2dfc490da62e5ff712ff126390 100644

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

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

@@ -52,7 +52,7 @@ void LayoutMeter::updateLogicalWidth()

LayoutBox::updateLogicalWidth();

IntSize frameSize = LayoutTheme::theme().meterSizeForBounds(*this, pixelSnappedIntRect(frameRect()));

- setLogicalWidth(isHorizontalWritingMode() ? frameSize.width() : frameSize.height());

+ setLogicalWidth(LayoutUnit(isHorizontalWritingMode() ? frameSize.width() : frameSize.height()));

}

void LayoutMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const

@@ -65,7 +65,7 @@ void LayoutMeter::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logi

else

frame.setWidth(computedValues.m_extent);

IntSize frameSize = LayoutTheme::theme().meterSizeForBounds(*this, pixelSnappedIntRect(frame));

- computedValues.m_extent = isHorizontalWritingMode() ? frameSize.height() : frameSize.width();

+ computedValues.m_extent = LayoutUnit(isHorizontalWritingMode() ? frameSize.height() : frameSize.width());

}

void LayoutMeter::updateFromElement()