[LayoutNG] Move NGFloatingObject off Oilpan

third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.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_fragment_builder.h"
 
 #include "core/layout/ng/ng_block_break_token.h"
 #include "core/layout/ng/ng_block_node.h"
 #include "core/layout/ng/ng_break_token.h"
 #include "core/layout/ng/ng_fragment.h"
@@ skipping 73 matching lines @@
   did_break_ |= child->IsBox() && !child->BreakToken()->IsFinished();
 
   child_break_tokens_.push_back(child->BreakToken());
   children_.push_back(std::move(child));
   offsets_.push_back(child_offset);
 
   return *this;
 }
 
 NGFragmentBuilder& NGFragmentBuilder::AddFloatingObject(
-    NGFloatingObject* floating_object,
+    RefPtr<NGFloatingObject> floating_object,
     const NGLogicalOffset& floating_object_offset) {
   positioned_floats_.push_back(floating_object);
   floating_object_offsets_.push_back(floating_object_offset);
   return *this;
 }
 
 NGFragmentBuilder& NGFragmentBuilder::SetBfcOffset(
     const NGLogicalOffset& offset) {
   bfc_offset_ = offset;
   return *this;
@@ skipping 61 matching lines @@
   DCHECK_EQ(offsets_.size(), children_.size());
 
   NGPhysicalSize physical_size = size_.ConvertToPhysical(writing_mode_);
 
   for (size_t i = 0; i < children_.size(); ++i) {
     NGPhysicalFragment* child = children_[i].get();
     child->SetOffset(offsets_[i].ConvertToPhysical(
         writing_mode_, direction_, physical_size, child->Size()));
   }
 
-  Vector<Persistent<NGFloatingObject>> positioned_floats;
+  Vector<RefPtr<NGFloatingObject>> positioned_floats;

[ikilpatrick, 2017/03/15 22:45:40]

not sure why this exists? :)

[Gleb Lanbin, 2017/03/15 23:24:25]

Done.

   positioned_floats.reserveCapacity(positioned_floats_.size());
 
   RefPtr<NGBreakToken> break_token;
   if (did_break_) {
     break_token = NGBlockBreakToken::create(
         toNGBlockNode(node_.get()), used_block_size_, child_break_tokens_);
   } else {
     break_token = NGBlockBreakToken::create(node_.get());
   }
 
   for (size_t i = 0; i < positioned_floats_.size(); ++i) {
-    Persistent<NGFloatingObject>& floating_object = positioned_floats_[i];
+    RefPtr<NGFloatingObject>& floating_object = positioned_floats_[i];
     NGPhysicalFragment* floating_fragment = floating_object->fragment.get();
     floating_fragment->SetOffset(floating_object_offsets_[i].ConvertToPhysical(
         writing_mode_, direction_, physical_size, floating_fragment->Size()));
     positioned_floats.push_back(floating_object);
   }
 
   RefPtr<NGPhysicalBoxFragment> fragment = adoptRef(new NGPhysicalBoxFragment(
       node_->GetLayoutObject(), physical_size,
       overflow_.ConvertToPhysical(writing_mode_), children_, positioned_floats_,
       bfc_offset_, end_margin_strut_, std::move(break_token)));
 
   return adoptRef(
       new NGLayoutResult(std::move(fragment), out_of_flow_descendants_,
                          out_of_flow_positions_, unpositioned_floats_));
 }
 
 RefPtr<NGPhysicalTextFragment> NGFragmentBuilder::ToTextFragment(
     unsigned index,
     unsigned start_offset,
     unsigned end_offset) {
   DCHECK_EQ(type_, NGPhysicalFragment::kFragmentText);
   DCHECK(children_.isEmpty());
   DCHECK(offsets_.isEmpty());
 
-  Vector<Persistent<NGFloatingObject>> empty_unpositioned_floats;
-  Vector<Persistent<NGFloatingObject>> empty_positioned_floats;
-
   return adoptRef(new NGPhysicalTextFragment(
       node_->GetLayoutObject(), toNGInlineNode(node_), index, start_offset,
       end_offset, size_.ConvertToPhysical(writing_mode_),
       overflow_.ConvertToPhysical(writing_mode_)));
 }
 
 }  // namespace blink