Changes MouseEvent constructor to take changed_button_flags.

ui/aura/root_window_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 "ui/aura/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/run_loop.h"
@@ skipping 96 matching lines @@
   gfx::Rect bounds1(100, 200, kWindowWidth, kWindowHeight);
   gfx::Rect bounds2(300, 400, kWindowWidth, kWindowHeight);
   scoped_ptr<aura::Window> window1(CreateTestWindowWithDelegate(
       delegate1.get(), -1234, bounds1, root_window()));
   scoped_ptr<aura::Window> window2(CreateTestWindowWithDelegate(
       delegate2.get(), -5678, bounds2, root_window()));
 
   // Send a mouse event to window1.
   gfx::Point point(101, 201);
   ui::MouseEvent event1(
-      ui::ET_MOUSE_PRESSED, point, point, ui::EF_LEFT_MOUSE_BUTTON);
+      ui::ET_MOUSE_PRESSED, point, point, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::EF_LEFT_MOUSE_BUTTON);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&event1);
 
   // Event was tested for non-client area for the target window.
   EXPECT_EQ(1, delegate1->non_client_count());
   EXPECT_EQ(0, delegate2->non_client_count());
   // The non-client component test was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->non_client_location());
   // Mouse event was received by target window.
   EXPECT_EQ(1, delegate1->mouse_event_count());
   EXPECT_EQ(0, delegate2->mouse_event_count());
   // Event was in local coordinates.
   EXPECT_EQ(gfx::Point(1, 1), delegate1->mouse_event_location());
   // Non-client flag was set.
   EXPECT_TRUE(delegate1->mouse_event_flags() & ui::EF_IS_NON_CLIENT);
 }
 
 TEST_F(RootWindowTest, RepostEvent) {
   // Test RepostEvent in RootWindow. It only works for Mouse Press.
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
   gfx::Point point(10, 10);
   ui::MouseEvent event(
-      ui::ET_MOUSE_PRESSED, point, point, ui::EF_LEFT_MOUSE_BUTTON);
+      ui::ET_MOUSE_PRESSED, point, point, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::EF_LEFT_MOUSE_BUTTON);
   dispatcher()->RepostEvent(event);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 }
 
 // Check that we correctly track the state of the mouse buttons in response to
 // button press and release events.
 TEST_F(RootWindowTest, MouseButtonState) {
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
 
   gfx::Point location;
   scoped_ptr<ui::MouseEvent> event;
 
   // Press the left button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
       location,
+      ui::EF_LEFT_MOUSE_BUTTON,
       ui::EF_LEFT_MOUSE_BUTTON));
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Additionally press the right.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
       location,
-      ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON));
+      ui::EF_LEFT_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::EF_RIGHT_MOUSE_BUTTON));
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Release the left button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_RELEASED,
       location,
       location,
-      ui::EF_RIGHT_MOUSE_BUTTON));
+      ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::EF_LEFT_MOUSE_BUTTON));
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 
   // Release the right button.  We should ignore the Shift-is-down flag.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_RELEASED,
       location,
       location,
-      ui::EF_SHIFT_DOWN));
+      ui::EF_SHIFT_DOWN,
+      ui::EF_RIGHT_MOUSE_BUTTON));
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
 
   // Press the middle button.
   event.reset(new ui::MouseEvent(
       ui::ET_MOUSE_PRESSED,
       location,
       location,
+      ui::EF_MIDDLE_MOUSE_BUTTON,
       ui::EF_MIDDLE_MOUSE_BUTTON));
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(event.get());
   EXPECT_TRUE(Env::GetInstance()->IsMouseButtonDown());
 }
 
 TEST_F(RootWindowTest, TranslatedEvent) {
   scoped_ptr<Window> w1(test::CreateTestWindowWithDelegate(NULL, 1,
       gfx::Rect(50, 50, 100, 100), root_window()));
 
   gfx::Point origin(100, 100);
-  ui::MouseEvent root(ui::ET_MOUSE_PRESSED, origin, origin, 0);
+  ui::MouseEvent root(ui::ET_MOUSE_PRESSED, origin, origin, 0, 0);
 
   EXPECT_EQ("100,100", root.location().ToString());
   EXPECT_EQ("100,100", root.root_location().ToString());
 
   ui::MouseEvent translated_event(
       root, static_cast<Window*>(root_window()), w1.get(),
       ui::ET_MOUSE_ENTERED, root.flags());
   EXPECT_EQ("50,50", translated_event.location().ToString());
   EXPECT_EQ("100,100", translated_event.root_location().ToString());
 }
