Chromium Code Reviews| 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 77f45164a303db0d0f8e05e2c14d65f92c559236..5cc77d2c86006143dfededcb1291605f2ad1dc74 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_win.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_win.cc |
| @@ -64,6 +64,9 @@ |
| #include "webkit/plugins/npapi/webplugin.h" |
| #include "webkit/plugins/npapi/webplugin_delegate_impl.h" |
| +// From MSDN. |
| +#define MOUSEEVENTF_FROMTOUCH 0xFF515700 |
| + |
| using base::TimeDelta; |
| using base::TimeTicks; |
| using content::BrowserThread; |
| @@ -1796,6 +1799,15 @@ LRESULT RenderWidgetHostViewWin::OnMouseEvent(UINT message, WPARAM wparam, |
| LPARAM lparam, BOOL& handled) { |
| handled = TRUE; |
| + // Windows sends (fake) mouse messages for touch events. Ignore these since |
| + // we're processing WM_TOUCH elsewhere. |
| + if (touch_events_enabled_ && |
| + (message == WM_LBUTTONDOWN || message == WM_LBUTTONUP || |
| + message == WM_RBUTTONDOWN || message == WM_RBUTTONUP) && |
|
sky
2012/05/31 00:44:14
nit: indent this line one more space.
|
| + (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) == |
| + MOUSEEVENTF_FROMTOUCH) |
| + return 0; |
| + |
| if (message == WM_MOUSELEAVE) |
| ignore_mouse_movement_ = true; |