Remove references to WebTouchEvent.targetTouches

content/renderer/pepper/event_conversion_unittest.cc

Index: content/renderer/pepper/event_conversion_unittest.cc
diff --git a/content/renderer/pepper/event_conversion_unittest.cc b/content/renderer/pepper/event_conversion_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8a22a939e8da459ab08932d8fdaa8fd40cef6f75
--- /dev/null
+++ b/content/renderer/pepper/event_conversion_unittest.cc
@@ -0,0 +1,145 @@
+// Copyright 2014 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/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "content/common/input/synthetic_web_input_event_builders.h"
+#include "content/renderer/pepper/event_conversion.h"
+#include "ppapi/shared_impl/ppb_input_event_shared.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace content {
+
+class EventConversionTest : public ::testing::Test {
+ protected:
+  void CompareWebTouchEvents(const blink::WebTouchEvent& expected,
+                             const blink::WebTouchEvent& actual) {
+    EXPECT_EQ(expected.type, actual.type);
+    ASSERT_EQ(expected.touchesLength, actual.touchesLength);
+    for (size_t i = 0; i < expected.touchesLength; ++i) {
+      size_t j = 0;
+      for (; j < actual.touchesLength; ++j) {
+        if (actual.touches[j].id == expected.touches[i].id)
+          break;
+      }
+      ASSERT_NE(j, actual.touchesLength);
+      EXPECT_EQ(expected.touches[i].id, actual.touches[j].id);
+      EXPECT_EQ(expected.touches[i].state, actual.touches[j].state);
+      EXPECT_EQ(expected.touches[i].position.x, actual.touches[j].position.x);
+      EXPECT_EQ(expected.touches[i].position.y, actual.touches[j].position.y);
+      EXPECT_EQ(expected.touches[i].radiusX, actual.touches[j].radiusX);
+      EXPECT_EQ(expected.touches[i].radiusY, actual.touches[j].radiusY);
+      EXPECT_EQ(expected.touches[i].rotationAngle,
+                actual.touches[j].rotationAngle);
+      EXPECT_EQ(expected.touches[i].force, actual.touches[j].force);
+    }
+  }
+};
+
+TEST_F(EventConversionTest, TouchStart) {
+  SyntheticWebTouchEvent touch;
+  touch.PressPoint(1.f, 2.f);
+
+  std::vector<ppapi::InputEventData> pp_events;
+  CreateInputEventData(touch, &pp_events);
+  ASSERT_EQ(1U, pp_events.size());
+
+  const ppapi::InputEventData& pp_event = pp_events[0];
+  ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHSTART, pp_event.event_type);
+  ASSERT_EQ(1U, pp_event.touches.size());
+  ASSERT_EQ(1U, pp_event.changed_touches.size());
+  ASSERT_EQ(1U, pp_event.target_touches.size());
+
+  scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+  const blink::WebTouchEvent* touch_out =
+      static_cast<const blink::WebTouchEvent*>(event_out.get());
+  ASSERT_TRUE(touch_out);
+  EXPECT_EQ(touch.type, touch_out->type);
+  EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
+  CompareWebTouchEvents(touch, *touch_out);
+}
+
+TEST_F(EventConversionTest, TouchMove) {
+  SyntheticWebTouchEvent touch;
+  touch.PressPoint(1.f, 2.f);
+  touch.ResetPoints();
+  touch.PressPoint(3.f, 4.f);
+  touch.ResetPoints();
+  touch.MovePoint(1, 5.f, 6.f);
+
+  std::vector<ppapi::InputEventData> pp_events;
+  CreateInputEventData(touch, &pp_events);
+  ASSERT_EQ(1U, pp_events.size());
+
+  const ppapi::InputEventData& pp_event = pp_events[0];
+  ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHMOVE, pp_event.event_type);
+  ASSERT_EQ(2U, pp_event.touches.size());
+  ASSERT_EQ(1U, pp_event.changed_touches.size());
+  ASSERT_EQ(2U, pp_event.target_touches.size());
+
+  scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+  const blink::WebTouchEvent* touch_out =
+      static_cast<const blink::WebTouchEvent*>(event_out.get());
+  ASSERT_TRUE(touch_out);
+  EXPECT_EQ(touch.type, touch_out->type);
+  EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
+  CompareWebTouchEvents(touch, *touch_out);
+}
+
+TEST_F(EventConversionTest, TouchEnd) {
+  SyntheticWebTouchEvent touch;
+  touch.PressPoint(1.f, 2.f);
+  touch.ResetPoints();
+  touch.PressPoint(3.f, 4.f);
+  touch.ResetPoints();
+  touch.ReleasePoint(0);
+
+  std::vector<ppapi::InputEventData> pp_events;
+  CreateInputEventData(touch, &pp_events);
+  ASSERT_EQ(1U, pp_events.size());
+
+  const ppapi::InputEventData& pp_event = pp_events[0];
+  ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHEND, pp_event.event_type);
+  ASSERT_EQ(1U, pp_event.touches.size());
+  ASSERT_EQ(1U, pp_event.changed_touches.size());
+  ASSERT_EQ(2U, pp_event.target_touches.size());
+
+  scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+  const blink::WebTouchEvent* touch_out =
+      static_cast<const blink::WebTouchEvent*>(event_out.get());
+  ASSERT_TRUE(touch_out);
+  EXPECT_EQ(touch.type, touch_out->type);
+  ASSERT_EQ(touch.touchesLength, touch_out->touchesLength);
+  CompareWebTouchEvents(touch, *touch_out);
+}
+
+TEST_F(EventConversionTest, TouchCancel) {
+  SyntheticWebTouchEvent touch;
+  touch.PressPoint(1.f, 2.f);
+  touch.ResetPoints();
+  touch.PressPoint(3.f, 4.f);
+  touch.ResetPoints();
+  touch.CancelPoint(1);
+  touch.CancelPoint(0);
+
+  std::vector<ppapi::InputEventData> pp_events;
+  CreateInputEventData(touch, &pp_events);
+  ASSERT_EQ(1U, pp_events.size());
+
+  const ppapi::InputEventData& pp_event = pp_events[0];
+  ASSERT_EQ(PP_INPUTEVENT_TYPE_TOUCHCANCEL, pp_event.event_type);
+  ASSERT_EQ(0U, pp_event.touches.size());
+  ASSERT_EQ(2U, pp_event.changed_touches.size());
+  ASSERT_EQ(2U, pp_event.target_touches.size());
+
+  scoped_ptr<blink::WebInputEvent> event_out(CreateWebInputEvent(pp_event));
+  const blink::WebTouchEvent* touch_out =
+      static_cast<const blink::WebTouchEvent*>(event_out.get());
+  ASSERT_TRUE(touch_out);
+  EXPECT_EQ(touch.type, touch_out->type);
+  EXPECT_EQ(touch.touchesLength, touch_out->touchesLength);
+  CompareWebTouchEvents(touch, *touch_out);
+}
+
+}  // namespace content