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_down_(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 278 matching lines @@
   // dialog). When gtk_widget_destroy is called on the parent, the destroy
   // signal reaches parent first and then the child. Thus causing the parent
   // WidgetGtk's dtor executed before the child's. If child's view hierarchy
   // references this focus manager, it crashes. This will defer focus manager's
   // destruction after child WidgetGtk's dtor.
   FocusManager* focus_manager = focus_manager_.release();
   if (focus_manager)
     MessageLoop::current()->DeleteSoon(FROM_HERE, focus_manager);
 }
 
+bool Widget::ProcessMousePressed(const MouseEvent& event) {
+  last_mouse_event_was_move_ = false;
+  if (GetRootView()->OnMousePressed(event)) {
+    is_mouse_down_ = true;
+    if (!native_widget_->HasMouseCapture())
+      native_widget_->SetMouseCapture();
+    return true;
+  }
+  return false;
+}
+
+bool Widget::ProcessMouseReleased(const MouseEvent& event) {
+  last_mouse_event_was_move_ = false;
+  is_mouse_down_ = false;
+
+  // Release capture first, to avoid confusion if OnMouseReleased blocks.
+  if (native_widget_->HasMouseCapture() &&
+      native_widget_->ShouldReleaseCaptureOnMouseReleased()) {
+    native_widget_->ReleaseMouseCapture();
+  }
+
+  GetRootView()->OnMouseReleased(event);
+  return true;
+}
+
+void Widget::ProcessMouseMoved(const MouseEvent& event) {
+  if (native_widget_->HasMouseCapture() && is_mouse_down_) {
+    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);
+  }
+}
+
+void Widget::ProcessMouseCaptureLost() {
+  if (is_mouse_down_)
+    GetRootView()->OnMouseCaptureLost();
+  is_mouse_down_ = false;
+}
+
 void Widget::ReplaceFocusManager(FocusManager* focus_manager) {
   focus_manager_.reset(focus_manager);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Widget, private:
 
 void Widget::RefreshCompositeTree() {
   if (!EnsureCompositor())
     return;
@@ skipping 10 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