Prepare to enable RenderTextHarfBuzz by default

ui/gfx/render_text_harfbuzz.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text_harfbuzz.h"
 
 #include <map>
 
 #include "base/debug/leak_annotations.h"
 #include "base/i18n/bidi_line_iterator.h"
@@ skipping 518 matching lines @@
     }
   }
   return EdgeSelectionModel(CURSOR_RIGHT);
 }
 
 std::vector<RenderText::FontSpan> RenderTextHarfBuzz::GetFontSpansForTesting() {
   NOTIMPLEMENTED();
   return std::vector<RenderText::FontSpan>();
 }
 
+Range RenderTextHarfBuzz::GetGlyphBounds(size_t index) {
+  EnsureLayout();
+  const size_t run_index =
+      GetRunContainingCaret(SelectionModel(index, CURSOR_FORWARD));
+  // Return edge bounds if the index is invalid or beyond the layout text size.
+  if (run_index >= runs_.size())
+    return Range(GetStringSize().width());
+  const size_t layout_index = TextIndexToLayoutIndex(index);
+  return Range(runs_[run_index]->GetGlyphXBoundary(layout_index, false),
+               runs_[run_index]->GetGlyphXBoundary(layout_index, true));
+}
+
 int RenderTextHarfBuzz::GetLayoutTextBaseline() {
   EnsureLayout();
   return lines()[0].baseline;
 }
 
 SelectionModel RenderTextHarfBuzz::AdjacentCharSelectionModel(
     const SelectionModel& selection,
     VisualCursorDirection direction) {
   DCHECK(!needs_layout_);
   internal::TextRunHarfBuzz* run;
@@ skipping 75 matching lines @@
           pos = begin;
           break;
         }
         pos = iter.pos() - iter.GetString().length();
       }
     }
   }
   return SelectionModel(pos, CURSOR_FORWARD);
 }
 
-Range RenderTextHarfBuzz::GetGlyphBounds(size_t index) {
-  const size_t run_index =
-      GetRunContainingCaret(SelectionModel(index, CURSOR_FORWARD));
-  // Return edge bounds if the index is invalid or beyond the layout text size.
-  if (run_index >= runs_.size())
-    return Range(GetStringSize().width());
-  const size_t layout_index = TextIndexToLayoutIndex(index);
-  return Range(runs_[run_index]->GetGlyphXBoundary(layout_index, false),
-               runs_[run_index]->GetGlyphXBoundary(layout_index, true));
-}
-
 std::vector<Rect> RenderTextHarfBuzz::GetSubstringBounds(const Range& range) {
   DCHECK(!needs_layout_);
   DCHECK(Range(0, text().length()).Contains(range));
   Range layout_range(TextIndexToLayoutIndex(range.start()),
                      TextIndexToLayoutIndex(range.end()));
   DCHECK(Range(0, GetLayoutText().length()).Contains(layout_range));
 
   std::vector<Rect> rects;
   if (layout_range.is_empty())
     return rects;
@@ skipping 382 matching lines @@
     run->positions[i].set(run->width + x_offset, -y_offset);
     run->width +=
         SkScalarRoundToInt(SkFixedToScalar(hb_positions[i].x_advance));
   }
 
   hb_buffer_destroy(buffer);
   hb_font_destroy(harfbuzz_font);
 }
 
 }  // namespace gfx