Get rid of redundant block scope from ComputeInlineBoxPositionForTextNode()

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 821 matching lines @@
                                              affinity, primary_direction);
 }
 
 // TODO(yosin): We should make |ComputeInlineBoxPositionForTextNode()| to take
 // |const LayoutText&|.
 static InlineBoxPosition ComputeInlineBoxPositionForTextNode(
     LayoutObject* layout_object,
     int caret_offset,
     TextAffinity affinity,
     TextDirection primary_direction) {
-  // TODO(yosin): We should move this code fragment to another function to
-  // remove the scope.
   InlineBox* inline_box = nullptr;
-  {
-    LayoutText* text_layout_object = ToLayoutText(layout_object);
+  LayoutText* text_layout_object = ToLayoutText(layout_object);
 
-    InlineTextBox* candidate = nullptr;
+  InlineTextBox* candidate = nullptr;
 
-    for (InlineTextBox* box : InlineTextBoxesOf(*text_layout_object)) {
-      int caret_min_offset = box->CaretMinOffset();
-      int caret_max_offset = box->CaretMaxOffset();
+  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()))
-        continue;
+    if (caret_offset < caret_min_offset || caret_offset > caret_max_offset ||
+        (caret_offset == caret_max_offset && box->IsLineBreak()))
+      continue;
 
-      if (caret_offset > caret_min_offset && caret_offset < caret_max_offset)
-        return InlineBoxPosition(box, caret_offset);
+    if (caret_offset > caret_min_offset && caret_offset < caret_max_offset)
+      return InlineBoxPosition(box, caret_offset);
 
-      if (IsCaretAtEdgeOfInlineTextBox(caret_offset, *box, affinity)) {
-        inline_box = box;
-        break;
-      }
+    if (IsCaretAtEdgeOfInlineTextBox(caret_offset, *box, affinity)) {
+      inline_box = box;
+      break;
+    }
 
-      candidate = box;
-    }
-    if (candidate && candidate == text_layout_object->LastTextBox() &&
-        affinity == TextAffinity::kDownstream) {
-      inline_box = SearchAheadForBetterMatch(text_layout_object);
-      if (inline_box)
-        caret_offset = inline_box->CaretMinOffset();
-    }
-    if (!inline_box)
-      inline_box = candidate;
+    candidate = box;
   }
+  if (candidate && candidate == text_layout_object->LastTextBox() &&
+      affinity == TextAffinity::kDownstream) {
+    inline_box = SearchAheadForBetterMatch(text_layout_object);
+    if (inline_box)
+      caret_offset = inline_box->CaretMinOffset();
+  }
+  if (!inline_box)
+    inline_box = candidate;
 
   if (!inline_box)
     return InlineBoxPosition();
   return AdjustInlineBoxPositionForTextDirection(
       inline_box, caret_offset, layout_object->Style()->GetUnicodeBidi(),
       primary_direction);
 }
 
 static InlineBoxPosition AdjustInlineBoxPositionForTextDirection(
     InlineBox* inline_box,
@@ skipping 1215 matching lines @@
 
 IntRect ComputeTextRect(const EphemeralRangeInFlatTree& range) {
   return EnclosingIntRect(ComputeTextRectTemplate(range));
 }
 
 FloatRect ComputeTextFloatRect(const EphemeralRange& range) {
   return ComputeTextRectTemplate(range);
 }
 
 }  // namespace blink