Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1985)

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2595263002: Introduce ViewRoot forwarding input/view events to native (Closed)
Patch Set: rebased & ViewAndroud::Bounds Created 3 years, 11 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
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 6d4b39c6098b04e175003267e8ad84bec591681d..afe5bbfd26f285a9176bb1451c3ef7dd479ed3af 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -447,6 +447,7 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
content_view_core_(nullptr),
ime_adapter_android_(this),
cached_background_color_(SK_ColorWHITE),
+ view_(this),
last_compositor_frame_sink_id_(kUndefinedCompositorFrameSinkId),
gesture_provider_(ui::GetGestureProviderConfig(
ui::GestureProviderConfigType::CURRENT_PLATFORM),
@@ -824,6 +825,13 @@ void RenderWidgetHostViewAndroid::SetNeedsBeginFrames(bool needs_begin_frames) {
ClearBeginFrameRequest(PERSISTENT_BEGIN_FRAME);
}
+bool RenderWidgetHostViewAndroid::OnTouchEvent(
+ const ui::MotionEventAndroid& event,
+ bool is_touch_handle_event) {
+ return is_touch_handle_event ? ProcessTouchHandleEvent(event)
+ : ProcessTouchEvent(event);
+}
+
void RenderWidgetHostViewAndroid::OnStartContentIntent(
const GURL& content_url, bool is_main_frame) {
if (content_view_core_)
@@ -838,7 +846,7 @@ void RenderWidgetHostViewAndroid::OnSmartClipDataExtracted(
content_view_core_->OnSmartClipDataExtracted(text, html, rect);
}
-bool RenderWidgetHostViewAndroid::OnTouchEvent(
+bool RenderWidgetHostViewAndroid::ProcessTouchEvent(
const ui::MotionEvent& event) {
if (!host_)
return false;
@@ -880,7 +888,7 @@ bool RenderWidgetHostViewAndroid::OnTouchEvent(
return true;
}
-bool RenderWidgetHostViewAndroid::OnTouchHandleEvent(
+bool RenderWidgetHostViewAndroid::ProcessTouchHandleEvent(
const ui::MotionEvent& event) {
return selection_controller_ &&
selection_controller_->WillHandleTouchEvent(event);

Powered by Google App Engine
This is Rietveld 408576698