| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "WebToCCInputHandlerAdapter.h" | 7 #include "web_to_ccinput_handler_adapter.h" |
| 8 | 8 |
| 9 #include "cc/stubs/int_point.h" | 9 #include "cc/stubs/int_point.h" |
| 10 #include "cc/stubs/int_size.h" | 10 #include "cc/stubs/int_size.h" |
| 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClie
nt.h" | 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClie
nt.h" |
| 12 #include "webcore_convert.h" | 12 #include "webcore_convert.h" |
| 13 | 13 |
| 14 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \ | 14 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \ |
| 15 COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enu
ms) | 15 COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enu
ms) |
| 16 | 16 |
| 17 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, CC
InputHandlerClient::ScrollOnMainThread); | 17 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, CC
InputHandlerClient::ScrollOnMainThread); |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 m_clientAdapter.reset(new ClientAdapter(client)); | 101 m_clientAdapter.reset(new ClientAdapter(client)); |
| 102 m_handler->bindToClient(m_clientAdapter.get()); | 102 m_handler->bindToClient(m_clientAdapter.get()); |
| 103 } | 103 } |
| 104 | 104 |
| 105 void WebToCCInputHandlerAdapter::animate(double monotonicTime) | 105 void WebToCCInputHandlerAdapter::animate(double monotonicTime) |
| 106 { | 106 { |
| 107 m_handler->animate(monotonicTime); | 107 m_handler->animate(monotonicTime); |
| 108 } | 108 } |
| 109 | 109 |
| 110 } | 110 } |
| OLD | NEW |