Implement TouchSelectionEditing controls for OOPIF.

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 94 matching lines @@
     ui::ScrollEvent* event) {
   DCHECK_NE(ui::TouchSelectionController::INACTIVE,
             selection_controller_->active_status());
 
   selection_controller_->HideAndDisallowShowingAutomatically();
 }
 
 TouchSelectionControllerClientAura::TouchSelectionControllerClientAura(
     RenderWidgetHostViewAura* rwhva)
     : rwhva_(rwhva),
+      internal_client_(rwhva),
+      active_client_(&internal_client_),
+      active_menu_client_(this),
       quick_menu_timer_(
           FROM_HERE,
           base::TimeDelta::FromMilliseconds(kQuickMenuDelayInMs),
           base::Bind(&TouchSelectionControllerClientAura::ShowQuickMenu,
                      base::Unretained(this)),
           false),
       quick_menu_requested_(false),
       touch_down_(false),
       scroll_in_progress_(false),
       handle_drag_in_progress_(false),
       show_quick_menu_immediately_for_test_(false) {
   DCHECK(rwhva_);
 }
 
 TouchSelectionControllerClientAura::~TouchSelectionControllerClientAura() {
+  for (auto& observer : observers_)
+    observer.OnManagerWillDestroy(this);
 }
 
 void TouchSelectionControllerClientAura::OnWindowMoved() {
   UpdateQuickMenu();
 }
 
 void TouchSelectionControllerClientAura::OnTouchDown() {
   touch_down_ = true;
   UpdateQuickMenu();
 }
@@ skipping 22 matching lines @@
       params.selection_text.empty() &&
       IsQuickMenuAvailable()) {
     quick_menu_requested_ = true;
     UpdateQuickMenu();
     return true;
   }
   rwhva_->selection_controller()->HideAndDisallowShowingAutomatically();
   return false;
 }
 