@@ skipping 345 matching lines @@
   // over |window| and verify |window| gets it (|window| gets it because it has
   // capture).
   EXPECT_FALSE(Env::GetInstance()->IsMouseButtonDown());
   scoped_ptr<Window> window(CreateNormalWindow(1, root_window(), NULL));
   window->SetBounds(gfx::Rect(20, 20, 40, 30));
   EventFilterRecorder* recorder = new EventFilterRecorder;
   window->SetEventFilter(recorder);  // Takes ownership.
   window->SetCapture();
   const ui::MouseEvent press_event(
       ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
-      ui::EF_LEFT_MOUSE_BUTTON);
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
   dispatcher()->RepostEvent(press_event);
   RunAllPendingInMessageLoop();  // Necessitated by RepostEvent().
   // Mouse moves/enters may be generated. We only care about a pressed.
   EXPECT_TRUE(EventTypesToString(recorder->events()).find("MOUSE_PRESSED") !=
               std::string::npos) << EventTypesToString(recorder->events());
 }
 
 TEST_F(RootWindowTest, MouseMovesHeld) {
   EventFilterRecorder* filter = new EventFilterRecorder;
   root_window()->SetEventFilter(filter);  // passes ownership
 
   test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1, gfx::Rect(0, 0, 100, 100), root_window()));
 
   ui::MouseEvent mouse_move_event(ui::ET_MOUSE_MOVED, gfx::Point(0, 0),
-                                  gfx::Point(0, 0), 0);
+                                  gfx::Point(0, 0), 0, 0);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_move_event);
   // Discard MOUSE_ENTER.
   filter->events().clear();
 
   dispatcher()->HoldPointerMoves();
 
   // Check that we don't immediately dispatch the MOUSE_DRAGGED event.
   ui::MouseEvent mouse_dragged_event(ui::ET_MOUSE_DRAGGED, gfx::Point(0, 0),
-                                     gfx::Point(0, 0), 0);
+                                     gfx::Point(0, 0), 0, 0);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_dragged_event);
   EXPECT_TRUE(filter->events().empty());
 
   // Check that we do dispatch the held MOUSE_DRAGGED event before another type
   // of event.
   ui::MouseEvent mouse_pressed_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                                     gfx::Point(0, 0), 0);
+                                     gfx::Point(0, 0), 0, 0);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(filter->events()));
   filter->events().clear();
 
   // Check that we coalesce held MOUSE_DRAGGED events.
   ui::MouseEvent mouse_dragged_event2(ui::ET_MOUSE_DRAGGED, gfx::Point(1, 1),
-                                      gfx::Point(1, 1), 0);
+                                      gfx::Point(1, 1), 0, 0);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_dragged_event);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_dragged_event2);
   EXPECT_TRUE(filter->events().empty());
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(
       &mouse_pressed_event);
   EXPECT_EQ("MOUSE_DRAGGED MOUSE_PRESSED",
             EventTypesToString(filter->events()));
   filter->events().clear();
@@ skipping 100 matching lines @@
   test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
   window->SetCapture();
 
   test::TestCursorClient cursor_client(root_window());
 
   // Dispatch a non-synthetic mouse event when mouse events are enabled.
   ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), 0);
+                        gfx::Point(10, 10), 0, 0);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse1);
   EXPECT_FALSE(filter->events().empty());
   filter->events().clear();
 
   // Dispatch a synthetic mouse event when mouse events are enabled.
   ui::MouseEvent mouse2(ui::ET_MOUSE_MOVED, gfx::Point(10, 10),
-                        gfx::Point(10, 10), ui::EF_IS_SYNTHESIZED);
+                        gfx::Point(10, 10), ui::EF_IS_SYNTHESIZED, 0);
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse2);
   EXPECT_FALSE(filter->events().empty());
   filter->events().clear();
 
   // Dispatch a synthetic mouse event when mouse events are disabled.
   cursor_client.DisableMouseEvents();
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse2);
   EXPECT_TRUE(filter->events().empty());
 }
 
 // Tests that a mouse exit is dispatched to the last known cursor location
 // when the cursor becomes invisible.
 TEST_F(RootWindowTest, DispatchMouseExitWhenCursorHidden) {
   EventFilterRecorder* filter = new EventFilterRecorder;
   root_window()->SetEventFilter(filter);  // passes ownership
 
   test::TestWindowDelegate delegate;
   gfx::Point window_origin(7, 18);
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(
       &delegate, 1234, gfx::Rect(window_origin,
       gfx::Size(100, 100)), root_window()));
   window->Show();
 
   // Dispatch a mouse move event into the window.
   gfx::Point mouse_location(gfx::Point(15, 25));
   ui::MouseEvent mouse1(ui::ET_MOUSE_MOVED, mouse_location,
-                        mouse_location, 0);
+                        mouse_location, 0, 0);
   EXPECT_TRUE(filter->events().empty());
   dispatcher()->AsRootWindowHostDelegate()->OnHostMouseEvent(&mouse1);
   EXPECT_FALSE(filter->events().empty());
   filter->events().clear();
 
   // Hide the cursor and verify a mouse exit was dispatched.
   dispatcher()->OnCursorVisibilityChanged(false);
   EXPECT_FALSE(filter->events().empty());
   EXPECT_EQ("MOUSE_EXITED", EventTypesToString(filter->events()));
 
