Index: content/browser/renderer_host/render_widget_host_view_aura.h |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h |
index d9e12015d8a94d271dae24baea6215dc985b70da..92437fb066e684e52f41ae0daf9096c8fda67fa4 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.h |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h |
@@ -30,7 +30,6 @@ |
#include "ui/aura/window_tree_host_observer.h" |
#include "ui/base/ime/text_input_client.h" |
#include "ui/base/touch/selection_bound.h" |
-#include "ui/base/touch/touch_editing_controller.h" |
#include "ui/events/gestures/motion_event_aura.h" |
#include "ui/gfx/display_observer.h" |
#include "ui/gfx/geometry/insets.h" |
@@ -64,6 +63,8 @@ class CompositorLock; |
class InputMethod; |
class LocatedEvent; |
class Texture; |
+class TouchSelectionController; |
+class TouchSelectionControllerClient; |
} |
namespace content { |
@@ -88,49 +89,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
public aura::client::FocusChangeObserver, |
public aura::client::CursorClientObserver { |
public: |
- // Displays and controls touch editing elements such as selection handles. |
- class TouchEditingClient { |
- public: |
- TouchEditingClient() {} |
- |
- // Tells the client to start showing touch editing handles. |
- virtual void StartTouchEditing() = 0; |
- |
- // Notifies the client that touch editing is no longer needed. |quick| |
- // determines whether the handles should fade out quickly or slowly. |
- virtual void EndTouchEditing(bool quick) = 0; |
- |
- // Notifies the client that the selection bounds need to be updated. |
- virtual void OnSelectionOrCursorChanged( |
- const ui::SelectionBound& anchor, |
- const ui::SelectionBound& focus) = 0; |
- |
- // Notifies the client that the current text input type as changed. |
- virtual void OnTextInputTypeChanged(ui::TextInputType type) = 0; |
- |
- // Notifies the client that an input event is about to be sent to the |
- // renderer. Returns true if the client wants to stop event propagation. |
- virtual bool HandleInputEvent(const ui::Event* event) = 0; |
- |
- // Notifies the client that a gesture event ack was received. |
- virtual void GestureEventAck(int gesture_event_type) = 0; |
- |
- // Notifies the client that the fling has ended, so it can activate touch |
- // editing if needed. |
- virtual void DidStopFlinging() = 0; |
- |
- // This is called when the view is destroyed, so that the client can |
- // perform any necessary clean-up. |
- virtual void OnViewDestroyed() = 0; |
- |
- protected: |
- virtual ~TouchEditingClient() {} |
- }; |
- |
- void set_touch_editing_client(TouchEditingClient* client) { |
- touch_editing_client_ = client; |
- } |
- |
// When |is_guest_view_hack| is true, this view isn't really the view for |
// the |widget|, a RenderWidgetHostViewGuest is. |
// |
@@ -298,6 +256,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
void OnTouchEvent(ui::TouchEvent* event) override; |
void OnGestureEvent(ui::GestureEvent* event) override; |
+ // Performs gesture handling needed for touch text selection. Sets event as |
+ // handled if it should not be further processed. |
+ void HandleGestureForTouchSelection(ui::GestureEvent* event); |
+ |
// Overridden from aura::client::ActivationDelegate: |
bool ShouldActivate() const override; |
@@ -346,6 +308,13 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
void SnapToPhysicalPixelBoundary(); |
+ void InitSelectionController(scoped_ptr<ui::TouchSelectionControllerClient> |
+ selection_controller_client); |
+ |
+ ui::TouchSelectionController* selection_controller() const { |
+ return selection_controller_.get(); |
+ } |
+ |
OverscrollController* overscroll_controller() const { |
return overscroll_controller_.get(); |
} |
@@ -509,6 +478,13 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
// Called when the parent window hierarchy for our window changes. |
void ParentHierarchyChanged(); |
+ // Helper function to be called whenever new selection information is |
+ // received. It will update selection controller and notify IME. |
+ void SelectionUpdated(bool is_editable, |
+ bool is_empty_text_form_control, |
+ const ui::SelectionBound& start, |
+ const ui::SelectionBound& end); |
+ |
// The model object. |
RenderWidgetHostImpl* host_; |
@@ -561,8 +537,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
bool can_compose_inline_; |
// Bounds for the selection. |
- ui::SelectionBound selection_anchor_; |
- ui::SelectionBound selection_focus_; |
+ ui::SelectionBound selection_start_; |
+ ui::SelectionBound selection_end_; |
// The current composition character bounds. |
std::vector<gfx::Rect> composition_character_bounds_; |
@@ -646,7 +622,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura |
bool has_snapped_to_boundary_; |
- TouchEditingClient* touch_editing_client_; |
+ scoped_ptr<ui::TouchSelectionControllerClient> selection_controller_client_; |
+ scoped_ptr<ui::TouchSelectionController> selection_controller_; |
scoped_ptr<OverscrollController> overscroll_controller_; |