ash: Refactor touch hud drawing to ash/touch_hud as a separate component.

ash/touch_hud/touch_hud_renderer.cc

Index: ash/touch_hud/touch_hud_renderer.cc
diff --git a/ash/touch/touch_hud_projection.cc b/ash/touch_hud/touch_hud_renderer.cc
similarity index 75%
copy from ash/touch/touch_hud_projection.cc
copy to ash/touch_hud/touch_hud_renderer.cc
index 02f604ef8d72543e6bb78242274de5c29a37161a..1a4de54333e221f09abba6b2796f6fb4f40f93b2 100644
--- a/ash/touch/touch_hud_projection.cc
+++ b/ash/touch_hud/touch_hud_renderer.cc
@@ -1,22 +1,22 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.

[James Cook, 2016/07/12 17:22:07]

per earlier comment, either this file is considered new and should be 2016, or
the old file should be considered new and should be 2016, but not both (and
neither would be OK too).

[riajiang, 2016/07/12 20:08:26]

Changed both files back to 2013.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/touch/touch_hud_projection.h"
+#include "ash/touch_hud/touch_hud_renderer.h"
 
-#include "ash/root_window_controller.h"
-#include "ash/shell.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_observer.h"
 
 namespace ash {
 
-const int kPointRadius = 20;
+const int kPointRadius = 40;

[James Cook, 2016/07/12 17:22:07]

Just curious, why is this different?

[riajiang, 2016/07/12 20:08:26]

I was testing the touch-hud app on pixel and the old touch point size looks
smaller than its actual size in mash mode so I made this change. But I just
double checked the new point size in non-mash mode and it's now too big for the
current touch-hud we have. I changed it back to 20 for now and will check why it
looks small in mash mode in the touch-hud app cl.

 const SkColor kProjectionFillColor = SkColorSetRGB(0xF5, 0xF5, 0xDC);
 const SkColor kProjectionStrokeColor = SK_ColorGRAY;
 const int kProjectionAlpha = 0xB0;
@@ -24,7 +24,7 @@ const int kFadeoutDurationInMs = 250;
 const int kFadeoutFrameRate = 60;
 
 // TouchPointView draws a single touch point. This object manages its own
-// lifetime and deletes itself upon fade-out completion or whenever |Remove()|
+// lifetime and deletes itself upon fade-out completion or whenever |Destroy()|
 // is explicitly called.
 class TouchPointView : public views::View,
                        public gfx::AnimationDelegate,
@@ -52,9 +52,11 @@ class TouchPointView : public views::View,
     parent_widget->AddObserver(this);
   }
 
-  void UpdateTouch(const ui::TouchEvent& touch) {
+  void UpdateTouch(const ui::LocatedEvent& touch) {
     if (touch.type() == ui::ET_TOUCH_RELEASED ||
-        touch.type() == ui::ET_TOUCH_CANCELLED) {
+        touch.type() == ui::ET_TOUCH_CANCELLED ||
+        touch.type() == ui::ET_POINTER_UP ||
+        touch.type() == ui::ET_POINTER_CANCELLED) {
       fadeout_.reset(new gfx::LinearAnimation(kFadeoutDurationInMs,
                                               kFadeoutFrameRate, this));
       fadeout_->Start();
@@ -65,7 +67,7 @@ class TouchPointView : public views::View,
     }
   }
 
-  void Remove() { delete this; }
+  void Destroy() { delete this; }

[James Cook, 2016/07/12 17:22:07]

Just curious, any reason to have a Destroy() method rather than just calling
delete? It doesn't do any cleanup.

[sadrul, 2016/07/12 17:48:10]

This is probably so we can destroy this thing from below (~line 159 newcode)
without changing the ownership.

 
  private:
   ~TouchPointView() override {
@@ -110,7 +112,7 @@ class TouchPointView : public views::View,
     if (fadeout_)
       fadeout_->Stop();
     else
-      Remove();
+      Destroy();
   }
 
   const gfx::Point circle_center_;
@@ -126,50 +128,48 @@ class TouchPointView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(TouchPointView);
 };
 
-TouchHudProjection::TouchHudProjection(aura::Window* initial_root)
-    : TouchObserverHUD(initial_root) {}
+TouchHudRenderer::TouchHudRenderer(views::Widget* parent_widget)
+    : parent_widget_(parent_widget) {}
 
-TouchHudProjection::~TouchHudProjection() {}
+TouchHudRenderer::~TouchHudRenderer() {}
 
-void TouchHudProjection::Clear() {
+void TouchHudRenderer::Clear() {
   for (std::map<int, TouchPointView*>::iterator iter = points_.begin();
        iter != points_.end(); iter++)
-    iter->second->Remove();
+    iter->second->Destroy();
   points_.clear();
 }
 
-void TouchHudProjection::OnTouchEvent(ui::TouchEvent* event) {
-  if (event->type() == ui::ET_TOUCH_PRESSED) {
-    TouchPointView* point = new TouchPointView(widget());
+void TouchHudRenderer::HandleTouchEvent(const ui::LocatedEvent* event) {
+  int id = 0;
+  if (event->IsTouchEvent()) {
+    id = event->AsTouchEvent()->touch_id();
+  } else if (event->IsPointerEvent()) {
+    id = event->AsPointerEvent()->pointer_id();

[sadrul, 2016/07/12 17:48:10]

Do else, and DCHECK that event->IsPointerEvent(). Also, DCHECK that
PointerEvent::pointer_details().pointer_type == POINTER_TYPE_TOUCH

[riajiang, 2016/07/12 20:08:26]

Done.

+  }
+  if (event->type() == ui::ET_TOUCH_PRESSED ||
+      event->type() == ui::ET_POINTER_DOWN) {
+    TouchPointView* point = new TouchPointView(parent_widget_);
     point->UpdateTouch(*event);
     std::pair<std::map<int, TouchPointView*>::iterator, bool> result =
-        points_.insert(std::make_pair(event->touch_id(), point));
-    // If a |TouchPointView| is already mapped to the touch id, remove it and
+        points_.insert(std::make_pair(id, point));
+    // If a |TouchPointView| is already mapped to the touch id, destroy it and
     // replace it with the new one.
     if (!result.second) {
-      result.first->second->Remove();
+      result.first->second->Destroy();
       result.first->second = point;
     }
   } else {
-    std::map<int, TouchPointView*>::iterator iter =
-        points_.find(event->touch_id());
+    std::map<int, TouchPointView*>::iterator iter = points_.find(id);
     if (iter != points_.end()) {
       iter->second->UpdateTouch(*event);
       if (event->type() == ui::ET_TOUCH_RELEASED ||
-          event->type() == ui::ET_TOUCH_CANCELLED)
+          event->type() == ui::ET_TOUCH_CANCELLED ||
+          event->type() == ui::ET_POINTER_UP ||
+          event->type() == ui::ET_POINTER_CANCELLED)
         points_.erase(iter);
     }
   }
 }
 
-void TouchHudProjection::SetHudForRootWindowController(
-    RootWindowController* controller) {
-  controller->set_touch_hud_projection(this);
-}
-
-void TouchHudProjection::UnsetHudForRootWindowController(
-    RootWindowController* controller) {
-  controller->set_touch_hud_projection(NULL);
-}
-
 }  // namespace ash