@@ skipping 474 matching lines @@
   virtual ~DontResetHeldEventWindowDelegate() {}
 
   int mouse_event_count() const { return mouse_event_count_; }
 
   // TestWindowDelegate:
   virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     if ((event->flags() & ui::EF_SHIFT_DOWN) != 0 &&
         mouse_event_count_++ == 0) {
       ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED,
                                  gfx::Point(10, 10), gfx::Point(10, 10),
-                                 ui::EF_SHIFT_DOWN);
+                                 ui::EF_SHIFT_DOWN, 0);
       root_->GetDispatcher()->RepostEvent(mouse_event);
     }
   }
 
  private:
   Window* root_;
   int mouse_event_count_;
 
   DISALLOW_COPY_AND_ASSIGN(DontResetHeldEventWindowDelegate);
 };
 
 }  // namespace
 
 // Verifies RootWindow doesn't reset |RootWindow::held_repostable_event_| after
 // dispatching. This is done by using DontResetHeldEventWindowDelegate, which
 // tracks the number of events with ui::EF_SHIFT_DOWN set (all reposted events
 // have EF_SHIFT_DOWN). When the first event is seen RepostEvent() is used to
 // schedule another reposted event.
 TEST_F(RootWindowTest, DontResetHeldEvent) {
   DontResetHeldEventWindowDelegate delegate(root_window());
   scoped_ptr<Window> w1(CreateNormalWindow(1, root_window(), &delegate));
   RootWindowHostDelegate* root_window_delegate =
       static_cast<RootWindowHostDelegate*>(root_window()->GetDispatcher());
   w1->SetBounds(gfx::Rect(0, 0, 40, 40));
   ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED,
                          gfx::Point(10, 10), gfx::Point(10, 10),
-                         ui::EF_SHIFT_DOWN);
+                         ui::EF_SHIFT_DOWN, 0);
   root_window()->GetDispatcher()->RepostEvent(pressed);
   ui::MouseEvent pressed2(ui::ET_MOUSE_PRESSED,
-                          gfx::Point(10, 10), gfx::Point(10, 10), 0);
+                          gfx::Point(10, 10), gfx::Point(10, 10), 0, 0);
   // Invoke OnHostMouseEvent() to flush event scheduled by way of RepostEvent().
   root_window_delegate->OnHostMouseEvent(&pressed2);
   // Delegate should have seen reposted event (identified by way of
   // EF_SHIFT_DOWN). Invoke OnHostMouseEvent() to flush the second
   // RepostedEvent().
   EXPECT_EQ(1, delegate.mouse_event_count());
   root_window_delegate->OnHostMouseEvent(&pressed2);
   EXPECT_EQ(2, delegate.mouse_event_count());
 }
 
@@ skipping 46 matching lines @@
   // Should be deleted by |delegate|.
   RootWindow* r2 =
       new RootWindow(RootWindow::CreateParams(gfx::Rect(0, 0, 100, 100)));
   r2->Init();
   DeleteRootFromHeldMouseEventDelegate delegate(r2);
   // Owned by |r2|.
   Window* w1 = CreateNormalWindow(1, r2->window(), &delegate);
   w1->SetBounds(gfx::Rect(0, 0, 40, 40));
   ui::MouseEvent pressed(ui::ET_MOUSE_PRESSED,
                          gfx::Point(10, 10), gfx::Point(10, 10),
-                         ui::EF_SHIFT_DOWN);
+                         ui::EF_SHIFT_DOWN, 0);
   r2->RepostEvent(pressed);
   // RunAllPendingInMessageLoop() to make sure the |pressed| is run.
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(delegate.got_mouse_event());
   EXPECT_TRUE(delegate.got_destroy());
 }
 
 TEST_F(RootWindowTest, WindowHideCancelsActiveTouches) {
   EventFilterRecorder* filter = new EventFilterRecorder;
   root_window()->SetEventFilter(filter);  // passes ownership
@@ skipping 98 matching lines @@
 class RootWindowTestWithMessageLoop : public RootWindowTest {
  public:
   RootWindowTestWithMessageLoop() {}
   virtual ~RootWindowTestWithMessageLoop() {}
 
   void RunTest() {
     // Start a nested message-loop, post an event to be dispatched, and then
     // terminate the message-loop. When the message-loop unwinds and gets back,
     // the reposted event should not have fired.
     ui::MouseEvent mouse(ui::ET_MOUSE_PRESSED, gfx::Point(10, 10),
-                         gfx::Point(10, 10), ui::EF_NONE);
+                         gfx::Point(10, 10), ui::EF_NONE, ui::EF_NONE);
     message_loop()->PostTask(FROM_HERE,
                              base::Bind(&RootWindow::RepostEvent,
                                         base::Unretained(dispatcher()),
                                         mouse));
     message_loop()->PostTask(FROM_HERE,
                              message_loop()->QuitClosure());
 
     base::MessageLoop::ScopedNestableTaskAllower allow(message_loop());
     base::RunLoop loop;
     loop.Run();
@@ skipping 30 matching lines @@
   CHECK(!message_loop()->is_running());
   // Perform the test in a callback, so that it runs after the message-loop
   // starts.
   message_loop()->PostTask(FROM_HERE,
                            base::Bind(&RootWindowTestWithMessageLoop::RunTest,
                                       base::Unretained(this)));
   message_loop()->Run();
 }
 
 }  // namespace aura