Revert of Fix Views inline autocomplete with multi-char graphemes.

ui/gfx/render_text_mac.cc

 // Copyright (c) 2012 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_mac.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 27 matching lines @@
   return SelectionModel();
 }
 
 std::vector<RenderText::FontSpan> RenderTextMac::GetFontSpansForTesting() {
   EnsureLayout();
   if (!runs_valid_)
     ComputeRuns();
 
   std::vector<RenderText::FontSpan> spans;
   for (size_t i = 0; i < runs_.size(); ++i) {
-    Font font(runs_[i].font_name, runs_[i].text_size);
+    gfx::Font font(runs_[i].font_name, runs_[i].text_size);
     const CFRange cf_range = CTRunGetStringRange(runs_[i].ct_run);
     const Range range(cf_range.location, cf_range.location + cf_range.length);
     spans.push_back(RenderText::FontSpan(font, range));
   }
 
   return spans;
 }
 
 int RenderTextMac::GetLayoutTextBaseline() {
   EnsureLayout();
@@ skipping 27 matching lines @@
 size_t RenderTextMac::TextIndexToLayoutIndex(size_t index) const {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return index;
 }
 
 size_t RenderTextMac::LayoutIndexToTextIndex(size_t index) const {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
   return index;
 }
 
-bool RenderTextMac::IsValidCursorIndex(size_t index) {
+bool RenderTextMac::IsCursorablePosition(size_t position) {
   // TODO(asvitkine): Implement this. http://crbug.com/131618
-  return IsValidLogicalIndex(index);
+  return true;
 }
 
 void RenderTextMac::ResetLayout() {
   line_.reset();
   attributes_.reset();
   runs_.clear();
   runs_valid_ = false;
 }
 
 void RenderTextMac::EnsureLayout() {
@@ skipping 95 matching lines @@
   // Clear the attributes storage.
   attributes_.reset(CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks));
 
   // https://developer.apple.com/library/mac/#documentation/Carbon/Reference/CoreText_StringAttributes_Ref/Reference/reference.html
   internal::StyleIterator style(colors(), styles());
   const size_t layout_text_length = GetLayoutText().length();
   for (size_t i = 0, end = 0; i < layout_text_length; i = end) {
     end = TextIndexToLayoutIndex(style.GetRange().end());
     const CFRange range = CFRangeMake(i, end - i);
     base::ScopedCFTypeRef<CGColorRef> foreground(
-        CGColorCreateFromSkColor(style.color()));
+        gfx::CGColorCreateFromSkColor(style.color()));
     CFAttributedStringSetAttribute(attr_string, range,
         kCTForegroundColorAttributeName, foreground);
     CFArrayAppendValue(attributes_, foreground);
 
     if (style.style(UNDERLINE)) {
       CTUnderlineStyle value = kCTUnderlineStyleSingle;
       base::ScopedCFTypeRef<CFNumberRef> underline_value(
           CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
       CFAttributedStringSetAttribute(attr_string, range,
                                      kCTUnderlineStyleAttributeName,
@@ skipping 22 matching lines @@
 }
 
 void RenderTextMac::ComputeRuns() {
   DCHECK(line_);
 
   CFArrayRef ct_runs = CTLineGetGlyphRuns(line_);
   const CFIndex ct_runs_count = CFArrayGetCount(ct_runs);
 
   // TODO(asvitkine): Don't use GetLineOffset() until draw time, since it may be
   // updated based on alignment changes without resetting the layout.
-  Vector2d text_offset = GetLineOffset(0);
+  gfx::Vector2d text_offset = GetLineOffset(0);
   // Skia will draw glyphs with respect to the baseline.
-  text_offset += Vector2d(0, common_baseline_);
+  text_offset += gfx::Vector2d(0, common_baseline_);
 
   const SkScalar x = SkIntToScalar(text_offset.x());
   const SkScalar y = SkIntToScalar(text_offset.y());
   SkPoint run_origin = SkPoint::Make(x, y);
 
   const CFRange empty_cf_range = CFRangeMake(0, 0);
   for (CFIndex i = 0; i < ct_runs_count; ++i) {
     CTRunRef ct_run =
         base::mac::CFCast<CTRunRef>(CFArrayGetValueAtIndex(ct_runs, i));
     const size_t glyph_count = CTRunGetGlyphCount(ct_run);
@@ skipping 48 matching lines @@
     CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(ct_font);
     if (traits & kCTFontBoldTrait)
       run->font_style |= Font::BOLD;
     if (traits & kCTFontItalicTrait)
       run->font_style |= Font::ITALIC;
 
     const CGColorRef foreground =
         base::mac::GetValueFromDictionary<CGColorRef>(
             attributes, kCTForegroundColorAttributeName);
     if (foreground)
-      run->foreground = CGColorRefToSkColor(foreground);
+      run->foreground = gfx::CGColorRefToSkColor(foreground);
 
     const CFNumberRef underline =
         base::mac::GetValueFromDictionary<CFNumberRef>(
             attributes, kCTUnderlineStyleAttributeName);
     CTUnderlineStyle value = kCTUnderlineStyleNone;
     if (underline && CFNumberGetValue(underline, kCFNumberSInt32Type, &value))
       run->underline = (value == kCTUnderlineStyleSingle);
 
     run_origin.offset(run_width, 0);
   }
   runs_valid_ = true;
 }
 
 RenderText* RenderText::CreateInstance() {
   return new RenderTextMac;
 }
 
 }  // namespace gfx