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

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

Issue 2651853002: Deprecate the currently used NGMarginStrut in favor of the new one. (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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/layout/ng/ng_fragment_builder.h" 5 #include "core/layout/ng/ng_fragment_builder.h"
6 6
7 #include "core/layout/ng/ng_block_node.h" 7 #include "core/layout/ng/ng_block_node.h"
8 #include "core/layout/ng/ng_break_token.h" 8 #include "core/layout/ng/ng_break_token.h"
9 #include "core/layout/ng/ng_fragment.h" 9 #include "core/layout/ng/ng_fragment.h"
10 #include "core/layout/ng/ng_physical_box_fragment.h" 10 #include "core/layout/ng/ng_physical_box_fragment.h"
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 NGFragmentBuilder& NGFragmentBuilder::AddOutOfFlowDescendant( 128 NGFragmentBuilder& NGFragmentBuilder::AddOutOfFlowDescendant(
129 NGBlockNode* descendant, 129 NGBlockNode* descendant,
130 const NGStaticPosition& position) { 130 const NGStaticPosition& position) {
131 out_of_flow_descendants_.add(descendant); 131 out_of_flow_descendants_.add(descendant);
132 out_of_flow_positions_.push_back(position); 132 out_of_flow_positions_.push_back(position);
133 return *this; 133 return *this;
134 } 134 }
135 135
136 NGFragmentBuilder& NGFragmentBuilder::SetMarginStrutBlockStart( 136 NGFragmentBuilder& NGFragmentBuilder::SetMarginStrutBlockStart(
137 const NGMarginStrut& from) { 137 const NGDeprecatedMarginStrut& from) {
138 margin_strut_.margin_block_start = from.margin_block_start; 138 margin_strut_.margin_block_start = from.margin_block_start;
139 margin_strut_.negative_margin_block_start = from.negative_margin_block_start; 139 margin_strut_.negative_margin_block_start = from.negative_margin_block_start;
140 return *this; 140 return *this;
141 } 141 }
142 142
143 NGFragmentBuilder& NGFragmentBuilder::SetMarginStrutBlockEnd( 143 NGFragmentBuilder& NGFragmentBuilder::SetMarginStrutBlockEnd(
144 const NGMarginStrut& from) { 144 const NGDeprecatedMarginStrut& from) {
145 margin_strut_.margin_block_end = from.margin_block_end; 145 margin_strut_.margin_block_end = from.margin_block_end;
146 margin_strut_.negative_margin_block_end = from.negative_margin_block_end; 146 margin_strut_.negative_margin_block_end = from.negative_margin_block_end;
147 return *this; 147 return *this;
148 } 148 }
149 149
150 NGPhysicalBoxFragment* NGFragmentBuilder::ToBoxFragment() { 150 NGPhysicalBoxFragment* NGFragmentBuilder::ToBoxFragment() {
151 // TODO(layout-ng): Support text fragments 151 // TODO(layout-ng): Support text fragments
152 DCHECK_EQ(type_, NGPhysicalFragment::kFragmentBox); 152 DCHECK_EQ(type_, NGPhysicalFragment::kFragmentBox);
153 DCHECK_EQ(offsets_.size(), children_.size()); 153 DCHECK_EQ(offsets_.size(), children_.size());
154 154
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 DEFINE_TRACE(NGFragmentBuilder) { 203 DEFINE_TRACE(NGFragmentBuilder) {
204 visitor->trace(children_); 204 visitor->trace(children_);
205 visitor->trace(out_of_flow_descendant_candidates_); 205 visitor->trace(out_of_flow_descendant_candidates_);
206 visitor->trace(out_of_flow_descendants_); 206 visitor->trace(out_of_flow_descendants_);
207 visitor->trace(positioned_floats_); 207 visitor->trace(positioned_floats_);
208 visitor->trace(unpositioned_floats_); 208 visitor->trace(unpositioned_floats_);
209 visitor->trace(break_token_); 209 visitor->trace(break_token_);
210 } 210 }
211 211
212 } // namespace blink 212 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698