Introduce AdjustInlineBoxPositionForPrimaryDirection() for ComputeInlineBoxPosition()

third_party/WebKit/Source/core/editing/VisibleUnits.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 731 matching lines @@
 static bool IsStartOfDifferentDirection(const InlineBox* inline_box) {
   InlineBox* prev_box = inline_box->PrevLeafChild();
   if (!prev_box)
     return true;
   if (prev_box->Direction() == inline_box->Direction())
     return true;
   DCHECK_NE(prev_box->BidiLevel(), inline_box->BidiLevel());
   return prev_box->BidiLevel() > inline_box->BidiLevel();
 }
 
+static InlineBoxPosition AdjustInlineBoxPositionForPrimaryDirection(
+    InlineBox* inline_box,
+    int caret_offset) {
+  if (caret_offset == inline_box->CaretRightmostOffset()) {
+    InlineBox* const next_box = inline_box->NextLeafChild();
+    if (!next_box || next_box->BidiLevel() >= inline_box->BidiLevel())
+      return InlineBoxPosition(inline_box, caret_offset);
+
+    const unsigned level = next_box->BidiLevel();
+    InlineBox* const prev_box =
+        InlineBoxTraversal::FindLeftBidiRun(*inline_box, level);
+
+    // For example, abc FED 123 ^ CBA
+    if (prev_box && prev_box->BidiLevel() == level)
+      return InlineBoxPosition(inline_box, caret_offset);
+
+    // For example, abc 123 ^ CBA
+    inline_box = InlineBoxTraversal::FindRightBoundaryOfEntireBidiRun(
+        *inline_box, level);
+    return InlineBoxPosition(inline_box, inline_box->CaretRightmostOffset());
+  }
+
+  if (IsStartOfDifferentDirection(inline_box))
+    return InlineBoxPosition(inline_box, caret_offset);
+
+  const unsigned level = inline_box->PrevLeafChild()->BidiLevel();
+  InlineBox* const next_box =
+      InlineBoxTraversal::FindRightBidiRun(*inline_box, level);
+
+  if (next_box && next_box->BidiLevel() == level)
+    return InlineBoxPosition(inline_box, caret_offset);
+
+  inline_box =
+      InlineBoxTraversal::FindLeftBoundaryOfEntireBidiRun(*inline_box, level);
+  return InlineBoxPosition(inline_box, inline_box->CaretLeftmostOffset());
+}
+
 static InlineBoxPosition AdjustInlineBoxPositionForTextDirection(
     InlineBox* inline_box,
     int caret_offset,
     UnicodeBidi unicode_bidi,
     TextDirection primary_direction) {
-  unsigned char level = inline_box->BidiLevel();
+  if (inline_box->Direction() == primary_direction)
+    return AdjustInlineBoxPositionForPrimaryDirection(inline_box, caret_offset);
 
-  if (inline_box->Direction() == primary_direction) {
-    if (caret_offset == inline_box->CaretRightmostOffset()) {
-      InlineBox* next_box = inline_box->NextLeafChild();
-      if (!next_box || next_box->BidiLevel() >= level)
-        return InlineBoxPosition(inline_box, caret_offset);
-
-      level = next_box->BidiLevel();
-      InlineBox* const prev_box =
-          InlineBoxTraversal::FindLeftBidiRun(*inline_box, level);
-
-      // For example, abc FED 123 ^ CBA
-      if (prev_box && prev_box->BidiLevel() == level)
-        return InlineBoxPosition(inline_box, caret_offset);
-
-      // For example, abc 123 ^ CBA
-      inline_box = InlineBoxTraversal::FindRightBoundaryOfEntireBidiRun(
-          *inline_box, level);
-      return InlineBoxPosition(inline_box, inline_box->CaretRightmostOffset());
-    }
-
-    if (IsStartOfDifferentDirection(inline_box))
-      return InlineBoxPosition(inline_box, caret_offset);
-
-    level = inline_box->PrevLeafChild()->BidiLevel();
-    InlineBox* const next_box =
-        InlineBoxTraversal::FindRightBidiRun(*inline_box, level);
-
-    if (next_box && next_box->BidiLevel() == level)
-      return InlineBoxPosition(inline_box, caret_offset);
-
-    inline_box =
-        InlineBoxTraversal::FindLeftBoundaryOfEntireBidiRun(*inline_box, level);
-    return InlineBoxPosition(inline_box, inline_box->CaretLeftmostOffset());
-  }
-
+  const unsigned char level = inline_box->BidiLevel();
   if (caret_offset == inline_box->CaretLeftmostOffset()) {
     InlineBox* prev_box = inline_box->PrevLeafChildIgnoringLineBreak();
     if (!prev_box || prev_box->BidiLevel() < level) {
       // Left edge of a secondary run. Set to the right edge of the entire
       // run.
       inline_box =
           InlineBoxTraversal::FindRightBoundaryOfEntireBidiRunIgnoringLineBreak(
               *inline_box, level);
       return InlineBoxPosition(inline_box, inline_box->CaretRightmostOffset());
     }
@@ skipping 1266 matching lines @@
 
 IntRect ComputeTextRect(const EphemeralRangeInFlatTree& range) {
   return EnclosingIntRect(ComputeTextRectTemplate(range));
 }
 
 FloatRect ComputeTextFloatRect(const EphemeralRange& range) {
   return ComputeTextRectTemplate(range);
 }
 
 }  // namespace blink