| 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 "web_to_ccinput_handler_adapter.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" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 : m_client(client) | 42 : m_client(client) |
| 43 { | 43 { |
| 44 } | 44 } |
| 45 | 45 |
| 46 virtual ~ClientAdapter() | 46 virtual ~ClientAdapter() |
| 47 { | 47 { |
| 48 } | 48 } |
| 49 | 49 |
| 50 virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERR
IDE | 50 virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERR
IDE |
| 51 { | 51 { |
| 52 return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scroll
Begin(convert(point), static_cast<cc::InputHandlerClient::ScrollInputType>(type)
)); | 52 return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scroll
Begin(point, static_cast<cc::InputHandlerClient::ScrollInputType>(type))); |
| 53 } | 53 } |
| 54 | 54 |
| 55 virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE | 55 virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE |
| 56 { | 56 { |
| 57 m_client->scrollBy(convert(point), convert(offset)); | 57 m_client->scrollBy(point, convert(offset)); |
| 58 } | 58 } |
| 59 | 59 |
| 60 virtual void scrollEnd() OVERRIDE | 60 virtual void scrollEnd() OVERRIDE |
| 61 { | 61 { |
| 62 m_client->scrollEnd(); | 62 m_client->scrollEnd(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 virtual void pinchGestureBegin() OVERRIDE | 65 virtual void pinchGestureBegin() OVERRIDE |
| 66 { | 66 { |
| 67 m_client->pinchGestureBegin(); | 67 m_client->pinchGestureBegin(); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 m_handler->bindToClient(m_clientAdapter.get()); | 104 m_handler->bindToClient(m_clientAdapter.get()); |
| 105 } | 105 } |
| 106 | 106 |
| 107 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time) | 107 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time) |
| 108 { | 108 { |
| 109 double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF(); | 109 double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF(); |
| 110 m_handler->animate(monotonicTimeSeconds); | 110 m_handler->animate(monotonicTimeSeconds); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } | 113 } |
| OLD | NEW |