third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc - Issue 2899413002: [LayoutNG] Removes per-child state from NGBlockLayoutAlgorithm.

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/inline/ng_inline_layout_algorithm.cc

Issue 2899413002: [LayoutNG] Removes per-child state from NGBlockLayoutAlgorithm. (Closed)

Patch Set: try3 Created 3 years, 7 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/LayoutTests/TestExpectations ('k') | third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h » ('j') | third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc

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

index 95c075b7396e9a9f4aa79a142339b6d7aaa77308..5782ae8630271318c17f2184d03affb7122ca129 100644

--- a/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc

+++ b/third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.cc

@@ -55,11 +55,11 @@ NGInlineLayoutAlgorithm::NGInlineLayoutAlgorithm(

// Only resolve our BFC offset if we know that we are non-empty as we may

// need to pass through our margin strut.

if (!inline_node->Items().IsEmpty()) {

- NGLogicalOffset bfc_offset = ConstraintSpace().BfcOffset();

- bfc_offset.block_offset += ConstraintSpace().MarginStrut().Sum();

- MaybeUpdateFragmentBfcOffset(ConstraintSpace(), bfc_offset,

+ LayoutUnit bfc_block_offset = ConstraintSpace().BfcOffset().block_offset;

+ bfc_block_offset += ConstraintSpace().MarginStrut().Sum();

+ MaybeUpdateFragmentBfcOffset(ConstraintSpace(), bfc_block_offset,

&container_builder_);

- PositionPendingFloats(bfc_offset.block_offset, &container_builder_,

+ PositionPendingFloats(bfc_block_offset, &container_builder_,

MutableConstraintSpace());

}