Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(578)

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.cc

Issue 2632523002: [LayoutNG] Initial support for multicol, introducing NGBlockBreakToken. (Closed)
Patch Set: Add TODO. Created 3 years, 11 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: third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.cc
diff --git a/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.cc b/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.cc
index 5ca6488795c07a4703c2ddcdb171307d31a384ea..78f30d7d616a47f331e6cd0d42d85ecf45b6bd27 100644
--- a/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.cc
+++ b/third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.cc
@@ -5,6 +5,7 @@
#include "core/layout/ng/ng_fragment_builder.h"
#include "core/layout/ng/ng_block_node.h"
+#include "core/layout/ng/ng_break_token.h"
#include "core/layout/ng/ng_fragment.h"
#include "core/layout/ng/ng_physical_box_fragment.h"
#include "core/layout/ng/ng_physical_text_fragment.h"
@@ -136,6 +137,9 @@ NGPhysicalBoxFragment* NGFragmentBuilder::ToBoxFragment() {
DCHECK_EQ(type_, NGPhysicalFragment::kFragmentBox);
DCHECK_EQ(offsets_.size(), children_.size());
+ auto* break_token = break_token_.get();
+ break_token_ = nullptr;
+
NGPhysicalSize physical_size = size_.ConvertToPhysical(writing_mode_);
HeapVector<Member<const NGPhysicalFragment>> children;
children.reserveCapacity(children_.size());
@@ -148,7 +152,8 @@ NGPhysicalBoxFragment* NGFragmentBuilder::ToBoxFragment() {
}
return new NGPhysicalBoxFragment(
physical_size, overflow_.ConvertToPhysical(writing_mode_), children,
- out_of_flow_descendants_, out_of_flow_positions_, margin_strut_);
+ out_of_flow_descendants_, out_of_flow_positions_, margin_strut_,
+ break_token);
}
NGPhysicalTextFragment* NGFragmentBuilder::ToTextFragment(NGInlineNode* node,
@@ -167,6 +172,7 @@ DEFINE_TRACE(NGFragmentBuilder) {
visitor->trace(children_);
visitor->trace(out_of_flow_descendant_candidates_);
visitor->trace(out_of_flow_descendants_);
+ visitor->trace(break_token_);
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698