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

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 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/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
@@ skipping 349 matching lines @@
   Widget* toplevel = CreateTopLevelFramelessPlatformWidget();
   View* container = new View;
   toplevel->SetContentsView(container);
 
   EXPECT_FALSE(toplevel->HasCapture());
   toplevel->SetCapture(NULL);
   EXPECT_TRUE(toplevel->HasCapture());
 
   // By default, mouse release removes capture.
   gfx::Point click_location(45, 15);
-  ui::MouseEvent release(ui::ET_MOUSE_RELEASED, click_location, click_location,
-                         ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                         ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent release(
+      ui::ET_MOUSE_RELEASED, click_location, click_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&release);
   EXPECT_FALSE(toplevel->HasCapture());
 
   // Now a mouse release shouldn't remove capture.
   toplevel->set_auto_release_capture(false);
   toplevel->SetCapture(NULL);
   EXPECT_TRUE(toplevel->HasCapture());
   toplevel->OnMouseEvent(&release);
   EXPECT_TRUE(toplevel->HasCapture());
   toplevel->ReleaseCapture();
@@ skipping 29 matching lines @@
                        15,
                        0,
                        base::TimeDelta(),
                        ui::GestureEventDetails(ui::ET_GESTURE_END));
   toplevel->OnGestureEvent(&tap_down);
 
   // Now try to click on |mouse|. Since |gesture| will have capture, |mouse|
   // will not receive the event.
   gfx::Point click_location(45, 15);
 
-  ui::MouseEvent press(ui::ET_MOUSE_PRESSED, click_location, click_location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
-  ui::MouseEvent release(ui::ET_MOUSE_RELEASED, click_location, click_location,
-                         ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                         ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent press(
+      ui::ET_MOUSE_PRESSED, click_location, click_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
+  ui::MouseEvent release(
+      ui::ET_MOUSE_RELEASED, click_location, click_location,
+      ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   EXPECT_TRUE(toplevel->HasCapture());
 
   toplevel->OnMouseEvent(&press);
   toplevel->OnMouseEvent(&release);
   EXPECT_EQ(0, mouse->pressed());
 
   EXPECT_FALSE(toplevel->HasCapture());
 
   // The end of the gesture should release the capture, and pressing on |mouse|
@@ skipping 25 matching lines @@
   View* container = new NestedLoopCaptureView(second);
   first->SetContentsView(container);
 
   second->SetContentsView(new ExitLoopOnRelease());
 
   first->SetSize(gfx::Size(100, 100));
   first->Show();
 
   gfx::Point location(20, 20);
   base::MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(&Widget::OnMouseEvent, base::Unretained(second),
-                            base::Owned(new ui::MouseEvent(
-                                ui::ET_MOUSE_RELEASED, location, location,
-                                ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                                ui::EF_LEFT_MOUSE_BUTTON))));
-  ui::MouseEvent press(ui::ET_MOUSE_PRESSED, location, location,
-                       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
-                       ui::EF_LEFT_MOUSE_BUTTON);
+      FROM_HERE,
+      base::Bind(
+          &Widget::OnMouseEvent, base::Unretained(second),
+          base::Owned(new ui::MouseEvent(
+              ui::ET_MOUSE_RELEASED, location, location, ui::EventTimeForNow(),
+              ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+              ui::PointerEventDetails(
+                  ui::EventPointerType::POINTER_TYPE_MOUSE)))));
+  ui::MouseEvent press(
+      ui::ET_MOUSE_PRESSED, location, location, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   first->OnMouseEvent(&press);
   EXPECT_FALSE(first->HasCapture());
   first->Close();
   RunPendingMessages();
 }
 
 // Tests some grab/ungrab events.
 // TODO(estade): can this be enabled now that this is an interactive ui test?
 TEST_F(WidgetTestInteractive, DISABLED_GrabUngrab) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
@@ skipping 10 matching lines @@
   child2->SetBounds(gfx::Rect(200, 10, 200, 200));
   view = new MouseView();
   view->SetBounds(0, 0, 200, 200);
   child2->GetRootView()->AddChildView(view);
 
   toplevel->Show();
   RunPendingMessages();
 
   // Click on child1
   gfx::Point p1(45, 45);
-  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));
   toplevel->OnMouseEvent(&pressed);
 
   EXPECT_TRUE(toplevel->HasCapture());
   EXPECT_TRUE(child1->HasCapture());
   EXPECT_FALSE(child2->HasCapture());
 
