cc: Store tiles, painters, tiling data in scoped_ptr

cc/layer_tiling_data.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 "CCLayerTilingData.h"
 
 using namespace std;
 
 namespace cc {
 
-PassOwnPtr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize, BorderTexelOption border)
+scoped_ptr<CCLayerTilingData> CCLayerTilingData::create(const IntSize& tileSize, BorderTexelOption border)
 {
-    return adoptPtr(new CCLayerTilingData(tileSize, border));
+    return make_scoped_ptr(new CCLayerTilingData(tileSize, border));
 }
 
 CCLayerTilingData::CCLayerTilingData(const IntSize& tileSize, BorderTexelOption border)
     : m_tilingData(tileSize, IntSize(), border == HasBorderTexels)
 {
     setTileSize(tileSize);
 }
 
 CCLayerTilingData::~CCLayerTilingData()
 {
@@ skipping 24 matching lines @@
     m_tilingData.setHasBorderTexels(borderTexels);
 }
 
 const CCLayerTilingData& CCLayerTilingData::operator=(const CCLayerTilingData& tiler)
 {
     m_tilingData = tiler.m_tilingData;
 
     return *this;
 }
 
-void CCLayerTilingData::addTile(PassOwnPtr<Tile> tile, int i, int j)
+void CCLayerTilingData::addTile(scoped_ptr<Tile> tile, int i, int j)
 {
     ASSERT(!tileAt(i, j));
     tile->moveTo(i, j);
-    m_tiles.add(make_pair(i, j), tile);
+    m_tiles.add(make_pair(i, j), tile.Pass());
 }
 
-PassOwnPtr<CCLayerTilingData::Tile> CCLayerTilingData::takeTile(int i, int j)
+scoped_ptr<CCLayerTilingData::Tile> CCLayerTilingData::takeTile(int i, int j)
 {
-    return m_tiles.take(make_pair(i, j));
+    return m_tiles.take_and_erase(make_pair(i, j));
 }
 
 CCLayerTilingData::Tile* CCLayerTilingData::tileAt(int i, int j) const
 {
     return m_tiles.get(make_pair(i, j));
 }
 
 void CCLayerTilingData::reset()
 {
     m_tiles.clear();
@@ skipping 46 matching lines @@
     if (size.isEmpty()) {
         m_tiles.clear();
         return;
     }
 
     // Any tiles completely outside our new bounds are invalid and should be dropped.
     int left, top, right, bottom;
     contentRectToTileIndices(IntRect(IntPoint(), size), left, top, right, bottom);
     Vector<TileMapKey> invalidTileKeys;
     for (TileMap::const_iterator it = m_tiles.begin(); it != m_tiles.end(); ++it) {
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
-        if (it->key.first > right || it->key.second > bottom)
-            invalidTileKeys.append(it->key);
-#else
         if (it->first.first > right || it->first.second > bottom)
             invalidTileKeys.append(it->first);
-#endif
     }
     for (size_t i = 0; i < invalidTileKeys.size(); ++i)
-        m_tiles.remove(invalidTileKeys[i]);
+        m_tiles.erase(invalidTileKeys[i]);
 }
 
 IntSize CCLayerTilingData::bounds() const
 {
     return m_tilingData.totalSize();
 }
 
 } // namespace cc