exo: Replace pointer based stylus and replace with touch based stylus

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/public/cpp/shell_window_ids.h"
 #include "components/exo/pointer_delegate.h"
 #include "components/exo/pointer_stylus_delegate.h"
 #include "components/exo/surface.h"
@@ skipping 33 matching lines @@
       surface_(nullptr),
       focus_(nullptr),
       cursor_scale_(1.0f) {
   auto* helper = WMHelper::GetInstance();
   helper->AddPreTargetHandler(this);
   helper->AddCursorObserver(this);
 }
 
 Pointer::~Pointer() {
   delegate_->OnPointerDestroying(this);
-  if (stylus_delegate_)
-    stylus_delegate_->OnPointerDestroying(this);
   if (surface_)
     surface_->RemoveSurfaceObserver(this);
   if (focus_) {
     focus_->RemoveSurfaceObserver(this);
     focus_->UnregisterCursorProvider(this);
   }
   if (widget_)
     widget_->CloseNow();
 
   auto* helper = WMHelper::GetInstance();
@@ skipping 33 matching lines @@
   // Update hotspot and show cursor surface if not already visible.
   hotspot_ = hotspot;
   if (surface_) {
     surface_->window()->SetBounds(
         gfx::Rect(gfx::Point() - hotspot_.OffsetFromOrigin(),
                   surface_->window()->layer()->size()));
     if (!surface_->window()->IsVisible())
       surface_->window()->Show();
 
     // Show widget now that cursor has been defined.
-    if (!widget_->IsVisible() && !is_direct_input_)
+    if (!widget_->IsVisible())
       widget_->Show();
   }
 
   // Register pointer as cursor provider now that the cursor for |focus_| has
   // been defined.
   focus_->RegisterCursorProvider(this);
 
   // Update cursor in case the registration of pointer as cursor provider
   // caused the cursor to change.
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(focus_->window()->GetRootWindow());
   if (cursor_client)
     cursor_client->SetCursor(
         focus_->window()->GetCursor(gfx::ToFlooredPoint(location_)));
 }
 
-bool Pointer::HasStylusDelegate() const {
-  return !!stylus_delegate_;
-}
-
-void Pointer::SetStylusDelegate(PointerStylusDelegate* delegate) {
-  stylus_delegate_ = delegate;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ui::EventHandler overrides:
 
 void Pointer::OnMouseEvent(ui::MouseEvent* event) {
   Surface* target = GetEffectiveTargetForEvent(event);
 
   if (event->flags() & ui::EF_TOUCH_ACCESSIBILITY)
     return;
 
-  auto new_pointer_type = pointer_type_;
-  if ((event->flags() & ui::EF_IS_SYNTHESIZED) == 0) {
-    new_pointer_type = event->pointer_details().pointer_type;
-    if (new_pointer_type == ui::EventPointerType::POINTER_TYPE_UNKNOWN)
-      new_pointer_type = ui::EventPointerType::POINTER_TYPE_MOUSE;
-  }
-
   // If target is different than the current pointer focus then we need to
   // generate enter and leave events.
   if (target != focus_) {
     // First generate a leave event if we currently have a target in focus.
     if (focus_) {
       delegate_->OnPointerLeave(focus_);
       focus_->RemoveSurfaceObserver(this);
       // Require SetCursor() to be called and cursor to be re-defined in
       // response to each OnPointerEnter() call.
       focus_->UnregisterCursorProvider(this);
       focus_ = nullptr;
     }
     // Second generate an enter event if focus moved to a new target.
     if (target) {
       delegate_->OnPointerEnter(target, event->location_f(),
                                 event->button_flags());
       location_ = event->location_f();
-      if (stylus_delegate_) {
-        stylus_delegate_->OnPointerToolChange(new_pointer_type);
-        pointer_type_ = new_pointer_type;
-      }
-
       focus_ = target;
       focus_->AddSurfaceObserver(this);
     }
     delegate_->OnPointerFrame();
   }
 
-  // Report changes in pointer type.
-  if (focus_ && stylus_delegate_ && new_pointer_type != pointer_type_) {
-    stylus_delegate_->OnPointerToolChange(new_pointer_type);
-    pointer_type_ = new_pointer_type;
-  }
-
   if (focus_ && event->IsMouseEvent() && event->type() != ui::ET_MOUSE_EXITED) {
-    bool send_frame = false;
-
     // 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 (!SameLocation(event, location_)) {
       location_ = event->location_f();
       delegate_->OnPointerMotion(event->time_stamp(), location_);
-      send_frame = true;
+      delegate_->OnPointerFrame();
     }
-    if (stylus_delegate_ &&
-        pointer_type_ != ui::EventPointerType::POINTER_TYPE_MOUSE) {
-      constexpr float kEpsilon = std::numeric_limits<float>::epsilon();
-      gfx::Vector2dF new_tilt = gfx::Vector2dF(event->pointer_details().tilt_x,
-                                               event->pointer_details().tilt_y);
-      if (std::abs(new_tilt.x() - tilt_.x()) > kEpsilon ||
-          std::abs(new_tilt.y() - tilt_.y()) > kEpsilon) {
-        tilt_ = new_tilt;
-        stylus_delegate_->OnPointerTilt(event->time_stamp(), new_tilt);
-        send_frame = true;
-      }
-
-      float new_force = event->pointer_details().force;
-      if (std::abs(new_force - force_) > kEpsilon) {
-        force_ = new_force;
-        stylus_delegate_->OnPointerForce(event->time_stamp(), new_force);
-        send_frame = true;
-      }
-    }
-    if (send_frame)
-      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();
@@ skipping 33 matching lines @@
     case ui::ET_MOUSE_DRAGGED:
     case ui::ET_MOUSE_ENTERED:
     case ui::ET_MOUSE_EXITED:
     case ui::ET_MOUSE_CAPTURE_CHANGED:
       break;
     default:
       NOTREACHED();
       break;
   }
 
-  if ((event->flags() & ui::EF_IS_SYNTHESIZED) == 0)
-    is_direct_input_ = (event->flags() & ui::EF_DIRECT_INPUT) != 0;
-
   // Update cursor widget to reflect current focus and pointer location.
-  if (focus_ && !is_direct_input_) {
+  if (focus_) {
     if (!widget_)
       CreatePointerWidget();
 
     // Update cursor location if mouse event caused it to change.
     gfx::Point mouse_location = aura::Env::GetInstance()->last_mouse_location();
     gfx::Rect bounds = widget_->GetWindowBoundsInScreen();
     if (mouse_location != bounds.origin()) {
       bounds.set_origin(mouse_location);
       widget_->SetBounds(bounds);
     }
@@ skipping 88 matching lines @@
 
   if (ui_scale != cursor_scale_) {
     gfx::Transform transform;
     transform.Scale(ui_scale, ui_scale);
     widget_->GetNativeWindow()->SetTransform(transform);
     cursor_scale_ = ui_scale;
   }
 }
 
 }  // namespace exo