third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc - Issue 2807113002: [LayoutNG] Use NGLogical[Offset|Size] for NGFragment

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 2807113002: [LayoutNG] Use NGLogical[Offset|Size] for NGFragment

Patch Set: Created 3 years, 8 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

« third_party/WebKit/Source/core/layout/ng/geometry/ng_physical_offset.cc ('K') | « third_party/WebKit/Source/core/layout/ng/geometry/ng_physical_offset.cc ('k') | third_party/WebKit/Source/core/layout/ng/ng_floats_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 0668e1334d4f58568a4d0c5aa1f9607646322cde..07a9167200ffac84055754f72c1952cd6eede497 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

@@ -413,10 +413,11 @@ void NGBlockLayoutAlgorithm::FinishChildLayout(

// <div style="margin-top: 8px"></div>

// <div style="margin-top: 10px"></div>

// </div>

- if (fragment.BlockSize())

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

+ NGLogicalSize fragment_size = fragment.Size();

+ if (fragment_size.block_size)

+ content_size_ = fragment_size.block_size + logical_offset.block_offset;

max_inline_size_ =

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

+ std::max(max_inline_size_, fragment_size.inline_size +

curr_child_margins_.InlineSum() +

border_and_padding_.InlineSum());