Make leading OOF objects to be handled by block layout in LayoutNG

third_party/WebKit/Source/core/layout/ng/inline/ng_inline_layout_algorithm.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_inline_layout_algorithm.h"
 
 #include "core/layout/ng/inline/ng_bidi_paragraph.h"
 #include "core/layout/ng/inline/ng_inline_break_token.h"
 #include "core/layout/ng/inline/ng_inline_node.h"
 #include "core/layout/ng/inline/ng_line_box_fragment.h"
@@ skipping 48 matching lines @@
     : NGLayoutAlgorithm(inline_node, space, break_token),
       is_horizontal_writing_mode_(
           blink::IsHorizontalWritingMode(space->WritingMode())),
       disallow_first_line_rules_(false),
       space_builder_(space)
 #if DCHECK_IS_ON()
       ,
       is_bidi_reordered_(false)
 #endif
 {
+  container_builder_.MutableUnpositionedFloats() = space->UnpositionedFloats();
+
+  // TODO(crbug.com/716930): We may be an empty LayoutInline due to splitting.
+  // Only resolve our BFC offset if we know that we are non-empty as we may
+  // need to pass through our margin strut.
+  if (!inline_node->Items().IsEmpty()) {
+    NGLogicalOffset bfc_offset = ConstraintSpace().BfcOffset();
+    bfc_offset.block_offset += ConstraintSpace().MarginStrut().Sum();
+    MaybeUpdateFragmentBfcOffset(ConstraintSpace(), bfc_offset,
+                                 &container_builder_);
+    PositionPendingFloats(bfc_offset.block_offset, &container_builder_,
+                          MutableConstraintSpace());
+  }
+
   if (!is_horizontal_writing_mode_)
     baseline_type_ = FontBaseline::kIdeographicBaseline;
   if (break_token)
     Initialize(break_token->ItemIndex(), break_token->TextOffset());
   else
     Initialize(0, 0);
-  container_builder_.MutableUnpositionedFloats() = space->UnpositionedFloats();
 }
 
 bool NGInlineLayoutAlgorithm::IsFirstLine() const {
   return !disallow_first_line_rules_ && container_builder_.Children().IsEmpty();
 }
 
 const ComputedStyle& NGInlineLayoutAlgorithm::FirstLineStyle() const {
   return Node()->GetLayoutObject()->FirstLineStyleRef();
 }
 
@@ skipping 150 matching lines @@
 
 bool NGInlineLayoutAlgorithm::CreateLine() {
   if (HasItemsAfterLastBreakOpportunity())
     SetBreakOpportunity();
   return CreateLineUpToLastBreakOpportunity();
 }
 
 bool NGInlineLayoutAlgorithm::CreateLineUpToLastBreakOpportunity() {
   const Vector<NGInlineItem>& items = Node()->Items();
 
-  // TODO(crbug.com/716930): We may be an empty LayoutInline due to splitting.
-  // Only resolve our BFC offset if we know that we are non-empty as we may
-  // need to pass through our margin strut.
-  if (!items.IsEmpty()) {
-    NGLogicalOffset bfc_offset = ConstraintSpace().BfcOffset();
-    bfc_offset.block_offset += ConstraintSpace().MarginStrut().Sum();
-    MaybeUpdateFragmentBfcOffset(ConstraintSpace(), bfc_offset,
-                                 &container_builder_);
-    PositionPendingFloats(bfc_offset.block_offset, &container_builder_,
-                          MutableConstraintSpace());
-  }
-
   // Create a list of LineItemChunk from |start| and |last_break_opportunity|.
   // TODO(kojii): Consider refactoring LineItemChunk once NGLineBuilder's public
   // API is more finalized. It does not fit well with the current API.
   Vector<LineItemChunk, 32> line_item_chunks;
   unsigned start_offset = start_offset_;
   for (unsigned i = start_index_; i <= last_break_opportunity_index_; i++) {
     const NGInlineItem& item = items[i];
     unsigned end_offset =
         std::min(item.EndOffset(), last_break_opportunity_offset_);
     line_item_chunks.push_back(
@@ skipping 276 matching lines @@
   state->metrics.Unite(metrics);
 
   // TODO(kojii): Figure out what to do with OOF in NGLayoutResult.
   // Floats are ok because atomic inlines are BFC?
 
   return -metrics.ascent;
 }
 
 void NGInlineLayoutAlgorithm::FindNextLayoutOpportunity() {
   NGLogicalOffset iter_offset = ConstraintSpace().BfcOffset();
+  if (container_builder_.BfcOffset())
+    iter_offset = ContainerBfcOffset();
   iter_offset.block_offset += content_size_;
   auto* iter = MutableConstraintSpace()->LayoutOpportunityIterator(iter_offset);
   NGLayoutOpportunity opportunity = iter->Next();
   if (!opportunity.IsEmpty())
     current_opportunity_ = opportunity;
 }
 
 RefPtr<NGLayoutResult> NGInlineLayoutAlgorithm::Layout() {
   // TODO(koji): The relationship of NGInlineLayoutAlgorithm and NGLineBreaker
   // should be inverted.
@@ skipping 30 matching lines @@
 
   // max-content is the width without any line wrapping.
   // TODO(kojii): Implement hard breaks (<br> etc.) to break.
   for (const auto& item : Node()->Items())
     sizes.max_content += InlineSize(item);
 
   return sizes;
 }
 
 }  // namespace blink