diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 20:33:28 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-03 20:33:28 +0000 |
| commit | 83c222ba602ac7e887c4d8ba28ce25644c955b5f (patch) | |
| tree | 2a226b772042221520143e356d0dadae7a1eee78 /cc/CCLayerTreeHost.h | |
| parent | 5e22dd387ccaa528567f9a3fe416df67ec90caf3 (diff) | |
| download | chromium_src-83c222ba602ac7e887c4d8ba28ce25644c955b5f.zip chromium_src-83c222ba602ac7e887c4d8ba28ce25644c955b5f.tar.gz chromium_src-83c222ba602ac7e887c4d8ba28ce25644c955b5f.tar.bz2 | |
cc: Remove OwnPtr usage from CCFontAtlas.
BUG=152049
TEST=cc_unittests
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/11053005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCLayerTreeHost.h')
| -rw-r--r-- | cc/CCLayerTreeHost.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cc/CCLayerTreeHost.h b/cc/CCLayerTreeHost.h index 04a31b9..48311f1 100644 --- a/cc/CCLayerTreeHost.h +++ b/cc/CCLayerTreeHost.h @@ -6,6 +6,7 @@ #define CCLayerTreeHost_h #include "base/basictypes.h" +#include "base/memory/scoped_ptr.h" #include "cc/own_ptr_vector.h" #include "CCAnimationEvents.h" #include "CCGraphicsContext.h" @@ -204,7 +205,7 @@ public: void setDeviceScaleFactor(float); float deviceScaleFactor() const { return m_deviceScaleFactor; } - void setFontAtlas(PassOwnPtr<CCFontAtlas>); + void setFontAtlas(scoped_ptr<CCFontAtlas>); HeadsUpDisplayLayerChromium* hudLayer() const { return m_hudLayer.get(); } @@ -248,7 +249,7 @@ private: RefPtr<LayerChromium> m_rootLayer; RefPtr<HeadsUpDisplayLayerChromium> m_hudLayer; - OwnPtr<CCFontAtlas> m_fontAtlas; + scoped_ptr<CCFontAtlas> m_fontAtlas; OwnPtr<CCPrioritizedTextureManager> m_contentsTextureManager; OwnPtr<CCPrioritizedTexture> m_surfaceMemoryPlaceholder; @@ -280,6 +281,6 @@ private: DISALLOW_COPY_AND_ASSIGN(CCLayerTreeHost); }; -} +} // namespace cc #endif |