Pointer watcher modifications to support laser pointer.

ash/common/system/chromeos/palette/tools/laser_pointer_mode.cc

+// Copyright 2016 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 "ash/common/system/chromeos/palette/tools/laser_pointer_mode.h"
+
+#include "ash/common/palette_delegate.h"
+#include "ash/common/system/chromeos/palette/palette_ids.h"
+#include "ash/common/wm_shell.h"
+#include "ui/wm/core/coordinate_conversion.h"
+#include "ui/wm/core/cursor_manager.h"
+
+namespace ash {
+
+const int LaserPointerMode::kPointLifeDurationMs = 300;
+const int LaserPointerMode::kAddStationaryPointsDelayMs = 10;
+
+LaserPointerMode::LaserPointerMode(Delegate* delegate)
+    : CommonPaletteTool(delegate),
+      timer_repeat_count_(0),

[jdufault, 2016/08/11 23:41:54]

Initialize in header.

+      laser_points_(
+          base::TimeDelta::FromMilliseconds(int{kPointLifeDurationMs})) {

[jdufault, 2016/08/11 23:41:54]

Remove the int{} cast.

+  laser_pointer_view_ = new LaserPointerView();

[jdufault, 2016/08/11 23:41:54]

Use std::unique_ptr

+  InitializeTimer();
+  WmShell::Get()->AddPointerWatcher(this, true);
+}
+
+LaserPointerMode::~LaserPointerMode() {
+  WmShell::Get()->RemovePointerWatcher(this);
+}
+
+PaletteGroup LaserPointerMode::GetGroup() const {
+  return PaletteGroup::MODE;
+}
+
+PaletteToolId LaserPointerMode::GetToolId() const {
+  return PaletteToolId::LASER_POINTER;
+}
+
+void LaserPointerMode::OnEnable() {
+  CommonPaletteTool::OnEnable();
+  if (WmShell::Get()->palette_delegate())
+    WmShell::Get()->palette_delegate()->OnLaserModeEnabled();
+  laser_points_.AddPoint(current_mouse_location_);
+  laser_pointer_view_->SetNewPoints(laser_points_);
+}
+
+void LaserPointerMode::OnDisable() {
+  CommonPaletteTool::OnDisable();
+  if (WmShell::Get()->palette_delegate())
+    WmShell::Get()->palette_delegate()->OnLaserModeDisabled();
+  StopTimer();
+  // Clear the points and then notify the view that there is nothing to be
+  // rendered.
+  laser_points_.Clear();
+  laser_pointer_view_->Stop();
+}
+
+gfx::VectorIconId LaserPointerMode::GetActiveTrayIcon() {
+  return gfx::VectorIconId::PALETTE_TRAY_ICON_LASER_POINTER;
+}
+
+gfx::VectorIconId LaserPointerMode::GetPaletteIconId() {
+  return gfx::VectorIconId::PALETTE_MODE_LASER_POINTER;
+}
+
+void LaserPointerMode::InitializeTimer() {
+  timer_.reset(new base::Timer(

[jdufault, 2016/08/11 23:41:54]

Is this the output from git cl format?

+      FROM_HERE, base::TimeDelta::FromMilliseconds(kAddStationaryPointsDelayMs),
+      base::Bind(&LaserPointerMode::AddStationaryPoint, base::Unretained(this)),
+      false));
+}
+
+void LaserPointerMode::StartTimer() {
+  timer_->Reset();
+}
+
+void LaserPointerMode::StopTimer() {
+  points_lock_.Acquire();
+  timer_repeat_count_ = 0;
+  points_lock_.Release();
+  timer_->Stop();
+}
+
+void LaserPointerMode::AddStationaryPoint() {
+  points_lock_.Acquire();
+  laser_points_.AddPoint(current_mouse_location_);
+  laser_pointer_view_->SetNewPoints(laser_points_);
+  int count = timer_repeat_count_;
+  points_lock_.Release();
+  // We can stop repeating the timer once the mouse has been stationary for
+  // longer than the life of a point.
+  if (count * kAddStationaryPointsDelayMs < kPointLifeDurationMs) {
+    timer_repeat_count_++;
+    timer_->Reset();
+  } else {
+    StopTimer();
+  }
+}
+
+void LaserPointerMode::OnPointerEventObserved(
+    const ui::PointerEvent& event,
+    const gfx::Point& location_in_screen,
+    views::Widget* target) {
+  if (event.type() == ui::ET_POINTER_MOVED) {

[jdufault, 2016/08/11 23:41:54]

We want to only run this logic for pen pointer events as well.

event.pointer_details().pointer_type == ui::EventPointerType::POINTER_TYPE_PEN)

+    current_mouse_location_ = location_in_screen;
+    if (enabled()) {

[jdufault, 2016/08/11 23:41:54]

Do we want to always capture the mouse location? Can we move this if check to
the start of the function?

+      points_lock_.Acquire();
+      // Add the new point and notify the queue.
+      laser_points_.AddPoint(current_mouse_location_);
+      laser_pointer_view_->SetNewPoints(laser_points_);
+      timer_repeat_count_ = 0;
+      points_lock_.Release();
+      StartTimer();
+    }
+  }
+}
+}  // namespace ash