[LayoutNG] Add floats_bfc_offset to constraint space.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/ng/ng_constraint_space_builder.h"
 
 #include "core/layout/ng/ng_length_utils.h"
 
 namespace blink {
 
@@ skipping 56 matching lines @@
   return *this;
 }
 
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetMarginStrut(
     const NGMarginStrut& margin_strut) {
   margin_strut_ = margin_strut;
   return *this;
 }
 
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetBfcOffset(
-    const NGLogicalOffset& offset) {
-  bfc_offset_ = offset;
+    const NGLogicalOffset& bfc_offset) {
+  bfc_offset_ = bfc_offset;
   return *this;
 }
 
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetFloatsBfcOffset(
+    const WTF::Optional<NGLogicalOffset>& floats_bfc_offset) {
+  floats_bfc_offset_ = floats_bfc_offset;
+  return *this;
+}
+
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetClearanceOffset(
     const WTF::Optional<LayoutUnit>& clearance_offset) {
   clearance_offset_ = clearance_offset;
   return *this;
 }
 
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsFixedSizeInline(
     bool is_fixed_size_inline) {
   is_fixed_size_inline_ = is_fixed_size_inline;
   return *this;
@@ skipping 89 matching lines @@
 
   // Reset things that do not pass the Formatting Context boundary.
   std::shared_ptr<NGExclusions> exclusions(
       is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_);
   if (is_new_fc_)
     DCHECK(unpositioned_floats_.IsEmpty());
   NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
   NGMarginStrut margin_strut = is_new_fc_ ? NGMarginStrut() : margin_strut_;
   WTF::Optional<LayoutUnit> clearance_offset =
       is_new_fc_ ? WTF::nullopt : clearance_offset_;
+  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 (is_in_parallel_flow) {
     return AdoptRef(new NGConstraintSpace(
         static_cast<NGWritingMode>(out_writing_mode),
         static_cast<TextDirection>(text_direction_), available_size,
         percentage_resolution_size, initial_containing_block_size_,
         fragmentainer_space_available_, is_fixed_size_inline_,
         is_fixed_size_block_, is_shrink_to_fit_,
         is_inline_direction_triggers_scrollbar_,
         is_block_direction_triggers_scrollbar_,
         static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
-        is_anonymous_, margin_strut, bfc_offset, exclusions,
+        is_anonymous_, margin_strut, bfc_offset, floats_bfc_offset, exclusions,
         unpositioned_floats_, clearance_offset));
   }
   return AdoptRef(new NGConstraintSpace(
       out_writing_mode, static_cast<TextDirection>(text_direction_),
       available_size, percentage_resolution_size,
       initial_containing_block_size_, fragmentainer_space_available_,
       is_fixed_size_block_, is_fixed_size_inline_, is_shrink_to_fit_,
       is_block_direction_triggers_scrollbar_,
       is_inline_direction_triggers_scrollbar_,
       static_cast<NGFragmentationType>(fragmentation_type_), is_new_fc_,
-      is_anonymous_, margin_strut, bfc_offset, exclusions, unpositioned_floats_,
-      clearance_offset));
+      is_anonymous_, margin_strut, bfc_offset, floats_bfc_offset, exclusions,
+      unpositioned_floats_, clearance_offset));
 }
 
 }  // namespace blink