components/exo: Extend pointer to use v5 protocol

components/exo/pointer.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 "components/exo/pointer.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "components/exo/pointer_delegate.h"
 #include "components/exo/surface.h"
@@ skipping 99 matching lines @@
       // but OnPointerMotion should only be called if location changed since
       // OnPointerEnter was called.
       if (focus_ && event->location() != location_) {
         delegate_->OnPointerMotion(event->time_stamp(), event->location());
         location_ = event->location();
       }
       break;
     case ui::ET_SCROLL:
       if (focus_) {
         ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event);
-        delegate_->OnPointerWheel(
+        delegate_->OnPointerScroll(
             event->time_stamp(),
-            gfx::Vector2d(scroll_event->x_offset(), scroll_event->y_offset()));
+            gfx::Vector2dF(scroll_event->x_offset(), scroll_event->y_offset()),
+            false);
       }
       break;
     case ui::ET_MOUSEWHEEL:
       if (focus_) {
-        delegate_->OnPointerWheel(
+        delegate_->OnPointerScroll(
             event->time_stamp(),
-            static_cast<ui::MouseWheelEvent*>(event)->offset());
+            static_cast<ui::MouseWheelEvent*>(event)->offset(), true);
+      }
+      break;
+    case ui::ET_SCROLL_FLING_START:
+      if (focus_) {

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

nit: not need for "{" "}"

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

Done.

+        delegate_->OnPointerScrollStop(event->time_stamp());
+      }
+      break;
+    case ui::ET_SCROLL_FLING_CANCEL:
+      if (focus_) {
+        // Wayland doesn't know the concept of a fling cancel. But we can send a

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

nit: please add a OnPointerScrollStart (feel free to pick a better name if you
can think one) function to the delegate interface and keep this wayland specific
comment and 0 distance scroll in the wayland code. 

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

Done.

+        // zero distance scroll to stop any kinetic scrolling that might be
+        // going on.
+        delegate_->OnPointerScroll(event->time_stamp(), gfx::Vector2dF(0, 0),
+                                   false);
       }
       break;
     case ui::ET_MOUSE_ENTERED:
     case ui::ET_MOUSE_EXITED:
     case ui::ET_MOUSE_CAPTURE_CHANGED:
-    case ui::ET_SCROLL_FLING_START:
-    case ui::ET_SCROLL_FLING_CANCEL:
       break;
     default:
       NOTREACHED();
       break;
   }
 
+  if (focus_) {

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

nit: not need for "{" "}"

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

Done.

+    delegate_->OnPointerFrame();
+  }
+
   // Update cursor widget to reflect current focus and pointer location.
   if (focus_) {
     if (!widget_)
       CreatePointerWidget();
     widget_->SetBounds(gfx::Rect(
         focus_->GetBoundsInScreen().origin() + location_.OffsetFromOrigin(),
         gfx::Size(1, 1)));
     if (!widget_->IsVisible())
       widget_->Show();
   } else {
@@ skipping 56 matching lines @@
 Surface* Pointer::GetEffectiveTargetForEvent(ui::Event* event) const {
   Surface* target =
       Surface::AsSurface(static_cast<aura::Window*>(event->target()));
   if (!target)
     return nullptr;
 
   return delegate_->CanAcceptPointerEventsForSurface(target) ? target : nullptr;
 }
 
 }  // namespace exo