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 48 matching lines @@
 #include "ui/base/win/mouse_wheel_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #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 ui::ViewProp;
 using WebKit::WebInputEvent;
 using WebKit::WebInputEventFactory;
 using WebKit::WebMouseEvent;
 using WebKit::WebTextDirection;
 using webkit::npapi::WebPluginGeometry;
 
 namespace content {
@@ skipping 1768 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_ && base::win::IsMouseEventFromTouch(message))) {

[sky, 2012/07/24 21:36:25]

nit: !touch_events_enabled || !IsMouseEventFromTouch
is easier to read.

[girard, 2012/07/24 23:54:54]

Done.

+    // 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