diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 16:57:47 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 16:57:47 +0000 |
| commit | 2d86b9236f5c502d9bf33aeb33e1fc865fb19914 (patch) | |
| tree | 8571637a2d38f45f7a1ce9c9ac69df42bbc04f1c /cc/texture_update_controller.h | |
| parent | e36df000ad8432ab5f15cdd219fa7921dcbf9478 (diff) | |
| download | chromium_src-2d86b9236f5c502d9bf33aeb33e1fc865fb19914.zip chromium_src-2d86b9236f5c502d9bf33aeb33e1fc865fb19914.tar.gz chromium_src-2d86b9236f5c502d9bf33aeb33e1fc865fb19914.tar.bz2 | |
cc: Own CCTimer by scoped_ptr instead of using OwnPtr.
BUG=154451
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org
Review URL: https://codereview.chromium.org/11118002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/texture_update_controller.h')
| -rw-r--r-- | cc/texture_update_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h index 74bb8ca..3eb629f 100644 --- a/cc/texture_update_controller.h +++ b/cc/texture_update_controller.h @@ -59,7 +59,7 @@ protected: void updateMoreTexturesNow(); CCTextureUpdateControllerClient* m_client; - OwnPtr<CCTimer> m_timer; + scoped_ptr<CCTimer> m_timer; OwnPtr<CCTextureUpdateQueue> m_queue; bool m_contentsTexturesPurged; CCResourceProvider* m_resourceProvider; @@ -72,6 +72,6 @@ private: DISALLOW_COPY_AND_ASSIGN(CCTextureUpdateController); }; -} +} // namespace cc #endif // CCTextureUpdateController_h |