| Index: content/browser/renderer_host/render_widget_host_view_android.cc
|
| 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 2e5c0851dabd45615ea7a2a2fcff81d6924f50bf..7f015bfa5b9eb9d563d98a1550765231c152ed0e 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
|
| @@ -34,12 +34,15 @@
|
| #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/render_widget_host_impl.h"
|
| +#include "content/browser/renderer_host/synthetic_touch_event_android.h"
|
| #include "content/common/gpu/client/gl_helper.h"
|
| #include "content/common/gpu/gpu_messages.h"
|
| +#include "content/common/input/input_event.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "skia/ext/image_operations.h"
|
| +#include "third_party/WebKit/public/web/WebInputEvent.h"
|
| #include "third_party/khronos/GLES2/gl2.h"
|
| #include "third_party/khronos/GLES2/gl2ext.h"
|
| #include "ui/gfx/android/device_display_info.h"
|
| @@ -48,6 +51,9 @@
|
| #include "ui/gfx/screen.h"
|
| #include "ui/gfx/size_conversions.h"
|
|
|
| +using WebKit::WebInputEvent;
|
| +using WebKit::WebTouchEvent;
|
| +
|
| namespace content {
|
|
|
| namespace {
|
| @@ -1001,6 +1007,21 @@ void RenderWidgetHostViewAndroid::ProcessAckedTouchEvent(
|
| content_view_core_->ConfirmTouchEvent(ack_result);
|
| }
|
|
|
| +void RenderWidgetHostViewAndroid::QueueInputEventToPlatform(
|
| + const InputEvent& event) {
|
| + if (!synthetic_touch_event_)
|
| + synthetic_touch_event_.reset(
|
| + new SyntheticTouchEventAndroid(content_view_core_));
|
| +
|
| + if (WebInputEvent::isTouchEventType(event.web_event->type)) {
|
| + const WebTouchEvent* web_touch =
|
| + static_cast<const WebTouchEvent*>(event.web_event.get());
|
| +
|
| + synthetic_touch_event_->InjectWebTouchEvent(web_touch);
|
| + } else
|
| + NOTREACHED(); // FIXME: implement other types (MouseWheel?)
|
| +}
|
| +
|
| void RenderWidgetHostViewAndroid::SetHasHorizontalScrollbar(
|
| bool has_horizontal_scrollbar) {
|
| // intentionally empty, like RenderWidgetHostViewViews
|
|
|