diff options
author | dominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 17:47:35 +0000 |
---|---|---|
committer | dominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 17:47:35 +0000 |
commit | 9017d7856ea1f59a673ec8fcfd468674b4a2c008 (patch) | |
tree | d6a2defff791ff5c294bd6367401db7a481812a7 /content/browser/renderer_host/render_widget_host_view_android.cc | |
parent | 9a67241862c036c172eca8b81f2e717b616471ae (diff) | |
download | chromium_src-9017d7856ea1f59a673ec8fcfd468674b4a2c008.zip chromium_src-9017d7856ea1f59a673ec8fcfd468674b4a2c008.tar.gz chromium_src-9017d7856ea1f59a673ec8fcfd468674b4a2c008.tar.bz2 |
Replace old with new synthetic gesture framework.
- Remove current implementation of synthetic gestures.
- Rename temporarily named classes and files of new synthetic gesture framework
(e.g. SyntheticGestureNew -> SyntheticGesture).
- Link up new implementation in browser and renderer.
- Hook up synthetic gesture controller to input flushing in RWHI.
- Update JavaScript front-end and Telemetry.
BUG=297980
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=236254
Review URL: https://codereview.chromium.org/62443007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236545 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_view_android.cc')
-rw-r--r-- | content/browser/renderer_host/render_widget_host_view_android.cc | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index 8382811..5e590d8 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -33,7 +33,6 @@ #include "content/browser/gpu/gpu_surface_tracker.h" #include "content/browser/renderer_host/compositor_impl_android.h" #include "content/browser/renderer_host/dip_util.h" -#include "content/browser/renderer_host/generic_touch_gesture_android.h" #include "content/browser/renderer_host/image_transport_factory_android.h" #include "content/browser/renderer_host/input/synthetic_gesture_target_android.h" #include "content/browser/renderer_host/render_widget_host_impl.h" @@ -57,7 +56,6 @@ namespace content { namespace { const int kUndefinedOutputSurfaceId = -1; -const int kMinimumPointerDistance = 50; void InsertSyncPointAndAckForCompositor( int renderer_host_id, @@ -623,30 +621,6 @@ RenderWidgetHostViewAndroid::CreateSyntheticGestureTarget() { host_, content_view_core_->CreateTouchEventSynthesizer())); } -SyntheticGesture* RenderWidgetHostViewAndroid::CreateSmoothScrollGesture( - bool scroll_down, int pixels_to_scroll, int mouse_event_x, - int mouse_event_y) { - return new GenericTouchGestureAndroid( - GetRenderWidgetHost(), - content_view_core_->CreateOnePointTouchGesture( - mouse_event_x, mouse_event_y, - 0, scroll_down ? -pixels_to_scroll : pixels_to_scroll)); -} - -SyntheticGesture* RenderWidgetHostViewAndroid::CreatePinchGesture( - bool zoom_in, int pixels_to_move, int anchor_x, - int anchor_y) { - int distance_between_pointers = zoom_in ? - kMinimumPointerDistance : (kMinimumPointerDistance + pixels_to_move); - return new GenericTouchGestureAndroid( - GetRenderWidgetHost(), - content_view_core_->CreateTwoPointTouchGesture( - anchor_x, anchor_y - distance_between_pointers / 2, - 0, (zoom_in ? -pixels_to_move : pixels_to_move) / 2, - anchor_x, anchor_y + distance_between_pointers / 2, - 0, (zoom_in ? pixels_to_move : -pixels_to_move) / 2)); -} - void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() { } |