OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/laser/laser_pointer_points_test_api.h" | 5 #include "ash/laser/laser_pointer_points_test_api.h" |
6 | 6 |
7 #include "ash/laser/laser_pointer_points.h" | |
8 | |
9 namespace ash { | 7 namespace ash { |
10 | 8 |
11 LaserPointerPointsTestApi::LaserPointerPointsTestApi( | 9 LaserPointerPointsTestApi::LaserPointerPointsTestApi( |
12 LaserPointerPoints* instance) | 10 LaserPointerPoints* instance) |
13 : new_point_time_(base::Time::Now()), instance_(instance) {} | 11 : instance_(instance) {} |
14 | 12 |
15 LaserPointerPointsTestApi::~LaserPointerPointsTestApi() {} | 13 LaserPointerPointsTestApi::~LaserPointerPointsTestApi() {} |
16 | 14 |
17 int LaserPointerPointsTestApi::GetNumberOfPoints() const { | 15 int LaserPointerPointsTestApi::GetNumberOfPoints() const { |
18 return instance_->GetNumberOfPoints(); | 16 return instance_->GetNumberOfPoints(); |
19 } | 17 } |
20 | 18 |
21 void LaserPointerPointsTestApi::MoveForwardInTime( | 19 void LaserPointerPointsTestApi::MoveForwardInTime( |
22 const base::TimeDelta& delta) { | 20 const base::TimeDelta& delta) { |
23 for (LaserPointerPoints::LaserPoint& point : instance_->points_) | 21 base::Time new_time = instance_->collection_latest_time_ + delta; |
24 point.creation_time -= delta; | |
25 | 22 |
26 LaserPointerPoints::LaserPoint new_point; | 23 LaserPointerPoints::LaserPoint new_point; |
27 new_point.creation_time = new_point_time_; | 24 new_point.age = 0.0; |
25 instance_->MoveForwardToTime(new_time); | |
jdufault
2016/10/05 21:36:05
Keep new_point initialization together; move the M
sammiequon
2016/10/06 00:19:16
Done.
| |
28 instance_->points_.push_back(new_point); | 26 instance_->points_.push_back(new_point); |
29 instance_->ClearOldPoints(); | |
30 } | 27 } |
28 | |
29 LaserPointerPoints::LaserPoint LaserPointerPointsTestApi::GetPointAtIndex( | |
30 int index) { | |
31 DCHECK(index >= GetNumberOfPoints()); | |
jdufault
2016/10/05 21:36:05
Is this DCHECK right? It looks like it is inverted
sammiequon
2016/10/06 00:19:15
Done.
| |
32 return instance_->points_[index]; | |
33 } | |
34 | |
31 } // namespace ash | 35 } // namespace ash |
OLD | NEW |