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

Unified Diff: cc/test/tiled_layer_test_common.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months 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
Index: cc/test/tiled_layer_test_common.cc
diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc
index 6316cf986325a6e80e87e5ff262d3b4d42b4a8da..1d6de5ba6c16823a1fb783865fc35162a628e4d8 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)
{
@@ -20,7 +20,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&)
{
TextureUploader::Parameters upload = { texture(), NULL, NULL, { IntRect(), IntRect(), IntSize() } };
if (partialUpdate)
@@ -41,7 +41,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;
@@ -53,15 +53,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(GC3Denum)
@@ -69,28 +69,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(GraphicsContext3D::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)
{
}
@@ -98,17 +98,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.
@@ -117,7 +117,7 @@ void FakeTiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& ca
if (missingTargetRenderSurface)
createRenderSurface();
- TiledLayerChromium::setTexturePriorities(calculator);
+ TiledLayer::setTexturePriorities(calculator);
if (missingTargetRenderSurface) {
clearRenderSurface();
@@ -125,12 +125,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();
}
@@ -149,7 +149,7 @@ void FakeTextureUploader::markPendingUploadsAsNonBlocking()
{
}
-void FakeTextureUploader::uploadTexture(cc::CCResourceProvider* resourceProvider, Parameters upload)
+void FakeTextureUploader::uploadTexture(cc::ResourceProvider* resourceProvider, Parameters upload)
{
upload.texture->acquireBackingTexture(resourceProvider);
}
« cc/active_animation.h ('K') | « cc/test/tiled_layer_test_common.h ('k') | cc/texture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698