| Index: webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| diff --git a/webkit/compositor_bindings/web_layer_tree_view_impl.cc b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| index f58a17da341523c0e98d9860e58a11fb0ab17c1b..22423c84937e548fa063060463aa3ea25f61c0b8 100644
|
| --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| @@ -229,9 +229,10 @@ void WebLayerTreeViewImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, float
|
| m_client->applyScrollAndScale(scrollDelta, pageScale);
|
| }
|
|
|
| -scoped_ptr<WebCompositorOutputSurface> WebLayerTreeViewImpl::createOutputSurface()
|
| +scoped_ptr<cc::OutputSurface> WebLayerTreeViewImpl::createOutputSurface()
|
| {
|
| - return scoped_ptr<WebCompositorOutputSurface>(m_client->createOutputSurface());
|
| + WebKit::WebCompositorOutputSurface *web = m_client->createOutputSurface();
|
| + return make_scoped_ptr(static_cast<cc::OutputSurface*>(web));
|
| }
|
|
|
| void WebLayerTreeViewImpl::didRecreateOutputSurface(bool success)
|
|
|