Revert of Do not interchange MOUSE_MOVED and MOUSE_DRAGGED events in Widget

ui/views/widget/widget_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 <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 3175 matching lines @@
   // Drargging. Cover HasCapture() and NativeWidgetPrivate::IsMouseButtonDown().
   generator.DragMouseTo(gfx::Point(40, 40));
   EXPECT_EQ(3, view->GetEventCount(ui::ET_MOUSE_PRESSED));
   EXPECT_EQ(3, view->GetEventCount(ui::ET_MOUSE_RELEASED));
   EXPECT_EQ(1, view->GetEventCount(ui::ET_MOUSE_DRAGGED));
   EXPECT_EQ(ui::EF_LEFT_MOUSE_BUTTON, view->last_flags());
 
   widget->CloseNow();
 }
 
-// Tests that a view does not receive entered, dragged, or moved events if
-// a mouse cursor is moved into it while the left mouse button is pressed.
-TEST_F(WidgetTest, DragIntoView) {
-  EventCountView* container = new EventCountView;
-  container->SetBounds(0, 0, 100, 80);
-
-  EventCountView* consume_view = new EventCountView;
-  consume_view->set_handle_mode(EventCountView::CONSUME_EVENTS);
-  consume_view->SetBounds(10, 10, 50, 40);
-
-  Widget* widget = CreateTopLevelFramelessPlatformWidget();
-  widget->SetBounds(gfx::Rect(0, 0, 100, 80));
-  widget->SetContentsView(container);
-  container->AddChildView(consume_view);
-
-  widget->Show();
-
-  ui::test::EventGenerator generator(GetContext(), widget->GetNativeWindow());
-  generator.set_current_location(gfx::Point(75, 15));
-
-  generator.PressLeftButton();
-  generator.MoveMouseTo(gfx::Point(20, 20));
-  EXPECT_EQ(0, consume_view->GetEventCount(ui::ET_MOUSE_ENTERED));
-  EXPECT_EQ(0, consume_view->GetEventCount(ui::ET_MOUSE_DRAGGED));
-  EXPECT_EQ(0, consume_view->GetEventCount(ui::ET_MOUSE_MOVED));
-
-  widget->CloseNow();
-}
-
-// Tests that a view receives the correct mouse events if a mouse cursor
-// is moved out of its bounds while the left mouse button is pressed.
-TEST_F(WidgetTest, DragOutOfView) {
-  EventCountView* container = new EventCountView;
-  container->SetBounds(0, 0, 100, 80);
-
-  EventCountView* consume_view = new EventCountView;
-  consume_view->set_handle_mode(EventCountView::CONSUME_EVENTS);
-  consume_view->SetBounds(10, 10, 50, 40);
-
-  Widget* widget = CreateTopLevelFramelessPlatformWidget();
-  widget->SetBounds(gfx::Rect(0, 0, 100, 80));
-  widget->SetContentsView(container);
-  container->AddChildView(consume_view);
-
-  widget->Show();
-
-  ui::test::EventGenerator generator(GetContext(), widget->GetNativeWindow());
-  generator.set_current_location(gfx::Point(20, 20));
-
-  generator.PressLeftButton();
-  EXPECT_EQ(1, consume_view->GetEventCount(ui::ET_MOUSE_PRESSED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_PRESSED));
-  consume_view->ResetCounts();
-
-  generator.MoveMouseTo(gfx::Point(70, 70));
-  EXPECT_EQ(0, consume_view->GetEventCount(ui::ET_MOUSE_EXITED));
-  EXPECT_EQ(1, consume_view->GetEventCount(ui::ET_MOUSE_DRAGGED));
-  EXPECT_EQ(0, consume_view->GetEventCount(ui::ET_MOUSE_MOVED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_ENTERED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_DRAGGED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_MOVED));
-  consume_view->ResetCounts();
-
-  generator.MoveMouseTo(gfx::Point(71, 71));
-  EXPECT_EQ(1, consume_view->GetEventCount(ui::ET_MOUSE_DRAGGED));
-  EXPECT_EQ(0, consume_view->GetEventCount(ui::ET_MOUSE_MOVED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_DRAGGED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_MOVED));
-  consume_view->ResetCounts();
-
-  generator.ReleaseLeftButton();
-  EXPECT_EQ(1, consume_view->GetEventCount(ui::ET_MOUSE_RELEASED));
-  EXPECT_EQ(0, container->GetEventCount(ui::ET_MOUSE_RELEASED));
-  consume_view->ResetCounts();
-
-  widget->CloseNow();
-}
-
 // Tests that the root view is correctly set up for Widget types that do not
 // require a non-client view, before any other views are added to the widget.
 // That is, before Widget::ReorderNativeViews() is called which, if called with
 // a root view not set, could cause the root view to get resized to the widget.
 TEST_F(WidgetTest, NonClientWindowValidAfterInit) {
   Widget* widget = CreateTopLevelFramelessPlatformWidget();
   View* root_view = widget->GetRootView();
 
   // Size the root view to exceed the widget bounds.
   const gfx::Rect test_rect(0, 0, 500, 500);
   root_view->SetBoundsRect(test_rect);
 
   EXPECT_NE(test_rect.size(), widget->GetWindowBoundsInScreen().size());
 
   EXPECT_EQ(test_rect, root_view->bounds());
   widget->ReorderNativeViews();
   EXPECT_EQ(test_rect, root_view->bounds());
 
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views