| 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 #ifndef NDEBUG | 80 #ifndef NDEBUG |
| 81 bool expect_scroll_update_end_; | 81 bool expect_scroll_update_end_; |
| 82 bool expect_pinch_update_end_; | 82 bool expect_pinch_update_end_; |
| 83 #endif | 83 #endif |
| 84 bool gesture_scroll_on_impl_thread_; | 84 bool gesture_scroll_on_impl_thread_; |
| 85 bool gesture_pinch_on_impl_thread_; | 85 bool gesture_pinch_on_impl_thread_; |
| 86 // This is always false when there are no flings on the main thread, but | 86 // This is always false when there are no flings on the main thread, but |
| 87 // conservative in the sense that we might not be actually flinging when it is | 87 // conservative in the sense that we might not be actually flinging when it is |
| 88 // true. | 88 // true. |
| 89 bool fling_may_be_active_on_main_thread_; | 89 bool fling_may_be_active_on_main_thread_; |
| 90 // The axes on which the current fling has overshot the bounds of the content. |
| 91 bool fling_overscrolled_horizontally_; |
| 92 bool fling_overscrolled_vertically_; |
| 90 | 93 |
| 91 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); | 94 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |
| 92 }; | 95 }; |
| 93 | 96 |
| 94 } // namespace content | 97 } // namespace content |
| 95 | 98 |
| 96 #endif // CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ | 99 #endif // CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ |
| OLD | NEW |