cros: Laser pointer fades out on release, do not cover palette.

ash/laser/laser_pointer_view.cc

Index: ash/laser/laser_pointer_view.cc
diff --git a/ash/laser/laser_pointer_view.cc b/ash/laser/laser_pointer_view.cc
index 2bfe8dafb8d353d8d600fee69bbd1360383744ad..8639a5739cfb4f6ea64a844d9c8021c6a89fc896 100644
--- a/ash/laser/laser_pointer_view.cc
+++ b/ash/laser/laser_pointer_view.cc
@@ -85,8 +85,14 @@ void LaserPointerView::ReparentWidget(aura::Window* new_root_window) {
   }
 }
 
-void LaserPointerView::AddNewPoint(const gfx::Point& new_point) {
-  laser_points_.AddPoint(new_point);
+void LaserPointerView::AddNewPoint(const gfx::Point& new_point,
+                                   bool fading_away) {
+  // Do not add the point but advance the time if the view is in process of
+  // fading away.
+  if (fading_away)
+    laser_points_.MoveForwardToCurrentTime();
+  else
+    laser_points_.AddPoint(new_point);
 
   // The bounding box should be relative to the screen.
   gfx::Point screen_offset =
@@ -113,29 +119,26 @@ void LaserPointerView::OnPaint(gfx::Canvas* canvas) {
   paint.setAntiAlias(true);
   paint.setStrokeJoin(SkPaint::kBevel_Join);
 
-  base::Time oldest = laser_points_.GetOldest().creation_time;
-  base::Time newest = laser_points_.GetNewest().creation_time;
-  gfx::Point previous_point = laser_points_.GetOldest().location;
-  gfx::Point current_point;
-
   // Compute the offset of the current widget.
   gfx::Point widget_offset =
       widget_->GetNativeView()->GetBoundsInRootWindow().origin();
+
+  gfx::Vector2d previous_point_vector =

[jdufault, 2016/10/04 22:04:13]

FYI, this variable is very confusing (it's not clear that this is used to share
initialization state) - I thought the vector suffix referred to some
direction/etc, not the type of the variable.

I'd remove the helper variable entirely and initialize previous_point directly.

[sammiequon, 2016/10/05 17:42:23]

Done.

+      laser_points_.GetOldest().location - widget_offset;
+  gfx::Point previous_point =
+      gfx::Point(previous_point_vector.x(), previous_point_vector.y());
+  gfx::Point current_point;

[jdufault, 2016/10/04 22:04:13]

Declare this on line 144 since it is not used outside of the for loop.

[sammiequon, 2016/10/05 17:42:23]

It's used on line 165.

+
   int num_points_ = laser_points_.GetNumberOfPoints();
   int point_count = 0;
+  int current_opacity = 0;
   for (const LaserPointerPoints::LaserPoint& point :
        laser_points_.laser_points()) {
-    // relative_time is a value between [0,1] where 0 means the point is about
-    // to be removed and 1 means that the point was just added.
-    double relative_time = 1.0;
-    if (oldest != newest) {
-      relative_time = 1.0 - ((point.creation_time - oldest).InMillisecondsF() /
-                             (newest - oldest).InMillisecondsF());
-    }
-
     // Set the radius and opacity based on the distance.
-    double radius = LinearInterpolate(kPointInitialRadius, kPointFinalRadius,
-                                      relative_time);
+    double current_radius =
+        LinearInterpolate(kPointInitialRadius, kPointFinalRadius, point.age);
+    current_opacity = int{LinearInterpolate(
+        double{kPointInitialOpacity}, double{kPointFinalOpacity}, point.age)};
 
     gfx::Vector2d center = point.location - widget_offset;
     current_point = gfx::Point(center.x(), center.y());
@@ -144,23 +147,20 @@ void LaserPointerView::OnPaint(gfx::Canvas* canvas) {
     // the result will be very jagged, unless we are on the last point, then we
     // draw regardless.
     point_count++;
-    float distance_threshold = float{radius * 2};
+    float distance_threshold = float{current_radius * 2};
     if (DistanceBetweenPoints(previous_point, current_point) <=
             distance_threshold &&
         point_count != num_points_) {
       continue;
     }
 
-    int opacity =
-        int{LinearInterpolate(double{kPointInitialOpacity},
-                              double{kPointFinalOpacity}, relative_time)};
-    paint.setColor(SkColorSetA(kPointColor, opacity));
-    paint.setStrokeWidth(radius * 2);
+    paint.setColor(SkColorSetA(kPointColor, current_opacity));
+    paint.setStrokeWidth(current_radius * 2);
     canvas->DrawLine(previous_point, current_point, paint);
     previous_point = current_point;
   }
   // Draw the last point as a circle.
-  paint.setColor(SkColorSetA(kPointColor, kPointInitialOpacity));
+  paint.setColor(SkColorSetA(kPointColor, current_opacity));
   paint.setStyle(SkPaint::kFill_Style);
   canvas->DrawCircle(current_point, kPointInitialRadius, paint);
 }