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

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

Issue 2790283003: Reset constraint space's BFC offset if block creates a new FC (Closed)
Patch Set: git rebase-update Created 3 years, 8 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_constraint_space_builder.h" 5 #include "core/layout/ng/ng_constraint_space_builder.h"
6 6
7 #include "core/layout/ng/ng_length_utils.h" 7 #include "core/layout/ng/ng_length_utils.h"
8 8
9 namespace blink { 9 namespace blink {
10 10
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 initial_containing_block_size_.width; 169 initial_containing_block_size_.width;
170 } else { 170 } else {
171 percentage_resolution_size.inline_size = 171 percentage_resolution_size.inline_size =
172 initial_containing_block_size_.height; 172 initial_containing_block_size_.height;
173 } 173 }
174 } 174 }
175 175
176 // Reset things that do not pass the Formatting Context boundary. 176 // Reset things that do not pass the Formatting Context boundary.
177 std::shared_ptr<NGExclusions> exclusions( 177 std::shared_ptr<NGExclusions> exclusions(
178 is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_); 178 is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_);
179 // TODO(glebl): Uncomment the line below once we add the fragmentation 179 NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
180 // support for floats.
181 // NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
182 NGMarginStrut margin_strut = is_new_fc_ ? NGMarginStrut() : margin_strut_; 180 NGMarginStrut margin_strut = is_new_fc_ ? NGMarginStrut() : margin_strut_;
183 WTF::Optional<LayoutUnit> clearance_offset = 181 WTF::Optional<LayoutUnit> clearance_offset =
184 is_new_fc_ ? WTF::nullopt : clearance_offset_; 182 is_new_fc_ ? WTF::nullopt : clearance_offset_;
185 183
186 if (is_in_parallel_flow) { 184 if (is_in_parallel_flow) {
187 return adoptRef(new NGConstraintSpace( 185 return adoptRef(new NGConstraintSpace(
188 static_cast<NGWritingMode>(out_writing_mode), 186 static_cast<NGWritingMode>(out_writing_mode),
189 static_cast<TextDirection>(text_direction_), available_size, 187 static_cast<TextDirection>(text_direction_), available_size,
190 percentage_resolution_size, initial_containing_block_size_, 188 percentage_resolution_size, initial_containing_block_size_,
191 fragmentainer_space_available_, is_fixed_size_inline_, 189 fragmentainer_space_available_, is_fixed_size_inline_,
192 is_fixed_size_block_, is_shrink_to_fit_, 190 is_fixed_size_block_, is_shrink_to_fit_,
193 is_inline_direction_triggers_scrollbar_, 191 is_inline_direction_triggers_scrollbar_,
194 is_block_direction_triggers_scrollbar_, 192 is_block_direction_triggers_scrollbar_,
195 static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_, 193 static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
196 is_anonymous_, margin_strut, bfc_offset_, exclusions, 194 is_anonymous_, margin_strut, bfc_offset, exclusions, clearance_offset));
197 clearance_offset));
198 } 195 }
199 return adoptRef(new NGConstraintSpace( 196 return adoptRef(new NGConstraintSpace(
200 out_writing_mode, static_cast<TextDirection>(text_direction_), 197 out_writing_mode, static_cast<TextDirection>(text_direction_),
201 available_size, percentage_resolution_size, 198 available_size, percentage_resolution_size,
202 initial_containing_block_size_, fragmentainer_space_available_, 199 initial_containing_block_size_, fragmentainer_space_available_,
203 is_fixed_size_block_, is_fixed_size_inline_, is_shrink_to_fit_, 200 is_fixed_size_block_, is_fixed_size_inline_, is_shrink_to_fit_,
204 is_block_direction_triggers_scrollbar_, 201 is_block_direction_triggers_scrollbar_,
205 is_inline_direction_triggers_scrollbar_, 202 is_inline_direction_triggers_scrollbar_,
206 static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_, 203 static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
207 is_anonymous_, margin_strut, bfc_offset_, exclusions, clearance_offset)); 204 is_anonymous_, margin_strut, bfc_offset, exclusions, clearance_offset));
208 } 205 }
209 206
210 } // namespace blink 207 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698