-  ui::MouseEvent released(ui::ET_MOUSE_RELEASED, p1, p1, ui::EventTimeForNow(),
-                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent released(
+      ui::ET_MOUSE_RELEASED, p1, p1, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&released);
 
   EXPECT_FALSE(toplevel->HasCapture());
   EXPECT_FALSE(child1->HasCapture());
   EXPECT_FALSE(child2->HasCapture());
 
   RunPendingMessages();
 
   // Click on child2
   gfx::Point p2(315, 45);
-  ui::MouseEvent pressed2(ui::ET_MOUSE_PRESSED, p2, p2, ui::EventTimeForNow(),
-                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent pressed2(
+      ui::ET_MOUSE_PRESSED, p2, p2, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&pressed2);
   EXPECT_TRUE(pressed2.handled());
   EXPECT_TRUE(toplevel->HasCapture());
   EXPECT_TRUE(child2->HasCapture());
   EXPECT_FALSE(child1->HasCapture());
 
-  ui::MouseEvent released2(ui::ET_MOUSE_RELEASED, p2, p2, ui::EventTimeForNow(),
-                           ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
+  ui::MouseEvent released2(
+      ui::ET_MOUSE_RELEASED, p2, p2, ui::EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&released2);
   EXPECT_FALSE(toplevel->HasCapture());
   EXPECT_FALSE(child1->HasCapture());
   EXPECT_FALSE(child2->HasCapture());
 
   toplevel->CloseNow();
 }
 
 // Tests mouse move outside of the window into the "resize controller" and back
 // will still generate an OnMouseEntered and OnMouseExited event..
 TEST_F(WidgetTestInteractive, CheckResizeControllerEvents) {
   Widget* toplevel = CreateTopLevelPlatformWidget();
 
   toplevel->SetBounds(gfx::Rect(0, 0, 100, 100));
 
   MouseView* view = new MouseView();
   view->SetBounds(90, 90, 10, 10);
   toplevel->GetRootView()->AddChildView(view);
 
   toplevel->Show();
   RunPendingMessages();
 
   // Move to an outside position.
   gfx::Point p1(200, 200);
-  ui::MouseEvent moved_out(ui::ET_MOUSE_MOVED, p1, p1, ui::EventTimeForNow(),
-                           ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent moved_out(
+      ui::ET_MOUSE_MOVED, p1, p1, ui::EventTimeForNow(), ui::EF_NONE,
+      ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&moved_out);
   EXPECT_EQ(0, view->EnteredCalls());
   EXPECT_EQ(0, view->ExitedCalls());
 
   // Move onto the active view.
   gfx::Point p2(95, 95);
-  ui::MouseEvent moved_over(ui::ET_MOUSE_MOVED, p2, p2, ui::EventTimeForNow(),
-                            ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent moved_over(
+      ui::ET_MOUSE_MOVED, p2, p2, ui::EventTimeForNow(), ui::EF_NONE,
+      ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&moved_over);
   EXPECT_EQ(1, view->EnteredCalls());
   EXPECT_EQ(0, view->ExitedCalls());
 
   // Move onto the outer resizing border.
   gfx::Point p3(102, 95);
-  ui::MouseEvent moved_resizer(ui::ET_MOUSE_MOVED, p3, p3,
-                               ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent moved_resizer(
+      ui::ET_MOUSE_MOVED, p3, p3, ui::EventTimeForNow(), ui::EF_NONE,
+      ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   toplevel->OnMouseEvent(&moved_resizer);
   EXPECT_EQ(0, view->EnteredCalls());
   EXPECT_EQ(1, view->ExitedCalls());
 
   // Move onto the view again.
   toplevel->OnMouseEvent(&moved_over);
   EXPECT_EQ(1, view->EnteredCalls());
   EXPECT_EQ(0, view->ExitedCalls());
 
   RunPendingMessages();
@@ skipping 815 matching lines @@
 
   // Set capture to widget2 and verity it gets it.
   widget2.SetCapture(widget2.GetRootView());
   EXPECT_FALSE(widget1.HasCapture());
   EXPECT_TRUE(widget2.HasCapture());
 
   widget1.GetAndClearGotMouseEvent();
   widget2.GetAndClearGotMouseEvent();
   // Send a mouse event to the RootWindow associated with |widget1|. Even though
   // |widget2| has capture, |widget1| should still get the event.
-  ui::MouseEvent mouse_event(ui::ET_MOUSE_EXITED, gfx::Point(), gfx::Point(),
-                             ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE);
+  ui::MouseEvent mouse_event(
+      ui::ET_MOUSE_EXITED, gfx::Point(), gfx::Point(), ui::EventTimeForNow(),
+      ui::EF_NONE, ui::EF_NONE,
+      ui::PointerEventDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::EventDispatchDetails details = widget1.GetNativeWindow()->
       GetHost()->event_processor()->OnEventFromSource(&mouse_event);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_TRUE(widget1.GetAndClearGotMouseEvent());
   EXPECT_FALSE(widget2.GetAndClearGotMouseEvent());
 }
 #endif  // defined(OS_WIN)
 
 class WidgetInputMethodInteractiveTest : public WidgetTestInteractive {
  public:
@@ skipping 157 matching lines @@
             widget->GetInputMethod()->GetTextInputType());
 
   textfield->SetReadOnly(true);
   EXPECT_EQ(ui::TEXT_INPUT_TYPE_NONE,
             widget->GetInputMethod()->GetTextInputType());
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views