Revert "[chromecast] Detect screen enter/exit and corner holds."

This reverts commit 64356c22.

Reason for revert: Downstream breakage on device.

Original change's description:
> [chromecast] Detect screen enter/exit and corner holds.
> 
>   - Adds detection and dispatch of screen entry/exit events.
>   - Adds detection of a finger press and hold in the corner.
>   - Better handling of multiple-finger events on the screen.
> 
> Bug: internal b/112073644
> Bug: internal b/112314035
> Test: unit test and manual
> Change-Id: Id2155f8e432428ee63f3457274f1507ce1edee53
> Reviewed-on: https://chromium-review.googlesource.com/1165795
> Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
> Reviewed-by: Kevin Schoedel <kpschoedel@chromium.org>
> Commit-Queue: Ryan Daum <rdaum@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#582196}

TBR=alexst@chromium.org,kpschoedel@chromium.org,rdaum@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: internal b/112073644, internal b/112314035
Change-Id: I8fc29ab7b2a7629803d1b45eff6b84bb582698c6
Reviewed-on: https://chromium-review.googlesource.com/1172562Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
Commit-Queue: Ryan Daum <rdaum@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582580}

chromecast/graphics/BUILD.gn

@@ -15,7 +15,6 @@ cast_source_set("graphics") {
 
   deps = [
     "//base",
-    "//ui/events:events",
     "//ui/gfx",
   ]
 

chromecast/graphics/cast_gesture_handler.cc

@@ -10,8 +10,4 @@ bool CastGestureHandler::CanHandleSwipe(CastSideSwipeOrigin swipe_origin) {
   return false;
 }
 
-CastGestureHandler::Corner CastGestureHandler::HandledCornerHolds() const {
-  return NO_CORNERS;
-}
-
 }  // namespace chromecast

chromecast/graphics/cast_gesture_handler.h

@@ -5,8 +5,6 @@
 #ifndef CHROMECAST_GRAPHICS_CAST_GESTURE_HANDLER_H_
 #define CHROMECAST_GRAPHICS_CAST_GESTURE_HANDLER_H_
 
-#include "ui/events/event.h"
-
 // TODO(rdaum): Move into chromecast/graphics/gestures, which will require some
 // cross-repo maneuvers.
 #include "base/macros.h"
@@ -49,37 +47,6 @@ class CastGestureHandler {
   // followed by a release, within the tap timeout window
   virtual void HandleTapGesture(const gfx::Point& touch_location) {}
 
-  // Triggered when the finger enters a side margin from inside the screen.
-  // That is, the finger is leaving the screen.
-  virtual void HandleScreenExit(CastSideSwipeOrigin side,
-                                const gfx::Point& touch_location) {}
-
-  // Triggered when the finger enters a side margin from outside the screen.
-  // That is, the finger is entering the screen.
-  virtual void HandleScreenEnter(CastSideSwipeOrigin side,
-                                 const gfx::Point& touch_location) {}
-
-  enum Corner {
-    NO_CORNERS = 0,
-    TOP_LEFT_CORNER = 1 << 0,
-    BOTTOM_LEFT_CORNER = 1 << 1,
-    TOP_RIGHT_CORNER = 1 << 2,
-    BOTTOM_RIGHT_CORNER = 1 << 3,
-  };
-
-  // Return a bitmask of the corners that this handler is interested in, if any.
-  virtual Corner HandledCornerHolds() const;
-
-  // Triggered when the finger has been held inside the corner for longer
-  // than the corner hold threshold time.
-  virtual void HandleCornerHold(Corner corner_origin,
-                                const ui::TouchEvent& touch_event) {}
-
-  // Triggered when a corner hold is ended because the finger has left the
-  // corner or has been released.
-  virtual void HandleCornerHoldEnd(Corner corner_origin,
-                                   const ui::TouchEvent& touch_event) {}
-
  private:
   DISALLOW_COPY_AND_ASSIGN(CastGestureHandler);
 };

chromecast/graphics/gestures/cast_system_gesture_dispatcher.cc

@@ -76,47 +76,4 @@ void CastSystemGestureDispatcher::HandleTapGesture(
   }
 }
 
-void CastSystemGestureDispatcher::HandleScreenExit(
-    CastSideSwipeOrigin side,
+}  // namespace chromecast
\ No newline at end of file
-    const gfx::Point& touch_location) {
-  for (auto* gesture_handler : gesture_handlers_) {
-    gesture_handler->HandleScreenExit(side, touch_location);
-  }
-}
-
-void CastSystemGestureDispatcher::HandleScreenEnter(
-    CastSideSwipeOrigin side,
-    const gfx::Point& touch_location) {
-  for (auto* gesture_handler : gesture_handlers_) {
-    gesture_handler->HandleScreenEnter(side, touch_location);
-  }
-}
-
-CastGestureHandler::Corner CastSystemGestureDispatcher::HandledCornerHolds()
-    const {
-  int corner_hold_bitmask = CastGestureHandler::NO_CORNERS;
-  for (auto* gesture_handler : gesture_handlers_) {
-    corner_hold_bitmask |= gesture_handler->HandledCornerHolds();
-  }
-  return static_cast<CastGestureHandler::Corner>(corner_hold_bitmask);
-}
-
-void CastSystemGestureDispatcher::HandleCornerHold(
-    CastGestureHandler::Corner corner_origin,
-    const ui::TouchEvent& touch_event) {
-  for (auto* gesture_handler : gesture_handlers_) {
-    if (gesture_handler->HandledCornerHolds() & corner_origin) {
-      gesture_handler->HandleCornerHold(corner_origin, touch_event);
-    }
-  }
-}
-void CastSystemGestureDispatcher::HandleCornerHoldEnd(
-    CastGestureHandler::Corner corner_origin,
-    const ui::TouchEvent& touch_event) {
-  for (auto* gesture_handler : gesture_handlers_) {
-    if (gesture_handler->HandledCornerHolds() & corner_origin) {
-      gesture_handler->HandleCornerHoldEnd(corner_origin, touch_event);
-    }
-  }
-}
-}  // namespace chromecast

