third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc - Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink

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/ng/ng_block_layout_algorithm.cc

Issue 2701993002: DO NOT COMMIT: Results of running new (proposed) clang-format on Blink (Closed)

Patch Set: Created 3 years, 10 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/ng/ng_absolute_utils_test.cc ('k') | third_party/WebKit/Source/core/layout/ng/ng_length_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

index 96ed87300191df1d8642d1ac29696a25c4143d6d..9dee7eea1b8f3428d864b4edb53f5776986cb279 100644

--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc

@@ -596,9 +596,9 @@ void NGBlockLayoutAlgorithm::FinishCurrentChildLayout(

if (fragment.BlockSize())

content_size_ = fragment.BlockSize() + logical_offset.block_offset;

max_inline_size_ =

- std::max(max_inline_size_, fragment.InlineSize() +

- curr_child_margins_.InlineSum() +

- border_and_padding_.InlineSum());

+ std::max(max_inline_size_,

+ fragment.InlineSize() + curr_child_margins_.InlineSum() +

+ border_and_padding_.InlineSum());

builder_->AddChild(std::move(physical_fragment), logical_offset);

}