summaryrefslogtreecommitdiffstats
path: root/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
diff options
context:
space:
mode:
authorenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-06 20:06:39 +0000
committerenne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-06 20:06:39 +0000
commit5192817613654b94f21dac2afc67f416271d3519 (patch)
treeebf82fbb8b8eb58530ec3a656276f729b4932d20 /webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
parent4e08169aeb6af87a5f5e9615640234b46ed01878 (diff)
downloadchromium_src-5192817613654b94f21dac2afc67f416271d3519.zip
chromium_src-5192817613654b94f21dac2afc67f416271d3519.tar.gz
chromium_src-5192817613654b94f21dac2afc67f416271d3519.tar.bz2
[cc] Use scoped_ptr for CCLayerTreeHost(Impl)
BUG=154451 Review URL: https://chromiumcodereview.appspot.com/11031079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/WebLayerTreeViewImpl.cpp')
-rw-r--r--webkit/compositor_bindings/WebLayerTreeViewImpl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
index 3bcca79..e74651b 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
@@ -26,11 +26,11 @@ namespace WebKit {
WebLayerTreeView* WebLayerTreeView::create(WebLayerTreeViewClient* client, const WebLayer& root, const WebLayerTreeView::Settings& settings)
{
- OwnPtr<WebLayerTreeViewImpl> layerTreeViewImpl = adoptPtr(new WebLayerTreeViewImpl(client));
+ scoped_ptr<WebLayerTreeViewImpl> layerTreeViewImpl(new WebLayerTreeViewImpl(client));
if (!layerTreeViewImpl->initialize(settings))
return 0;
layerTreeViewImpl->setRootLayer(root);
- return layerTreeViewImpl.leakPtr();
+ return layerTreeViewImpl.release();
}
WebLayerTreeViewImpl::WebLayerTreeViewImpl(WebLayerTreeViewClient* client)
@@ -54,7 +54,7 @@ bool WebLayerTreeViewImpl::initialize(const WebLayerTreeView::Settings& webSetti
settings.defaultTileSize = convert(webSettings.defaultTileSize);
settings.maxUntiledLayerSize = convert(webSettings.maxUntiledLayerSize);
m_layerTreeHost = CCLayerTreeHost::create(this, settings);
- if (!m_layerTreeHost)
+ if (!m_layerTreeHost.get())
return false;
return true;
}