touch: Gesture manager receives the touch-sequence status.

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 297 matching lines @@
 #if defined(TOUCH_UI)
 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_);
     status = touch_pressed_handler_->ProcessTouchEvent(touch_event);
-    gesture_manager_->ProcessTouchEventForGesture(e, this, true);
+    gesture_manager_->ProcessTouchEventForGesture(e, this, status);

[sadrul, 2011/01/18 19:33:30]

Should the status fall through, or do we always want to send
TOUCH_STATUS_CONTINUE instead (seeing as how it always sent 'true' before)?

[rjkroege, 2011/01/18 20:01:28]

the true was a bug. This is correct. (famous last words)

     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_);
     status = touch_pressed_handler_->ProcessTouchEvent(touch_event);
 
     // If the touch didn't initiate a touch-sequence, then reset the touch event
     // handler.
     if (status != TOUCH_STATUS_START)
       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);
+    if (status != TOUCH_STATUS_UNKNOWN) {
+      gesture_manager_->ProcessTouchEventForGesture(e, this, status);
       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);
+  gesture_manager_->ProcessTouchEventForGesture(e, this, status);
   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.
@@ skipping 415 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