Forward Windows touch messages to the renderer

content/browser/renderer_host/render_widget_host_view_win.h

Index: content/browser/renderer_host/render_widget_host_view_win.h
===================================================================
--- content/browser/renderer_host/render_widget_host_view_win.h	(revision 108760)
+++ content/browser/renderer_host/render_widget_host_view_win.h	(working copy)
@@ -141,6 +141,7 @@
     MESSAGE_HANDLER(WM_VSCROLL, OnWheelEvent)
     MESSAGE_HANDLER(WM_CHAR, OnKeyEvent)
     MESSAGE_HANDLER(WM_SYSCHAR, OnKeyEvent)
+    MESSAGE_HANDLER(WM_TOUCH, OnTouchEvent)
     MESSAGE_HANDLER(WM_IME_CHAR, OnKeyEvent)
     MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate)
     MESSAGE_HANDLER(WM_GETOBJECT, OnGetObject)
@@ -247,6 +248,8 @@
       UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
   LRESULT OnWheelEvent(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
+  LRESULT OnTouchEvent(
+      UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
   LRESULT OnMouseActivate(UINT message,
                           WPARAM wparam,
                           LPARAM lparam,
@@ -329,6 +332,17 @@
 
   void HandleLockedMouseEvent(UINT message, WPARAM wparam, LPARAM lparam);
 
+  // Copy details from a TOUCHINPUT to an existing WebTouchPoint, returning
+  // true if the resulting point is a stationary move.
+  bool UpdateTouchPoint(WebKit::WebTouchPoint* touch_point,
+                        TOUCHINPUT* touch_input);
+
+  // Adds a touch point or returns NULL if there's not enough space.
+  WebKit::WebTouchPoint* AddTouchPoint(TOUCHINPUT* touch_input);
+
+  // Completes a touch event if needed (e.g. due to a focus change)
+  void FinishTouchEvent();

[cpu_(ooo_6.6-7.5), 2011/11/08 02:34:04]

You are going to hate me but I have the urge to tell you that there is a little
class that is screaming to be born. I'll let you name it but here is what it
look s like to me:

class Fooo {
public:
  AddTouchPoint(...)
  UpdateTouchPoint(..)
  FinishTouchEvent(..)
private:
  WebKit::WebTouchEvent touch_event_;
}

[jschuh, 2011/11/08 17:12:41]

Yeah, I was thinking about that but I anticipate significantly changing
WebTouchEvent class in the near future. Also, I didn't want to dupe the hwnd
into the class (but that's not a big deal). I think it would be better to factor
it all out at once, but I can do it now if you think it's better.

[cpu_(ooo_6.6-7.5), 2011/11/08 19:20:14]

I think now it's a good time. If you want you can put the class declaration in
this file and the impl in the .cc

Mostly what I want is logical separation.


On 2011/11/08 17:12:41, Justin Schuh wrote:

+
   LRESULT OnDocumentFeed(RECONVERTSTRING* reconv);
   LRESULT OnReconvertString(RECONVERTSTRING* reconv);
 
@@ -367,6 +381,11 @@
   // true if the View is not visible.
   bool is_hidden_;
 
+  // The touch-event. Its touch-points are updated as necessary. A new
+  // touch-point is added from an TOUCHEVENTF_DOWN message, and a touch-point
+  // is removed from the list on an TOUCHEVENTF_UP message.
+  WebKit::WebTouchEvent touch_event_;
+
   // True if we're in the midst of a paint operation and should respond to
   // DidPaintRect() notifications by merely invalidating.  See comments on
   // render_widget_host_view.h:DidPaintRect().