summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authorreveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 21:16:40 +0000
committerreveman@google.com <reveman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-07 21:16:40 +0000
commit3b10a30273e8efe972c623f859a50b5a8643a063 (patch)
tree4cf6423c7541350104105c61cb3293356805bfa4 /cc/test
parent34f3e03f8de771a2bf954c9f029804768fec2a5b (diff)
downloadchromium_src-3b10a30273e8efe972c623f859a50b5a8643a063.zip
chromium_src-3b10a30273e8efe972c623f859a50b5a8643a063.tar.gz
chromium_src-3b10a30273e8efe972c623f859a50b5a8643a063.tar.bz2
cc: Rename PrioritizedTexture to PrioritizedResource.
sed -e ' s/PrioritizedTexture/PrioritizedResource/g s/prioritized_texture/prioritized_resource/g s/PRIORITIZED_TEXTURE/PRIORITIZED_RESOURCE/g s/managedTexture/managedResource/g s/textureManager/resourceManager/g s/constentsTextureManager/constentsResourceManager/g ' BUG= TEST=cc_unittests Review URL: https://codereview.chromium.org/11369109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/tiled_layer_test_common.cc18
-rw-r--r--cc/test/tiled_layer_test_common.h14
2 files changed, 16 insertions, 16 deletions
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index 6ed95ca..12172f1 100644
--- a/cc/test/tiled_layer_test_common.cc
+++ b/cc/test/tiled_layer_test_common.cc
@@ -10,7 +10,7 @@ using namespace cc;
namespace WebKitTests {
-FakeLayerUpdater::Resource::Resource(FakeLayerUpdater* layer, scoped_ptr<PrioritizedTexture> texture)
+FakeLayerUpdater::Resource::Resource(FakeLayerUpdater* layer, scoped_ptr<PrioritizedResource> texture)
: LayerUpdater::Resource(texture.Pass())
, m_layer(layer)
{
@@ -63,9 +63,9 @@ void FakeLayerUpdater::setRectToInvalidate(const gfx::Rect& rect, FakeTiledLayer
m_layer = layer;
}
-scoped_ptr<LayerUpdater::Resource> FakeLayerUpdater::createResource(PrioritizedTextureManager* manager)
+scoped_ptr<LayerUpdater::Resource> FakeLayerUpdater::createResource(PrioritizedResourceManager* manager)
{
- return scoped_ptr<LayerUpdater::Resource>(new Resource(this, PrioritizedTexture::create(manager)));
+ return scoped_ptr<LayerUpdater::Resource>(new Resource(this, PrioritizedResource::create(manager)));
}
FakeTiledLayerImpl::FakeTiledLayerImpl(int id)
@@ -77,10 +77,10 @@ FakeTiledLayerImpl::~FakeTiledLayerImpl()
{
}
-FakeTiledLayer::FakeTiledLayer(PrioritizedTextureManager* textureManager)
+FakeTiledLayer::FakeTiledLayer(PrioritizedResourceManager* resourceManager)
: TiledLayer()
, m_fakeUpdater(make_scoped_refptr(new FakeLayerUpdater))
- , m_textureManager(textureManager)
+ , m_resourceManager(resourceManager)
{
setTileSize(tileSize());
setTextureFormat(GL_RGBA);
@@ -88,8 +88,8 @@ FakeTiledLayer::FakeTiledLayer(PrioritizedTextureManager* textureManager)
setIsDrawable(true); // So that we don't get false positives if any of these tests expect to return false from drawsContent() for other reasons.
}
-FakeTiledLayerWithScaledBounds::FakeTiledLayerWithScaledBounds(PrioritizedTextureManager* textureManager)
- : FakeTiledLayer(textureManager)
+FakeTiledLayerWithScaledBounds::FakeTiledLayerWithScaledBounds(PrioritizedResourceManager* resourceManager)
+ : FakeTiledLayer(resourceManager)
{
}
@@ -124,9 +124,9 @@ void FakeTiledLayer::setTexturePriorities(const PriorityCalculator& calculator)
}
}
-cc::PrioritizedTextureManager* FakeTiledLayer::textureManager() const
+cc::PrioritizedResourceManager* FakeTiledLayer::resourceManager() const
{
- return m_textureManager;
+ return m_resourceManager;
}
cc::LayerUpdater* FakeTiledLayer::updater() const
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
index 2b0f13b..2a8875b 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;