Revert 109594 - Forward Windows touch messages to the renderer

content/browser/renderer_host/render_widget_host_view_win.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ skipping 123 matching lines @@
     MESSAGE_HANDLER(WM_SYSKEYDOWN, OnKeyEvent)
     MESSAGE_HANDLER(WM_SYSKEYUP, OnKeyEvent)
     MESSAGE_HANDLER(WM_KEYDOWN, OnKeyEvent)
     MESSAGE_HANDLER(WM_KEYUP, OnKeyEvent)
     MESSAGE_HANDLER(WM_MOUSEWHEEL, OnWheelEvent)
     MESSAGE_HANDLER(WM_MOUSEHWHEEL, OnWheelEvent)
     MESSAGE_HANDLER(WM_HSCROLL, OnWheelEvent)
     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)
     MESSAGE_HANDLER(WM_PARENTNOTIFY, OnParentNotify)
     MESSAGE_HANDLER(WM_POINTERDOWN, OnPointerMessage)
     MESSAGE_HANDLER(WM_POINTERUP, OnPointerMessage)
     MESSAGE_HANDLER(WM_GESTURE, OnGestureEvent)
   END_MSG_MAP()
 
   // Implementation of RenderWidgetHostView:
@@ skipping 86 matching lines @@
   LRESULT OnImeEndComposition(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
   LRESULT OnImeRequest(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
   LRESULT OnMouseEvent(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
   LRESULT OnKeyEvent(
       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,
                           BOOL& handled);
   // Handle MSAA requests for accessibility information.
   LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam,
                       BOOL& handled);
   // Handle vertical scrolling.
   LRESULT OnVScroll(int code, short position, HWND scrollbar_control);
   // Handle horizontal scrolling.
@@ skipping 100 matching lines @@
   // Represents whether or not this browser process is receiving status
   // messages about the focused edit control from a renderer process.
   bool ime_notification_;
 
   // true if Enter was hit when render widget host was in focus.
   bool capture_enter_key_;
 
   // true if the View is not visible.
   bool is_hidden_;
 
-  // Wrapper for maintaining touchstate associated with a WebTouchEvent.
-  class WebTouchState {
-   public:
-    explicit WebTouchState(const CWindowImpl* window);
-
-    // Updates the current touchpoint state with the supplied touches.
-    // Touches will be consumed only if they are of the same type (e.g. down,
-    // up, move). Returns the number of consumed touches.
-    size_t UpdateTouchPoints(TOUCHINPUT* points, size_t count);
-
-    // Marks all active touchpoints as released.
-    bool ReleaseTouchPoints();
-
-    // The contained WebTouchEvent.
-    const WebKit::WebTouchEvent& touch_event() { return touch_event_; }
-
-    // Returns if any touches are modified in the event.
-    bool is_changed() { return touch_event_.changedTouchesLength != 0; }
-
-   private:
-    // Adds a touch point or returns NULL if there's not enough space.
-    WebKit::WebTouchPoint* AddTouchPoint(TOUCHINPUT* touch_input);
-
-    // 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);
-
-    WebKit::WebTouchEvent touch_event_;
-    const CWindowImpl* const window_;
-  };
-
-  // The touch-state. 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.
-  WebTouchState touch_state_;
-
   // 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().
   bool about_to_validate_and_paint_;
 
   // true if the View should be closed when its HWND is deactivated (used to
   // support SELECT popups which are closed when they are deactivated).
   bool close_on_deactivate_;
 
   // Whether Destroy() has been called.  Used to detect a crasher
@@ skipping 66 matching lines @@
   // duplicate lbutton down messages to the renderer.
   bool ignore_next_lbutton_message_at_same_location;
   // The location of the last WM_POINTERDOWN message. We ignore the subsequent
   // lbutton down only if the locations match.
   LPARAM last_pointer_down_location_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_