Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1830)

Unified Diff: cc/test/tiled_layer_test_common.h

Issue 11369109: cc: Rename PrioritizedTexture to PrioritizedResource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/skpicture_content_layer_updater.cc ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/tiled_layer_test_common.h
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 2b0f13b8150a70d4b5f9062f405822e312488a8a..2a8875b083e7c1147621464d7aa7e62ddab76a91 100644
--- a/cc/test/tiled_layer_test_common.h
+++ b/cc/test/tiled_layer_test_common.h
@@ -7,7 +7,7 @@
#include "Region.h"
#include "cc/layer_updater.h"
-#include "cc/prioritized_texture.h"
+#include "cc/prioritized_resource.h"
#include "cc/resource_provider.h"
#include "cc/resource_update_queue.h"
#include "cc/texture_copier.h"
@@ -25,7 +25,7 @@ class FakeLayerUpdater : public cc::LayerUpdater {
public:
class Resource : public cc::LayerUpdater::Resource {
public:
- Resource(FakeLayerUpdater*, scoped_ptr<cc::PrioritizedTexture>);
+ Resource(FakeLayerUpdater*, scoped_ptr<cc::PrioritizedResource>);
virtual ~Resource();
virtual void update(cc::ResourceUpdateQueue&, const gfx::Rect&, const gfx::Vector2d&, bool, cc::RenderingStats&) OVERRIDE;
@@ -37,7 +37,7 @@ public:
FakeLayerUpdater();
- virtual scoped_ptr<cc::LayerUpdater::Resource> createResource(cc::PrioritizedTextureManager*) OVERRIDE;
+ virtual scoped_ptr<cc::LayerUpdater::Resource> createResource(cc::PrioritizedResourceManager*) OVERRIDE;
virtual void prepareToUpdate(const gfx::Rect& contentRect, const gfx::Size&, float, float, gfx::Rect& resultingOpaqueRect, cc::RenderingStats&) OVERRIDE;
// Sets the rect to invalidate during the next call to prepareToUpdate(). After the next
@@ -80,7 +80,7 @@ public:
class FakeTiledLayer : public cc::TiledLayer {
public:
- explicit FakeTiledLayer(cc::PrioritizedTextureManager*);
+ explicit FakeTiledLayer(cc::PrioritizedResourceManager*);
static gfx::Size tileSize() { return gfx::Size(100, 100); }
@@ -95,7 +95,7 @@ public:
virtual void setTexturePriorities(const cc::PriorityCalculator&) OVERRIDE;
- virtual cc::PrioritizedTextureManager* textureManager() const OVERRIDE;
+ virtual cc::PrioritizedResourceManager* resourceManager() const OVERRIDE;
FakeLayerUpdater* fakeLayerUpdater() { return m_fakeUpdater.get(); }
gfx::RectF updateRect() { return m_updateRect; }
@@ -106,13 +106,13 @@ protected:
private:
scoped_refptr<FakeLayerUpdater> m_fakeUpdater;
- cc::PrioritizedTextureManager* m_textureManager;
+ cc::PrioritizedResourceManager* m_resourceManager;
gfx::RectF m_lastNeedsDisplayRect;
};
class FakeTiledLayerWithScaledBounds : public FakeTiledLayer {
public:
- explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedTextureManager*);
+ explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedResourceManager*);
void setContentBounds(const gfx::Size& contentBounds) { m_forcedContentBounds = contentBounds; }
virtual gfx::Size contentBounds() const OVERRIDE;
« no previous file with comments | « cc/skpicture_content_layer_updater.cc ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698