third_party/WebKit/Source/core/layout/ng/ng_constraint_space_builder.cc - Issue 2954953002: [LayoutNG] Abort a layout once the BFC offset is resolved.

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_constraint_space_builder.cc

Issue 2954953002: [LayoutNG] Abort a layout once the BFC offset is resolved. (Closed)

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

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

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

index 89880d1b61e48c78c4cfa3ce729b72c148561fc0..39b0537bd317058cbf53c35696ed67c819a4b42b 100644

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

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

@@ -145,7 +145,7 @@ NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsAnonymous(

NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetUnpositionedFloats(

Vector<RefPtr<NGUnpositionedFloat>>& unpositioned_floats) {

- unpositioned_floats_.swap(unpositioned_floats);

+ unpositioned_floats_ = unpositioned_floats;

return *this;

}

@@ -210,10 +210,10 @@ RefPtr<NGConstraintSpace> NGConstraintSpaceBuilder::ToConstraintSpace(

WTF::Optional<NGLogicalOffset> floats_bfc_offset =

is_new_fc_ ? WTF::nullopt : floats_bfc_offset_;

- // The inline_offsets of the bfc_offset and floats_bfc_offset should match.

- if (floats_bfc_offset)

- DCHECK_EQ(bfc_offset.inline_offset,

- floats_bfc_offset.value().inline_offset);

+ if (floats_bfc_offset) {

+ floats_bfc_offset = NGLogicalOffset(

+ {bfc_offset.inline_offset, floats_bfc_offset.value().block_offset});

+ }

if (is_in_parallel_flow) {

return AdoptRef(new NGConstraintSpace(