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

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

Issue 138163016: [DevTools] Touch emulation in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another approach in RWH unittest Created 6 years, 8 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_impl.cc
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index c7e66dbc734ee6841e75e803f40108a0ac356772..971a2de6ac14f13dcb227972e3ed23dcad1e030e 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -38,6 +38,7 @@
#include "content/browser/renderer_host/input/synthetic_gesture_controller.h"
#include "content/browser/renderer_host/input/synthetic_gesture_target.h"
#include "content/browser/renderer_host/input/timeout_monitor.h"
+#include "content/browser/renderer_host/input/touch_emulator.h"
#include "content/browser/renderer_host/overscroll_controller.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
@@ -243,6 +244,8 @@ RenderWidgetHostImpl::RenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
input_router_.reset(new InputRouterImpl(process_, this, this, routing_id_));
+ touch_emulator_.reset();
+
#if defined(USE_AURA)
bool overscroll_enabled = CommandLine::ForCurrentProcess()->
GetSwitchValueASCII(switches::kOverscrollHistoryNavigation) != "0";
@@ -483,6 +486,8 @@ bool RenderWidgetHostImpl::OnMessageReceived(const IPC::Message &msg) {
IPC_MESSAGE_HANDLER(ViewHostMsg_Focus, OnFocus)
IPC_MESSAGE_HANDLER(ViewHostMsg_Blur, OnBlur)
IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnSetCursor)
+ IPC_MESSAGE_HANDLER(ViewHostMsg_SetTouchEventEmulationEnabled,
+ OnSetTouchEventEmulationEnabled)
IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputTypeChanged,
OnTextInputTypeChanged)
IPC_MESSAGE_HANDLER(ViewHostMsg_ImeCancelComposition,
@@ -681,10 +686,16 @@ void RenderWidgetHostImpl::Blur() {
if (overscroll_controller_)
overscroll_controller_->Cancel();
+ if (touch_emulator_)
+ touch_emulator_->CancelTouch();
+
Send(new InputMsg_SetFocus(routing_id_, false));
}
void RenderWidgetHostImpl::LostCapture() {
+ if (touch_emulator_)
+ touch_emulator_->CancelTouch();
+
Send(new InputMsg_MouseCaptureLost(routing_id_));
}
@@ -998,6 +1009,9 @@ void RenderWidgetHostImpl::ForwardMouseEventWithLatencyInfo(
if (IgnoreInputEvents())
return;
+ if (touch_emulator_ && touch_emulator_->HandleMouseEvent(mouse_event))
+ return;
+
input_router_->SendMouseEvent(MouseEventWithLatencyInfo(mouse_event,
latency_info));
}
@@ -1021,6 +1035,9 @@ void RenderWidgetHostImpl::ForwardWheelEventWithLatencyInfo(
if (IgnoreInputEvents())
return;
+ if (touch_emulator_ && touch_emulator_->HandleMouseWheelEvent(wheel_event))
+ return;
+
input_router_->SendWheelEvent(MouseWheelEventWithLatencyInfo(wheel_event,
latency_info));
}
@@ -1070,6 +1087,11 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
input_router_->SendGestureEvent(gesture_with_latency);
}
+void RenderWidgetHostImpl::ForwardTouchEvent(
+ const blink::WebTouchEvent& touch_event) {
+ ForwardTouchEventWithLatencyInfo(touch_event, ui::LatencyInfo());
+}
+
void RenderWidgetHostImpl::ForwardTouchEventWithLatencyInfo(
const blink::WebTouchEvent& touch_event,
const ui::LatencyInfo& ui_latency) {
@@ -1145,6 +1167,9 @@ void RenderWidgetHostImpl::ForwardKeyboardEvent(
suppress_next_char_events_ = false;
}
+ if (touch_emulator_ && touch_emulator_->HandleKeyboardEvent(key_event))
+ return;
+
input_router_->SendKeyboardEvent(
key_event,
CreateRWHLatencyInfoIfNotExist(NULL, key_event.type),
@@ -1165,6 +1190,12 @@ void RenderWidgetHostImpl::QueueSyntheticGesture(
}
}
+void RenderWidgetHostImpl::SetCursor(const WebCursor& cursor) {
+ if (!view_)
+ return;
+ view_->UpdateCursor(cursor);
+}
+
void RenderWidgetHostImpl::SendCursorVisibilityState(bool is_visible) {
Send(new InputMsg_CursorVisibilityChange(GetRoutingID(), is_visible));
}
@@ -1829,10 +1860,19 @@ void RenderWidgetHostImpl::OnBlur() {
}
void RenderWidgetHostImpl::OnSetCursor(const WebCursor& cursor) {
- if (!view_) {
- return;
+ SetCursor(cursor);
+}
+
+void RenderWidgetHostImpl::OnSetTouchEventEmulationEnabled(
+ bool enabled, bool allow_pinch) {
+ if (enabled) {
+ if (!touch_emulator_)
+ touch_emulator_.reset(new TouchEmulator(this));
+ touch_emulator_->Enable(allow_pinch);
+ } else {
+ if (touch_emulator_)
+ touch_emulator_->Disable();
}
- view_->UpdateCursor(cursor);
}
void RenderWidgetHostImpl::OnTextInputTypeChanged(
@@ -2170,6 +2210,10 @@ void RenderWidgetHostImpl::OnTouchEventAck(
ui::INPUT_EVENT_LATENCY_TERMINATED_TOUCH_COMPONENT, 0, 0);
}
ComputeTouchLatency(touch_event.latency);
+
+ if (touch_emulator_ && touch_emulator_->HandleTouchEventAck(ack_result))
+ return;
+
if (view_)
view_->ProcessAckedTouchEvent(touch_event, ack_result);
}

Powered by Google App Engine
This is Rietveld 408576698