| Index: trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc (revision 236262)
|
| +++ trunk/src/content/browser/renderer_host/render_widget_host_view_android.cc (working copy)
|
| @@ -33,6 +33,7 @@
|
| #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"
|
| @@ -56,6 +57,7 @@
|
| namespace {
|
|
|
| const int kUndefinedOutputSurfaceId = -1;
|
| +const int kMinimumPointerDistance = 50;
|
|
|
| void InsertSyncPointAndAckForCompositor(
|
| int renderer_host_id,
|
| @@ -621,6 +623,30 @@
|
| 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() {
|
| }
|
|
|
|
|