ui: events: Add a class to hold common touch and stylus properties

ui/views/view_unittest.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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 336 matching lines @@
   internal::RootView* root =
       static_cast<internal::RootView*>(widget->GetRootView());
 
   root->AddChildView(v1);
   v1->AddChildView(v2);
 
   v1->Reset();
   v2->Reset();
 
   gfx::Point p1(110, 120);
-  ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, p1, p1, ui::EventTimeForNow(),
-                         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, p1, p1, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMousePressed(pressed);
   EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_PRESSED);
   EXPECT_EQ(v2->location_.x(), 10);
   EXPECT_EQ(v2->location_.y(), 20);
   // Make sure v1 did not receive the event
   EXPECT_EQ(v1->last_mouse_event_type_, 0);
 
   // Drag event out of bounds. Should still go to v2
   v1->Reset();
   v2->Reset();
   gfx::Point p2(50, 40);
-  ui::MouseEvent dragged(ui::ET_MOUSE_DRAGGED, p2, p2, ui::EventTimeForNow(),
-                         ui::EF_LEFT_MOUSE_BUTTON, 0);
+  ui::MouseEvent dragged(
+      ui::ET_MOUSE_DRAGGED, p2, p2, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMouseDragged(dragged);
   EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_DRAGGED);
   EXPECT_EQ(v2->location_.x(), -50);
   EXPECT_EQ(v2->location_.y(), -60);
   // Make sure v1 did not receive the event
   EXPECT_EQ(v1->last_mouse_event_type_, 0);
 
   // Releasted event out of bounds. Should still go to v2
   v1->Reset();
   v2->Reset();
