[BidiCaretAffinity] Merge NGInlineNode::SegmentBidiRunsInternal into caller

The function was separated out from NGInlineNode::SegmentBidiRuns to
support legacy layout. Now that we've remove legacy layout support from
bidi caret affinity, the function can be merged back.

Bug: 925192
Change-Id: I38dfde1278b604e7839e431a7aff64a68f815280
Reviewed-on: https://chromium-review.googlesource.com/c/1437271
Auto-Submit: Xiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626458}

third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.cc

@@ -602,13 +602,9 @@ void NGInlineNode::SegmentFontOrientation(NGInlineNodeData* data) {
   }
 }
 
-// static
 // Segment bidi runs by resolving bidi embedding levels.
 // http://unicode.org/reports/tr9/#Resolving_Embedding_Levels
-// TODO(xiaochengh): Merge it back into SegmentBidiRuns(), as we no longer have
-// any legacy callers.
-void NGInlineNode::SegmentBidiRunsInternal(NGInlineNodeData* data,
-                                           const ComputedStyle& style) {
+void NGInlineNode::SegmentBidiRuns(NGInlineNodeData* data) {
   if (!data->is_bidi_enabled_) {
     data->SetBaseDirection(TextDirection::kLtr);
     return;
@@ -616,7 +612,7 @@ void NGInlineNode::SegmentBidiRunsInternal(NGInlineNodeData* data,
 
   NGBidiParagraph bidi;
   data->text_content.Ensure16Bit();
-  if (!bidi.SetParagraph(data->text_content, style)) {
+  if (!bidi.SetParagraph(data->text_content, Style())) {
     // On failure, give up bidi resolving and reordering.
     data->is_bidi_enabled_ = false;
     data->SetBaseDirection(TextDirection::kLtr);
@@ -651,10 +647,6 @@ void NGInlineNode::SegmentBidiRunsInternal(NGInlineNodeData* data,
 #endif
 }
 
-void NGInlineNode::SegmentBidiRuns(NGInlineNodeData* data) {
-  SegmentBidiRunsInternal(data, Style());
-}
-
 void NGInlineNode::ShapeText(NGInlineItemsData* data,
                              NGInlineItemsData* previous_data) {
   const String& text_content = data->text_content;

third_party/blink/renderer/core/layout/ng/inline/ng_inline_node.h

@@ -142,11 +142,6 @@ class CORE_EXPORT NGInlineNode : public NGLayoutInputNode {
   static void ComputeOffsetMapping(LayoutBlockFlow* layout_block_flow,
                                    NGInlineNodeData* data);
 
-  // This function shares bidi segmentation code between inline layout algorithm
-  // and |NGCaretNavigator| building, which may run on legacy layout.
-  // TODO(layout-dev): Merge with |SegmentBidiRuns| when we remove legacy layout
-  static void SegmentBidiRunsInternal(NGInlineNodeData*, const ComputedStyle&);
-
   friend class NGLineBreakerTest;
   friend class NGInlineNodeLegacy;
 };