| Index: content/browser/renderer_host/input/motion_event_android.h
|
| diff --git a/content/browser/renderer_host/input/motion_event_android.h b/content/browser/renderer_host/input/motion_event_android.h
|
| index 4af9f72e00b2557ac841ec7565d665415dc212b1..f4e8c9422ddd7778292257818911c2661c033aac 100644
|
| --- a/content/browser/renderer_host/input/motion_event_android.h
|
| +++ b/content/browser/renderer_host/input/motion_event_android.h
|
| @@ -55,35 +55,35 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
|
| jfloat raw_offset_y_pixels,
|
| const Pointer& pointer0,
|
| const Pointer& pointer1);
|
| - virtual ~MotionEventAndroid();
|
| + ~MotionEventAndroid() override;
|
|
|
| // ui::MotionEvent methods.
|
| - virtual int GetId() const override;
|
| - virtual Action GetAction() const override;
|
| - virtual int GetActionIndex() const override;
|
| - virtual size_t GetPointerCount() const override;
|
| - virtual int GetPointerId(size_t pointer_index) const override;
|
| - virtual float GetX(size_t pointer_index) const override;
|
| - virtual float GetY(size_t pointer_index) const override;
|
| - virtual float GetRawX(size_t pointer_index) const override;
|
| - virtual float GetRawY(size_t pointer_index) const override;
|
| - virtual float GetTouchMajor(size_t pointer_index) const override;
|
| - virtual float GetTouchMinor(size_t pointer_index) const override;
|
| - virtual float GetOrientation(size_t pointer_index) const override;
|
| - virtual float GetPressure(size_t pointer_index) const override;
|
| - virtual base::TimeTicks GetEventTime() const override;
|
| - virtual size_t GetHistorySize() const override;
|
| - virtual base::TimeTicks GetHistoricalEventTime(
|
| + int GetId() const override;
|
| + Action GetAction() const override;
|
| + int GetActionIndex() const override;
|
| + size_t GetPointerCount() const override;
|
| + int GetPointerId(size_t pointer_index) const override;
|
| + float GetX(size_t pointer_index) const override;
|
| + float GetY(size_t pointer_index) const override;
|
| + float GetRawX(size_t pointer_index) const override;
|
| + float GetRawY(size_t pointer_index) const override;
|
| + float GetTouchMajor(size_t pointer_index) const override;
|
| + float GetTouchMinor(size_t pointer_index) const override;
|
| + float GetOrientation(size_t pointer_index) const override;
|
| + float GetPressure(size_t pointer_index) const override;
|
| + base::TimeTicks GetEventTime() const override;
|
| + size_t GetHistorySize() const override;
|
| + base::TimeTicks GetHistoricalEventTime(
|
| size_t historical_index) const override;
|
| - virtual float GetHistoricalTouchMajor(size_t pointer_index,
|
| - size_t historical_index) const override;
|
| - virtual float GetHistoricalX(size_t pointer_index,
|
| - size_t historical_index) const override;
|
| - virtual float GetHistoricalY(size_t pointer_index,
|
| - size_t historical_index) const override;
|
| - virtual ToolType GetToolType(size_t pointer_index) const override;
|
| - virtual int GetButtonState() const override;
|
| - virtual int GetFlags() const override;
|
| + float GetHistoricalTouchMajor(size_t pointer_index,
|
| + size_t historical_index) const override;
|
| + float GetHistoricalX(size_t pointer_index,
|
| + size_t historical_index) const override;
|
| + float GetHistoricalY(size_t pointer_index,
|
| + size_t historical_index) const override;
|
| + ToolType GetToolType(size_t pointer_index) const override;
|
| + int GetButtonState() const override;
|
| + int GetFlags() const override;
|
|
|
| static bool RegisterMotionEventAndroid(JNIEnv* env);
|
|
|
|
|