Utilize ComputeInlineBoxPosition in early-return style

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 756 matching lines @@
   if (affinity == TextAffinity::kUpstream)
     return true;
   return box.NextLeafChild() && box.NextLeafChild()->IsLineBreak();
 }
 
 template <typename Strategy>
 static InlineBoxPosition ComputeInlineBoxPositionTemplate(
     const PositionTemplate<Strategy>& position,
     TextAffinity affinity,
     TextDirection primary_direction) {
-  InlineBox* inline_box = nullptr;
   int caret_offset = position.ComputeEditingOffset();
   Node* const anchor_node = position.AnchorNode();
   LayoutObject* layout_object =
       anchor_node->IsShadowRoot()
           ? ToShadowRoot(anchor_node)->host().GetLayoutObject()
           : anchor_node->GetLayoutObject();
 
   DCHECK(layout_object) << position;
 
   if (!layout_object->IsText()) {
-    inline_box = 0;
     if (CanHaveChildrenForEditing(anchor_node) &&
         layout_object->IsLayoutBlockFlow() &&
         HasRenderedNonAnonymousDescendantsWithHeight(layout_object)) {
       // Try a visually equivalent position with possibly opposite
       // editability. This helps in case |this| is in an editable block
       // but surrounded by non-editable positions. It acts to negate the
       // logic at the beginning of
       // |LayoutObject::createPositionWithAffinity()|.
       const PositionTemplate<Strategy>& downstream_equivalent =
           DownstreamIgnoringEditingBoundaries(position);
       if (downstream_equivalent != position) {
         return ComputeInlineBoxPosition(
             downstream_equivalent, TextAffinity::kUpstream, primary_direction);
       }
       const PositionTemplate<Strategy>& upstream_equivalent =
           UpstreamIgnoringEditingBoundaries(position);
       if (upstream_equivalent == position ||
           DownstreamIgnoringEditingBoundaries(upstream_equivalent) == position)
         return InlineBoxPosition();
 
       return ComputeInlineBoxPosition(
           upstream_equivalent, TextAffinity::kUpstream, primary_direction);
     }
-    if (layout_object->IsBox()) {
-      inline_box = ToLayoutBox(layout_object)->InlineBoxWrapper();
-      if (!inline_box)
-        return InlineBoxPosition();
-      if ((caret_offset > inline_box->CaretMinOffset() &&
-           caret_offset < inline_box->CaretMaxOffset()))
-        return InlineBoxPosition(inline_box, caret_offset);
-    }
-  } else {
+    if (!layout_object->IsBox())
+      return InlineBoxPosition();
+    InlineBox* const inline_box =
+        ToLayoutBox(layout_object)->InlineBoxWrapper();
+    if (!inline_box)
+      return InlineBoxPosition();
+    if ((caret_offset > inline_box->CaretMinOffset() &&
+         caret_offset < inline_box->CaretMaxOffset()))
+      return InlineBoxPosition(inline_box, caret_offset);
+    return AdjustInlineBoxPositionForTextDirection(
+        inline_box, caret_offset, layout_object->Style()->GetUnicodeBidi(),
+        primary_direction);
+  }
+
+  InlineBox* inline_box = nullptr;
+  {

[Xiaocheng, 2017/06/14 18:33:58]

nit: Please add a TODO for removing this extra scope.

[yosin_UTC9, 2017/06/15 02:33:21]

Done.

     LayoutText* text_layout_object = ToLayoutText(layout_object);
 
     InlineTextBox* candidate = nullptr;
 
     for (InlineTextBox* box : InlineTextBoxesOf(*text_layout_object)) {
       int caret_min_offset = box->CaretMinOffset();
       int caret_max_offset = box->CaretMaxOffset();
 
       if (caret_offset < caret_min_offset || caret_offset > caret_max_offset ||
           (caret_offset == caret_max_offset && box->IsLineBreak()))
@@ skipping 1246 matching lines @@
 
 IntRect ComputeTextRect(const EphemeralRangeInFlatTree& range) {
   return EnclosingIntRect(ComputeTextRectTemplate(range));
 }
 
 FloatRect ComputeTextFloatRect(const EphemeralRange& range) {
   return ComputeTextRectTemplate(range);
 }
 
 }  // namespace blink