| Index: ui/events/gesture_detection/velocity_tracker.cc
|
| diff --git a/ui/events/gesture_detection/velocity_tracker.cc b/ui/events/gesture_detection/velocity_tracker.cc
|
| index 072ae885e843bb767bc09496f5b4e902cfccff93..46f87d4cf1a33c23561065951fbc24a06f05d42f 100644
|
| --- a/ui/events/gesture_detection/velocity_tracker.cc
|
| +++ b/ui/events/gesture_detection/velocity_tracker.cc
|
| @@ -119,15 +119,14 @@ class LeastSquaresVelocityTrackerStrategy : public VelocityTrackerStrategy {
|
| // Degree must be no greater than Estimator::kMaxDegree.
|
| LeastSquaresVelocityTrackerStrategy(uint32_t degree,
|
| Weighting weighting = WEIGHTING_NONE);
|
| - virtual ~LeastSquaresVelocityTrackerStrategy();
|
| + ~LeastSquaresVelocityTrackerStrategy() override;
|
|
|
| - virtual void Clear() override;
|
| - virtual void ClearPointers(BitSet32 id_bits) override;
|
| - virtual void AddMovement(const TimeTicks& event_time,
|
| - BitSet32 id_bits,
|
| - const Position* positions) override;
|
| - virtual bool GetEstimator(uint32_t id,
|
| - Estimator* out_estimator) const override;
|
| + void Clear() override;
|
| + void ClearPointers(BitSet32 id_bits) override;
|
| + void AddMovement(const TimeTicks& event_time,
|
| + BitSet32 id_bits,
|
| + const Position* positions) override;
|
| + bool GetEstimator(uint32_t id, Estimator* out_estimator) const override;
|
|
|
| private:
|
| // Sample horizon.
|
| @@ -158,15 +157,14 @@ class IntegratingVelocityTrackerStrategy : public VelocityTrackerStrategy {
|
| public:
|
| // Degree must be 1 or 2.
|
| explicit IntegratingVelocityTrackerStrategy(uint32_t degree);
|
| - virtual ~IntegratingVelocityTrackerStrategy();
|
| -
|
| - virtual void Clear() override;
|
| - virtual void ClearPointers(BitSet32 id_bits) override;
|
| - virtual void AddMovement(const TimeTicks& event_time,
|
| - BitSet32 id_bits,
|
| - const Position* positions) override;
|
| - virtual bool GetEstimator(uint32_t id,
|
| - Estimator* out_estimator) const override;
|
| + ~IntegratingVelocityTrackerStrategy() override;
|
| +
|
| + void Clear() override;
|
| + void ClearPointers(BitSet32 id_bits) override;
|
| + void AddMovement(const TimeTicks& event_time,
|
| + BitSet32 id_bits,
|
| + const Position* positions) override;
|
| + bool GetEstimator(uint32_t id, Estimator* out_estimator) const override;
|
|
|
| private:
|
| // Current state estimate for a particular pointer.
|
|
|