Consolidate Widget Event code, other cleanup.

views/widget/widget.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/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "views/focus/view_storage.h"
@@ skipping 29 matching lines @@
       delete_on_destroy(true),
       mirror_origin_in_rtl(true),
       has_dropshadow(false),
       native_widget(NULL) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, public:
 
 Widget::Widget()
-    : native_widget_(NULL),
+    : is_mouse_button_pressed_(false),
+      last_mouse_event_was_move_(false),
+      native_widget_(NULL),
       widget_delegate_(NULL),
       dragged_view_(NULL) {
 }
 
 Widget::~Widget() {
 }
 
 // Unconverted methods (see header) --------------------------------------------
 
 void Widget::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
@@ skipping 235 matching lines @@
 
 bool Widget::HasFocusManager() const {
   return !!focus_manager_.get();
 }
 
 void Widget::OnNativeWidgetPaint(gfx::Canvas* canvas) {
   GetRootView()->Paint(canvas);
   RefreshCompositeTree();
 }
 
+bool Widget::OnMouseEvent(const MouseEvent& event) {
+  switch (event.type()) {
+    case ui::ET_MOUSE_PRESSED:
+      last_mouse_event_was_move_ = false;
+      if (GetRootView()->OnMousePressed(event)) {
+        is_mouse_button_pressed_ = true;
+        if (!native_widget_->HasMouseCapture())
+          native_widget_->SetMouseCapture();
+        return true;
+      }
+      return false;
+    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 (native_widget_->HasMouseCapture() &&
+          native_widget_->ShouldReleaseCaptureOnMouseReleased()) {
+        native_widget_->ReleaseMouseCapture();
+      }
+      GetRootView()->OnMouseReleased(event);
+      return (event.flags() & ui::EF_IS_NON_CLIENT) ? false : true;
+    case ui::ET_MOUSE_MOVED:
+    case ui::ET_MOUSE_DRAGGED:
+      if (native_widget_->HasMouseCapture() && is_mouse_button_pressed_) {
+        last_mouse_event_was_move_ = false;
+        GetRootView()->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;
+        GetRootView()->OnMouseMoved(event);
+      }
+      return false;
+    case ui::ET_MOUSE_EXITED:
+      last_mouse_event_was_move_ = false;
+      GetRootView()->OnMouseExited(event);
+      return false;
+    default:
+      return false;
+  }
+  return true;
+}
+
+void Widget::OnMouseCaptureLost() {
+  if (is_mouse_button_pressed_)
+    GetRootView()->OnMouseCaptureLost();
+  is_mouse_button_pressed_ = false;
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, FocusTraversable implementation:
 
 FocusSearch* Widget::GetFocusSearch() {
   return root_view_->GetFocusSearch();
 }
 
 FocusTraversable* Widget::GetFocusTraversableParent() {
   // We are a proxy to the root view, so we should be bypassed when traversing
   // up and as a result this should not be called.
@@ skipping 53 matching lines @@
   // TODO(sad): If there is a parent Widget, then use the same compositor
   //            instead of creating a new one here.
   gfx::AcceleratedWidget widget = native_widget_->GetAcceleratedWidget();
   if (widget != gfx::kNullAcceleratedWidget)
     compositor_ = ui::Compositor::Create(widget);
 
   return compositor_.get() != NULL;
 }
 
 }  // namespace views