+void TouchSelectionControllerClientAura::UpdateClientSelectionBounds(
+    const gfx::SelectionBound& start,
+    const gfx::SelectionBound& end) {
+  UpdateClientSelectionBounds(start, end, &internal_client_, this);
+}
+
+void TouchSelectionControllerClientAura::UpdateClientSelectionBounds(
+    const gfx::SelectionBound& start,
+    const gfx::SelectionBound& end,
+    ui::TouchSelectionControllerClient* client,
+    ui::TouchSelectionMenuClient* menu_client) {
+  if (client != active_client_ &&
+      (start.type() == gfx::SelectionBound::EMPTY || !start.visible()) &&
+      (end.type() == gfx::SelectionBound::EMPTY || !end.visible()) &&
+      (manager_selection_start_.type() != gfx::SelectionBound::EMPTY ||
+       manager_selection_end_.type() != gfx::SelectionBound::EMPTY)) {
+    return;
+  }
+
+  active_client_ = client;
+  active_menu_client_ = menu_client;
+  manager_selection_start_ = start;
+  manager_selection_end_ = end;
+  // Notify TouchSelectionController if anything should change here. Only
+  // udate if the client is different and not making a change to empty, or

[Charlie Reis, 2017/05/25 02:29:43]

nit: update

[wjmaclean, 2017/05/25 14:04:35]

Done.

+  // is the same client.
+  GetTouchSelectionController()->OnSelectionBoundsChanged(start, end);
+}
+
+void TouchSelectionControllerClientAura::InvalidateClient(
+    ui::TouchSelectionControllerClient* client) {
+  DCHECK(client != &internal_client_);
+  if (client == active_client_) {
+    active_client_ = &internal_client_;
+    active_menu_client_ = this;
+  }
+}
+
+ui::TouchSelectionController*
+TouchSelectionControllerClientAura::GetTouchSelectionController() {
+  return rwhva_->selection_controller();
+}
+
+void TouchSelectionControllerClientAura::AddObserver(
+    TouchSelectionControllerClientManager::Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void TouchSelectionControllerClientAura::RemoveObserver(
+    TouchSelectionControllerClientManager::Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 bool TouchSelectionControllerClientAura::IsQuickMenuAvailable() const {
   return ui::TouchSelectionMenuRunner::GetInstance() &&
-         ui::TouchSelectionMenuRunner::GetInstance()->IsMenuAvailable(this);
+         ui::TouchSelectionMenuRunner::GetInstance()->IsMenuAvailable(
+             active_menu_client_);
 }
 
 void TouchSelectionControllerClientAura::ShowQuickMenu() {
   if (!ui::TouchSelectionMenuRunner::GetInstance())
     return;
 
   gfx::RectF rect = rwhva_->selection_controller()->GetRectBetweenBounds();
 
   // Clip rect, which is in |rwhva_|'s window's coordinate space, to client
   // bounds.
@@ skipping 10 matching lines @@
   gfx::RectF anchor_rect(origin, size);
 
   // Calculate maximum handle image size;
   gfx::SizeF max_handle_size =
       rwhva_->selection_controller()->GetStartHandleRect().size();
   max_handle_size.SetToMax(
       rwhva_->selection_controller()->GetEndHandleRect().size());
 
   aura::Window* parent = rwhva_->GetNativeView();
   ui::TouchSelectionMenuRunner::GetInstance()->OpenMenu(
-      this, ConvertRectToScreen(parent, anchor_rect),
+      active_menu_client_, ConvertRectToScreen(parent, anchor_rect),
       gfx::ToRoundedSize(max_handle_size), parent->GetToplevelWindow());
 }
 
 void TouchSelectionControllerClientAura::UpdateQuickMenu() {
   bool menu_is_showing =
       ui::TouchSelectionMenuRunner::GetInstance() &&
       ui::TouchSelectionMenuRunner::GetInstance()->IsRunning();
 
   // Hide the quick menu if there is any. This should happen even if the menu
   // should be shown again, in order to update its location or content.
   if (menu_is_showing)
     ui::TouchSelectionMenuRunner::GetInstance()->CloseMenu();
   else
     quick_menu_timer_.Stop();
 
   bool should_show_menu = quick_menu_requested_ && !touch_down_ &&
                           !scroll_in_progress_ && !handle_drag_in_progress_ &&
                           IsQuickMenuAvailable();
 
   // Start timer to show quick menu if necessary.
   if (should_show_menu) {
     if (show_quick_menu_immediately_for_test_)
       ShowQuickMenu();
     else
       quick_menu_timer_.Reset();
   }
 }
 
 bool TouchSelectionControllerClientAura::SupportsAnimation() const {
+  // We don't pass this to the active client, since it is assumed it will have
+  // the same behaviour as the Aura client.
   return false;
 }
 
+bool TouchSelectionControllerClientAura::InternalClient::SupportsAnimation()
+    const {
+  NOTREACHED();
+  return false;
+}
+
 void TouchSelectionControllerClientAura::SetNeedsAnimate() {
   NOTREACHED();
 }
 
+void TouchSelectionControllerClientAura::InternalClient::SetNeedsAnimate() {
+  NOTREACHED();
+}
+
 void TouchSelectionControllerClientAura::MoveCaret(
     const gfx::PointF& position) {
+  active_client_->MoveCaret(position);
+}
+
+void TouchSelectionControllerClientAura::InternalClient::MoveCaret(
+    const gfx::PointF& position) {
   RenderWidgetHostImpl* host =
       RenderWidgetHostImpl::From(rwhva_->GetRenderWidgetHost());
   host->MoveCaret(gfx::ToRoundedPoint(position));
 }
 
 void TouchSelectionControllerClientAura::MoveRangeSelectionExtent(
     const gfx::PointF& extent) {
+  active_client_->MoveRangeSelectionExtent(extent);
+}
+
+void TouchSelectionControllerClientAura::InternalClient::
+    MoveRangeSelectionExtent(const gfx::PointF& extent) {
   RenderWidgetHostDelegate* host_delegate =
       RenderWidgetHostImpl::From(rwhva_->GetRenderWidgetHost())->delegate();
   if (host_delegate)
     host_delegate->MoveRangeSelectionExtent(gfx::ToRoundedPoint(extent));
 }
 
 void TouchSelectionControllerClientAura::SelectBetweenCoordinates(
     const gfx::PointF& base,
     const gfx::PointF& extent) {
+  active_client_->SelectBetweenCoordinates(base, extent);
+}
+
+void TouchSelectionControllerClientAura::InternalClient::
+    SelectBetweenCoordinates(const gfx::PointF& base,
+                             const gfx::PointF& extent) {
   RenderWidgetHostDelegate* host_delegate =
       RenderWidgetHostImpl::From(rwhva_->GetRenderWidgetHost())->delegate();
   if (host_delegate) {
     host_delegate->SelectRange(gfx::ToRoundedPoint(base),
                                gfx::ToRoundedPoint(extent));
   }
 }
 
 void TouchSelectionControllerClientAura::OnSelectionEvent(
     ui::SelectionEventType event) {
+  // This function (implicitly) uses active_menu_client_, so we don't go to the
+  // active view for this.
   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:
@@ skipping 16 matching lines @@
     case ui::INSERTION_HANDLE_MOVED:
       UpdateQuickMenu();
       break;
     case ui::INSERTION_HANDLE_TAPPED:
       quick_menu_requested_ = !quick_menu_requested_;
       UpdateQuickMenu();
       break;
   };
 }
 
+void TouchSelectionControllerClientAura::InternalClient::OnSelectionEvent(
+    ui::SelectionEventType event) {
+  NOTREACHED();
+}
+
 std::unique_ptr<ui::TouchHandleDrawable>
 TouchSelectionControllerClientAura::CreateDrawable() {
+  // This function is purely related to the top-level view's window, so it
+  // is always handled here and never in
+  // TouchSelectionControllerClientChildFrame.
   return std::unique_ptr<ui::TouchHandleDrawable>(
       new ui::TouchHandleDrawableAura(rwhva_->GetNativeView()));
 }
 
+std::unique_ptr<ui::TouchHandleDrawable>
+TouchSelectionControllerClientAura::InternalClient::CreateDrawable() {
+  NOTREACHED();
+  return nullptr;
+}
+
 bool TouchSelectionControllerClientAura::IsCommandIdEnabled(
     int command_id) const {
   bool editable = rwhva_->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE;
   bool readable = rwhva_->GetTextInputType() != ui::TEXT_INPUT_TYPE_PASSWORD;
   gfx::Range selection_range;
   rwhva_->GetSelectionRange(&selection_range);
   bool has_selection = !selection_range.is_empty();
   switch (command_id) {
     case IDS_APP_CUT:
       return editable && readable && has_selection;
@@ skipping 45 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