OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_ | 5 #ifndef WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_ |
6 #define WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_ | 6 #define WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_ |
7 | 7 |
8 #include "base/android/scoped_java_ref.h" | 8 #include "base/android/scoped_java_ref.h" |
9 #include "third_party/WebKit/public/platform/WebFloatPoint.h" | 9 #include "third_party/WebKit/public/platform/WebFloatPoint.h" |
10 #include "third_party/WebKit/public/platform/WebGestureCurve.h" | 10 #include "third_party/WebKit/public/platform/WebGestureCurve.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 virtual void CancelFling(); | 42 virtual void CancelFling(); |
43 | 43 |
44 bool is_active_; | 44 bool is_active_; |
45 | 45 |
46 // Java OverScroller instance and methods. | 46 // Java OverScroller instance and methods. |
47 base::android::ScopedJavaGlobalRef<jobject> java_scroller_; | 47 base::android::ScopedJavaGlobalRef<jobject> java_scroller_; |
48 | 48 |
49 gfx::Point last_position_; | 49 gfx::Point last_position_; |
50 gfx::PointF last_velocity_; | 50 gfx::PointF last_velocity_; |
51 double last_time_; | 51 double last_time_; |
| 52 float dpi_scale_; |
52 | 53 |
53 DISALLOW_COPY_AND_ASSIGN(FlingAnimatorImpl); | 54 DISALLOW_COPY_AND_ASSIGN(FlingAnimatorImpl); |
54 }; | 55 }; |
55 | 56 |
56 } // namespace webkit_glue | 57 } // namespace webkit_glue |
57 | 58 |
58 #endif // WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_ | 59 #endif // WEBKIT_CHILD_FLING_ANIMATOR_IMPL_ANDROID_H_ |
OLD | NEW |