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

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

Issue 2054193002: Android mouse events shouldn't appear as TouchEvents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed a test, etc. Created 4 years, 1 month 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 78c0d2271379a3629f84f3621665b921121d1daf..7750ca9ebbb6387389ff47173dd0671a09ef776d 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -82,6 +82,7 @@
#include "ui/base/layout.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
+#include "ui/events/base_event_utils.h"
#include "ui/events/blink/blink_event_util.h"
#include "ui/events/blink/did_overscroll_params.h"
#include "ui/events/blink/web_input_event_traits.h"
@@ -1657,9 +1658,27 @@ void RenderWidgetHostViewAndroid::SendKeyEvent(
}
void RenderWidgetHostViewAndroid::SendMouseEvent(
- const blink::WebMouseEvent& event) {
+ const ui::MotionEventAndroid& motion_event,
+ int changed_button) {
+ blink::WebInputEvent::Type webMouseEventType =
+ ui::ToWebMouseEventType(motion_event.GetAction());
+
+ blink::WebMouseEvent mouse_event = WebMouseEventBuilder::Build(
+ webMouseEventType,
+ ui::EventTimeStampToSeconds(motion_event.GetEventTime()),
+ motion_event.GetX(0),
+ motion_event.GetY(0),
+ motion_event.GetFlags(),
+ motion_event.GetButtonState() ? 1 : 0 /* click count */,
+ motion_event.GetPointerId(0),
+ motion_event.GetPressure(0),
+ motion_event.GetOrientation(0),
+ motion_event.GetTilt(0),
+ changed_button,
+ motion_event.GetToolType(0));
+
if (host_)
- host_->ForwardMouseEvent(event);
+ host_->ForwardMouseEvent(mouse_event);
}
void RenderWidgetHostViewAndroid::SendMouseWheelEvent(

Powered by Google App Engine
This is Rietveld 408576698