Create FloatingObject from NG Fragment in old Layout tree

third_party/WebKit/Source/core/layout/ng/ng_box.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_box.h"
 
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/ng/layout_ng_block_flow.h"
 #include "core/layout/ng/ng_block_layout_algorithm.h"
 #include "core/layout/ng/ng_constraint_space.h"
@@ skipping 85 matching lines @@
 }
 
 void NGBox::SetNextSibling(NGBox* sibling) {
   next_sibling_ = sibling;
 }
 
 void NGBox::SetFirstChild(NGBox* child) {
   first_child_ = child;
 }
 
-void NGBox::PositionUpdated() {
+void NGBox::PositionUpdated(LayoutBox* parent) {
   if (layout_box_) {
     layout_box_->setX(fragment_->LeftOffset());
     layout_box_->setY(fragment_->TopOffset());
   }
+
+  if (layout_box_->isFloating() && parent->isLayoutBlockFlow()) {

[cbiesinger, 2016/10/17 21:00:34]

You're accessing layout_box_ without a nullcheck here.

Probably the first nullcheck in this function should just be an early return.

Why do you need the parent argument instead of using layout_box_->parent()?

[Gleb Lanbin, 2016/10/17 22:13:22]

Done.

+    FloatingObject* floating_object =
+        toLayoutBlockFlow(parent)->insertFloatingObject(*layout_box_);
+    floating_object->setX(fragment_->LeftOffset());
+    floating_object->setY(fragment_->TopOffset());
+    floating_object->setIsPlaced(true);
+  }
 }
 
 bool NGBox::CanUseNewLayout() {
   if (!layout_box_)
     return true;
   if (!layout_box_->isLayoutBlockFlow())
     return false;
   const LayoutBlockFlow* block_flow = toLayoutBlockFlow(layout_box_);
   return !block_flow->childrenInline() || !block_flow->firstChild();
 }
 
 void NGBox::CopyFragmentDataToLayoutBox(
     const NGConstraintSpace& constraint_space) {
   DCHECK(layout_box_);
   layout_box_->setWidth(fragment_->Width());
   layout_box_->setHeight(fragment_->Height());
   NGBoxStrut border_and_padding =
       computeBorders(*Style()) + 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);
 
   // Ensure the position of the children are copied across to the
   // LayoutObject tree.
   for (NGBox* box = FirstChild(); box; box = box->NextSibling()) {
     if (box->fragment_)
-      box->PositionUpdated();
+      box->PositionUpdated(layout_box_);
   }
 
   if (layout_box_->isLayoutBlock())
     toLayoutBlock(layout_box_)->layoutPositionedObjects(true);
   layout_box_->clearNeedsLayout();
   if (layout_box_->isLayoutBlockFlow()) {
     toLayoutBlockFlow(layout_box_)->updateIsSelfCollapsing();
   }
 }
 
@@ skipping 18 matching lines @@
       .SetBlockSize(layout_box_->logicalHeight())
       .SetDirection(FromPlatformDirection(layout_box_->styleRef().direction()))
       .SetWritingMode(
           FromPlatformWritingMode(layout_box_->styleRef().getWritingMode()))
       .SetInlineOverflow(overflow.width())
       .SetBlockOverflow(overflow.height());
   return builder.ToFragment();
 }
 
 }  // namespace blink