-  ui::MouseEvent released(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
-                          ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent released(
+      ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
+      0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMouseDragged(released);
   EXPECT_EQ(v2->last_mouse_event_type_, ui::ET_MOUSE_RELEASED);
   EXPECT_EQ(v2->location_.x(), -100);
   EXPECT_EQ(v2->location_.y(), -100);
   // Make sure v1 did not receive the event
   EXPECT_EQ(v1->last_mouse_event_type_, 0);
 
   widget->CloseNow();
 }
 
@@ skipping 13 matching lines @@
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds = gfx::Rect(50, 50, 650, 650);
   widget->Init(params);
   View* root = widget->GetRootView();
 
   root->AddChildView(v1);
   v1->AddChildView(v2);
 
   v2->delete_on_pressed_ = true;
   gfx::Point point(110, 120);
-  ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, point, point,
-                         ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                         ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMousePressed(pressed);
   EXPECT_EQ(0, v1->child_count());
 
   widget->CloseNow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Painting
 ////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 1242 matching lines @@
   v1->Reset();
   v11->Reset();
   v111->Reset();
   v12->Reset();
   v121->Reset();
   v2->Reset();
   v21->Reset();
 
   // Move the mouse in v111.
   gfx::Point p1(6, 6);
-  ui::MouseEvent move1(ui::ET_MOUSE_MOVED, p1, p1, ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move1(
+      ui::ET_MOUSE_MOVED, p1, p1, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move1);
   EXPECT_TRUE(v111->received_mouse_enter_);
   EXPECT_FALSE(v11->last_mouse_event_type_);
   EXPECT_TRUE(v1->received_mouse_enter_);
 
   v111->Reset();
   v1->Reset();
 
   // Now, move into v121.
   gfx::Point p2(65, 21);
-  ui::MouseEvent move2(ui::ET_MOUSE_MOVED, p2, p2, ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move2(
+      ui::ET_MOUSE_MOVED, p2, p2, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move2);
   EXPECT_TRUE(v111->received_mouse_exit_);
   EXPECT_TRUE(v121->received_mouse_enter_);
   EXPECT_FALSE(v1->last_mouse_event_type_);
 
   v111->Reset();
   v121->Reset();
 
   // Now, move into v11.
   gfx::Point p3(1, 1);
-  ui::MouseEvent move3(ui::ET_MOUSE_MOVED, p3, p3, ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move3(
+      ui::ET_MOUSE_MOVED, p3, p3, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move3);
   EXPECT_TRUE(v121->received_mouse_exit_);
   EXPECT_TRUE(v11->received_mouse_enter_);
   EXPECT_FALSE(v1->last_mouse_event_type_);
 
   v121->Reset();
   v11->Reset();
 
   // Move to v21.
   gfx::Point p4(121, 15);
-  ui::MouseEvent move4(ui::ET_MOUSE_MOVED, p4, p4, ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move4(
+      ui::ET_MOUSE_MOVED, p4, p4, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move4);
   EXPECT_TRUE(v21->received_mouse_enter_);
   EXPECT_FALSE(v2->last_mouse_event_type_);
   EXPECT_TRUE(v11->received_mouse_exit_);
   EXPECT_TRUE(v1->received_mouse_exit_);
 
   v21->Reset();
   v11->Reset();
   v1->Reset();
 
   // Move to v1.
   gfx::Point p5(21, 0);
-  ui::MouseEvent move5(ui::ET_MOUSE_MOVED, p5, p5, ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent move5(
+      ui::ET_MOUSE_MOVED, p5, p5, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(move5);
   EXPECT_TRUE(v21->received_mouse_exit_);
   EXPECT_TRUE(v1->received_mouse_enter_);
 
   v21->Reset();
   v1->Reset();
 
   // Now, move into v11.
   gfx::Point p6(15, 15);
-  ui::MouseEvent mouse6(ui::ET_MOUSE_MOVED, p6, p6, ui::EventTimeForNow(), 0,
-                        0);
+  ui::MouseEvent mouse6(
+      ui::ET_MOUSE_MOVED, p6, p6, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(mouse6);
   EXPECT_TRUE(v11->received_mouse_enter_);
   EXPECT_FALSE(v1->last_mouse_event_type_);
 
   v11->Reset();
   v1->Reset();
 
   // Move back into v1. Although |v1| had already received an ENTER for mouse6,
   // and the mouse remains inside |v1| the whole time, it receives another ENTER
   // when the mouse leaves v11.
   gfx::Point p7(21, 0);
-  ui::MouseEvent mouse7(ui::ET_MOUSE_MOVED, p7, p7, ui::EventTimeForNow(), 0,
-                        0);
+  ui::MouseEvent mouse7(
+      ui::ET_MOUSE_MOVED, p7, p7, ui::EventTimeForNow(), 0, 0,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root_view->OnMouseMoved(mouse7);
   EXPECT_TRUE(v11->received_mouse_exit_);
   EXPECT_FALSE(v1->received_mouse_enter_);
 
   widget->CloseNow();
 }
 
 TEST_F(ViewTest, Textfield) {
   const base::string16 kText = ASCIIToUTF16(
       "Reality is that which, when you stop believing it, doesn't go away.");
@@ skipping 508 matching lines @@
   gfx::Transform transform(v1->GetTransform());
   RotateCounterclockwise(&transform);
   transform.matrix().set(1, 3, 500.0);
   v1->SetTransform(transform);
 
   // |v2| now occupies (100, 200) to (200, 400) in |root|.
   v1->Reset();
   v2->Reset();
 
   gfx::Point p1(110, 210);
-  ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED, p1, p1, ui::EventTimeForNow(),
-                         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent pressed(
+      ui::ET_MOUSE_PRESSED, p1, p1, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMousePressed(pressed);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
   EXPECT_EQ(190, v2->location_.x());
   EXPECT_EQ(10, v2->location_.y());
 
-  ui::MouseEvent released(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(),
-                          ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent released(
+      ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
+      0, 0, ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMouseReleased(released);
 
   // Now rotate |v2| inside |v1| clockwise.
   transform = v2->GetTransform();
   RotateClockwise(&transform);
   transform.matrix().set(0, 3, 100.f);
   v2->SetTransform(transform);
 
   // Now, |v2| occupies (100, 100) to (200, 300) in |v1|, and (100, 300) to
   // (300, 400) in |root|.
 
   v1->Reset();
   v2->Reset();
 
   gfx::Point point2(110, 320);
-  ui::MouseEvent p2(ui::ET_MOUSE_PRESSED, point2, point2, ui::EventTimeForNow(),
-                    ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent p2(
+      ui::ET_MOUSE_PRESSED, point2, point2, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMousePressed(p2);
   EXPECT_EQ(0, v1->last_mouse_event_type_);
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v2->last_mouse_event_type_);
   EXPECT_EQ(10, v2->location_.x());
   EXPECT_EQ(20, v2->location_.y());
 
   root->OnMouseReleased(released);
 
   v1->SetTransform(gfx::Transform());
   v2->SetTransform(gfx::Transform());
@@ skipping 14 matching lines @@
   transform.matrix().set(1, 1, 0.5f);
   v2->SetTransform(transform);
 
   // |v3| occupies (108, 105) to (132, 115) in |root|.
 
   v1->Reset();
   v2->Reset();
   v3->Reset();
 
   gfx::Point point(112, 110);
-  ui::MouseEvent p3(ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
-                    ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent p3(
+      ui::ET_MOUSE_PRESSED, point, point, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMousePressed(p3);
 
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
   EXPECT_EQ(10, v3->location_.x());
   EXPECT_EQ(25, v3->location_.y());
 
   root->OnMouseReleased(released);
 
   v1->SetTransform(gfx::Transform());
   v2->SetTransform(gfx::Transform());
@@ skipping 17 matching lines @@
 
   // Translate |v2| with respect to |v1|.
   transform = v2->GetTransform();
   transform.matrix().set(0, 3, 10.f);
   transform.matrix().set(1, 3, 10.f);
   v2->SetTransform(transform);
 
   // |v3| now occupies (120, 120) to (144, 130) in |root|.
 
   gfx::Point point3(124, 125);
-  ui::MouseEvent p4(ui::ET_MOUSE_PRESSED, point3, point3, ui::EventTimeForNow(),
-                    ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent p4(
+      ui::ET_MOUSE_PRESSED, point3, point3, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   root->OnMousePressed(p4);
 
   EXPECT_EQ(ui::ET_MOUSE_PRESSED, v3->last_mouse_event_type_);
   EXPECT_EQ(10, v3->location_.x());
   EXPECT_EQ(25, v3->location_.y());
 
   root->OnMouseReleased(released);
 
   widget->CloseNow();
 }
@@ skipping 1700 matching lines @@
   // notification.
   TestView* test_view_child_2 = new TestView();
   test_view->AddChildView(test_view_child_2);
   EXPECT_TRUE(test_view_child_2->native_theme_);
   EXPECT_EQ(widget->GetNativeTheme(), test_view_child_2->native_theme_);
 
   widget->CloseNow();
 }
 
 }  // namespace views