summaryrefslogtreecommitdiffstats
path: root/cc/tiled_layer.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 01:12:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-29 01:12:27 +0000
commit787465c591d96bb78dfc632dfef12fe5911255a5 (patch)
tree2cd1cd933405c2f5694b4f8432da3b6a6deaf2be /cc/tiled_layer.cc
parent0f24e53eb19d7662374fa84e2df1ebda4a2ae64e (diff)
downloadchromium_src-787465c591d96bb78dfc632dfef12fe5911255a5.zip
chromium_src-787465c591d96bb78dfc632dfef12fe5911255a5.tar.gz
chromium_src-787465c591d96bb78dfc632dfef12fe5911255a5.tar.bz2
cc: Convert more usages from Vector to std::vector.
This patch converted the entries found by the following command line: $ g grep -n "Vector<" cc/ | grep -v ScopedPtrVector | grep -v WebVector | grep -v "Vector<WebCore::IntRect" BUG=154451 TEST=cc_unittests R=enne@chromium.org,jamesr@chromium.org Review URL: https://codereview.chromium.org/11343003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/tiled_layer.cc')
-rw-r--r--cc/tiled_layer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index df4a985..6c71c5b9 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -204,7 +204,7 @@ void TiledLayer::pushPropertiesTo(LayerImpl* layer)
tiledLayer->setSkipsDraw(m_skipsDraw);
tiledLayer->setTilingData(*m_tiler);
- Vector<UpdatableTile*> invalidTiles;
+ std::vector<UpdatableTile*> invalidTiles;
for (LayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
int i = iter->first.first;
@@ -216,7 +216,7 @@ void TiledLayer::pushPropertiesTo(LayerImpl* layer)
if (!tile->managedTexture()->haveBackingTexture()) {
// Evicted tiles get deleted from both layers
- invalidTiles.append(tile);
+ invalidTiles.push_back(tile);
continue;
}
@@ -228,7 +228,7 @@ void TiledLayer::pushPropertiesTo(LayerImpl* layer)
tiledLayer->pushTileProperties(i, j, tile->managedTexture()->resourceId(), tile->opaqueRect(), tile->managedTexture()->contentsSwizzled());
}
- for (Vector<UpdatableTile*>::const_iterator iter = invalidTiles.begin(); iter != invalidTiles.end(); ++iter)
+ for (std::vector<UpdatableTile*>::const_iterator iter = invalidTiles.begin(); iter != invalidTiles.end(); ++iter)
m_tiler->takeTile((*iter)->i(), (*iter)->j());
}