Correct behaviour of touch wrt mouse capture.

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/render_widget_host_view_win.h"
 
 #include <algorithm>
 #include <map>
 #include <peninputpanel_i.c>
 #include <stack>
@@ skipping 274 matching lines @@
     result.windowX = result.x;
     result.windowY = result.y;
     // Note that we support diagonal scrolling.
     result.deltaX = static_cast<float>(delta.x);
     result.wheelTicksX = WHEEL_DELTA;
     result.deltaY = static_cast<float>(delta.y);
     result.wheelTicksY = WHEEL_DELTA;
     return result;
 }
 
+// Windows emulates mouse messages for touch events.
+bool IsEmulatedMouseEvent(UINT message) {

[sky, 2012/07/24 16:41:40]

Move this to ui/base/win/events_win.h/events_win.cc and make this and
native_widget_win share the implementation. It should also be named more
descriptively. Maybe IsMouseEventFromTouch or something.

[girard, 2012/07/24 19:49:01]

Done.

+  return (message == WM_MOUSEMOVE ||
+      message == WM_LBUTTONDOWN || message == WM_LBUTTONUP ||
+      message == WM_RBUTTONDOWN || message == WM_RBUTTONUP) &&
+      (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) ==
+      MOUSEEVENTF_FROMTOUCH;
+}
+
 static const int kTouchMask = 0x7;
 
 inline int GetTouchType(const TOUCHINPUT& point) {
   return point.dwFlags & kTouchMask;
 }
 
 inline void SetTouchType(TOUCHINPUT* point, int type) {
   point->dwFlags = (point->dwFlags & kTouchMask) | type;
 }
 
@@ skipping 1545 matching lines @@
       handled = FALSE;
       return 0;
   }
 }
 
 LRESULT RenderWidgetHostViewWin::OnMouseEvent(UINT message, WPARAM wparam,
                                               LPARAM lparam, BOOL& handled) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewWin::OnMouseEvent");
   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_MOUSEMOVE ||
-      message == WM_LBUTTONDOWN || message == WM_LBUTTONUP ||
-      message == WM_RBUTTONDOWN || message == WM_RBUTTONUP) &&
-      (GetMessageExtraInfo() & MOUSEEVENTF_FROMTOUCH) ==
-      MOUSEEVENTF_FROMTOUCH)
-    return 0;
-
   if (message == WM_MOUSELEAVE)
     ignore_mouse_movement_ = true;
 
   if (mouse_locked_) {
     HandleLockedMouseEvent(message, wparam, lparam);
     MoveCursorToCenterIfNecessary();
     return 0;
   }
 
   if (::IsWindow(tooltip_hwnd_)) {
@@ skipping 1033 matching lines @@
       event.movementX =
           event.globalX - last_mouse_position_.unlocked_global.x();
       event.movementY =
           event.globalY - last_mouse_position_.unlocked_global.y();
     }
 
     last_mouse_position_.unlocked.SetPoint(event.windowX, event.windowY);
     last_mouse_position_.unlocked_global.SetPoint(event.globalX, event.globalY);
   }
 
-  // Send the event to the renderer before changing mouse capture, so that the
-  // capturelost event arrives after mouseup.
-  render_widget_host_->ForwardMouseEvent(event);
+  // Windows sends (fake) mouse messages for touch events. Don't send these to
+  // the render widget.
+  if (!(touch_events_enabled_ && IsEmulatedMouseEvent(message))) {
+    // Send the event to the renderer before changing mouse capture, so that the
+    // capturelost event arrives after mouseup.
+    render_widget_host_->ForwardMouseEvent(event);
+  }
 
   switch (event.type) {
     case WebInputEvent::MouseMove:
       TrackMouseLeave(true);
       break;
     case WebInputEvent::MouseLeave:
       TrackMouseLeave(false);
       break;
     case WebInputEvent::MouseDown:
       SetCapture();
@@ skipping 220 matching lines @@
   // receive a focus change in the context of a pointer down message, it means
   // that the pointer down message occurred on the edit field and we should
   // display the on screen keyboard
   if (!received_focus_change_after_pointer_down_ && virtual_keyboard_)
     DisplayOnScreenKeyboardIfNeeded();
   received_focus_change_after_pointer_down_ = false;
   pointer_down_context_ = false;
 }
 
 }  // namespace content