content/browser/android/content_view_core_impl.cc - Issue 1430623004: blimp: Add support for input handling

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/content_view_core_impl.cc

Issue 1430623004: blimp: Add support for input handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« blimp/client/android/java/src/org/chromium/blimp/BlimpView.java ('K') | « content/browser/android/browser_jni_registrar.cc ('k') | content/browser/renderer_host/input/motion_event_android.h » ('j') | content/browser/renderer_host/render_widget_host_view_android.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_view_core_impl.cc

diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc

index bc83a1ca9289a29cc3b7592af40fc4e7254d380f..6b7df679f794ce9c75d2dcafbc00ed51e13fa1b0 100644

--- a/content/browser/android/content_view_core_impl.cc

+++ b/content/browser/android/content_view_core_impl.cc

@@ -25,7 +25,6 @@

#include "content/browser/geolocation/geolocation_service_context.h"

#include "content/browser/media/media_web_contents_observer.h"

#include "content/browser/renderer_host/compositor_impl_android.h"

-#include "content/browser/renderer_host/input/motion_event_android.h"

#include "content/browser/renderer_host/input/web_input_event_builders_android.h"

#include "content/browser/renderer_host/input/web_input_event_util.h"

#include "content/browser/renderer_host/render_view_host_impl.h"

@@ -52,6 +51,7 @@

#include "third_party/WebKit/public/web/WebInputEvent.h"

#include "ui/android/view_android.h"

#include "ui/android/window_android.h"

+#include "ui/events/android/motion_event_android.h"

#include "ui/gfx/android/java_bitmap.h"

#include "ui/gfx/geometry/point_conversions.h"

#include "ui/gfx/geometry/size_conversions.h"

@@ -889,21 +889,21 @@ jboolean ContentViewCoreImpl::OnTouchEvent(JNIEnv* env,

if (!rwhv)

return false;

- MotionEventAndroid::Pointer pointer0(pointer_id_0,

+ ui::MotionEventAndroid::Pointer pointer0(pointer_id_0,

pos_x_0,

pos_y_0,

touch_major_0,

touch_minor_0,

orientation_0,

android_tool_type_0);

- MotionEventAndroid::Pointer pointer1(pointer_id_1,

+ ui::MotionEventAndroid::Pointer pointer1(pointer_id_1,

pos_x_1,

pos_y_1,

touch_major_1,

touch_minor_1,

orientation_1,

android_tool_type_1);

- MotionEventAndroid event(1.f / dpi_scale(),

+ ui::MotionEventAndroid event(1.f / dpi_scale(),

env,

motion_event,

time_ms,