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

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

Issue 2655783006: Top down version of algorithm to position margins and floats in LayoutNG (Closed)
Patch Set: git rebase-update 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 70250224c644321e35a209a95d59e79c9fe21a77..8e9b6d1ca0cd6a149d141a185116cfb26673502f 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
@@ -80,6 +80,12 @@ NGFragmentBuilder& NGFragmentBuilder::AddFloatingObject(
return *this;
}
+NGFragmentBuilder& NGFragmentBuilder::SetBfcOffset(
+ const NGLogicalOffset& offset) {
+ bfc_offset_ = offset;
+ return *this;
+}
+
NGFragmentBuilder& NGFragmentBuilder::AddOutOfFlowChildCandidate(
NGBlockNode* child,
NGLogicalOffset child_offset) {
@@ -136,20 +142,6 @@ NGFragmentBuilder& NGFragmentBuilder::AddOutOfFlowDescendant(
return *this;
}
-NGFragmentBuilder& NGFragmentBuilder::SetMarginStrutBlockStart(
- const NGDeprecatedMarginStrut& from) {
- margin_strut_.margin_block_start = from.margin_block_start;
- margin_strut_.negative_margin_block_start = from.negative_margin_block_start;
- return *this;
-}
-
-NGFragmentBuilder& NGFragmentBuilder::SetMarginStrutBlockEnd(
- const NGDeprecatedMarginStrut& from) {
- margin_strut_.margin_block_end = from.margin_block_end;
- margin_strut_.negative_margin_block_end = from.negative_margin_block_end;
- return *this;
-}
-
NGPhysicalBoxFragment* NGFragmentBuilder::ToBoxFragment() {
// TODO(layout-ng): Support text fragments
DCHECK_EQ(type_, NGPhysicalFragment::kFragmentBox);
@@ -182,8 +174,9 @@ NGPhysicalBoxFragment* NGFragmentBuilder::ToBoxFragment() {
return new NGPhysicalBoxFragment(
layout_object_, physical_size, overflow_.ConvertToPhysical(writing_mode_),
- children, out_of_flow_descendants_, out_of_flow_positions_, margin_strut_,
- unpositioned_floats_, positioned_floats_, break_token);
+ children, out_of_flow_descendants_, out_of_flow_positions_,
+ unpositioned_floats_, positioned_floats_, bfc_offset_, end_margin_strut_,
+ break_token);
}
NGPhysicalTextFragment* NGFragmentBuilder::ToTextFragment(NGInlineNode* node,

Powered by Google App Engine
This is Rietveld 408576698