[LayoutNG] Float behavior simplification before larger patch.

third_party/WebKit/Source/core/layout/ng/inline/ng_line_breaker.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/inline/ng_line_breaker.h"
 
 #include "core/layout/ng/inline/ng_inline_break_token.h"
 #include "core/layout/ng/inline/ng_inline_layout_algorithm.h"
 #include "core/layout/ng/inline/ng_inline_node.h"
 #include "core/layout/ng/inline/ng_text_fragment.h"
@@ skipping 399 matching lines @@
   const ComputedStyle& float_style = node.Style();
   NGBoxStrut margins = ComputeMargins(*constraint_space_, float_style,
                                       constraint_space_->WritingMode(),
                                       constraint_space_->Direction());
 
   // TODO(ikilpatrick): Add support for float break tokens inside an inline
   // layout context.
   RefPtr<NGUnpositionedFloat> unpositioned_float = NGUnpositionedFloat::Create(
       constraint_space_->AvailableSize(),
       constraint_space_->PercentageResolutionSize(),
-      constraint_space_->BfcOffset(), constraint_space_->BfcOffset(), margins,
-      node, /* break_token */ nullptr);
+      constraint_space_->BfcOffset().inline_offset,
+      constraint_space_->BfcOffset().inline_offset, margins, node,
+      /* break_token */ nullptr);
 
   LayoutUnit inline_size = ComputeInlineSizeForUnpositionedFloat(
       constraint_space_, unpositioned_float.Get());
 
   // We can only determine if our float will fit if we have an available_width
   // I.e. we may not have come across any text yet, in order to be able to
   // resolve the BFC position.
   bool float_does_not_fit =
       !HasAvailableWidth() ||
       position_ + inline_size + margins.InlineSum() > AvailableWidth();
 
   // Check if we already have a pending float. That's because a float cannot be
   // higher than any block or floated box generated before.
   if (!container_builder_->UnpositionedFloats().IsEmpty() ||
       float_does_not_fit) {
     container_builder_->AddUnpositionedFloat(unpositioned_float);
   } else {
     NGLogicalOffset container_bfc_offset =
         container_builder_->BfcOffset().value();
-    unpositioned_float->origin_offset = container_bfc_offset + content_offset_;
-    unpositioned_float->from_offset.block_offset =
-        container_bfc_offset.block_offset;
-    unpositioned_float->parent_bfc_block_offset =
-        container_bfc_offset.block_offset;
+    LayoutUnit origin_block_offset =
+        container_bfc_offset.block_offset + content_offset_.block_offset;
 
     container_builder_->AddPositionedFloat(
-        PositionFloat(unpositioned_float.Get(), constraint_space_));
+        PositionFloat(origin_block_offset, container_bfc_offset.block_offset,
+                      unpositioned_float.Get(), constraint_space_));
 
     // We need to recalculate the available_width as the float probably
     // consumed space on the line.
     UpdateAvailableWidth();
   }
 
   // Floats are already positioned in the container_builder.
   item_results->pop_back();
   MoveToNextOf(item);
 }
@@ skipping 226 matching lines @@
 }
 
 RefPtr<NGInlineBreakToken> NGLineBreaker::CreateBreakToken() const {
   const Vector<NGInlineItem>& items = node_.Items();
   if (item_index_ >= items.size())
     return nullptr;
   return NGInlineBreakToken::Create(node_, item_index_, offset_);
 }
 
 }  // namespace blink