Add ClearanceOffset to LayoutNG 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 53 matching lines @@
   text_direction_ = static_cast<unsigned>(text_direction);
   return *this;
 }
 
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetMarginStrut(
     const NGMarginStrut& margin_strut) {
   margin_strut_ = margin_strut;
   return *this;
 }
 
+NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetBfcOffset(
+    const NGLogicalOffset& offset) {
+  bfc_offset_ = 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;
 }
 
 NGConstraintSpaceBuilder& NGConstraintSpaceBuilder::SetIsFixedSizeBlock(
     bool is_fixed_size_block) {
   is_fixed_size_block_ = is_fixed_size_block;
   return *this;
@@ skipping 67 matching lines @@
       percentage_resolution_size.inline_size =
           initial_containing_block_size_.height;
     }
   }
 
   // Exclusions do not pass the formatting context boundary.
   std::shared_ptr<NGExclusions> exclusions(
       is_new_fc_ ? std::make_shared<NGExclusions>() : exclusions_);
   NGLogicalOffset bfc_offset = is_new_fc_ ? NGLogicalOffset() : bfc_offset_;
   NGMarginStrut margin_strut = is_new_fc_ ? NGMarginStrut() : margin_strut_;
+  WTF::Optional<LayoutUnit> clearance_offset =

[ikilpatrick, 2017/02/24 17:36:57]

worth adding more comments here for the is_new_fc_ cases?

[Gleb Lanbin, 2017/02/24 18:37:00]

Done.

+      is_new_fc_ ? WTF::nullopt : clearance_offset_;
 
   if (is_in_parallel_flow) {
     return 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_,
-        margin_strut, bfc_offset, exclusions);
+        margin_strut, bfc_offset, exclusions, clearance_offset);
   }
   return 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_,
-      margin_strut, bfc_offset, exclusions);
+      margin_strut, bfc_offset, exclusions, clearance_offset);
 }
 
 }  // namespace blink