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 881bf814988c69dda98a2539a3802693b28d6461..b1dc693c1f613f01b0225e915e864d9875c34866 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -39,6 +39,7 @@ |
#include "content/browser/renderer_host/input/synthetic_gesture_target_android.h" |
#include "content/browser/renderer_host/render_process_host_impl.h" |
#include "content/browser/renderer_host/render_widget_host_impl.h" |
+#include "content/browser/renderer_host/ui_events_helper.h" |
#include "content/common/gpu/client/gl_helper.h" |
#include "content/common/gpu/gpu_messages.h" |
#include "content/common/input_messages.h" |
@@ -52,6 +53,7 @@ |
#include "third_party/khronos/GLES2/gl2ext.h" |
#include "third_party/skia/include/core/SkCanvas.h" |
#include "ui/base/android/window_android.h" |
+#include "ui/events/event.h" |
#include "ui/gfx/android/device_display_info.h" |
#include "ui/gfx/android/java_bitmap.h" |
#include "ui/gfx/display.h" |
@@ -1018,6 +1020,7 @@ gfx::GLSurfaceHandle RenderWidgetHostViewAndroid::GetCompositingSurface() { |
void RenderWidgetHostViewAndroid::ProcessAckedTouchEvent( |
const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
+ LOG(ERROR) << "ProcessAckedTouchEvent"; |
if (content_view_core_) |
content_view_core_->ConfirmTouchEvent(ack_result); |
} |
@@ -1166,8 +1169,19 @@ void RenderWidgetHostViewAndroid::SendKeyEvent( |
void RenderWidgetHostViewAndroid::SendTouchEvent( |
const blink::WebTouchEvent& event) { |
+ LOG(ERROR) << "RWHVA SendTouchEvent"; |
if (host_) |
host_->ForwardTouchEventWithLatencyInfo(event, ui::LatencyInfo()); |
+ |
+ TouchEventWithLatencyInfo touch_with_latency(event, ui::LatencyInfo()); |
+ ScopedVector<ui::TouchEvent> events; |
+ MakeUITouchEventsFromWebTouchEvents( |
+ touch_with_latency, &events, content::LOCAL_COORDINATES); |
+ for (ScopedVector<ui::TouchEvent>::iterator it = events.begin(); |
+ it != events.end(); |
+ ++it) { |
+ LOG(ERROR) << "I HAVE AN EVENT"; // TODO |
+ } |
} |