Introduce NGFloatingObject

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 164 matching lines @@
   NGLayoutInputNode::trace(visitor);
 }
 
 void NGBlockNode::PositionUpdated() {
   if (!layout_box_)
     return;
   DCHECK(layout_box_->parent()) << "Should be called on children only.";
 
   layout_box_->setX(fragment_->LeftOffset());
   layout_box_->setY(fragment_->TopOffset());
+}
 
-  if (layout_box_->isFloating() && layout_box_->parent()->isLayoutBlockFlow()) {
-    FloatingObject* floating_object = toLayoutBlockFlow(layout_box_->parent())
-                                          ->insertFloatingObject(*layout_box_);
+void NGBlockNode::FloatPositionUpdated(LayoutObject* parent) {
+  PositionUpdated();
+
+  if (layout_box_->isFloating() && parent && parent->isLayoutBlockFlow()) {
+    FloatingObject* floating_object =
+        toLayoutBlockFlow(parent)->insertFloatingObject(*layout_box_);
+    // TODO(glebl): Fix floating_object's inline offset if it's attached to
+    // parent != layout_box_->parent
     floating_object->setX(fragment_->LeftOffset());
     floating_object->setY(fragment_->TopOffset());
     floating_object->setIsPlaced(true);
   }
 }
 
 bool NGBlockNode::CanUseNewLayout() {
   if (!layout_box_)
     return true;
   if (!layout_box_->isLayoutBlockFlow())
@@ skipping 45 matching lines @@
          !walker.atEnd(); walker.advance()) {
       LayoutObject* o = LineLayoutAPIShim::layoutObjectFrom(walker.current());
       o->clearNeedsLayout();
     }
 
     // Ensure the position of the children are copied across to the
     // LayoutObject tree.
   } else {
     for (NGBlockNode* box = toNGBlockNode(FirstChild()); box;
          box = box->NextSibling()) {
-      if (box->fragment_)
+      if (box->fragment_ && box->fragment_->IsPlaced())
         box->PositionUpdated();
+
+      for (const auto& floating_object : box->fragment_->PositionedFloats()) {
+        floating_object->node->FloatPositionUpdated(box->layout_box_);
+      }
     }
   }
 
   if (layout_box_->isLayoutBlock())
     toLayoutBlock(layout_box_)->layoutPositionedObjects(true);
   layout_box_->clearNeedsLayout();
   if (layout_box_->isLayoutBlockFlow()) {
     toLayoutBlockFlow(layout_box_)->updateIsSelfCollapsing();
   }
 }
@@ skipping 45 matching lines @@
 // Save static position for legacy AbsPos layout.
 void NGBlockNode::SaveStaticOffsetForLegacy(const NGLogicalOffset& offset) {
   DCHECK(layout_box_);
   DCHECK(layout_box_->isOutOfFlowPositioned());
   DCHECK(layout_box_->layer());
   layout_box_->layer()->setStaticBlockPosition(offset.block_offset);
   layout_box_->layer()->setStaticInlinePosition(offset.inline_offset);
 }
 
 }  // namespace blink