[LayoutNG] Fix orthogonal writing mode child margin strut from being used in collapsing margins cal…

third_party/WebKit/Source/core/layout/ng/ng_constraint_space.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.h"
 
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/ng/ng_layout_opportunity_iterator.h"
 #include "core/layout/ng/ng_units.h"
 
 namespace blink {
 
 NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
                                      NGDirection direction,
                                      NGLogicalSize container_size)
     : physical_space_(new NGPhysicalConstraintSpace(
           container_size.ConvertToPhysical(writing_mode))),
       size_(container_size),
       writing_mode_(writing_mode),
-      direction_(direction),
-      is_new_fc_(false) {}
+      direction_(direction) {}
 
 NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
                                      NGDirection direction,
                                      NGPhysicalConstraintSpace* physical_space)
     : physical_space_(physical_space),
       size_(physical_space->ContainerSize().ConvertToLogical(writing_mode)),
       writing_mode_(writing_mode),
-      direction_(direction),
-      is_new_fc_(false) {}
+      direction_(direction) {}
 
 NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
                                      NGDirection direction,
                                      const NGConstraintSpace* constraint_space)
     : physical_space_(constraint_space->PhysicalSpace()),
       offset_(constraint_space->Offset()),
       size_(constraint_space->Size()),
       writing_mode_(writing_mode),
-      direction_(direction),
-      is_new_fc_(false) {}
+      direction_(direction) {}
 
 NGConstraintSpace::NGConstraintSpace(const NGConstraintSpace& other,
                                      NGLogicalOffset offset,
                                      NGLogicalSize size)
     : physical_space_(other.PhysicalSpace()),
       offset_(offset),
       size_(size),
       writing_mode_(other.WritingMode()),
-      direction_(other.Direction()),
-      is_new_fc_(false) {}
+      direction_(other.Direction()) {}
 
 NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
                                      NGDirection direction,
                                      const NGConstraintSpace& other,
                                      NGLogicalSize size)
-    : size_(size),
-      writing_mode_(writing_mode),
-      direction_(direction),
-      is_new_fc_(false) {
+    : size_(size), writing_mode_(writing_mode), direction_(direction) {
   physical_space_ =
       new NGPhysicalConstraintSpace(size.ConvertToPhysical(writing_mode));
   for (const auto& exclusion : other.PhysicalSpace()->Exclusions()) {
     physical_space_->AddExclusion(exclusion);
   }
 }
 
 NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
     const LayoutBox& box) {
-  bool fixed_inline = false, fixed_block = false;
+  bool fixed_inline = false, fixed_block = false, is_new_fc = false;
   // XXX for orthogonal writing mode this is not right
   LayoutUnit container_logical_width =
       std::max(LayoutUnit(), box.containingBlockLogicalWidthForContent());
   LayoutUnit container_logical_height;
   if (!box.parent()) {
     container_logical_height = box.view()->viewLogicalHeightForPercentages();
   } else if (box.containingBlock()) {
     container_logical_height =
         box.containingBlock()->availableLogicalHeightForPercentageComputation();
   }
   // When we have an override size, the container_logical_{width,height} will be
   // used as the final size of the box, so it has to include border and
   // padding.
   if (box.hasOverrideLogicalContentWidth()) {
     container_logical_width =
         box.borderAndPaddingLogicalWidth() + box.overrideLogicalContentWidth();
     fixed_inline = true;
   }
   if (box.hasOverrideLogicalContentHeight()) {
     container_logical_height = box.borderAndPaddingLogicalHeight() +
                                box.overrideLogicalContentHeight();
     fixed_block = true;
   }
 
+  if (box.isLayoutBlock() && toLayoutBlock(box).createsNewFormattingContext())
+    is_new_fc = true;
+
   NGConstraintSpace* derived_constraint_space = new NGConstraintSpace(
       FromPlatformWritingMode(box.styleRef().getWritingMode()),
       FromPlatformDirection(box.styleRef().direction()),
       NGLogicalSize(container_logical_width, container_logical_height));
   derived_constraint_space->SetOverflowTriggersScrollbar(
       box.styleRef().overflowInlineDirection() == OverflowAuto,
       box.styleRef().overflowBlockDirection() == OverflowAuto);
   derived_constraint_space->SetFixedSize(fixed_inline, fixed_block);
+  derived_constraint_space->SetIsNewFormattingContext(is_new_fc);
+
   return derived_constraint_space;
 }
 
 NGLogicalSize NGConstraintSpace::ContainerSize() const {
   return physical_space_->container_size_.ConvertToLogical(
       static_cast<NGWritingMode>(writing_mode_));
 }
 
+bool NGConstraintSpace::IsNewFormattingContext() const {
+  return physical_space_->is_new_fc_;
+}
+
 bool NGConstraintSpace::InlineTriggersScrollbar() const {
   return writing_mode_ == HorizontalTopBottom
              ? physical_space_->width_direction_triggers_scrollbar_
              : physical_space_->height_direction_triggers_scrollbar_;
 }
 
 bool NGConstraintSpace::BlockTriggersScrollbar() const {
   return writing_mode_ == HorizontalTopBottom
              ? physical_space_->height_direction_triggers_scrollbar_
              : physical_space_->width_direction_triggers_scrollbar_;
@@ skipping 56 matching lines @@
               FragmentNone);
     physical_space_->height_direction_fragmentation_type_ = type;
   } else {
     DCHECK_EQ(static_cast<NGFragmentationType>(
                   physical_space_->height_direction_fragmentation_type_),
               FragmentNone);
     physical_space_->width_direction_triggers_scrollbar_ = type;
   }
 }
 
+void NGConstraintSpace::SetIsNewFormattingContext(bool is_new_fc) {
+  physical_space_->is_new_fc_ = is_new_fc;
+}
+
 String NGConstraintSpace::ToString() const {
   return String::format("%s,%s %sx%s",
                         offset_.inline_offset.toString().ascii().data(),
                         offset_.block_offset.toString().ascii().data(),
                         size_.inline_size.toString().ascii().data(),
                         size_.block_size.toString().ascii().data());
 }
 
 }  // namespace blink