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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 base::TimeTicks startTime = base::TimeTicks::FromInternalValue(startTime
Sec * base::Time::kMicrosecondsPerSecond); | 86 base::TimeTicks startTime = base::TimeTicks::FromInternalValue(startTime
Sec * base::Time::kMicrosecondsPerSecond); |
87 base::TimeDelta duration = base::TimeDelta::FromMicroseconds(durationSec
* base::Time::kMicrosecondsPerSecond); | 87 base::TimeDelta duration = base::TimeDelta::FromMicroseconds(durationSec
* base::Time::kMicrosecondsPerSecond); |
88 m_client->startPageScaleAnimation(convert(targetPosition), anchorPoint,
pageScale, startTime, duration); | 88 m_client->startPageScaleAnimation(convert(targetPosition), anchorPoint,
pageScale, startTime, duration); |
89 } | 89 } |
90 | 90 |
91 virtual void scheduleAnimation() OVERRIDE | 91 virtual void scheduleAnimation() OVERRIDE |
92 { | 92 { |
93 m_client->scheduleAnimation(); | 93 m_client->scheduleAnimation(); |
94 } | 94 } |
95 | 95 |
| 96 virtual bool checkTouchEventHandlerRegionHit(WebPoint point) |
| 97 { |
| 98 return m_client->checkTouchEventHandlerRegionHit(point); |
| 99 } |
| 100 |
96 private: | 101 private: |
97 cc::InputHandlerClient* m_client; | 102 cc::InputHandlerClient* m_client; |
98 }; | 103 }; |
99 | 104 |
100 | 105 |
101 void WebToCCInputHandlerAdapter::bindToClient(cc::InputHandlerClient* client) | 106 void WebToCCInputHandlerAdapter::bindToClient(cc::InputHandlerClient* client) |
102 { | 107 { |
103 m_clientAdapter.reset(new ClientAdapter(client)); | 108 m_clientAdapter.reset(new ClientAdapter(client)); |
104 m_handler->bindToClient(m_clientAdapter.get()); | 109 m_handler->bindToClient(m_clientAdapter.get()); |
105 } | 110 } |
106 | 111 |
107 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time) | 112 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time) |
108 { | 113 { |
109 double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF(); | 114 double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF(); |
110 m_handler->animate(monotonicTimeSeconds); | 115 m_handler->animate(monotonicTimeSeconds); |
111 } | 116 } |
112 | 117 |
113 } | 118 } |
OLD | NEW |