Fix movementX/Y attributes for touch pointer events

content/browser/renderer_host/input/touch_input_browsertest.cc

 // Copyright 2013 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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 85 matching lines @@
   RenderWidgetHostImpl* GetWidgetHost() {
     return RenderWidgetHostImpl::From(
         shell()->web_contents()->GetRenderViewHost()->GetWidget());
   }
 
   scoped_refptr<InputMsgWatcher> AddFilter(blink::WebInputEvent::Type type) {
     return new InputMsgWatcher(GetWidgetHost(), type);
   }
 
  protected:
+  void SendTouchEvent(SyntheticWebTouchEvent* event) {
+    GetWidgetHost()->ForwardTouchEventWithLatencyInfo(*event,
+                                                      ui::LatencyInfo());
+    event->ResetPoints();
+  }
   void LoadURL() {
     const GURL data_url(kTouchEventDataURL);
     NavigateToURL(shell(), data_url);
 
     RenderWidgetHostImpl* host = GetWidgetHost();
     host->GetView()->SetSize(gfx::Size(400, 400));
 
     // The page is loaded in the renderer, wait for a new frame to arrive.
     while (!host->ScheduleComposite())
       GiveItSomeTime();
@@ skipping 12 matching lines @@
 #define MAYBE_TouchNoHandler TouchNoHandler
 #endif
 IN_PROC_BROWSER_TEST_F(TouchInputBrowserTest, MAYBE_TouchNoHandler) {
   LoadURL();
   SyntheticWebTouchEvent touch;
 
   // A press on |first| should be acked with NO_CONSUMER_EXISTS since there is
   // no touch-handler on it.
   touch.PressPoint(25, 25);
   scoped_refptr<InputMsgWatcher> filter = AddFilter(WebInputEvent::TouchStart);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
+  SendTouchEvent(&touch);
 
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, filter->WaitForAck());
 
   // If a touch-press is acked with NO_CONSUMER_EXISTS, then subsequent
   // touch-points don't need to be dispatched until the touch point is released.
   touch.ReleasePoint(0);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
-  touch.ResetPoints();
+  SendTouchEvent(&touch);
 }
 
 #if defined(OS_CHROMEOS)
 // crbug.com/514456
 #define MAYBE_TouchHandlerNoConsume DISABLED_TouchHandlerNoConsume
 #else
 #define MAYBE_TouchHandlerNoConsume TouchHandlerNoConsume
 #endif
 IN_PROC_BROWSER_TEST_F(TouchInputBrowserTest, MAYBE_TouchHandlerNoConsume) {
   LoadURL();
   SyntheticWebTouchEvent touch;
 
   // Press on |second| should be acked with NOT_CONSUMED since there is a
   // touch-handler on |second|, but it doesn't consume the event.
   touch.PressPoint(125, 25);
   scoped_refptr<InputMsgWatcher> filter = AddFilter(WebInputEvent::TouchStart);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
+  SendTouchEvent(&touch);
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NOT_CONSUMED, filter->WaitForAck());
 
   filter = AddFilter(WebInputEvent::TouchEnd);
   touch.ReleasePoint(0);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
-  touch.ResetPoints();
+  SendTouchEvent(&touch);
   filter->WaitForAck();
 }
 
 #if defined(OS_CHROMEOS)
 // crbug.com/514456
 #define MAYBE_TouchHandlerConsume DISABLED_TouchHandlerConsume
 #else
 #define MAYBE_TouchHandlerConsume TouchHandlerConsume
 #endif
 IN_PROC_BROWSER_TEST_F(TouchInputBrowserTest, MAYBE_TouchHandlerConsume) {
   LoadURL();
   SyntheticWebTouchEvent touch;
 
   // Press on |third| should be acked with CONSUMED since the touch-handler on
   // |third| consimes the event.
   touch.PressPoint(25, 125);
   scoped_refptr<InputMsgWatcher> filter = AddFilter(WebInputEvent::TouchStart);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
+  SendTouchEvent(&touch);
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter->WaitForAck());
 
   touch.ReleasePoint(0);
   filter = AddFilter(WebInputEvent::TouchEnd);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
+  SendTouchEvent(&touch);
   filter->WaitForAck();
 }
 
 #if defined(OS_CHROMEOS)
 // crbug.com/514456
 #define MAYBE_MultiPointTouchPress DISABLED_MultiPointTouchPress
 #elif defined(OS_MACOSX)
 // TODO(ccameron): Failing on mac: crbug.com/346363
 #define MAYBE_MultiPointTouchPress DISABLED_MultiPointTouchPress
 #else
 #define MAYBE_MultiPointTouchPress MultiPointTouchPress
 #endif
 IN_PROC_BROWSER_TEST_F(TouchInputBrowserTest, MAYBE_MultiPointTouchPress) {
   LoadURL();
   SyntheticWebTouchEvent touch;
 
   // Press on |first|, which sould be acked with NO_CONSUMER_EXISTS. Then press
   // on |third|. That point should be acked with CONSUMED.
   touch.PressPoint(25, 25);
   scoped_refptr<InputMsgWatcher> filter = AddFilter(WebInputEvent::TouchStart);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
+  SendTouchEvent(&touch);
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS, filter->WaitForAck());
 
   touch.PressPoint(25, 125);
   filter = AddFilter(WebInputEvent::TouchStart);
-  GetWidgetHost()->ForwardTouchEventWithLatencyInfo(touch, ui::LatencyInfo());
+  SendTouchEvent(&touch);
   EXPECT_EQ(INPUT_EVENT_ACK_STATE_CONSUMED, filter->WaitForAck());
 }
 
 }  // namespace content