Revert "Plumb composition character bounds from C++ to Java"

content/browser/renderer_host/ime_adapter_android.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 "content/browser/renderer_host/ime_adapter_android.h"
 
 #include <algorithm>
 #include <android/input.h>
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/common/frame_messages.h"
@@ skipping 236 matching lines @@
 void ImeAdapterAndroid::FocusedNodeChanged(bool is_editable_node) {
   base::android::ScopedJavaLocalRef<jobject> obj =
       java_ime_adapter_.get(AttachCurrentThread());
   if (!obj.is_null()) {
     Java_ImeAdapter_focusedNodeChanged(AttachCurrentThread(),
                                        obj.obj(),
                                        is_editable_node);
   }
 }
 
-void ImeAdapterAndroid::SetCharacterBounds(
-    const std::vector<gfx::Rect>& character_bounds) {
-  JNIEnv* env = AttachCurrentThread();
-  base::android::ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env);
-  if (obj.is_null())
-    return;
-
-  const size_t coordinates_array_size = character_bounds.size() * 4;
-  base::android::ScopedJavaLocalRef<jfloatArray> coordinates_dest_array(
-      env, env->NewFloatArray(coordinates_array_size));
-  if (coordinates_dest_array.is_null())
-    return;
-
-  scoped_ptr<jfloat[]> coordinates_array(new jfloat[coordinates_array_size]);
-  for (size_t i = 0; i < character_bounds.size(); ++i) {
-    const gfx::Rect& rect = character_bounds[i];
-    const size_t coordinates_array_index = i * 4;
-    coordinates_array[coordinates_array_index + 0] = rect.x();
-    coordinates_array[coordinates_array_index + 1] = rect.y();
-    coordinates_array[coordinates_array_index + 2] = rect.right();
-    coordinates_array[coordinates_array_index + 3] = rect.bottom();
-  }
-  // TODO(yukawa): Consider to move this to base/android/jni_array.h
-  env->SetFloatArrayRegion(coordinates_dest_array.obj(), 0,
-                           coordinates_array_size, coordinates_array.get());
-  base::android::CheckException(env);
-  Java_ImeAdapter_setCharacterBounds(env, obj.obj(),
-                                     coordinates_dest_array.obj());
-}
-
 void ImeAdapterAndroid::SetEditableSelectionOffsets(JNIEnv*, jobject,
                                                     int start, int end) {
   RenderFrameHost* rfh = GetFocusedFrame();
   if (!rfh)
     return;
 
   rfh->Send(new FrameMsg_SetEditableSelectionOffsets(rfh->GetRoutingID(),
                                                      start, end));
 }
 
@@ skipping 81 matching lines @@
 WebContents* ImeAdapterAndroid::GetWebContents() {
   RenderWidgetHostImpl* rwh = GetRenderWidgetHostImpl();
   if (!rwh)
     return NULL;
   if (!rwh->IsRenderView())
     return NULL;
   return WebContents::FromRenderViewHost(RenderViewHost::From(rwh));
 }
 
 }  // namespace content