Deprecate the currently used NGMarginStrut in favor of the new one.

third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.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_block_layout_algorithm.h"
 
 #include "core/layout/ng/ng_absolute_utils.h"
 #include "core/layout/ng/ng_block_break_token.h"
 #include "core/layout/ng/ng_box_fragment.h"
 #include "core/layout/ng/ng_column_mapper.h"
@@ skipping 42 matching lines @@
       break;
     case EClear::ClearBoth:
       *content_size = std::max(left_block_end_offset, right_block_end_offset);
       break;
     default:
       ASSERT_NOT_REACHED();
   }
 }
 
 LayoutUnit ComputeCollapsedMarginBlockStart(
-    const NGMarginStrut& prev_margin_strut,
-    const NGMarginStrut& curr_margin_strut) {
+    const NGDeprecatedMarginStrut& prev_margin_strut,
+    const NGDeprecatedMarginStrut& curr_margin_strut) {
   return std::max(prev_margin_strut.margin_block_end,
                   curr_margin_strut.margin_block_start) -
          std::max(prev_margin_strut.negative_margin_block_end.abs(),
                   curr_margin_strut.negative_margin_block_start.abs());
 }
 
 // Creates an exclusion from the fragment that will be placed in the provided
 // layout opportunity.
 NGExclusion CreateExclusion(const NGFragment& fragment,
                             const NGLayoutOpportunity& opportunity,
@@ skipping 436 matching lines @@
   return space_left;
 }
 
 NGBoxStrut NGBlockLayoutAlgorithm::CollapseMargins(
     const NGBoxStrut& margins,
     const NGBoxFragment& fragment) {
   bool is_zero_height_box = !fragment.BlockSize() && margins.IsEmpty() &&
                             fragment.MarginStrut().IsEmpty();
   // Create the current child's margin strut from its children's margin strut or
   // use margin strut from the the last non-empty child.
-  NGMarginStrut curr_margin_strut =
+  NGDeprecatedMarginStrut curr_margin_strut =
       is_zero_height_box ? prev_child_margin_strut_ : fragment.MarginStrut();
 
   // Calculate borders and padding for the current child.
   NGBoxStrut border_and_padding =
       ComputeBorders(CurrentChildStyle()) +
       ComputePadding(ConstraintSpace(), CurrentChildStyle());
 
   // Collapse BLOCK-START margins if there is no padding or border between
   // parent (current child) and its first in-flow child.
   if (border_and_padding.block_start) {
@@ skipping 90 matching lines @@
 
   // Add the float as an exclusion.
   const NGExclusion exclusion = CreateExclusion(
       fragment, opportunity, float_offset, margins, exclusion_type);
   constraint_space_->AddExclusion(exclusion);
 
   return CalculateLogicalOffsetForOpportunity(opportunity, float_offset,
                                               margins);
 }
 
-void NGBlockLayoutAlgorithm::UpdateMarginStrut(const NGMarginStrut& from) {
+void NGBlockLayoutAlgorithm::UpdateMarginStrut(
+    const NGDeprecatedMarginStrut& from) {
   if (!is_fragment_margin_strut_block_start_updated_) {
     builder_->SetMarginStrutBlockStart(from);
     is_fragment_margin_strut_block_start_updated_ = true;
   }
   builder_->SetMarginStrutBlockEnd(from);
 }
 
 NGBoxStrut NGBlockLayoutAlgorithm::CalculateMargins(
     const NGConstraintSpace& space,
     const ComputedStyle& style) {
@@ skipping 49 matching lines @@
   visitor->trace(constraint_space_);
   visitor->trace(break_token_);
   visitor->trace(builder_);
   visitor->trace(space_builder_);
   visitor->trace(space_for_current_child_);
   visitor->trace(current_child_);
   visitor->trace(fragmentainer_mapper_);
 }
 
 }  // namespace blink