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

8 files changed, 32 insertions, 29 deletions

diff --git a/cc/CCFontAtlas.h b/cc/CCFontAtlas.h
index fae5a05..6b2df95 100644
--- a/cc/CCFontAtlas.h
+++ b/cc/CCFontAtlas.h
@@ -7,12 +7,12 @@
 
 #if USE(ACCELERATED_COMPOSITING)
 
+#include <string>
+
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
 #include "IntRect.h"
 #include "SkBitmap.h"
-#include <string>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 
 class SkCanvas;
 
@@ -27,9 +27,9 @@ class IntSize;
 // This class provides basic ability to draw text onto the heads-up display.
 class CCFontAtlas {
 public:
-    static PassOwnPtr<CCFontAtlas> create(SkBitmap bitmap, IntRect asciiToRectTable[128], int fontHeight)
+    static scoped_ptr<CCFontAtlas> create(SkBitmap bitmap, IntRect asciiToRectTable[128], int fontHeight)
     {
-        return adoptPtr(new CCFontAtlas(bitmap, asciiToRectTable, fontHeight));
+        return scoped_ptr<CCFontAtlas>(new CCFontAtlas(bitmap, asciiToRectTable, fontHeight));
     }
     ~CCFontAtlas();
 
diff --git a/cc/CCHeadsUpDisplayLayerImpl.cpp b/cc/CCHeadsUpDisplayLayerImpl.cpp
index 7811fc5..bd2bb77 100644
--- a/cc/CCHeadsUpDisplayLayerImpl.cpp
+++ b/cc/CCHeadsUpDisplayLayerImpl.cpp
@@ -48,9 +48,9 @@ CCHeadsUpDisplayLayerImpl::~CCHeadsUpDisplayLayerImpl()
 {
 }
 
-void CCHeadsUpDisplayLayerImpl::setFontAtlas(PassOwnPtr<CCFontAtlas> fontAtlas)
+void CCHeadsUpDisplayLayerImpl::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
-    m_fontAtlas = fontAtlas;
+    m_fontAtlas = fontAtlas.Pass();
 }
 
 void CCHeadsUpDisplayLayerImpl::willDraw(CCResourceProvider* resourceProvider)
@@ -153,7 +153,7 @@ void CCHeadsUpDisplayLayerImpl::drawHudContents(SkCanvas* canvas)
     if (settings.showFPSCounter)
         drawFPSCounter(canvas, layerTreeHostImpl()->fpsCounter(), fpsCounterTop, fpsCounterHeight);
 
-    if (settings.showPlatformLayerTree && m_fontAtlas) {
+    if (settings.showPlatformLayerTree && m_fontAtlas.get()) {
         std::string layerTree = layerTreeHostImpl()->layerTreeAsText();
         m_fontAtlas->drawText(canvas, createPaint(), layerTree, IntPoint(2, platformLayerTreeTop), bounds());
     }
@@ -229,7 +229,7 @@ void CCHeadsUpDisplayLayerImpl::drawFPSCounterText(SkCanvas* canvas, CCFrameRate
     canvas->drawRect(SkRect::MakeXYWH(2, top, width, height), paint);
 
     // Draw FPS text.
-    if (m_fontAtlas)
+    if (m_fontAtlas.get())
         m_fontAtlas->drawText(canvas, createPaint(), base::StringPrintf("FPS: %4.1f +/- %3.1f", averageFPS, stdDeviation), IntPoint(10, height / 3), IntSize(width, height));
 }
 
diff --git a/cc/CCHeadsUpDisplayLayerImpl.h b/cc/CCHeadsUpDisplayLayerImpl.h
index cc72100..234149d 100644
--- a/cc/CCHeadsUpDisplayLayerImpl.h
+++ b/cc/CCHeadsUpDisplayLayerImpl.h
@@ -5,6 +5,7 @@
 #ifndef CCHeadsUpDisplayLayerImpl_h
 #define CCHeadsUpDisplayLayerImpl_h
 
+#include "base/memory/scoped_ptr.h"
 #include "CCFontAtlas.h"
 #include "CCLayerImpl.h"
 #include "CCScopedTexture.h"
@@ -25,7 +26,7 @@ public:
     }
     virtual ~CCHeadsUpDisplayLayerImpl();
 
-    void setFontAtlas(PassOwnPtr<CCFontAtlas>);
+    void setFontAtlas(scoped_ptr<CCFontAtlas>);
 
     virtual void willDraw(CCResourceProvider*) OVERRIDE;
     virtual void appendQuads(CCQuadSink&, CCAppendQuadsData&) OVERRIDE;
@@ -46,11 +47,11 @@ private:
     void drawFPSCounterText(SkCanvas*, CCFrameRateCounter*, int top, int width, int height);
     void drawDebugRects(SkCanvas*, CCDebugRectHistory*);
 
-    OwnPtr<CCFontAtlas> m_fontAtlas;
+    scoped_ptr<CCFontAtlas> m_fontAtlas;
     OwnPtr<CCScopedTexture> m_hudTexture;
     OwnPtr<SkCanvas> m_hudCanvas;
 };
 
-}
+}  // namespace cc
 
 #endif // CCHeadsUpDisplayLayerImpl_h
diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
index ceeb536..a63bfe7 100644
--- a/cc/CCLayerTreeHost.cpp
+++ b/cc/CCLayerTreeHost.cpp
@@ -280,9 +280,9 @@ void CCLayerTreeHost::finishCommitOnImplThread(CCLayerTreeHostImpl* hostImpl)
     m_commitNumber++;
 }
 
-void CCLayerTreeHost::setFontAtlas(PassOwnPtr<CCFontAtlas> fontAtlas)
+void CCLayerTreeHost::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
-    m_fontAtlas = fontAtlas;
+    m_fontAtlas = fontAtlas.Pass();
     setNeedsCommit();
 }
 
@@ -293,8 +293,8 @@ void CCLayerTreeHost::willCommit()
         if (!m_hudLayer)
             m_hudLayer = HeadsUpDisplayLayerChromium::create();
 
-        if (m_fontAtlas)
-            m_hudLayer->setFontAtlas(m_fontAtlas.release());
+        if (m_fontAtlas.get())
+            m_hudLayer->setFontAtlas(m_fontAtlas.Pass());
 
         if (!m_hudLayer->parent())
             m_rootLayer->addChild(m_hudLayer);
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
diff --git a/cc/HeadsUpDisplayLayerChromium.cpp b/cc/HeadsUpDisplayLayerChromium.cpp
index 9a71c46..a9e1108 100644
--- a/cc/HeadsUpDisplayLayerChromium.cpp
+++ b/cc/HeadsUpDisplayLayerChromium.cpp
@@ -50,9 +50,9 @@ bool HeadsUpDisplayLayerChromium::drawsContent() const
     return true;
 }
 
-void HeadsUpDisplayLayerChromium::setFontAtlas(PassOwnPtr<CCFontAtlas> fontAtlas)
+void HeadsUpDisplayLayerChromium::setFontAtlas(scoped_ptr<CCFontAtlas> fontAtlas)
 {
-    m_fontAtlas = fontAtlas;
+    m_fontAtlas = fontAtlas.Pass();
     setNeedsCommit();
 }
 
@@ -65,11 +65,11 @@ void HeadsUpDisplayLayerChromium::pushPropertiesTo(CCLayerImpl* layerImpl)
 {
     LayerChromium::pushPropertiesTo(layerImpl);
 
-    if (!m_fontAtlas)
+    if (!m_fontAtlas.get())
         return;
 
     CCHeadsUpDisplayLayerImpl* hudLayerImpl = static_cast<CCHeadsUpDisplayLayerImpl*>(layerImpl);
-    hudLayerImpl->setFontAtlas(m_fontAtlas.release());
+    hudLayerImpl->setFontAtlas(m_fontAtlas.Pass());
 }
 
 }
diff --git a/cc/HeadsUpDisplayLayerChromium.h b/cc/HeadsUpDisplayLayerChromium.h
index 518212c..a22d44e 100644
--- a/cc/HeadsUpDisplayLayerChromium.h
+++ b/cc/HeadsUpDisplayLayerChromium.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 #ifndef HeadsUpDisplayLayerChromium_h
 #define HeadsUpDisplayLayerChromium_h
 
+#include "base/memory/scoped_ptr.h"
 #include "CCFontAtlas.h"
 #include "IntSize.h"
 #include "LayerChromium.h"
@@ -20,7 +20,7 @@ public:
     virtual void update(CCTextureUpdateQueue&, const CCOcclusionTracker*, CCRenderingStats&) OVERRIDE;
     virtual bool drawsContent() const OVERRIDE;
 
-    void setFontAtlas(PassOwnPtr<CCFontAtlas>);
+    void setFontAtlas(scoped_ptr<CCFontAtlas>);
 
     virtual PassOwnPtr<CCLayerImpl> createCCLayerImpl() OVERRIDE;
     virtual void pushPropertiesTo(CCLayerImpl*) OVERRIDE;
@@ -29,8 +29,9 @@ protected:
     HeadsUpDisplayLayerChromium();
 
 private:
-    OwnPtr<CCFontAtlas> m_fontAtlas;
+    scoped_ptr<CCFontAtlas> m_fontAtlas;
 };
 
-}
+}  // namespace cc
+
 #endif
diff --git a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
index f095c57..20e3d37 100644
--- a/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewImpl.cpp
@@ -186,8 +186,8 @@ void WebLayerTreeViewImpl::setFontAtlas(SkBitmap bitmap, WebRect asciiToWebRectT
     IntRect asciiToRectTable[128];
     for (int i = 0; i < 128; ++i)
         asciiToRectTable[i] = convert(asciiToWebRectTable[i]);
-    OwnPtr<CCFontAtlas> fontAtlas = CCFontAtlas::create(bitmap, asciiToRectTable, fontHeight);
-    m_layerTreeHost->setFontAtlas(fontAtlas.release());
+    scoped_ptr<CCFontAtlas> fontAtlas = CCFontAtlas::create(bitmap, asciiToRectTable, fontHeight);
+    m_layerTreeHost->setFontAtlas(fontAtlas.Pass());
 }
 
 void WebLayerTreeViewImpl::loseCompositorContext(int numTimes)