commit f33db56b4a1b7b753e09028588b7d670ce5d5b26
author reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 25 03:25:55 2012
committer reveman@chromium.org <reveman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Oct 25 03:25:55 2012
tree 5e1b546c63f145c300808b88be3985c79013707b
parent 12066cbcd88f48b5fcf537883b862f454f24ee0b

cc: Rename LayerUpdater::Texture to LayerUpdater::Resource.

BUG=
TEST=cc_unittests


Review URL: https://chromiumcodereview.appspot.com/11236078

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164007 0039d316-1c4b-4281-b951-d872f2087c98

cc/tiled_layer.cc

diff --git a/cc/tiled_layer.cc b/cc/tiled_layer.cc
index e737b75..538b30cfd 100644
--- a/cc/tiled_layer.cc
+++ b/cc/tiled_layer.cc
@@ -31,13 +31,13 @@
 
 class UpdatableTile : public LayerTilingData::Tile {
 public:
-    static scoped_ptr<UpdatableTile> create(scoped_ptr<LayerUpdater::Texture> texture)
+    static scoped_ptr<UpdatableTile> create(scoped_ptr<LayerUpdater::Resource> updaterResource)
     {
-        return make_scoped_ptr(new UpdatableTile(texture.Pass()));
+        return make_scoped_ptr(new UpdatableTile(updaterResource.Pass()));
     }
 
-    LayerUpdater::Texture* texture() { return m_texture.get(); }
-    PrioritizedTexture* managedTexture() { return m_texture->texture(); }
+    LayerUpdater::Resource* updaterResource() { return m_updaterResource.get(); }
+    PrioritizedTexture* managedTexture() { return m_updaterResource->texture(); }
 
     bool isDirty() const { return !dirtyRect.isEmpty(); }
 
@@ -71,16 +71,16 @@
     bool isInUseOnImpl;
 
 private:
-    explicit UpdatableTile(scoped_ptr<LayerUpdater::Texture> texture)
+    explicit UpdatableTile(scoped_ptr<LayerUpdater::Resource> updaterResource)
         : partialUpdate(false)
         , validForFrame(false)
         , occluded(false)
         , isInUseOnImpl(false)
-        , m_texture(texture.Pass())
+        , m_updaterResource(updaterResource.Pass())
     {
     }
 
-    scoped_ptr<LayerUpdater::Texture> m_texture;
+    scoped_ptr<LayerUpdater::Resource> m_updaterResource;
 
     DISALLOW_COPY_AND_ASSIGN(UpdatableTile);
 };
@@ -267,7 +267,7 @@
 {
     createUpdaterIfNeeded();
 
-    scoped_ptr<UpdatableTile> tile(UpdatableTile::create(updater()->createTexture(textureManager())));
+    scoped_ptr<UpdatableTile> tile(UpdatableTile::create(updater()->createResource(textureManager())));
     tile->managedTexture()->setDimensions(m_tiler->tileSize(), m_textureFormat);
 
     UpdatableTile* addedTile = tile.get();
@@ -531,7 +531,7 @@
             if (paintOffset.y() + sourceRect.height() > paintRect.height())
                 CRASH();
 
-            tile->texture()->update(queue, sourceRect, destOffset, tile->partialUpdate, stats);
+            tile->updaterResource()->update(queue, sourceRect, destOffset, tile->partialUpdate, stats);
             if (occlusion)
                 occlusion->overdrawMetrics().didUpload(WebTransformationMatrix(), sourceRect, tile->opaqueRect());
 
@@ -627,7 +627,7 @@
 
                 IntRect tileRect = m_tiler->tileRect(tile);
                 tile->dirtyRect = tileRect;
-                LayerUpdater::Texture* backBuffer = tile->texture();
+                LayerUpdater::Resource* backBuffer = tile->updaterResource();
                 setPriorityForTexture(visibleContentRect(), tile->dirtyRect, drawsToRoot, smallAnimatedLayer, backBuffer->texture());
                 scoped_ptr<PrioritizedTexture> frontBuffer = PrioritizedTexture::create(backBuffer->texture()->textureManager(),
                                                                                         backBuffer->texture()->size(),