touch: Gesture manager receives the touch-sequence status.

views/view_unittest.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 <map>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
@@ skipping 160 matching lines @@
   View* child_;
 
   // MouseEvent
   int last_mouse_event_type_;
   gfx::Point location_;
 
 #if defined(TOUCH_UI)
   // TouchEvent
   int last_touch_event_type_;
   bool last_touch_event_was_handled_;
+  bool in_touch_sequence_;
 #endif
 
   // Painting
   SkRect last_clip_;
 
   // Accelerators
   std::map<Accelerator, int> accelerator_count_map_;
 };
 
 #if defined(TOUCH_UI)
 // Mock instance of the GestureManager for testing.
 class MockGestureManager : public GestureManager {
  public:
   // Reset all test state
   void Reset() {
     last_touch_event_ = 0;
     last_view_ = NULL;
     previously_handled_flag_ = false;
     dispatched_synthetic_event_ = false;
   }
 
   bool ProcessTouchEventForGesture(const TouchEvent& event,
                                    View* source,
-                                   bool previouslyHandled);
+                                   View::TouchStatus status);
   MockGestureManager();
 
   bool previously_handled_flag_;
   int last_touch_event_;
   View *last_view_;
   bool dispatched_synthetic_event_;
 
   DISALLOW_COPY_AND_ASSIGN(MockGestureManager);
 };
 
@@ skipping 192 matching lines @@
   window->CloseNow();
 }
 
 #if defined(TOUCH_UI)
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent
 ////////////////////////////////////////////////////////////////////////////////
 bool MockGestureManager::ProcessTouchEventForGesture(
     const TouchEvent& event,
     View* source,
-    bool previouslyHandled) {
-  if (previouslyHandled) {
+    View::TouchStatus status) {
+  if (status != View::TOUCH_STATUS_UNKNOWN) {
     dispatched_synthetic_event_ = false;
     return false;
   }
   last_touch_event_ =  event.GetType();
   last_view_ = source;
-  previously_handled_flag_ = previouslyHandled;
+  previously_handled_flag_ = status != View::TOUCH_STATUS_UNKNOWN;
   dispatched_synthetic_event_ = true;
   return true;
 }
 
 MockGestureManager::MockGestureManager() {
 }
 
 View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
   last_touch_event_type_ = event.GetType();
   location_.SetPoint(event.x(), event.y());
+  if (!in_touch_sequence_) {
+    if (event.GetType() == Event::ET_TOUCH_PRESSED) {
+      in_touch_sequence_ = true;
+      return TOUCH_STATUS_START;
+    }
+  } else {
+    if (event.GetType() == Event::ET_TOUCH_RELEASED) {
+      in_touch_sequence_ = false;
+      return TOUCH_STATUS_END;
+    }
+    return TOUCH_STATUS_CONTINUE;
+  }
   return last_touch_event_was_handled_ ? TOUCH_STATUS_CONTINUE :
                                          TOUCH_STATUS_UNKNOWN;
 }
 
 TEST_F(ViewTest, TouchEvent) {
   MockGestureManager* gm = new MockGestureManager();
 
   TestView* v1 = new TestView();
   v1->SetBounds(0, 0, 300, 300);
 
@@ skipping 1023 matching lines @@
 #endif
 }
 
 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) {
   // TODO(georgey): Fix the test for Linux
 #if defined(OS_WIN)
   TestChangeNativeViewHierarchy test(this);
   test.CheckChangingHierarhy();
 #endif
 }