| 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/containers/hash_tables.h" | 9 #include "base/containers/hash_tables.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 WebKit::WebActiveWheelFlingParameters fling_parameters_; | 71 WebKit::WebActiveWheelFlingParameters fling_parameters_; |
| 72 | 72 |
| 73 InputHandlerProxyClient* client_; | 73 InputHandlerProxyClient* client_; |
| 74 cc::InputHandler* input_handler_; | 74 cc::InputHandler* input_handler_; |
| 75 | 75 |
| 76 #ifndef NDEBUG | 76 #ifndef NDEBUG |
| 77 bool expect_scroll_update_end_; | 77 bool expect_scroll_update_end_; |
| 78 bool expect_pinch_update_end_; | 78 bool expect_pinch_update_end_; |
| 79 #endif | 79 #endif |
| 80 bool gesture_scroll_on_impl_thread_; | 80 bool gesture_scroll_on_impl_thread_; |
| 81 bool gesture_scroll_on_main_thread_; |
| 81 bool gesture_pinch_on_impl_thread_; | 82 bool gesture_pinch_on_impl_thread_; |
| 82 // This is always false when there are no flings on the main thread, but | 83 // This is always false when there are no flings on the main thread, but |
| 83 // conservative in the sense that we might not be actually flinging when it is | 84 // conservative in the sense that we might not be actually flinging when it is |
| 84 // true. | 85 // true. |
| 85 bool fling_may_be_active_on_main_thread_; | 86 bool fling_may_be_active_on_main_thread_; |
| 86 // The axes on which the current fling has overshot the bounds of the content. | 87 // The axes on which the current fling has overshot the bounds of the content. |
| 87 bool fling_overscrolled_horizontally_; | 88 bool fling_overscrolled_horizontally_; |
| 88 bool fling_overscrolled_vertically_; | 89 bool fling_overscrolled_vertically_; |
| 89 | 90 |
| 90 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); | 91 DISALLOW_COPY_AND_ASSIGN(InputHandlerProxy); |
| 91 }; | 92 }; |
| 92 | 93 |
| 93 } // namespace content | 94 } // namespace content |
| 94 | 95 |
| 95 #endif // CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ | 96 #endif // CONTENT_RENDERER_GPU_INPUT_HANDLER_PROXY_H_ |
| OLD | NEW |