Add left_offset to NGFloatingObject and set it on legacy FloatingObject

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 20 matching lines @@
 
   DCHECK(layout_box->parent()) << "Should be called on children only.";
 
   layout_box->setX(box_fragment.LeftOffset());
   layout_box->setY(box_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* floating_object,
+void FloatingObjectPositionedUpdated(NGFloatingObject* ng_floating_object,
                                      LayoutBox* parent) {
   NGPhysicalBoxFragment* box_fragment =
-      toNGPhysicalBoxFragment(floating_object->fragment.get());
+      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);
-    // TODO(glebl): Fix floating_object's inline offset if it's attached to
-    // parent != layout_box_->parent
-    floating_object->setX(box_fragment->LeftOffset());
+    floating_object->setX(ng_floating_object->left_offset);
     floating_object->setY(box_fragment->TopOffset());
     floating_object->setIsPlaced(true);
   }
 }
 
 }  // namespace
 
 NGBlockNode::NGBlockNode(LayoutObject* layout_object)
     : NGLayoutInputNode(NGLayoutInputNodeType::kLegacyBlock),
       layout_box_(toLayoutBox(layout_object)) {
@@ skipping 261 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