Gesture related changes for views:

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/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
@@ skipping 151 matching lines @@
       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),
+      is_touch_down_(false),
       last_mouse_event_was_move_(false) {
 }
 
 Widget::~Widget() {
   while (!event_stack_.empty()) {
     event_stack_.top()->reset();
     event_stack_.pop();
   }
 
   DestroyRootView();
@@ skipping 635 matching lines @@
 }
 
 const NativeWidget* Widget::native_widget() const {
   return native_widget_;
 }
 
 NativeWidget* Widget::native_widget() {
   return native_widget_;
 }
 
-void Widget::SetMouseCapture(views::View* view) {
-  is_mouse_button_pressed_ = true;
+void Widget::SetCapture(views::View* view) {
+  if (internal::NativeWidgetPrivate::IsMouseButtonDown())
+    is_mouse_button_pressed_ = true;
+  if (internal::NativeWidgetPrivate::IsTouchDown())
+    is_touch_down_ = true;
   root_view_->SetMouseHandler(view);
   if (!native_widget_->HasCapture())
     native_widget_->SetCapture();
 }
 
-void Widget::ReleaseMouseCapture() {
+void Widget::ReleaseCapture() {
   if (native_widget_->HasCapture())
     native_widget_->ReleaseCapture();
 }
 
+bool Widget::HasCapture() {
+  return native_widget_->HasCapture();
+}
+
 const Event* Widget::GetCurrentEvent() {
   return event_stack_.empty() ? NULL : event_stack_.top()->event();
 }
 
 void Widget::TooltipTextChanged(View* view) {
   TooltipManager* manager = native_widget_private()->GetTooltipManager();
   if (manager)
     manager->TooltipTextChanged(view);
 }
 
@@ skipping 231 matching lines @@
     case ui::ET_MOUSEWHEEL:
       return GetRootView()->OnMouseWheel(
           reinterpret_cast<const MouseWheelEvent&>(event));
     default:
       return false;
   }
   return true;
 }
 
 void Widget::OnMouseCaptureLost() {
-  if (is_mouse_button_pressed_)
+  if (is_mouse_button_pressed_ || is_touch_down_)
     GetRootView()->OnMouseCaptureLost();
+  is_touch_down_ = false;
   is_mouse_button_pressed_ = false;
 }
 
 ui::TouchStatus Widget::OnTouchEvent(const TouchEvent& event) {
   ScopedEvent scoped(this, event);
   return GetRootView()->OnTouchEvent(event);
 }
 
 ui::GestureStatus Widget::OnGestureEvent(const GestureEvent& event) {
   ScopedEvent scoped(this, event);
+  switch (event.type()) {
+    case ui::ET_GESTURE_TAP_DOWN:
+      is_touch_down_ = true;
+      // We explicitly don't capture here. Not capturing enables multiple
+      // widgets to get tap events at the same time. Views (such as tab
+      // dragging) may explicitly capture.
+      break;
+
+    case ui::ET_GESTURE_TAP_UP:
+      is_touch_down_ = false;
+      ReleaseCapture();
+      break;
+
+    default:
+      break;
+  }
   return GetRootView()->OnGestureEvent(event);
 }
 
 bool Widget::ExecuteCommand(int command_id) {
   return widget_delegate_->ExecuteWindowsCommand(command_id);
 }
 
 InputMethod* Widget::GetInputMethodDirect() {
   return input_method_.get();
 }
@@ skipping 149 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views