[LayoutNG] Move NGConstraintSpaceBuilder off Oilpan and DISALLOW_NEW.

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_block_child_iterator.h"
 #include "core/layout/ng/ng_box_fragment.h"
@@ skipping 293 matching lines @@
 }  // namespace
 
 NGBlockLayoutAlgorithm::NGBlockLayoutAlgorithm(
     NGBlockNode* node,
     NGConstraintSpace* constraint_space,
     NGBlockBreakToken* break_token)
     : node_(node),
       constraint_space_(constraint_space),
       break_token_(break_token),
       builder_(WTF::wrapUnique(
-          new NGFragmentBuilder(NGPhysicalFragment::kFragmentBox, node))) {}
+          new NGFragmentBuilder(NGPhysicalFragment::kFragmentBox, node))),
+      space_builder_(

[ikilpatrick, 2017/02/28 18:28:05]

We could also do:

class NGConstraintSpaceBuilder {
  DISALLOW_NEW();
};

And just have this as part of the class, thoughts?
(could do the same for NGFragmentBuilder).

[cbiesinger, 2017/02/28 22:09:16]

Hm... I guess we never reset it / we never need to re-initialize it with a new
constraint space, so that does seem better.

[ikilpatrick, 2017/02/28 22:59:26]

I changed NGFragmentBuilder as well, and updated the patch comment, PTAL :)

+          WTF::wrapUnique(new NGConstraintSpaceBuilder(constraint_space_))) {}
 
 Optional<MinAndMaxContentSizes>
 NGBlockLayoutAlgorithm::ComputeMinAndMaxContentSizes() const {
   MinAndMaxContentSizes sizes;
 
   // Size-contained elements don't consider their contents for intrinsic sizing.
   if (Style().containsSize())
     return sizes;
 
   // TODO: handle floats & orthogonal children.
@@ skipping 68 matching lines @@
   // -1?
   LayoutUnit block_size =
       ComputeBlockSizeForFragment(ConstraintSpace(), Style(), NGSizeIndefinite);
   LayoutUnit adjusted_block_size(block_size);
   // Our calculated block-axis size may be indefinite at this point.
   // If so, just leave the size as NGSizeIndefinite instead of subtracting
   // borders and padding.
   if (adjusted_block_size != NGSizeIndefinite)
     adjusted_block_size -= border_and_padding_.BlockSum();
 
-  space_builder_ = new NGConstraintSpaceBuilder(constraint_space_);
   space_builder_
       ->SetAvailableSize(
           NGLogicalSize(adjusted_inline_size, adjusted_block_size))
       .SetPercentageResolutionSize(
           NGLogicalSize(adjusted_inline_size, adjusted_block_size));
 
   builder_->SetDirection(constraint_space_->Direction());
   builder_->SetWritingMode(constraint_space_->WritingMode());
   builder_->SetInlineSize(inline_size).SetBlockSize(block_size);
 
@@ skipping 349 matching lines @@
       DCHECK(builder_->BfcOffset());
       space_available -= curr_bfc_offset_.block_offset;
     }
   }
   space_builder_->SetFragmentainerSpaceAvailable(space_available);
 
   return space_builder_->ToConstraintSpace(
       FromPlatformWritingMode(current_child_style.getWritingMode()));
 }
 }  // namespace blink