cc: Store tiles, painters, tiling data in scoped_ptr

cc/tiled_layer_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCTiledLayerImpl.h"
 
 #include "base/basictypes.h"
 #include "base/stringprintf.h"
@@ skipping 28 matching lines @@
 static const int defaultCheckerboardColorBlue = 241;
 static const int debugTileEvictedCheckerboardColorRed = 255;
 static const int debugTileEvictedCheckerboardColorGreen = 200;
 static const int debugTileEvictedCheckerboardColorBlue = 200;
 static const int debugTileInvalidatedCheckerboardColorRed = 128;
 static const int debugTileInvalidatedCheckerboardColorGreen = 200;
 static const int debugTileInvalidatedCheckerboardColorBlue = 245;
 
 class DrawableTile : public CCLayerTilingData::Tile {
 public:
-    static PassOwnPtr<DrawableTile> create() { return adoptPtr(new DrawableTile()); }
+    static scoped_ptr<DrawableTile> create() { return make_scoped_ptr(new DrawableTile()); }
 
     CCResourceProvider::ResourceId resourceId() const { return m_resourceId; }
     void setResourceId(CCResourceProvider::ResourceId resourceId) { m_resourceId = resourceId; }
 
 private:
     DrawableTile() : m_resourceId(0) { }
 
     CCResourceProvider::ResourceId m_resourceId;
 
     DISALLOW_COPY_AND_ASSIGN(DrawableTile);
@@ skipping 39 matching lines @@
     return hasTileAt(i, j) && tileAt(i, j)->resourceId();
 }
 
 DrawableTile* CCTiledLayerImpl::tileAt(int i, int j) const
 {
     return static_cast<DrawableTile*>(m_tiler->tileAt(i, j));
 }
 
 DrawableTile* CCTiledLayerImpl::createTile(int i, int j)
 {
-    OwnPtr<DrawableTile> tile(DrawableTile::create());
+    scoped_ptr<DrawableTile> tile(DrawableTile::create());
     DrawableTile* addedTile = tile.get();
-    m_tiler->addTile(tile.release(), i, j);
+    m_tiler->addTile(tile.PassAs<CCLayerTilingData::Tile>(), i, j);
     return addedTile;
 }
 
 void CCTiledLayerImpl::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData)
 {
     const IntRect& contentRect = visibleContentRect();
 
     if (!m_tiler || m_tiler->hasEmptyBounds() || contentRect.isEmpty())
         return;
 
@@ skipping 118 matching lines @@
 {
     m_tiler->reset();
 }
 
 const char* CCTiledLayerImpl::layerTypeAsString() const
 {
     return "ContentLayer";
 }
 
 } // namespace cc