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

third_party/WebKit/Source/core/layout/ng/ng_box.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_box.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 #include "core/layout/ng/ng_constraint_space.h"
 #include "core/layout/ng/ng_direction.h"
 #include "core/layout/ng/ng_fragment.h"
 #include "core/layout/ng/ng_fragment_builder.h"
 #include "core/layout/ng/ng_length_utils.h"
 #include "core/layout/ng/ng_writing_mode.h"
 
 namespace blink {
-namespace {
-// TODO(layout-ng): Add m_isNewFc flag to ComputedStyle and set it from
-// StyleResolver instead of getting it calculated by createsNewFormattingContext
-bool IsNewFormattingContext(const LayoutBox* layout_box) {
-  return layout_box && toLayoutBlock(layout_box)->createsNewFormattingContext();
-}
-}  // namespace
 
 NGBox::NGBox(LayoutObject* layout_object)
     : layout_box_(toLayoutBox(layout_object)) {
   DCHECK(layout_box_);
 }
 
 NGBox::NGBox(ComputedStyle* style) : layout_box_(nullptr), style_(style) {
   DCHECK(style_);
 }
 
 bool NGBox::Layout(const NGConstraintSpace* constraint_space,
                    NGFragment** out) {
   if (layout_box_ && layout_box_->isOutOfFlowPositioned())
     layout_box_->containingBlock()->insertPositionedObject(layout_box_);
   // We can either use the new layout code to do the layout and then copy the
   // resulting size to the LayoutObject, or use the old layout code and
   // synthesize a fragment.
   if (CanUseNewLayout()) {
     if (!algorithm_)
       algorithm_ = new NGBlockLayoutAlgorithm(Style(), FirstChild());
     // Change the coordinate system of the constraint space.
     NGConstraintSpace* child_constraint_space = new NGConstraintSpace(
         FromPlatformWritingMode(Style()->getWritingMode()),
         FromPlatformDirection(Style()->direction()), constraint_space);
-    child_constraint_space->SetIsNewFormattingContext(
-        IsNewFormattingContext(layout_box_));
 
     NGPhysicalFragment* fragment = nullptr;
     if (!algorithm_->Layout(child_constraint_space, &fragment))
       return false;
     fragment_ = fragment;
 
     if (layout_box_) {
       CopyFragmentDataToLayoutBox(*constraint_space);
     }
   } else {
@@ skipping 118 matching lines @@
       .SetBlockSize(layout_box_->logicalHeight())
       .SetDirection(FromPlatformDirection(layout_box_->styleRef().direction()))
       .SetWritingMode(
           FromPlatformWritingMode(layout_box_->styleRef().getWritingMode()))
       .SetInlineOverflow(overflow.width())
       .SetBlockOverflow(overflow.height());
   return builder.ToFragment();
 }
 
 }  // namespace blink