| 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 15041165865be3bf04c01500ac941fa2c86d6c33..9787f03627aee46a79af5d757ef4a8a0d4f86578 100644
|
| --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| @@ -236,9 +236,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)
|
|
|