[LayoutNG] Add NGInlineBreakToken and back of NGInlineLayoutAlgorithm

third_party/WebKit/Source/core/layout/ng/ng_fragment_builder.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_fragment_builder.h"
 
 #include "core/layout/ng/ng_block_break_token.h"
 #include "core/layout/ng/ng_block_node.h"
 #include "core/layout/ng/ng_break_token.h"
 #include "core/layout/ng/ng_fragment.h"
@@ skipping 62 matching lines @@
 
   return AddChild(child->PhysicalFragment(), child_offset);
 }
 
 NGFragmentBuilder& NGFragmentBuilder::AddChild(
     RefPtr<NGPhysicalFragment> child,
     const NGLogicalOffset& child_offset) {
   DCHECK_EQ(type_, NGPhysicalFragment::kFragmentBox)
       << "Only box fragments can have children";
 
-  // Update if we have fragmented in this flow.
-  did_break_ |= child->IsBox() && !child->BreakToken()->IsFinished();
+  switch (child->Type()) {
+    case NGPhysicalBoxFragment::kFragmentBox:
+      // Update if we have fragmented in this flow.
+      did_break_ |= !child->BreakToken()->IsFinished();
+      child_break_tokens_.push_back(child->BreakToken());
+      break;
+    case NGPhysicalBoxFragment::kFragmentLineBox:
+      // NGInlineNode produces multiple line boxes in an anonymous box. Only
+      // the last break token is needed to be taken to parent.

[ikilpatrick, 2017/03/24 20:58:05]

.nit ... is needed to be reported to the parent. ?

+      DCHECK(child->BreakToken() && child->BreakToken()->InputNode() == node_);
+      last_inline_break_token_ =
+          child->BreakToken()->IsFinished() ? nullptr : child->BreakToken();
+      break;
+    case NGPhysicalBoxFragment::kFragmentText:
+      DCHECK(!child->BreakToken());
+      break;

[ikilpatrick, 2017/03/24 20:58:05]

default:
  NOTREACHED()?

+  }
 
-  child_break_tokens_.push_back(child->BreakToken());
   children_.push_back(std::move(child));
   offsets_.push_back(child_offset);
 
   return *this;
 }
 
 NGFragmentBuilder& NGFragmentBuilder::AddFloatingObject(
     RefPtr<NGFloatingObject> floating_object,
     const NGLogicalOffset& floating_object_offset) {
   positioned_floats_.push_back(floating_object);
@@ skipping 69 matching lines @@
 
   NGPhysicalSize physical_size = size_.ConvertToPhysical(writing_mode_);
 
   for (size_t i = 0; i < children_.size(); ++i) {
     NGPhysicalFragment* child = children_[i].get();
     child->SetOffset(offsets_[i].ConvertToPhysical(
         writing_mode_, direction_, physical_size, child->Size()));
   }
 
   RefPtr<NGBreakToken> break_token;
+  if (last_inline_break_token_) {
+    child_break_tokens_.push_back(std::move(last_inline_break_token_));
+    did_break_ = true;

[ikilpatrick, 2017/03/24 20:58:05]

does this need to check if last_inline_break_token_->IsFinished() ?

+  }
   if (did_break_) {
-    break_token = NGBlockBreakToken::create(
-        toNGBlockNode(node_.get()), used_block_size_, child_break_tokens_);
+    break_token = NGBlockBreakToken::create(node_.get(), used_block_size_,
+                                            child_break_tokens_);
   } else {
     break_token = NGBlockBreakToken::create(node_.get());
   }
 
   for (size_t i = 0; i < positioned_floats_.size(); ++i) {
     RefPtr<NGFloatingObject>& floating_object = positioned_floats_[i];
     NGPhysicalFragment* floating_fragment = floating_object->fragment.get();
     floating_fragment->SetOffset(floating_object_offsets_[i].ConvertToPhysical(
         writing_mode_, direction_, physical_size, floating_fragment->Size()));
   }
 
   RefPtr<NGPhysicalBoxFragment> fragment = adoptRef(new NGPhysicalBoxFragment(
       node_->GetLayoutObject(), physical_size,
       overflow_.ConvertToPhysical(writing_mode_), children_, positioned_floats_,
       bfc_offset_, end_margin_strut_, std::move(break_token)));
 
   return adoptRef(
       new NGLayoutResult(std::move(fragment), out_of_flow_descendants_,
                          out_of_flow_positions_, unpositioned_floats_));
 }
 
 }  // namespace blink