diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 20:58:10 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 20:58:10 +0000 |
commit | 184fac5add06d5f4670fa6be4a4d3b39232d51bb (patch) | |
tree | 7efc1d20146fcafdbe408fa67292117c41e9393f /cc/test/tiled_layer_test_common.cc | |
parent | fb7ffba75e81a79436434bab0715be0d6e67bc07 (diff) | |
download | chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.zip chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.gz chromium_src-184fac5add06d5f4670fa6be4a4d3b39232d51bb.tar.bz2 |
cc: Rename cc classes and members to match filenames
BUG=155413
Review URL: https://codereview.chromium.org/11189043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/tiled_layer_test_common.cc')
-rw-r--r-- | cc/test/tiled_layer_test_common.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index 7f42177..ccc593b 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 { -FakeLayerTextureUpdater::Texture::Texture(FakeLayerTextureUpdater* layer, scoped_ptr<CCPrioritizedTexture> texture) +FakeLayerTextureUpdater::Texture::Texture(FakeLayerTextureUpdater* layer, scoped_ptr<PrioritizedTexture> texture) : LayerTextureUpdater::Texture(texture.Pass()) , m_layer(layer) { @@ -22,7 +22,7 @@ FakeLayerTextureUpdater::Texture::~Texture() { } -void FakeLayerTextureUpdater::Texture::update(CCTextureUpdateQueue& queue, const IntRect&, const IntSize&, bool partialUpdate, CCRenderingStats&) +void FakeLayerTextureUpdater::Texture::update(TextureUpdateQueue& queue, const IntRect&, const IntSize&, bool partialUpdate, RenderingStats&) { const IntRect rect(0, 0, 10, 10); ResourceUpdate upload = ResourceUpdate::Create( @@ -45,7 +45,7 @@ FakeLayerTextureUpdater::~FakeLayerTextureUpdater() { } -void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float, float, IntRect& resultingOpaqueRect, CCRenderingStats&) +void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const IntSize&, float, float, IntRect& resultingOpaqueRect, RenderingStats&) { m_prepareCount++; m_lastUpdateRect = contentRect; @@ -57,15 +57,15 @@ void FakeLayerTextureUpdater::prepareToUpdate(const IntRect& contentRect, const resultingOpaqueRect = m_opaquePaintRect; } -void FakeLayerTextureUpdater::setRectToInvalidate(const IntRect& rect, FakeTiledLayerChromium* layer) +void FakeLayerTextureUpdater::setRectToInvalidate(const IntRect& rect, FakeTiledLayer* layer) { m_rectToInvalidate = rect; m_layer = layer; } -scoped_ptr<LayerTextureUpdater::Texture> FakeLayerTextureUpdater::createTexture(CCPrioritizedTextureManager* manager) +scoped_ptr<LayerTextureUpdater::Texture> FakeLayerTextureUpdater::createTexture(PrioritizedTextureManager* manager) { - return scoped_ptr<LayerTextureUpdater::Texture>(new Texture(this, CCPrioritizedTexture::create(manager))); + return scoped_ptr<LayerTextureUpdater::Texture>(new Texture(this, PrioritizedTexture::create(manager))); } LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFormat(GLenum) @@ -73,28 +73,28 @@ LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFor return SampledTexelFormatRGBA; } -FakeCCTiledLayerImpl::FakeCCTiledLayerImpl(int id) - : CCTiledLayerImpl(id) +FakeTiledLayerImpl::FakeTiledLayerImpl(int id) + : TiledLayerImpl(id) { } -FakeCCTiledLayerImpl::~FakeCCTiledLayerImpl() +FakeTiledLayerImpl::~FakeTiledLayerImpl() { } -FakeTiledLayerChromium::FakeTiledLayerChromium(CCPrioritizedTextureManager* textureManager) - : TiledLayerChromium() +FakeTiledLayer::FakeTiledLayer(PrioritizedTextureManager* textureManager) + : TiledLayer() , m_fakeTextureUpdater(make_scoped_refptr(new FakeLayerTextureUpdater)) , m_textureManager(textureManager) { setTileSize(tileSize()); setTextureFormat(GL_RGBA); - setBorderTexelOption(CCLayerTilingData::NoBorderTexels); + setBorderTexelOption(LayerTilingData::NoBorderTexels); 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(CCPrioritizedTextureManager* textureManager) - : FakeTiledLayerChromium(textureManager) +FakeTiledLayerWithScaledBounds::FakeTiledLayerWithScaledBounds(PrioritizedTextureManager* textureManager) + : FakeTiledLayer(textureManager) { } @@ -102,17 +102,17 @@ FakeTiledLayerWithScaledBounds::~FakeTiledLayerWithScaledBounds() { } -FakeTiledLayerChromium::~FakeTiledLayerChromium() +FakeTiledLayer::~FakeTiledLayer() { } -void FakeTiledLayerChromium::setNeedsDisplayRect(const FloatRect& rect) +void FakeTiledLayer::setNeedsDisplayRect(const FloatRect& rect) { m_lastNeedsDisplayRect = rect; - TiledLayerChromium::setNeedsDisplayRect(rect); + TiledLayer::setNeedsDisplayRect(rect); } -void FakeTiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& calculator) +void FakeTiledLayer::setTexturePriorities(const PriorityCalculator& calculator) { // Ensure there is always a target render surface available. If none has been // set (the layer is an orphan for the test), then just set a surface on itself. @@ -121,7 +121,7 @@ void FakeTiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& ca if (missingTargetRenderSurface) createRenderSurface(); - TiledLayerChromium::setTexturePriorities(calculator); + TiledLayer::setTexturePriorities(calculator); if (missingTargetRenderSurface) { clearRenderSurface(); @@ -129,12 +129,12 @@ void FakeTiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& ca } } -cc::CCPrioritizedTextureManager* FakeTiledLayerChromium::textureManager() const +cc::PrioritizedTextureManager* FakeTiledLayer::textureManager() const { return m_textureManager; } -cc::LayerTextureUpdater* FakeTiledLayerChromium::textureUpdater() const +cc::LayerTextureUpdater* FakeTiledLayer::textureUpdater() const { return m_fakeTextureUpdater.get(); } |