Factor out ContentViewAndroidDelegate

content/browser/android/content_view_core_impl.cc

 // Copyright 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/android/content_view_core_impl.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 485 matching lines @@
     const gfx::Rect& bounds,
     const std::vector<MenuItem>& items,
     int selected_item,
     bool multiple,
     bool right_aligned) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
 
-  ScopedJavaLocalRef<jobject> bounds_rect(CreateJavaRect(env, bounds));
-
   // For multi-select list popups we find the list of previous selections by
   // iterating through the items. But for single selection popups we take the
   // given |selected_item| as is.
   ScopedJavaLocalRef<jintArray> selected_array;
   if (multiple) {
     std::unique_ptr<jint[]> native_selected_array(new jint[items.size()]);
     size_t selected_count = 0;
     for (size_t i = 0; i < items.size(); ++i) {
       if (items[i].checked)
         native_selected_array[selected_count++] = i;
@@ skipping 16 matching lines @@
   for (size_t i = 0; i < items.size(); ++i) {
     labels.push_back(items[i].label);
     jint enabled =
         (items[i].type == MenuItem::GROUP ? POPUP_ITEM_TYPE_GROUP :
             (items[i].enabled ? POPUP_ITEM_TYPE_ENABLED :
                 POPUP_ITEM_TYPE_DISABLED));
     env->SetIntArrayRegion(enabled_array.obj(), i, 1, &enabled);
   }
   ScopedJavaLocalRef<jobjectArray> items_array(
       base::android::ToJavaArrayOfStrings(env, labels));
+  select_popup_.reset(view_.AcquireAnchorView());
+  view_.SetAnchorRect(select_popup_->ref(),
+                      gfx::ScaleRect(gfx::RectF(bounds), page_scale_));
   Java_ContentViewCore_showSelectPopup(
-      env, j_obj.obj(), reinterpret_cast<intptr_t>(frame), bounds_rect.obj(),
+      env, j_obj.obj(), select_popup_->obj(), bounds.width() * page_scale_,
+      reinterpret_cast<intptr_t>(frame),
       items_array.obj(), enabled_array.obj(), multiple, selected_array.obj(),
       right_aligned);
 }
 
 void ContentViewCoreImpl::HideSelectPopupMenu() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (!j_obj.is_null())
     Java_ContentViewCore_hideSelectPopup(env, j_obj.obj());
+  if (select_popup_)
+    select_popup_.reset();
 }
 
 void ContentViewCoreImpl::OnGestureEventAck(const blink::WebGestureEvent& event,
                                             InputEventAckState ack_result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
 
   switch (event.type) {
@@ skipping 291 matching lines @@
     return;
 
   gfx::Point base_point = gfx::ToRoundedPoint(base);
   gfx::Point extent_point = gfx::ToRoundedPoint(extent);
   if (base_point == extent_point)
     return;
 
   web_contents_->SelectRange(base_point, extent_point);
 }
 
-const base::android::JavaRef<jobject>&
-ContentViewCoreImpl::GetViewAndroidDelegate() const {
-  return view_.GetViewAndroidDelegate();
-}
-
 ui::WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() const {
   return view_.GetWindowAndroid();
 }
 
 cc::Layer* ContentViewCoreImpl::GetLayer() const {
   return view_.GetLayer();
 }
 
 ui::ViewAndroid* ContentViewCoreImpl::GetViewAndroid() {
   return &view_;
@@ skipping 769 matching lines @@
     return ScopedJavaLocalRef<jobject>();
 
   return view->GetJavaObject();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env) && JNI_DragEvent::RegisterNativesImpl(env);
 }
 
 }  // namespace content