[LayoutNG] Move NGFloatingObject off Oilpan

third_party/WebKit/Source/core/layout/ng/ng_block_node.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_node.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/line/InlineIterator.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
@@ skipping 32 matching lines @@
                      fragment.Width());
   } else {
     layout_box->setX(fragment.LeftOffset());
   }
   layout_box->setY(fragment.TopOffset());
 }
 
 // Similar to FragmentPositionUpdated but for floats.
 // - Updates layout object's geometric information.
 // - Creates legacy FloatingObject and attached it to the provided parent.
-void FloatingObjectPositionedUpdated(NGFloatingObject* ng_floating_object,
-                                     LayoutBox* parent) {
+void FloatingObjectPositionedUpdated(
+    RefPtr<NGFloatingObject> ng_floating_object,

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

same as comment in block_algorithm, just raw ptr with .get() when calling...?

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

Done.

+    LayoutBox* parent) {
   NGPhysicalBoxFragment* box_fragment =
       toNGPhysicalBoxFragment(ng_floating_object->fragment.get());
   FragmentPositionUpdated(*box_fragment);
 
   LayoutBox* layout_box = toLayoutBox(box_fragment->GetLayoutObject());
   DCHECK(layout_box->isFloating());
 
   if (parent && parent->isLayoutBlockFlow()) {
     FloatingObject* floating_object =
         toLayoutBlockFlow(parent)->insertFloatingObject(*layout_box);
@@ skipping 167 matching lines @@
                                   ComputePadding(constraint_space, Style());
   LayoutUnit intrinsic_logical_height =
       layout_box_->style()->isHorizontalWritingMode()
           ? fragment->HeightOverflow()
           : fragment->WidthOverflow();
   intrinsic_logical_height -= border_and_padding.BlockSum();
   layout_box_->setIntrinsicContentLogicalHeight(intrinsic_logical_height);
 
   // We may still have unpositioned floats when we reach the root box.
   if (!layout_box_->parent()) {
     for (const auto& floating_object : fragment->PositionedFloats()) {

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

/sigh, i wish we had clearer guidelines around const auto etc. so fine with this
as it is, but should try and work out some stage for a non-trivial type like
this (const RefPtr<NGFloatingObject>&) if we need to spell this out or not.

Looks like half of blink does and doesn't.

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

Done.

       FloatingObjectPositionedUpdated(floating_object, layout_box_);
     }
   }
 
   for (const auto& child_fragment : fragment->Children()) {
     if (child_fragment->IsPlaced())
       FragmentPositionUpdated(toNGPhysicalBoxFragment(*child_fragment));
 
     for (const auto& floating_object :
          toNGPhysicalBoxFragment(child_fragment.get())->PositionedFloats()) {
@@ skipping 72 matching lines @@
 
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_->isOutOfFlowPositioned());
   DCHECK(layout_box_->layer());
   layout_box_->layer()->setStaticBlockPosition(offset.block_offset);
   layout_box_->layer()->setStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink