touch: Return an enum from OnTouchEvent.

views/widget/root_view.cc

 // Copyright (c) 2010 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 "app/drag_drop_types.h"
 #include "base/logging.h"
@@ skipping 288 matching lines @@
 
     ViewStorage::GetInstance()->ViewRemoved(parent, child);
   }
 }
 
 void RootView::SetFocusOnMousePressed(bool f) {
   focus_on_mouse_pressed_ = f;
 }
 
 #if defined(TOUCH_UI)
-bool RootView::OnTouchEvent(const TouchEvent& e) {
+View::TouchStatus RootView::OnTouchEvent(const TouchEvent& e) {
   // If touch_pressed_handler_ is non null, we are currently processing
   // a touch down on the screen situation. In that case we send the
   // event to touch_pressed_handler_
+  View::TouchStatus status = TOUCH_STATUS_UNKNOWN;
 
   if (touch_pressed_handler_) {
     TouchEvent touch_event(e, this, touch_pressed_handler_);
-    touch_pressed_handler_->ProcessTouchEvent(touch_event);
+    status = touch_pressed_handler_->ProcessTouchEvent(touch_event);
     gesture_manager_->ProcessTouchEventForGesture(e, this, true);
-    return true;
+    if (status == TOUCH_STATUS_END)
+      touch_pressed_handler_ = NULL;
+    return status;
   }
 
   bool handled = false;
   // Walk up the tree until we find a view that wants the touch event.
   for (touch_pressed_handler_ = GetViewForPoint(e.location());
        touch_pressed_handler_ && (touch_pressed_handler_ != this);
        touch_pressed_handler_ = touch_pressed_handler_->GetParent()) {
     if (!touch_pressed_handler_->IsEnabled()) {
       // Disabled views eat events but are treated as not handled by the
       // the GestureManager.
       handled = false;
+      status = TOUCH_STATUS_UNKNOWN;
       break;
     }
 
     // See if this view wants to handle the touch
     TouchEvent touch_event(e, this, touch_pressed_handler_);
-    handled = touch_pressed_handler_->ProcessTouchEvent(touch_event);
+    status = touch_pressed_handler_->ProcessTouchEvent(touch_event);
+    if (status == TOUCH_STATUS_END)
+      touch_pressed_handler_ = NULL;
+
+    handled = status != TOUCH_STATUS_UNKNOWN;
 
     // The view could have removed itself from the tree when handling
     // OnTouchEvent(). So handle as per OnMousePressed. NB: we
     // assume that the RootView itself cannot be so removed.
     //
     // NOTE: Don't return true here, because we don't want the frame to
     // forward future events to us when there's no handler.
     if (!touch_pressed_handler_)
       break;
 
     // If the view handled the event, leave touch_pressed_handler_ set and
     // return true, which will cause subsequent drag/release events to get
     // forwarded to that view.
     if (handled) {
       gesture_manager_->ProcessTouchEventForGesture(e, this, handled);

[rjkroege, 2011/01/17 19:27:40]

there should probably be a TODO (and it can be for me) to change the GM to take
view::TouchStatus instead of bool handled.

[sadrul, 2011/01/18 03:50:15]

Done.

-      return true;
+      return status;
     }
   }
 
   // Reset touch_pressed_handler_ to indicate that no processing is occurring.
   touch_pressed_handler_ = NULL;
 
   // Give the touch event to the gesture manager.
   gesture_manager_->ProcessTouchEventForGesture(e, this, handled);
-  return handled;
+  return status;
 }
 #endif
 
 bool RootView::OnMousePressed(const MouseEvent& e) {
   // This function does not normally handle non-client messages except for
   // non-client double-clicks. Actually, all double-clicks are special as the
   // are formed from a single-click followed by a double-click event. When the
   // double-click event lands on a different view than its single-click part,
   // we transform it into a single-click which prevents odd things.
   if ((e.GetFlags() & MouseEvent::EF_IS_NON_CLIENT) &&
@@ skipping 414 matching lines @@
 #elif defined(OS_LINUX)
   gfx::NativeView native_view =
       static_cast<WidgetGtk*>(GetWidget())->window_contents();
   if (!native_view)
     return;
   gdk_window_set_cursor(native_view->window, cursor);
 #endif
 }
 
 }  // namespace views