Utilize Find{Left,Right}BoundaryOfEntireBidiRunIgnoringLineBreak() in RenderedPosition

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

 /*
  * Copyright (C) 2011 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/editing/RenderedPosition.h"
 
+#include "core/editing/InlineBoxTraversal.h"
 #include "core/editing/TextAffinity.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/compositing/CompositedSelectionBound.h"
 #include "core/paint/PaintLayer.h"
 
 namespace blink {
 
 template <typename Strategy>
@@ skipping 97 matching lines @@
 unsigned char RenderedPosition::BidiLevelOnRight() const {
   InlineBox* box = AtRightmostOffsetInBox() ? NextLeafChild() : inline_box_;
   return box ? box->BidiLevel() : 0;
 }
 
 RenderedPosition RenderedPosition::LeftBoundaryOfBidiRun(
     unsigned char bidi_level_of_run) {
   if (!inline_box_ || bidi_level_of_run > inline_box_->BidiLevel())
     return RenderedPosition();
 
-  InlineBox* box = inline_box_;
-  do {
-    InlineBox* prev = box->PrevLeafChildIgnoringLineBreak();
-    if (!prev || prev->BidiLevel() < bidi_level_of_run)
-      return RenderedPosition(
-          LineLayoutAPIShim::LayoutObjectFrom(box->GetLineLayoutItem()), box,
-          box->CaretLeftmostOffset());
-    box = prev;
-  } while (box);
-
-  NOTREACHED();
-  return RenderedPosition();
+  InlineBox* const box =
+      InlineBoxTraversal::FindLeftBoundaryOfEntireBidiRunIgnoringLineBreak(
+          *inline_box_, bidi_level_of_run);
+  return RenderedPosition(
+      LineLayoutAPIShim::LayoutObjectFrom(box->GetLineLayoutItem()), box,
+      box->CaretLeftmostOffset());
 }
 
 RenderedPosition RenderedPosition::RightBoundaryOfBidiRun(
     unsigned char bidi_level_of_run) {
   if (!inline_box_ || bidi_level_of_run > inline_box_->BidiLevel())
     return RenderedPosition();
 
-  InlineBox* box = inline_box_;
-  do {
-    InlineBox* next = box->NextLeafChildIgnoringLineBreak();
-    if (!next || next->BidiLevel() < bidi_level_of_run)
-      return RenderedPosition(
-          LineLayoutAPIShim::LayoutObjectFrom(box->GetLineLayoutItem()), box,
-          box->CaretRightmostOffset());
-    box = next;
-  } while (box);
-
-  NOTREACHED();
-  return RenderedPosition();
+  InlineBox* const box =
+      InlineBoxTraversal::FindRightBoundaryOfEntireBidiRunIgnoringLineBreak(
+          *inline_box_, bidi_level_of_run);
+  return RenderedPosition(
+      LineLayoutAPIShim::LayoutObjectFrom(box->GetLineLayoutItem()), box,
+      box->CaretRightmostOffset());
 }
 
 bool RenderedPosition::AtLeftBoundaryOfBidiRun(
     ShouldMatchBidiLevel should_match_bidi_level,
     unsigned char bidi_level_of_run) const {
   if (!inline_box_)
     return false;
 
   if (AtLeftmostOffsetInBox()) {
     if (should_match_bidi_level == kIgnoreBidiLevel)
@@ skipping 152 matching lines @@
   for (LayoutObject* layout_object = LayoutObjectFromPosition(position);
        layout_object && layout_object->GetNode();
        layout_object = layout_object->Parent()) {
     if (layout_object == target)
       return true;
   }
   return false;
 }
 
 }  // namespace blink