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

components/exo/touch.cc

Index: components/exo/touch.cc
diff --git a/components/exo/touch.cc b/components/exo/touch.cc
index 717b79ec6ba26e3de1fb264c7fb8daf9c187f67c..fae2f3ec2b2f87e784743b76604038717d5f393b 100644
--- a/components/exo/touch.cc
+++ b/components/exo/touch.cc
@@ -6,6 +6,7 @@
 
 #include "components/exo/surface.h"
 #include "components/exo/touch_delegate.h"
+#include "components/exo/touch_stylus_delegate.h"
 #include "components/exo/wm_helper.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
@@ -31,7 +32,8 @@ bool VectorContainsItem(T& vector, U value) {
 ////////////////////////////////////////////////////////////////////////////////
 // Touch, public:
 
-Touch::Touch(TouchDelegate* delegate) : delegate_(delegate) {
+Touch::Touch(TouchDelegate* delegate)
+    : delegate_(delegate), stylus_delegate_(nullptr) {

[reveman, 2016/12/08 23:17:14]

nit: unnecessary

[denniskempin, 2016/12/15 21:16:49]

Done.

   WMHelper::GetInstance()->AddPreTargetHandler(this);
 }
 
@@ -42,6 +44,10 @@ Touch::~Touch() {
   WMHelper::GetInstance()->RemovePreTargetHandler(this);
 }
 
+void Touch::SetStylusDelegate(TouchStylusDelegate* delegate) {
+  stylus_delegate_ = delegate;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ui::EventHandler overrides:
 
@@ -76,6 +82,12 @@ void Touch::OnTouchEvent(ui::TouchEvent* event) {
       // be different from the target surface.
       delegate_->OnTouchDown(focus_, event->time_stamp(), event->touch_id(),
                              location);
+      if (stylus_delegate_ &&
+          event->pointer_details().pointer_type !=
+              ui::EventPointerType::POINTER_TYPE_TOUCH) {
+        stylus_delegate_->OnTouchTool(event->touch_id(),
+                                      event->pointer_details().pointer_type);
+      }
       send_details = true;
     } break;
     case ui::ET_TOUCH_RELEASED: {
@@ -130,6 +142,19 @@ void Touch::OnTouchEvent(ui::TouchEvent* event) {
     delegate_->OnTouchShape(event->touch_id(),
                             event->pointer_details().radius_x,
                             event->pointer_details().radius_y);
+
+    if (stylus_delegate_ &&
+        event->pointer_details().pointer_type !=
+            ui::EventPointerType::POINTER_TYPE_TOUCH) {
+      if (!std::isnan(event->pointer_details().force)) {
+        stylus_delegate_->OnTouchForce(event->time_stamp(), event->touch_id(),
+                                       event->pointer_details().force);
+      }
+      stylus_delegate_->OnTouchTilt(
+          event->time_stamp(), event->touch_id(),
+          gfx::Vector2dF(event->pointer_details().tilt_x,
+                         event->pointer_details().tilt_y));
+    }
   }
   // TODO(denniskempin): Extend ui::TouchEvent to signal end of sequence of
   // touch events to send TouchFrame once after all touches have been updated.