OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ | 5 #ifndef CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ |
6 #define CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ | 6 #define CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/hash_tables.h" | 9 #include "base/hash_tables.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 #ifndef NDEBUG | 78 #ifndef NDEBUG |
79 bool expect_scroll_update_end_; | 79 bool expect_scroll_update_end_; |
80 bool expect_pinch_update_end_; | 80 bool expect_pinch_update_end_; |
81 #endif | 81 #endif |
82 bool gesture_scroll_on_impl_thread_; | 82 bool gesture_scroll_on_impl_thread_; |
83 bool gesture_pinch_on_impl_thread_; | 83 bool gesture_pinch_on_impl_thread_; |
84 // This is always false when there are no flings on the main thread, but | 84 // This is always false when there are no flings on the main thread, but |
85 // conservative in the sense that we might not be actually flinging when it is | 85 // conservative in the sense that we might not be actually flinging when it is |
86 // true. | 86 // true. |
87 bool fling_may_be_active_on_main_thread_; | 87 bool fling_may_be_active_on_main_thread_; |
| 88 // The axes on which the current fling has overshot the bounds of the content. |
| 89 bool fling_overscrolled_horizontally_; |
| 90 bool fling_overscrolled_vertically_; |
88 | 91 |
89 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); | 92 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |
90 }; | 93 }; |
91 | 94 |
92 } // namespace content | 95 } // namespace content |
93 | 96 |
94 #endif // CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ | 97 #endif // CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ |
OLD | NEW |