Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/widget/root_view.cc

 // Copyright (c) 2011 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 "views/widget/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 64 matching lines @@
   Layout();
 }
 
 void RootView::NotifyNativeViewHierarchyChanged(bool attached,
                                                 gfx::NativeView native_view) {
   PropagateNativeViewHierarchyChanged(attached, native_view, this);
 }
 
 // Input -----------------------------------------------------------------------
 
-void RootView::ProcessMouseDragCanceled() {
-  if (mouse_pressed_handler_) {
-    // Synthesize a release event.
-    MouseEvent release_event(ui::ET_MOUSE_RELEASED, last_mouse_event_x_,
-        last_mouse_event_y_, last_mouse_event_flags_);
-    OnMouseReleased(release_event, true);
-  }
-}
-
 bool RootView::ProcessKeyEvent(const KeyEvent& event) {
   bool consumed = false;
 
   View* v = GetFocusManager()->GetFocusedView();
   // Special case to handle right-click context menus triggered by the
   // keyboard.
   if (v && v->IsEnabled() && ((event.key_code() == ui::VKEY_APPS) ||
      (event.key_code() == ui::VKEY_F10 && event.IsShiftDown()))) {
     v->ShowContextMenu(v->GetKeyboardContextMenuLocation(), false);
     return true;
@@ skipping 150 matching lines @@
     SetMouseLocationAndFlags(e);
 
     gfx::Point p;
     ConvertPointToMouseHandler(e.location(), &p);
     MouseEvent mouse_event(e.type(), p.x(), p.y(), e.flags());
     return mouse_pressed_handler_->ProcessMouseDragged(mouse_event, &drag_info);
   }
   return false;
 }
 
-void RootView::OnMouseReleased(const MouseEvent& event, bool canceled) {
+void RootView::OnMouseReleased(const MouseEvent& event) {
   MouseEvent e(event, this);
   UpdateCursor(e);
 
   if (mouse_pressed_handler_) {
     gfx::Point p;
     ConvertPointToMouseHandler(e.location(), &p);
     MouseEvent mouse_released(e.type(), p.x(), p.y(), e.flags());
     // We allow the view to delete us from ProcessMouseReleased. As such,
     // configure state such that we're done first, then call View.
     View* mouse_pressed_handler = mouse_pressed_handler_;
-    mouse_pressed_handler_ = NULL;
-    explicit_mouse_handler_ = false;
-    mouse_pressed_handler->ProcessMouseReleased(mouse_released, canceled);
+    SetMouseHandler(NULL);
+    mouse_pressed_handler->ProcessMouseReleased(mouse_released);
     // WARNING: we may have been deleted.
   }
 }
+
+void RootView::OnMouseCaptureLost() {
+  if (mouse_pressed_handler_) {
+    // Synthesize a release event for UpdateCursor and OnMouseReleased.
+    MouseEvent release_event(ui::ET_MOUSE_RELEASED, last_mouse_event_x_,
+                             last_mouse_event_y_, last_mouse_event_flags_);
+    UpdateCursor(release_event);
+    // We allow the view to delete us from OnMouseCaptureLost. As such,
+    // configure state such that we're done first, then call View.
+    View* mouse_pressed_handler = mouse_pressed_handler_;
+    SetMouseHandler(NULL);
+    mouse_pressed_handler->OnMouseCaptureLost();
+    // WARNING: we may have been deleted.
+  }
+}
 
 void RootView::OnMouseMoved(const MouseEvent& event) {
   MouseEvent e(event, this);
   View* v = GetEventHandlerForPoint(e.location());
   // Find the first enabled view, or the existing move handler, whichever comes
   // first.  The check for the existing handler is because if a view becomes
   // disabled while handling moves, it's wrong to suddenly send ET_MOUSE_EXITED
   // and ET_MOUSE_ENTERED events, because the mouse hasn't actually exited yet.
   while (v && !v->IsEnabled() && (v != mouse_move_handler_))
     v = v->parent();
@@ skipping 177 matching lines @@
   widget_->SetCursor(cursor);
 }
 
 void RootView::SetMouseLocationAndFlags(const MouseEvent& event) {
   last_mouse_event_flags_ = event.flags();
   last_mouse_event_x_ = event.x();
   last_mouse_event_y_ = event.y();
 }
 
 }  // namespace views