exo: Implement v6 of touch protocol including shape and frame event

components/exo/touch_unittest.cc

 // Copyright 2015 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 "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_positioner.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
@@ skipping 18 matching lines @@
  public:
   MockTouchDelegate() {}
 
   // Overridden from TouchDelegate:
   MOCK_METHOD1(OnTouchDestroying, void(Touch*));
   MOCK_CONST_METHOD1(CanAcceptTouchEventsForSurface, bool(Surface*));
   MOCK_METHOD4(OnTouchDown,
                void(Surface*, base::TimeTicks, int, const gfx::Point&));
   MOCK_METHOD2(OnTouchUp, void(base::TimeTicks, int));
   MOCK_METHOD3(OnTouchMotion, void(base::TimeTicks, int, const gfx::Point&));
+  MOCK_METHOD3(OnTouchShape, void(int, float, float));
+  MOCK_METHOD0(OnTouchFrame, void());
   MOCK_METHOD0(OnTouchCancel, void());
 };
 
 TEST_F(TouchTest, OnTouchDown) {
   ash::WindowPositioner::DisableAutoPositioning(true);
 
   std::unique_ptr<Surface> bottom_surface(new Surface);
   std::unique_ptr<ShellSurface> bottom_shell_surface(
       new ShellSurface(bottom_surface.get()));
   gfx::Size bottom_buffer_size(10, 10);
@@ skipping 12 matching lines @@
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(top_buffer_size)));
   top_surface->Attach(top_buffer.get());
   top_surface->Commit();
   ash::wm::CenterWindow(ash::WmWindowAura::Get(
       top_shell_surface->GetWidget()->GetNativeWindow()));
 
   MockTouchDelegate delegate;
   std::unique_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
+  EXPECT_CALL(delegate, OnTouchShape(testing::_, testing::_, testing::_))
+      .Times(testing::AnyNumber());
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(top_surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate,
               OnTouchDown(top_surface.get(), testing::_, 1, gfx::Point()));
+  EXPECT_CALL(delegate, OnTouchFrame());
   generator.set_current_location(
       top_surface->window()->GetBoundsInScreen().origin());
   generator.PressTouchId(1);
 
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(bottom_surface.get()))
       .WillRepeatedly(testing::Return(true));
+
   // Second touch point should be relative to the focus surface.
   EXPECT_CALL(delegate, OnTouchDown(top_surface.get(), testing::_, 2,
                                     gfx::Point(-1, -1)));
+  EXPECT_CALL(delegate, OnTouchFrame());
+
   generator.set_current_location(
       bottom_surface->window()->GetBoundsInScreen().origin());
   generator.PressTouchId(2);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 TEST_F(TouchTest, OnTouchUp) {
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockTouchDelegate delegate;
   std::unique_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
+  EXPECT_CALL(delegate, OnTouchShape(testing::_, testing::_, testing::_))
+      .Times(testing::AnyNumber());
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate,
               OnTouchDown(surface.get(), testing::_, testing::_, gfx::Point()))
       .Times(2);
+  EXPECT_CALL(delegate, OnTouchFrame()).Times(2);
   generator.set_current_location(
       surface->window()->GetBoundsInScreen().origin());
   generator.PressTouchId(1);
   generator.PressTouchId(2);
 
   EXPECT_CALL(delegate, OnTouchUp(testing::_, 1));
+  EXPECT_CALL(delegate, OnTouchFrame());
   generator.ReleaseTouchId(1);
   EXPECT_CALL(delegate, OnTouchUp(testing::_, 2));
+  EXPECT_CALL(delegate, OnTouchFrame());
   generator.ReleaseTouchId(2);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 TEST_F(TouchTest, OnTouchMotion) {
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockTouchDelegate delegate;
   std::unique_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
+  EXPECT_CALL(delegate, OnTouchShape(testing::_, testing::_, testing::_))
+      .Times(testing::AnyNumber());
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate,
               OnTouchDown(surface.get(), testing::_, testing::_, gfx::Point()));
   EXPECT_CALL(delegate,
               OnTouchMotion(testing::_, testing::_, gfx::Point(5, 5)));
   EXPECT_CALL(delegate, OnTouchUp(testing::_, testing::_));
+  EXPECT_CALL(delegate, OnTouchFrame()).Times(3);
   generator.set_current_location(
       surface->window()->GetBoundsInScreen().origin());
   generator.PressMoveAndReleaseTouchBy(5, 5);
 
   // Check if touch point motion outside focus surface is reported properly to
   // the focus surface.
   EXPECT_CALL(delegate,
               OnTouchDown(surface.get(), testing::_, testing::_, gfx::Point()));
   EXPECT_CALL(delegate,
               OnTouchMotion(testing::_, testing::_, gfx::Point(100, 100)));
   EXPECT_CALL(delegate, OnTouchUp(testing::_, testing::_));
+  EXPECT_CALL(delegate, OnTouchFrame()).Times(3);
   generator.set_current_location(
       surface->window()->GetBoundsInScreen().origin());
   generator.PressMoveAndReleaseTouchBy(100, 100);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