chromecast/graphics/gestures/cast_system_gesture_dispatcher.h

@@ -35,15 +35,6 @@ class CastSystemGestureDispatcher : public CastGestureHandler {
                           const gfx::Point& touch_location) override;
   void HandleTapDownGesture(const gfx::Point& touch_location) override;
   void HandleTapGesture(const gfx::Point& touch_location) override;
-  void HandleScreenExit(CastSideSwipeOrigin side,
-                        const gfx::Point& touch_location) override;
-  void HandleScreenEnter(CastSideSwipeOrigin side,
-                         const gfx::Point& touch_location) override;
-  Corner HandledCornerHolds() const override;
-  void HandleCornerHold(Corner corner_origin,
-                        const ui::TouchEvent& touch_event) override;
-  void HandleCornerHoldEnd(Corner corner_origin,
-                           const ui::TouchEvent& touch_event) override;
 
  private:
   base::flat_set<CastGestureHandler*> gesture_handlers_;

chromecast/graphics/gestures/side_swipe_detector.h

@@ -6,10 +6,8 @@
 #define CHROMECAST_GRAPHICS_GESTURES_SIDE_SWIPE_DETECTOR_H_
 
 #include "base/timer/elapsed_timer.h"
-#include "base/timer/timer.h"
 #include "chromecast/graphics/cast_gesture_handler.h"
 #include "ui/events/event_rewriter.h"
-#include "ui/events/gesture_detection/gesture_detector.h"
 
 namespace aura {
 class Window;
@@ -17,10 +15,6 @@ class Window;
 
 namespace chromecast {
 
-namespace test {
-class SideSwipeDetectorTest;
-}  // namespace test
-
 // An event rewriter for detecting system-wide gestures performed on the margins
 // of the root window.
 // Recognizes swipe gestures that originate from the top, left, bottom, and
@@ -34,10 +28,8 @@ class SideSwipeDetector : public ui::EventRewriter {
 
   ~SideSwipeDetector() override;
 
-  bool GetMarginPosition(const gfx::Point& point,
-                         const gfx::Rect& screen_bounds,
-                         CastSideSwipeOrigin* side,
-                         CastGestureHandler::Corner* corner) const;
+  CastSideSwipeOrigin GetDragPosition(const gfx::Point& point,
+                                      const gfx::Rect& screen_bounds) const;
 
   // Overridden from ui::EventRewriter
   ui::EventRewriteStatus RewriteEvent(
@@ -48,16 +40,7 @@ class SideSwipeDetector : public ui::EventRewriter {
       std::unique_ptr<ui::Event>* new_event) override;
 
  private:
-  friend class test::SideSwipeDetectorTest;
-  void SetTimerForTesting(std::unique_ptr<base::OneShotTimer> mock_timer);
-
   void StashEvent(const ui::TouchEvent& event);
-  void OnCornerHoldTimerFired();
-  void EndCornerHold(const ui::TouchEvent& event);
-  void CancelCornerHoldCheck();
-
-  ui::EventRewriteStatus StartNextDispatchStashedEvents(
-      std::unique_ptr<ui::Event>* new_event);
 
   const int gesture_start_width_;
   const int gesture_start_height_;
@@ -65,22 +48,14 @@ class SideSwipeDetector : public ui::EventRewriter {
 
   CastGestureHandler* gesture_handler_;
   aura::Window* root_window_;
-  CastSideSwipeOrigin current_swipe_origin_;
-  int current_pointer_id_;
-  base::ElapsedTimer gesture_elapsed_timer_;
-  std::deque<ui::TouchEvent> stashed_events_;
+  CastSideSwipeOrigin current_swipe_;
+  base::ElapsedTimer current_swipe_time_;
 
-  // A default gesture detector config, so we can share the same
-  // longpress timeout for corner hold.
-  ui::GestureDetector::Config gesture_detector_config_;
-  std::unique_ptr<base::OneShotTimer> corner_hold_timer_;
-  std::unique_ptr<ui::Event> corner_hold_start_event_;
-  bool in_corner_hold_;
-  CastGestureHandler::Corner current_corner_origin_;
+  std::deque<ui::TouchEvent> stashed_events_;
 
   DISALLOW_COPY_AND_ASSIGN(SideSwipeDetector);
 };
 
 }  // namespace chromecast
 
-#endif  // CHROMECAST_GRAPHICS_GESTURES_SIDE_SWIPE_DETECTOR_H_
+#endif  // CHROMECAST_GRAPHICS_GESTURES_SIDE_SWIPE_DETECTOR_H_
\ No newline at end of file