| 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 0e27512b9587e0d0e8c8c20da06e2ab0b7f406bc..b4b9e7b4cd751015dc6c02ad09cbbcda9f4a8dee 100644
|
| --- a/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| +++ b/webkit/compositor_bindings/web_layer_tree_view_impl.cc
|
| @@ -27,7 +27,7 @@ namespace WebKit {
|
| WebLayerTreeView* WebLayerTreeView::create(WebLayerTreeViewClient* client, const WebLayer& root, const WebLayerTreeView::Settings& settings)
|
| {
|
| scoped_ptr<WebLayerTreeViewImpl> layerTreeViewImpl(new WebLayerTreeViewImpl(client));
|
| - if (!layerTreeViewImpl->initialize(settings))
|
| + if (!layerTreeViewImpl->initialize(settings, NULL))
|
| return 0;
|
| layerTreeViewImpl->setRootLayer(root);
|
| return layerTreeViewImpl.release();
|
| @@ -42,7 +42,7 @@ WebLayerTreeViewImpl::~WebLayerTreeViewImpl()
|
| {
|
| }
|
|
|
| -bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings)
|
| +bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSettings, CompositorSupportState* compositorSupportState)
|
| {
|
| CCLayerTreeSettings settings;
|
| settings.acceleratePainting = webSettings.acceleratePainting;
|
| @@ -53,7 +53,8 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
|
| settings.refreshRate = webSettings.refreshRate;
|
| settings.defaultTileSize = convert(webSettings.defaultTileSize);
|
| settings.maxUntiledLayerSize = convert(webSettings.maxUntiledLayerSize);
|
| - m_layerTreeHost = CCLayerTreeHost::create(this, settings);
|
| + m_layerTreeHost = CCLayerTreeHost::create(this, settings,
|
| + compositorSupportState);
|
| if (!m_layerTreeHost.get())
|
| return false;
|
| return true;
|
|
|