+TEST_F(TouchTest, OnTouchShape) {
+  std::unique_ptr<Surface> surface(new Surface);
+  std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
+  gfx::Size buffer_size(10, 10);
+  std::unique_ptr<Buffer> buffer(
+      new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
+  surface->Attach(buffer.get());
+  surface->Commit();
+
+  MockTouchDelegate delegate;
+  std::unique_ptr<Touch> touch(new Touch(&delegate));
+  ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
+
+  EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface.get()))
+      .WillRepeatedly(testing::Return(true));
+  {
+    testing::InSequence sequence;
+    EXPECT_CALL(delegate, OnTouchDown(surface.get(), testing::_, testing::_,
+                                      gfx::Point()));
+    EXPECT_CALL(delegate, OnTouchShape(testing::_, 1, 1));
+    EXPECT_CALL(delegate, OnTouchFrame());
+    EXPECT_CALL(delegate,
+                OnTouchMotion(testing::_, testing::_, gfx::Point(5, 5)));
+    EXPECT_CALL(delegate, OnTouchShape(testing::_, 1, 1));
+    EXPECT_CALL(delegate, OnTouchFrame());
+    EXPECT_CALL(delegate,
+                OnTouchMotion(testing::_, testing::_, gfx::Point(10, 10)));
+    EXPECT_CALL(delegate, OnTouchShape(testing::_, 20, 10));
+    EXPECT_CALL(delegate, OnTouchFrame());
+    EXPECT_CALL(delegate, OnTouchUp(testing::_, testing::_));
+    EXPECT_CALL(delegate, OnTouchFrame());
+  }
+  generator.set_current_location(
+      surface->window()->GetBoundsInScreen().origin());
+  generator.PressTouch();
+  generator.MoveTouchBy(5, 5);
+  generator.SetTouchRadius(20, 10);
+  generator.MoveTouchBy(5, 5);
+  generator.ReleaseTouch();
+  EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
+  touch.reset();
+}
+
 TEST_F(TouchTest, OnTouchCancel) {
   std::unique_ptr<Surface> surface(new Surface);
   std::unique_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   std::unique_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockTouchDelegate delegate;
   std::unique_ptr<Touch> touch(new Touch(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
+  EXPECT_CALL(delegate, OnTouchShape(testing::_, testing::_, testing::_))
+      .Times(testing::AnyNumber());
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate,
               OnTouchDown(surface.get(), testing::_, testing::_, gfx::Point()))
       .Times(2);
+  EXPECT_CALL(delegate, OnTouchFrame()).Times(2);
   generator.set_current_location(
       surface->window()->GetBoundsInScreen().origin());
   generator.PressTouchId(1);
   generator.PressTouchId(2);
 
   // One touch point being canceled is enough for OnTouchCancel to be called.
   EXPECT_CALL(delegate, OnTouchCancel());
+  EXPECT_CALL(delegate, OnTouchFrame());
   ui::TouchEvent cancel_event(ui::ET_TOUCH_CANCELLED, gfx::Point(), 1,
                               ui::EventTimeForNow());
   generator.Dispatch(&cancel_event);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 TEST_F(TouchTest, IgnoreTouchEventDuringModal) {
   std::unique_ptr<Surface> surface(new Surface);
@@ skipping 17 matching lines @@
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(gfx::Size(5, 5))));
   surface2->Attach(buffer2.get());
   surface2->Commit();
   ash::wm::CenterWindow(ash::WmWindowAura::Get(surface2->window()));
   gfx::Point location2 = surface2->window()->GetBoundsInScreen().origin();
 
   // Make the window modal.
   shell_surface2->SetSystemModal(true);
   EXPECT_TRUE(ash::WmShell::Get()->IsSystemModalWindowOpen());
 
+  EXPECT_CALL(delegate, OnTouchShape(testing::_, testing::_, testing::_))
+      .Times(testing::AnyNumber());
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
   EXPECT_CALL(delegate, CanAcceptTouchEventsForSurface(surface2.get()))
       .WillRepeatedly(testing::Return(true));
 
   // Check if touch events on modal window are registered.
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnTouchDown(surface2.get(), testing::_, testing::_,
                                       gfx::Point()));
+    EXPECT_CALL(delegate, OnTouchFrame());
     EXPECT_CALL(delegate,
                 OnTouchMotion(testing::_, testing::_, gfx::Point(1, 1)));
+    EXPECT_CALL(delegate, OnTouchFrame());
     EXPECT_CALL(delegate, OnTouchUp(testing::_, testing::_));
+    EXPECT_CALL(delegate, OnTouchFrame());
   }
   generator.set_current_location(location2);
   generator.PressMoveAndReleaseTouchBy(1, 1);
 
   // Check if touch events on non-modal window are ignored.
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnTouchDown(surface.get(), testing::_, testing::_,
                                       gfx::Point()))
         .Times(0);
     EXPECT_CALL(delegate,
                 OnTouchMotion(testing::_, testing::_, gfx::Point(1, 1)))
         .Times(0);
     EXPECT_CALL(delegate, OnTouchUp(testing::_, testing::_)).Times(0);
+    EXPECT_CALL(delegate, OnTouchFrame()).Times(0);
   }
   generator.set_current_location(location);
   generator.PressMoveAndReleaseTouchBy(1, 1);
 
   // Make the window non-modal.
   shell_surface2->SetSystemModal(false);
   EXPECT_FALSE(ash::WmShell::Get()->IsSystemModalWindowOpen());
 
   // Check if touch events on non-modal window are registered.
   {
     testing::InSequence sequence;
     EXPECT_CALL(delegate, OnTouchDown(surface.get(), testing::_, testing::_,
                                       gfx::Point()));
+    EXPECT_CALL(delegate, OnTouchFrame());
     EXPECT_CALL(delegate,
                 OnTouchMotion(testing::_, testing::_, gfx::Point(1, 1)));
+    EXPECT_CALL(delegate, OnTouchFrame());
     EXPECT_CALL(delegate, OnTouchUp(testing::_, testing::_));
+    EXPECT_CALL(delegate, OnTouchFrame());
   }
   generator.set_current_location(location);
   generator.PressMoveAndReleaseTouchBy(1, 1);
 
   EXPECT_CALL(delegate, OnTouchDestroying(touch.get()));
   touch.reset();
 }
 
 }  // namespace
 }  // namespace exo