Blink handle selection handle visibility

content/browser/renderer_host/input/touch_selection_controller_client_aura.cc

 // Copyright 2015 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/input/touch_selection_controller_client_aura.h"
 
 #include "base/macros.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
@@ skipping 29 matching lines @@
       screen_position_client->ConvertPointToScreen(window, &origin);
       screen_position_client->ConvertPointToScreen(window, &bottom_right);
     }
   }
   return gfx::Rect(origin.x(), origin.y(), bottom_right.x() - origin.x(),
                    bottom_right.y() - origin.y());
 }
 
 }  // namespace
 
-// A pre-target event handler for aura::Env which deactivates touch selection on
-// mouse and keyboard events.
-class TouchSelectionControllerClientAura::EnvPreTargetHandler
-    : public ui::EventHandler {
- public:
-  EnvPreTargetHandler(ui::TouchSelectionController* selection_controller,
-                      aura::Window* window);
-  ~EnvPreTargetHandler() override;
-
- private:
-  // EventHandler:
-  void OnKeyEvent(ui::KeyEvent* event) override;
-  void OnMouseEvent(ui::MouseEvent* event) override;
-  void OnScrollEvent(ui::ScrollEvent* event) override;
-
-  ui::TouchSelectionController* selection_controller_;
-  aura::Window* window_;
-
-  DISALLOW_COPY_AND_ASSIGN(EnvPreTargetHandler);
-};
-
-TouchSelectionControllerClientAura::EnvPreTargetHandler::EnvPreTargetHandler(
-    ui::TouchSelectionController* selection_controller,
-    aura::Window* window)
-    : selection_controller_(selection_controller), window_(window) {
-  aura::Env::GetInstance()->AddPreTargetHandler(this);
-}
-
-TouchSelectionControllerClientAura::EnvPreTargetHandler::
-    ~EnvPreTargetHandler() {
-  aura::Env::GetInstance()->RemovePreTargetHandler(this);
-}
-
-void TouchSelectionControllerClientAura::EnvPreTargetHandler::OnKeyEvent(
-    ui::KeyEvent* event) {
-  DCHECK_NE(ui::TouchSelectionController::INACTIVE,
-            selection_controller_->active_status());
-
-  selection_controller_->HideAndDisallowShowingAutomatically();
-}
-
-void TouchSelectionControllerClientAura::EnvPreTargetHandler::OnMouseEvent(
-    ui::MouseEvent* event) {
-  DCHECK_NE(ui::TouchSelectionController::INACTIVE,
-            selection_controller_->active_status());
-
-  // If mouse events are not enabled, this mouse event is synthesized from a
-  // touch event in which case we don't want to deactivate touch selection.
-  aura::client::CursorClient* cursor_client =
-      aura::client::GetCursorClient(window_->GetRootWindow());
-  if (!cursor_client || cursor_client->IsMouseEventsEnabled())
-    selection_controller_->HideAndDisallowShowingAutomatically();
-}
-
-void TouchSelectionControllerClientAura::EnvPreTargetHandler::OnScrollEvent(
-    ui::ScrollEvent* event) {
-  DCHECK_NE(ui::TouchSelectionController::INACTIVE,
-            selection_controller_->active_status());
-
-  selection_controller_->HideAndDisallowShowingAutomatically();
-}
-
 TouchSelectionControllerClientAura::TouchSelectionControllerClientAura(
     RenderWidgetHostViewAura* rwhva)
     : rwhva_(rwhva),
       quick_menu_timer_(
           FROM_HERE,
           base::TimeDelta::FromMilliseconds(kQuickMenuDelayInMs),
           base::Bind(&TouchSelectionControllerClientAura::ShowQuickMenu,
                      base::Unretained(this)),
           false),
       quick_menu_requested_(false),
@@ skipping 28 matching lines @@
 
 void TouchSelectionControllerClientAura::OnScrollCompleted() {
   scroll_in_progress_ = false;
   rwhva_->selection_controller()->SetTemporarilyHidden(false);
   UpdateQuickMenu();
 }
 
 bool TouchSelectionControllerClientAura::HandleContextMenu(
     const ContextMenuParams& params) {
   if (params.source_type == ui::MENU_SOURCE_LONG_PRESS &&
-      rwhva_->selection_controller()->insertion_active_or_requested() &&
+      params.is_editable &&
+      params.selection_text.empty() &&
       IsQuickMenuAvailable()) {
-    DCHECK(params.is_editable);
-    DCHECK(params.selection_text.empty());
     quick_menu_requested_ = true;
     UpdateQuickMenu();
     return true;
   }
   rwhva_->selection_controller()->HideAndDisallowShowingAutomatically();
   return false;
 }
 
 bool TouchSelectionControllerClientAura::IsQuickMenuAvailable() const {
   return ui::TouchSelectionMenuRunner::GetInstance() &&
@@ skipping 92 matching lines @@
 }
 
 void TouchSelectionControllerClientAura::OnSelectionEvent(
     ui::SelectionEventType event) {
   switch (event) {
     case ui::SELECTION_HANDLES_SHOWN:
       quick_menu_requested_ = true;
       // Fall through.
     case ui::INSERTION_HANDLE_SHOWN:
       UpdateQuickMenu();
-      env_pre_target_handler_.reset(new EnvPreTargetHandler(
-          rwhva_->selection_controller(), rwhva_->GetNativeView()));
       break;
     case ui::SELECTION_HANDLES_CLEARED:
     case ui::INSERTION_HANDLE_CLEARED:
-      env_pre_target_handler_.reset();
       quick_menu_requested_ = false;
       UpdateQuickMenu();
       break;
     case ui::SELECTION_HANDLE_DRAG_STARTED:
     case ui::INSERTION_HANDLE_DRAG_STARTED:
       handle_drag_in_progress_ = true;
       UpdateQuickMenu();
       break;
     case ui::SELECTION_HANDLE_DRAG_STOPPED:
     case ui::INSERTION_HANDLE_DRAG_STOPPED:
       handle_drag_in_progress_ = false;
       UpdateQuickMenu();
       break;
     case ui::SELECTION_HANDLES_MOVED:
     case ui::INSERTION_HANDLE_MOVED:
       UpdateQuickMenu();
       break;
     case ui::INSERTION_HANDLE_TAPPED:
       quick_menu_requested_ = !quick_menu_requested_;
       UpdateQuickMenu();
       break;
-    case ui::SELECTION_ESTABLISHED:
-    case ui::SELECTION_DISSOLVED:
-      break;
   };
 }
 
 std::unique_ptr<ui::TouchHandleDrawable>
 TouchSelectionControllerClientAura::CreateDrawable() {
   return std::unique_ptr<ui::TouchHandleDrawable>(
       new ui::TouchHandleDrawableAura(rwhva_->GetNativeView()));
 }
 
 bool TouchSelectionControllerClientAura::IsCommandIdEnabled(
@@ skipping 54 matching lines @@
                                          ui::MENU_SOURCE_TOUCH_EDIT_MENU,
                                          gfx::ToRoundedPoint(anchor_point)));
 
   // Hide selection handles after getting rect-between-bounds from touch
   // selection controller; otherwise, rect would be empty and the above
   // calculations would be invalid.
   rwhva_->selection_controller()->HideAndDisallowShowingAutomatically();
 }
 
 }  // namespace content