OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #include "web_layer_tree_view_impl.h" | 6 #include "web_layer_tree_view_impl.h" |
7 | 7 |
8 #include "cc/font_atlas.h" | 8 #include "cc/font_atlas.h" |
9 #include "cc/input_handler.h" | 9 #include "cc/input_handler.h" |
10 #include "cc/layer.h" | 10 #include "cc/layer.h" |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 m_layerTreeHost->setVisible(visible); | 117 m_layerTreeHost->setVisible(visible); |
118 } | 118 } |
119 | 119 |
120 void WebLayerTreeViewImpl::setPageScaleFactorAndLimits(float pageScaleFactor, fl
oat minimum, float maximum) | 120 void WebLayerTreeViewImpl::setPageScaleFactorAndLimits(float pageScaleFactor, fl
oat minimum, float maximum) |
121 { | 121 { |
122 m_layerTreeHost->setPageScaleFactorAndLimits(pageScaleFactor, minimum, maxim
um); | 122 m_layerTreeHost->setPageScaleFactorAndLimits(pageScaleFactor, minimum, maxim
um); |
123 } | 123 } |
124 | 124 |
125 void WebLayerTreeViewImpl::startPageScaleAnimation(const WebPoint& scroll, bool
useAnchor, float newPageScale, double durationSec) | 125 void WebLayerTreeViewImpl::startPageScaleAnimation(const WebPoint& scroll, bool
useAnchor, float newPageScale, double durationSec) |
126 { | 126 { |
127 m_layerTreeHost->startPageScaleAnimation(IntSize(scroll.x, scroll.y), useAnc
hor, newPageScale, durationSec); | 127 base::TimeDelta duration = base::TimeDelta::FromMicroseconds(durationSec * b
ase::Time::kMicrosecondsPerSecond); |
| 128 m_layerTreeHost->startPageScaleAnimation(IntSize(scroll.x, scroll.y), useAnc
hor, newPageScale, duration); |
128 } | 129 } |
129 | 130 |
130 void WebLayerTreeViewImpl::setNeedsAnimate() | 131 void WebLayerTreeViewImpl::setNeedsAnimate() |
131 { | 132 { |
132 m_layerTreeHost->setNeedsAnimate(); | 133 m_layerTreeHost->setNeedsAnimate(); |
133 } | 134 } |
134 | 135 |
135 void WebLayerTreeViewImpl::setNeedsRedraw() | 136 void WebLayerTreeViewImpl::setNeedsRedraw() |
136 { | 137 { |
137 m_layerTreeHost->setNeedsRedraw(); | 138 m_layerTreeHost->setNeedsRedraw(); |
138 } | 139 } |
139 | 140 |
140 bool WebLayerTreeViewImpl::commitRequested() const | 141 bool WebLayerTreeViewImpl::commitRequested() const |
141 { | 142 { |
142 return m_layerTreeHost->commitRequested(); | 143 return m_layerTreeHost->commitRequested(); |
143 } | 144 } |
144 | 145 |
145 void WebLayerTreeViewImpl::composite() | 146 void WebLayerTreeViewImpl::composite() |
146 { | 147 { |
147 if (Proxy::hasImplThread()) | 148 if (Proxy::hasImplThread()) |
148 m_layerTreeHost->setNeedsCommit(); | 149 m_layerTreeHost->setNeedsCommit(); |
149 else | 150 else |
150 m_layerTreeHost->composite(); | 151 m_layerTreeHost->composite(); |
151 } | 152 } |
152 | 153 |
153 void WebLayerTreeViewImpl::updateAnimations(double frameBeginTime) | 154 void WebLayerTreeViewImpl::updateAnimations(double frameBeginTimeSeconds) |
154 { | 155 { |
| 156 base::TimeTicks frameBeginTime = base::TimeTicks::FromInternalValue(frameBeg
inTimeSeconds * base::Time::kMicrosecondsPerSecond); |
155 m_layerTreeHost->updateAnimations(frameBeginTime); | 157 m_layerTreeHost->updateAnimations(frameBeginTime); |
156 } | 158 } |
157 | 159 |
158 bool WebLayerTreeViewImpl::compositeAndReadback(void *pixels, const WebRect& rec
t) | 160 bool WebLayerTreeViewImpl::compositeAndReadback(void *pixels, const WebRect& rec
t) |
159 { | 161 { |
160 return m_layerTreeHost->compositeAndReadback(pixels, convert(rect)); | 162 return m_layerTreeHost->compositeAndReadback(pixels, convert(rect)); |
161 } | 163 } |
162 | 164 |
163 void WebLayerTreeViewImpl::finishAllRendering() | 165 void WebLayerTreeViewImpl::finishAllRendering() |
164 { | 166 { |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 { | 265 { |
264 m_client->didCompleteSwapBuffers(); | 266 m_client->didCompleteSwapBuffers(); |
265 } | 267 } |
266 | 268 |
267 void WebLayerTreeViewImpl::scheduleComposite() | 269 void WebLayerTreeViewImpl::scheduleComposite() |
268 { | 270 { |
269 m_client->scheduleComposite(); | 271 m_client->scheduleComposite(); |
270 } | 272 } |
271 | 273 |
272 } // namespace WebKit | 274 } // namespace WebKit |
OLD | NEW |