Reland of Use NGLogicalRect instead of NGExclusion for exclusions.

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_constraint_space.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
 #include "core/layout/ng/ng_fragment_builder.h"
 #include "core/layout/ng/ng_fragment.h"
@@ skipping 10 matching lines @@
     const NGMarginStrut& prev_margin_strut,
     const NGMarginStrut& 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,
-                             LayoutUnit float_offset,
-                             NGBoxStrut margins) {
-  LayoutUnit exclusion_top = opportunity.offset.block_offset;
+NGLogicalRect CreateExclusion(const NGFragment& fragment,
+                              const NGLayoutOpportunity& opportunity,
+                              LayoutUnit float_offset,
+                              NGBoxStrut margins) {
+  NGLogicalRect exclusion;
+  exclusion.offset = opportunity.offset;
+  exclusion.offset.inline_offset += float_offset;
 
-  LayoutUnit exclusion_left = opportunity.offset.inline_offset;
-  exclusion_left += float_offset;
-
-  LayoutUnit exclusion_bottom = exclusion_top + fragment.BlockSize();
-  LayoutUnit exclusion_right = exclusion_left + fragment.InlineSize();
+  exclusion.size.inline_size = fragment.InlineSize();
+  exclusion.size.block_size = fragment.BlockSize();
 
   // Adjust to child's margin.
-  exclusion_bottom += margins.BlockSum();
-  exclusion_right += margins.InlineSum();
+  exclusion.size.block_size += margins.BlockSum();
+  exclusion.size.inline_size += margins.InlineSum();
 
-  return new NGExclusion(exclusion_top, exclusion_right, exclusion_bottom,
-                         exclusion_left);
+  return exclusion;
 }
 
 // Finds a layout opportunity for the fragment.
 // It iterates over all layout opportunities in the constraint space and returns
 // the first layout opportunity that is wider than the fragment or returns the
 // last one which is always the widest.
 //
 // @param space Constraint space that is used to find layout opportunity for
 //              the fragment.
 // @param fragment Fragment that needs to be placed.
@@ skipping 295 matching lines @@
       FindLayoutOpportunityForFragment(constraint_space_, fragment, margins);
   DCHECK(!opportunity.IsEmpty()) << "Opportunity is empty but it shouldn't be";
 
   // Calculate the float offset if needed.
   LayoutUnit float_offset;
   if (current_child_->Style()->floating() == EFloat::Right) {
     float_offset = opportunity.size.inline_size - fragment.InlineSize();
   }
 
   // Add the float as an exclusion.
-  const NGExclusion* exclusion =
+  const NGLogicalRect exclusion =
       CreateExclusion(fragment, opportunity, float_offset, margins);
   constraint_space_->AddExclusion(exclusion);
 
   return CalculateLogicalOffsetForOpportunity(opportunity, border_and_padding_,
                                               float_offset, margins);
 }
 
 void NGBlockLayoutAlgorithm::UpdateMarginStrut(const NGMarginStrut& from) {
   if (!is_fragment_margin_strut_block_start_updated_) {
     builder_->SetMarginStrutBlockStart(from);
     is_fragment_margin_strut_block_start_updated_ = true;
   }
   builder_->SetMarginStrutBlockEnd(from);
 }
 
 DEFINE_TRACE(NGBlockLayoutAlgorithm) {
   NGLayoutAlgorithm::trace(visitor);
   visitor->trace(first_child_);
   visitor->trace(constraint_space_);
   visitor->trace(builder_);
   visitor->trace(space_builder_);
   visitor->trace(space_for_current_child_);
   visitor->trace(current_child_);
 }
 
 }  // namespace blink