diff options
| author | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 03:33:40 +0000 |
|---|---|---|
| committer | falken@chromium.org <falken@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 03:33:40 +0000 |
| commit | a36c6649e81d18e8669c0b879d00d69a086fedbd (patch) | |
| tree | 0d4432cce37a8e66e3ce32904803ffb9010b2fe9 /cc/TextureLayerChromium.cpp | |
| parent | b91a4b66ef82d72bdac4e5f5784ccec494586764 (diff) | |
| download | chromium_src-a36c6649e81d18e8669c0b879d00d69a086fedbd.zip chromium_src-a36c6649e81d18e8669c0b879d00d69a086fedbd.tar.gz chromium_src-a36c6649e81d18e8669c0b879d00d69a086fedbd.tar.bz2 | |
Revert 161482 - [cc] Store CCLayerImpls as scoped_ptrs
(Reverting as cc_unittests on three Mac bots started failing)
Relanding https://codereview.chromium.org/11076013/
BUG=154451
Review URL: https://chromiumcodereview.appspot.com/11099040
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/11117008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/TextureLayerChromium.cpp')
| -rw-r--r-- | cc/TextureLayerChromium.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/TextureLayerChromium.cpp b/cc/TextureLayerChromium.cpp index e1b4851..cb03343 100644 --- a/cc/TextureLayerChromium.cpp +++ b/cc/TextureLayerChromium.cpp @@ -43,9 +43,9 @@ TextureLayerChromium::~TextureLayerChromium() } } -scoped_ptr<CCLayerImpl> TextureLayerChromium::createCCLayerImpl() +PassOwnPtr<CCLayerImpl> TextureLayerChromium::createCCLayerImpl() { - return CCTextureLayerImpl::create(m_layerId).PassAs<CCLayerImpl>(); + return CCTextureLayerImpl::create(m_layerId); } void TextureLayerChromium::setFlipped(bool flipped) |