[LayoutNG] Change anonymous LayoutBlockFlow to LayoutNGBlockFlow

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 58 matching lines @@
       ,
       is_bidi_reordered_(false)
 #endif
 {
   if (!is_horizontal_writing_mode_)
     baseline_type_ = FontBaseline::kIdeographicBaseline;
   if (break_token)
     Initialize(break_token->ItemIndex(), break_token->TextOffset());
   else
     Initialize(0, 0);
-
-  // BFC offset is known for inline fragments.
-  MaybeUpdateFragmentBfcOffset(ConstraintSpace(), ConstraintSpace().BfcOffset(),
-                               &container_builder_);
 }
 
 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_);
+  }
+
   // 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 301 matching lines @@
     // TODO(eae): Does this need the LayoutText::LocaleForLineBreakIterator
     // logic to switch the locale based on breaking mode?
     NGLineBreaker line_breaker(Node()->Style().Locale());
     line_breaker.BreakLines(this, Node()->Text(), start_offset_);
   }
 
   // TODO(kojii): Check if the line box width should be content or available.
   NGLogicalSize size(max_inline_size_, content_size_);
   container_builder_.SetSize(size).SetOverflowSize(size);
 
+  // TODO(crbug.com/716930): We may be an empty LayoutInline due to splitting.
+  // Margin struts shouldn't need to be passed through like this once we've
+  // removed LayoutInline splitting.
+  if (!container_builder_.BfcOffset()) {
+    container_builder_.SetEndMarginStrut(ConstraintSpace().MarginStrut());
+  }
+
   return container_builder_.ToBoxFragment();
 }
 
 MinMaxContentSize NGInlineLayoutAlgorithm::ComputeMinMaxContentSizeByLayout() {
   DCHECK_EQ(ConstraintSpace().AvailableSize().inline_size, LayoutUnit());
   DCHECK_EQ(ConstraintSpace().AvailableSize().block_size, NGSizeIndefinite);
   if (!Node()->Text().IsEmpty()) {
     NGLineBreaker line_breaker(Node()->Style().Locale());
     line_breaker.BreakLines(this, Node()->Text(), start_offset_);
   }
   MinMaxContentSize sizes;
   sizes.min_content = MaxInlineSize();
 
   // 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