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 74 matching lines @@
       focus_ = nullptr;
     }
     // Second generate an enter event if focus moved to a new target.
     if (target) {
       delegate_->OnPointerEnter(target, event->location(),
                                 event->button_flags());
       location_ = event->location();
       focus_ = target;
       focus_->AddSurfaceObserver(this);
     }
+    delegate_->OnPointerFrame();
   }
 
   switch (event->type()) {
     case ui::ET_MOUSE_PRESSED:
     case ui::ET_MOUSE_RELEASED:
       if (focus_) {
         delegate_->OnPointerButton(event->time_stamp(),
                                    event->changed_button_flags(),
                                    event->type() == ui::ET_MOUSE_PRESSED);
+        delegate_->OnPointerFrame();
       }
       break;
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_DRAGGED:
       // Generate motion event if location changed. We need to check location
       // here as mouse movement can generate both "moved" and "entered" events
       // 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());
+        delegate_->OnPointerFrame();
         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);
+        delegate_->OnPointerFrame();
       }
       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);
+        delegate_->OnPointerFrame();
+      }
+      break;
+    case ui::ET_SCROLL_FLING_START:
+      if (focus_) {
+        delegate_->OnPointerScrollStop(event->time_stamp());
+        delegate_->OnPointerFrame();
+      }
+      break;
+    case ui::ET_SCROLL_FLING_CANCEL:
+      if (focus_) {
+        delegate_->OnPointerScrollCancel(event->time_stamp());
+        delegate_->OnPointerFrame();
       }
       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;
   }
 
   // Update cursor widget to reflect current focus and pointer location.
   if (focus_) {
     if (!widget_)
       CreatePointerWidget();
@@ skipping 62 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