Source/core/rendering/RenderFlexibleBox.cpp - Issue 502733002: Eliminating FIXME from RenderFlexibleBox::mainAxisContentExtent

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: Source/core/rendering/RenderFlexibleBox.cpp

Issue 502733002: Eliminating FIXME from RenderFlexibleBox::mainAxisContentExtent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 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

Index: Source/core/rendering/RenderFlexibleBox.cpp

diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp

index d71accfa31a8cca3c227a327e50373efdec09540..7cb1c671c53bc8417cfb52b5fdccc2f719bf66aa 100644

--- a/Source/core/rendering/RenderFlexibleBox.cpp

+++ b/Source/core/rendering/RenderFlexibleBox.cpp

@@ -404,8 +404,7 @@ LayoutUnit RenderFlexibleBox::mainAxisContentExtent(LayoutUnit contentLogicalHei

if (isColumnFlow()) {

LogicalExtentComputedValues computedValues;

LayoutUnit borderPaddingAndScrollbar = borderAndPaddingLogicalHeight() + scrollbarLogicalHeight();

- // FIXME: Remove this std:max once we enable saturated layout arithmetic. It's just here to handle overflow.

- LayoutUnit borderBoxLogicalHeight = std::max(contentLogicalHeight, contentLogicalHeight + borderPaddingAndScrollbar);

+ LayoutUnit borderBoxLogicalHeight = contentLogicalHeight + borderPaddingAndScrollbar;

computeLogicalHeight(borderBoxLogicalHeight, logicalTop(), computedValues);

if (computedValues.m_extent == LayoutUnit::max())

return computedValues.m_extent;

« no previous file with comments | « no previous file | no next file » | no next file with comments »