Use NGLogicalRect instead of NGExclusion for exclusions.

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_constraint_space.h"
 #include "core/layout/ng/ng_constraint_space_builder.h"
@@ skipping 11 matching lines @@
       direction_(direction) {}
 
 NGConstraintSpace::NGConstraintSpace(NGWritingMode writing_mode,
                                      NGDirection direction,
                                      const NGConstraintSpace& other,
                                      NGLogicalSize size)
     : 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);
+    physical_space_->AddExclusion(*exclusion.get());
   }
 }
 
 NGConstraintSpace* NGConstraintSpace::CreateFromLayoutObject(
     const LayoutBox& box) {
   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;
@@ skipping 32 matching lines @@
       .SetIsFixedSizeInline(fixed_inline)
       .SetIsFixedSizeBlock(fixed_block)
       .SetIsNewFormattingContext(is_new_fc);
 
   return new NGConstraintSpace(
       FromPlatformWritingMode(box.styleRef().getWritingMode()),
       FromPlatformDirection(box.styleRef().direction()),
       builder.ToConstraintSpace());
 }
 
-void NGConstraintSpace::AddExclusion(const NGExclusion* exclusion) const {
+void NGConstraintSpace::AddExclusion(const NGLogicalRect& exclusion) const {
+  WRITING_MODE_IGNORED(
+      "Exclusions are stored directly in physical constraint"
+      "space.");

[ikilpatrick, 2016/10/28 23:18:24]

previous line?

[Gleb Lanbin, 2016/10/28 23:54:09]

Done.

   MutablePhysicalSpace()->AddExclusion(exclusion);
 }
 
 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_;
@@ skipping 80 matching lines @@
 
 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