[LayoutNG] Misc fixes in ShapingLineBreaker

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 151 matching lines @@
 #if defined(MOCK_SHAPE_LINE)
     unsigned break_offset;
     std::tie(break_offset, item_result->inline_size) =
         ShapeLineMock(item, offset, available_width - position, break_iterator);
 #else
     // TODO(kojii): Change constructor to take LazyLineBreakIterator.
     // TODO(kojii): We need to instantiate ShapingLineBreaker here because it
     // has item-specific info as context. Should they be part of ShapeLine() to
     // instantiate once, or is this just fine since instatiation is not
     // expensive?
+    DCHECK_EQ(item.TextShapeResult()->CharacterStartIndex(),
+              item.StartOffset());
+    DCHECK_EQ(item.TextShapeResult()->CharacterStartIndex() +
+                  item.TextShapeResult()->NumCharacters(),
+              item.EndOffset());
     ShapingLineBreaker breaker(&shaper, &item.Style()->GetFont(),
-                               item.TextShapeResult(), item.Style()->Locale(),
-                               LineBreakType::kNormal);
+                               item.TextShapeResult(), &break_iterator);
     // TODO(kojii): Set item.StartOffset/EndOffset() to ShapingLineBreaker, or
     // change ShapingLineBreaker to take the range from ShapeResult.
     // item.TextShapeResult() does not have results for outside the item offset
     // range.
     unsigned break_offset;
     item_result->shape_result =
         breaker.ShapeLine(offset, available_width - position, &break_offset);
     item_result->inline_size = item_result->shape_result->SnappedWidth();
 #endif
     DCHECK_GT(break_offset, offset);
@@ skipping 135 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