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

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

Issue 14122008: Enable touch-initiated drag-drop work on Windows (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixings in drag_source_win Created 7 years, 6 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_win.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index a68d8f6f825fd923d19e708e209b58932098c589..53356827f8d0d2eb61ef34ec99d3ccf3b3f86a72 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -409,7 +409,8 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget)
pointer_down_context_(false),
last_touch_location_(-1, -1),
touch_events_enabled_(false),
- gesture_recognizer_(ui::GestureRecognizer::Create(this)) {
+ gesture_recognizer_(ui::GestureRecognizer::Create(this)),
+ in_long_press_gesture_(false) {
render_widget_host_->SetView(this);
registrar_.Add(this,
NOTIFICATION_RENDERER_PROCESS_TERMINATED,
@@ -1747,6 +1748,12 @@ LRESULT RenderWidgetHostViewWin::OnMouseEvent(UINT message, WPARAM wparam,
TRACE_EVENT0("browser", "RenderWidgetHostViewWin::OnMouseEvent");
handled = TRUE;
+ // Invalidate the long press gesture once mouse up event is received.
+ // On Windows 8, a mouse up event gets triggered once a touch point is
+ // removed from screen.
+ if (message == WM_RBUTTONUP)
+ in_long_press_gesture_ = false;
+
if (message == WM_MOUSELEAVE)
ignore_mouse_movement_ = true;
@@ -2821,6 +2828,10 @@ bool RenderWidgetHostViewWin::ForwardGestureEventToRenderer(
CreateFlingCancelEvent(gesture->time_stamp().InSecondsF()));
}
render_widget_host_->ForwardGestureEvent(web_gesture);
+
+ if (web_gesture.type == WebKit::WebGestureEvent::GestureLongPress)
+ in_long_press_gesture_ = true;
+
return true;
}
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.h ('k') | content/browser/web_contents/web_contents_drag_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698