Revert of Do not interchange MOUSE_MOVED and MOUSE_DRAGGED events in Widget

ui/views/widget/widget.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/views/widget/widget.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 150 matching lines @@
       ownership_(InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       is_secondary_widget_(true),
       frame_type_(FRAME_TYPE_DEFAULT),
       disable_inactive_rendering_(false),
       widget_closed_(false),
       saved_show_state_(ui::SHOW_STATE_DEFAULT),
       focus_on_creation_(true),
       is_top_level_(false),
       native_widget_initialized_(false),
       native_widget_destroyed_(false),
+      is_mouse_button_pressed_(false),
       ignore_capture_loss_(false),
       last_mouse_event_was_move_(false),
       auto_release_capture_(true),
       root_layers_dirty_(false),
       movement_disabled_(false),
       observer_manager_(this) {
 }
 
 Widget::~Widget() {
   DestroyRootView();
@@ skipping 162 matching lines @@
 
   widget_delegate_ = params.delegate ?
       params.delegate : new DefaultWidgetDelegate(this);
   widget_delegate_->set_can_activate(can_activate);
 
   ownership_ = params.ownership;
   native_widget_ = CreateNativeWidget(params.native_widget, this)->
                    AsNativeWidgetPrivate();
   root_view_.reset(CreateRootView());
   default_theme_provider_.reset(new ui::DefaultThemeProvider);
+  if (params.type == InitParams::TYPE_MENU) {
+    is_mouse_button_pressed_ =
+        internal::NativeWidgetPrivate::IsMouseButtonDown();
+  }
   native_widget_->InitNativeWidget(params);
   if (RequiresNonClientView(params.type)) {
     non_client_view_ = new NonClientView;
     non_client_view_->SetFrameView(CreateNonClientFrameView());
     // Create the ClientView, add it to the NonClientView and add the
     // NonClientView to the RootView. This will cause everything to be parented.
     non_client_view_->set_client_view(widget_delegate_->CreateClientView(this));
     non_client_view_->SetOverlayView(widget_delegate_->CreateOverlayView());
     SetContentsView(non_client_view_);
     // Initialize the window's title before setting the window's initial bounds;
@@ skipping 573 matching lines @@
 
 void Widget::SetCapture(View* view) {
   if (!native_widget_->HasCapture()) {
     native_widget_->SetCapture();
 
     // Early return if setting capture was unsuccessful.
     if (!native_widget_->HasCapture())
       return;
   }
 
+  if (internal::NativeWidgetPrivate::IsMouseButtonDown())
+    is_mouse_button_pressed_ = true;
   root_view_->SetMouseHandler(view);
 }
 
 void Widget::ReleaseCapture() {
   if (native_widget_->HasCapture())
     native_widget_->ReleaseCapture();
 }
 
 bool Widget::HasCapture() {
   return native_widget_->HasCapture();
@@ skipping 220 matching lines @@
 }
 
 void Widget::OnKeyEvent(ui::KeyEvent* event) {
   SendEventToProcessor(event);
 }
 
 // TODO(tdanderson): We should not be calling the OnMouse*() functions on
 //                   RootView from anywhere in Widget. Use
 //                   SendEventToProcessor() instead. See crbug.com/348087.
 void Widget::OnMouseEvent(ui::MouseEvent* event) {
-  if (event->type() != ui::ET_MOUSE_MOVED)
-    last_mouse_event_was_move_ = false;
-
   View* root_view = GetRootView();
   switch (event->type()) {
     case ui::ET_MOUSE_PRESSED: {
+      last_mouse_event_was_move_ = false;
+
       // We may get deleted by the time we return from OnMousePressed. So we
       // use an observer to make sure we are still alive.
       WidgetDeletionObserver widget_deletion_observer(this);
 
       // Make sure we're still visible before we attempt capture as the mouse
       // press processing may have made the window hide (as happens with menus).
 
       // It is possible for a View to show a context menu on mouse-press. Since
       // the menu does a capture and starts a nested message-loop, the release
       // would go to the menu. The next click (i.e. both mouse-press and release
       // events) also go to the menu. The menu (and the nested message-loop)
       // gets closed after this second release event. The code then resumes from
       // here. So make sure that the mouse-button is still down before doing a
       // capture.
       if (root_view && root_view->OnMousePressed(*event) &&
           widget_deletion_observer.IsWidgetAlive() && IsVisible() &&
           internal::NativeWidgetPrivate::IsMouseButtonDown()) {
+        is_mouse_button_pressed_ = true;
         if (!native_widget_->HasCapture())
           native_widget_->SetCapture();
         event->SetHandled();
       }
       return;
     }
 
     case ui::ET_MOUSE_RELEASED:
+      last_mouse_event_was_move_ = false;
+      is_mouse_button_pressed_ = false;
       // Release capture first, to avoid confusion if OnMouseReleased blocks.
       if (auto_release_capture_ && native_widget_->HasCapture()) {
         base::AutoReset<bool> resetter(&ignore_capture_loss_, true);
         native_widget_->ReleaseCapture();
       }
       if (root_view)
         root_view->OnMouseReleased(*event);
       if ((event->flags() & ui::EF_IS_NON_CLIENT) == 0)
         event->SetHandled();
       return;
 
     case ui::ET_MOUSE_MOVED:
-      if (!last_mouse_event_was_move_ ||
-          last_mouse_event_position_ != event->location()) {
+    case ui::ET_MOUSE_DRAGGED:
+      if (native_widget_->HasCapture() && is_mouse_button_pressed_) {
+        last_mouse_event_was_move_ = false;
+        if (root_view)
+          root_view->OnMouseDragged(*event);
+      } else if (!last_mouse_event_was_move_ ||
+                 last_mouse_event_position_ != event->location()) {
         last_mouse_event_position_ = event->location();
         last_mouse_event_was_move_ = true;
         if (root_view)
           root_view->OnMouseMoved(*event);
       }
       return;
 
-    case ui::ET_MOUSE_DRAGGED:
-      if (root_view)
-        root_view->OnMouseDragged(*event);
-      return;
-
     case ui::ET_MOUSE_EXITED:
+      last_mouse_event_was_move_ = false;
       if (root_view)
         root_view->OnMouseExited(*event);
       return;
 
     case ui::ET_MOUSEWHEEL:
       if (root_view && root_view->OnMouseWheel(
           static_cast<const ui::MouseWheelEvent&>(*event)))
         event->SetHandled();
       return;
 
     default:
       return;
   }
 }
 
 void Widget::OnMouseCaptureLost() {
   if (ignore_capture_loss_)
     return;
 
   View* root_view = GetRootView();
   if (root_view)
     root_view->OnMouseCaptureLost();
+  is_mouse_button_pressed_ = false;
 }
 
 void Widget::OnScrollEvent(ui::ScrollEvent* event) {
   ui::ScrollEvent event_copy(*event);
   SendEventToProcessor(&event_copy);
 
   // Convert unhandled ui::ET_SCROLL events into ui::ET_MOUSEWHEEL events.
   if (!event_copy.handled() && event_copy.type() == ui::ET_SCROLL) {
     ui::MouseWheelEvent wheel(*event);
     OnMouseEvent(&wheel);
@@ skipping 234 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views