components/exo: Extend pointer to use v5 protocol

components/exo/pointer_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/shell.h"
 #include "components/exo/buffer.h"
 #include "components/exo/pointer.h"
 #include "components/exo/pointer_delegate.h"
 #include "components/exo/shell_surface.h"
 #include "components/exo/surface.h"
@@ skipping 12 matching lines @@
  public:
   MockPointerDelegate() {}
 
   // Overridden from PointerDelegate:
   MOCK_METHOD1(OnPointerDestroying, void(Pointer*));
   MOCK_CONST_METHOD1(CanAcceptPointerEventsForSurface, bool(Surface*));
   MOCK_METHOD3(OnPointerEnter, void(Surface*, const gfx::Point&, int));
   MOCK_METHOD1(OnPointerLeave, void(Surface*));
   MOCK_METHOD2(OnPointerMotion, void(base::TimeDelta, const gfx::Point&));
   MOCK_METHOD3(OnPointerButton, void(base::TimeDelta, int, bool));
-  MOCK_METHOD2(OnPointerWheel, void(base::TimeDelta, const gfx::Vector2d&));
+  MOCK_METHOD3(OnPointerScroll,
+               void(base::TimeDelta, const gfx::Vector2dF&, bool));
+  MOCK_METHOD1(OnPointerScrollStop, void(base::TimeDelta));
+  MOCK_METHOD0(OnPointerFrame, void());
 };
 
 TEST_F(PointerTest, SetCursor) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());

[reveman, 2016/03/02 04:16:53]

nit: Can we use an exact number of expected calls here and below instead of
testing::AnyNumber()?

[denniskempin, 2016/03/02 20:47:58]

Done.

   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin());
 
   scoped_ptr<Surface> pointer_surface(new Surface);
   scoped_ptr<Buffer> pointer_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   pointer_surface->Attach(pointer_buffer.get());
   pointer_surface->Commit();
 
   // Set pointer surface.
@@ skipping 17 matching lines @@
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin());
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
 TEST_F(PointerTest, OnPointerLeave) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin());
 
   EXPECT_CALL(delegate, OnPointerLeave(surface.get()));
   generator.MoveMouseTo(surface->GetBoundsInScreen().bottom_right());
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
 TEST_F(PointerTest, OnPointerMotion) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
+
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin());
 
   EXPECT_CALL(delegate, OnPointerMotion(testing::_, gfx::Point(1, 1)));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin() +
                         gfx::Vector2d(1, 1));
 
   scoped_ptr<Surface> sub_surface(new Surface);
   surface->AddSubSurface(sub_surface.get());
   surface->SetSubSurfacePosition(sub_surface.get(), gfx::Point(5, 5));
   gfx::Size sub_buffer_size(5, 5);
   scoped_ptr<Buffer> sub_buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(sub_buffer_size)));
   sub_surface->Attach(sub_buffer.get());
   sub_surface->Commit();
   surface->Commit();
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(sub_surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
+
   EXPECT_CALL(delegate, OnPointerLeave(surface.get()));
   EXPECT_CALL(delegate, OnPointerEnter(sub_surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(sub_surface->GetBoundsInScreen().origin());
 
   EXPECT_CALL(delegate, OnPointerMotion(testing::_, gfx::Point(1, 1)));
   generator.MoveMouseTo(sub_surface->GetBoundsInScreen().origin() +
                         gfx::Vector2d(1, 1));
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
 TEST_F(PointerTest, OnPointerButton) {
   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
+
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin());
 
   EXPECT_CALL(delegate,
               OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, true));
   EXPECT_CALL(delegate,
               OnPointerButton(testing::_, ui::EF_LEFT_MOUSE_BUTTON, false));
   generator.ClickLeftButton();
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
-TEST_F(PointerTest, OnPointerWheel) {
+TEST_F(PointerTest, OnPointerWheelScroll) {

[reveman, 2016/03/02 04:16:53]

nit: OnPointerScrollDiscrete and maybe move the test below the OnPointerScroll
test below

[denniskempin, 2016/03/02 20:47:58]

Done.

   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
+
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(surface->GetBoundsInScreen().origin());
 
-  EXPECT_CALL(delegate, OnPointerWheel(testing::_, gfx::Vector2d(1, 1)));
+  EXPECT_CALL(delegate,
+              OnPointerScroll(testing::_, gfx::Vector2dF(1, 1), true));
   generator.MoveMouseWheel(1, 1);
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
-TEST_F(PointerTest, OnPointerScroll) {
+TEST_F(PointerTest, OnPointerSmoothScroll) {

[reveman, 2016/03/02 04:16:53]

nit: I think we can keep the existing "OnPointerScroll" name here 

[denniskempin, 2016/03/02 20:47:58]

Done.

   scoped_ptr<Surface> surface(new Surface);
   scoped_ptr<ShellSurface> shell_surface(new ShellSurface(surface.get()));
   gfx::Size buffer_size(10, 10);
   scoped_ptr<Buffer> buffer(
       new Buffer(exo_test_helper()->CreateGpuMemoryBuffer(buffer_size)));
   surface->Attach(buffer.get());
   surface->Commit();
 
   MockPointerDelegate delegate;
   scoped_ptr<Pointer> pointer(new Pointer(&delegate));
   ui::test::EventGenerator generator(ash::Shell::GetPrimaryRootWindow());
   gfx::Point location = surface->GetBoundsInScreen().origin();
 
   EXPECT_CALL(delegate, CanAcceptPointerEventsForSurface(surface.get()))
       .WillRepeatedly(testing::Return(true));
+  EXPECT_CALL(delegate, OnPointerFrame()).Times(testing::AnyNumber());
+
   EXPECT_CALL(delegate, OnPointerEnter(surface.get(), gfx::Point(), 0));
   generator.MoveMouseTo(location);
 
-  EXPECT_CALL(delegate, OnPointerWheel(testing::_, gfx::Vector2d(1, 1)));
+  {  // Expect fling stop followed by scroll and scroll stop

[reveman, 2016/03/02 04:16:53]

nit: move the comment to the line below and add "." at the end of sentence.

[denniskempin, 2016/03/02 20:47:58]

Done.

+    testing::InSequence sequence;
+
+    EXPECT_CALL(delegate,
+                OnPointerScroll(testing::_, gfx::Vector2dF(0, 0), false));
+    EXPECT_CALL(delegate,
+                OnPointerScroll(testing::_, gfx::Vector2dF(1.2, 1.2), false));
+    EXPECT_CALL(delegate, OnPointerScrollStop(testing::_));
+  }
   generator.ScrollSequence(location, base::TimeDelta(), 1, 1, 1, 1);
 
   EXPECT_CALL(delegate, OnPointerDestroying(pointer.get()));
   pointer.reset();
 }
 
 }  // namespace
 }  // namespace exo