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 "web_layer_tree_view_impl.h" | 5 #include "web_layer_tree_view_impl.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 void WebLayerTreeViewImpl::layout() | 222 void WebLayerTreeViewImpl::layout() |
223 { | 223 { |
224 m_client->layout(); | 224 m_client->layout(); |
225 } | 225 } |
226 | 226 |
227 void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float
pageScale) | 227 void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float
pageScale) |
228 { | 228 { |
229 m_client->applyScrollAndScale(scrollDelta, pageScale); | 229 m_client->applyScrollAndScale(scrollDelta, pageScale); |
230 } | 230 } |
231 | 231 |
232 scoped_ptr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface
() | 232 scoped_ptr<cc::OutputSurface> WebLayerTreeViewImpl::createOutputSurface() |
233 { | 233 { |
234 return scoped_ptr<WebCompositorOutputSurface>(m_client->createOutputSurface(
)); | 234 WebKit::WebCompositorOutputSurface *web = m_client->createOutputSurface(); |
| 235 return make_scoped_ptr(static_cast<cc::OutputSurface*>(web)); |
235 } | 236 } |
236 | 237 |
237 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success) | 238 void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success) |
238 { | 239 { |
239 m_client->didRecreateOutputSurface(success); | 240 m_client->didRecreateOutputSurface(success); |
240 } | 241 } |
241 | 242 |
242 scoped_ptr<InputHandler> WebLayerTreeViewImpl::createInputHandler() | 243 scoped_ptr<InputHandler> WebLayerTreeViewImpl::createInputHandler() |
243 { | 244 { |
244 scoped_ptr<InputHandler> ret; | 245 scoped_ptr<InputHandler> ret; |
(...skipping 22 matching lines...) Expand all Loading... |
267 { | 268 { |
268 m_client->didCompleteSwapBuffers(); | 269 m_client->didCompleteSwapBuffers(); |
269 } | 270 } |
270 | 271 |
271 void WebLayerTreeViewImpl::scheduleComposite() | 272 void WebLayerTreeViewImpl::scheduleComposite() |
272 { | 273 { |
273 m_client->scheduleComposite(); | 274 m_client->scheduleComposite(); |
274 } | 275 } |
275 | 276 |
276 } // namespace WebKit | 277 } // namespace WebKit |
OLD | NEW |