Context Menu Refactor

content/browser/renderer_host/render_widget_host_view_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/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 39 matching lines @@
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/frame_metadata_util.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/render_process_host_impl.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/select_action_mode.h"
 #include "content/common/gpu_host_messages.h"
 #include "content/common/gpu_process_launch_causes.h"
 #include "content/common/input/did_overscroll_params.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/context_menu_params.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_start.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/android/window_android.h"
@@ skipping 1123 matching lines @@
     ui::SelectionEventType event) {
   DCHECK(content_view_core_);
   DCHECK(selection_controller_);
   // If a selection drag has started, it has taken over the active touch
   // sequence. Immediately cancel gesture detection and any downstream touch
   // listeners (e.g., web content) to communicate this transfer.
   if (event == ui::SELECTION_HANDLES_SHOWN &&
       gesture_provider_.GetCurrentDownEvent()) {
     ResetGestureDetection();
   }
+
+  switch(event) {
+      case ui::SelectionEventType::SELECTION_HANDLES_SHOWN:
+          if (select_action_mode_)
+              select_action_mode_->show();
+          break;
+
+      case ui::SelectionEventType::SELECTION_HANDLES_MOVED:
+      case ui::SelectionEventType::INSERTION_HANDLE_MOVED:
+          if (select_action_mode_)
+              select_action_mode_->move(
+                  GetSelectionRect(*selection_controller_));
+          break;
+
+      case ui::SelectionEventType::SELECTION_HANDLES_CLEARED:
+      case ui::SelectionEventType::INSERTION_HANDLE_CLEARED:
+          if (select_action_mode_) {
+              select_action_mode_->close();

[no sievers, 2016/06/23 23:16:41]

why does this need a call to close() first while below we just clobber it with
reset()?

[amaralp, 2016/06/24 00:45:49]

Good point. I previously had this implemented in Java so I had to close and set
it to
null, but now I could use the destructor.

+              select_action_mode_.reset();
+          }
+          break;
+
+      case ui::SelectionEventType::SELECTION_HANDLE_DRAG_STARTED:
+      case ui::SelectionEventType::INSERTION_HANDLE_DRAG_STARTED:
+          if (select_action_mode_)
+              select_action_mode_->hide();
+          break;
+
+      case ui::SelectionEventType::SELECTION_HANDLE_DRAG_STOPPED:
+      case ui::SelectionEventType::INSERTION_HANDLE_DRAG_STOPPED:
+          if (select_action_mode_)
+              select_action_mode_->show();
+          break;
+
+      case ui::SelectionEventType::INSERTION_HANDLE_TAPPED:
+          // TODO

[no sievers, 2016/06/23 23:16:41]

can you put a bug number that also explains what's missing/broken?

[amaralp, 2016/06/24 00:45:49]

This is just something for myself so that I don't forget. I don't
plan on uploading this without the insertion handle tapped logic.

+          break;
+
+      case ui::SelectionEventType::INSERTION_HANDLE_SHOWN:
+      case ui::SelectionEventType::SELECTION_ESTABLISHED:
+      case ui::SelectionEventType::SELECTION_DISSOLVED:
+          break;
+
+      default:
+          NOTREACHED();
+          break;
+  }

[no sievers, 2016/06/23 23:16:41]

What about other events we listened to in ContentViewCore.java before your patch
that caused the popups to disappear?

In particular I'm wondering about rotation and then the loss of focus. I'm
guessing that we might have specifically handled the case where the activity
gets paused and some other activity shows on top and partially obscures the web
contents.

[amaralp, 2016/06/24 00:45:49]

You are right. I'll have to take a look at those more carefully.

[no sievers, 2016/06/24 22:17:25]

Note that we know about visibility (host_->is_hidden()) and focus here
(Focus()/Blur()). And one way to detect orientation changes could be from
WasResized() and then looking at GetOrientationTypeForMobile().

We can similarly make available what's needed if you end up moving some stuff to
ViewAndroid as in crbug.com/622847 there.

+
   content_view_core_->OnSelectionEvent(
-      event, selection_controller_->GetStartPosition(),
-      GetSelectionRect(*selection_controller_));
+      event, selection_controller_->GetStartPosition());
 }
 
 std::unique_ptr<ui::TouchHandleDrawable>
 RenderWidgetHostViewAndroid::CreateDrawable() {
   DCHECK(content_view_core_);
   if (!using_browser_compositor_)
     return PopupTouchHandleDrawable::Create(content_view_core_);
 
   return std::unique_ptr<
       ui::TouchHandleDrawable>(new CompositedTouchHandleDrawable(
@@ skipping 807 matching lines @@
       return;
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
+void RenderWidgetHostViewAndroid::CreateSelectActionMode(
+    const content::ContextMenuParams& params) {
+    select_action_mode_.reset(new SelectActionMode(params));
+}
 }  // namespace content