diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 23:09:55 +0000 |
commit | 96baf3e81b1df4b0836d70c3cded9795e63fa789 (patch) | |
tree | 4332d128a05777ae34641ca2f185b7b548330b8d /cc/test/tiled_layer_test_common.h | |
parent | 1597399122fa6d8343dc6d5cdb771f95908c09b1 (diff) | |
download | chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.zip chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.gz chromium_src-96baf3e81b1df4b0836d70c3cded9795e63fa789.tar.bz2 |
cc: Rename cc classes and members to match filenames
Fixed reland of https://chromiumcodereview.appspot.com/11189043/
TBR=jam@chromium.org,jamesr@chromium.org
BUG=155413
Review URL: https://codereview.chromium.org/11231054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/tiled_layer_test_common.h')
-rw-r--r-- | cc/test/tiled_layer_test_common.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index b8d7a5c..be52ca1 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -20,16 +20,16 @@ namespace WebKitTests { -class FakeTiledLayerChromium; +class FakeTiledLayer; class FakeLayerTextureUpdater : public cc::LayerTextureUpdater { public: class Texture : public cc::LayerTextureUpdater::Texture { public: - Texture(FakeLayerTextureUpdater*, scoped_ptr<cc::CCPrioritizedTexture>); + Texture(FakeLayerTextureUpdater*, scoped_ptr<cc::PrioritizedTexture>); virtual ~Texture(); - virtual void update(cc::CCTextureUpdateQueue&, const cc::IntRect&, const cc::IntSize&, bool, cc::CCRenderingStats&) OVERRIDE; + virtual void update(cc::TextureUpdateQueue&, const cc::IntRect&, const cc::IntSize&, bool, cc::RenderingStats&) OVERRIDE; private: FakeLayerTextureUpdater* m_layer; @@ -38,12 +38,12 @@ public: FakeLayerTextureUpdater(); - virtual scoped_ptr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE; + virtual scoped_ptr<cc::LayerTextureUpdater::Texture> createTexture(cc::PrioritizedTextureManager*) OVERRIDE; - virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE; + virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::RenderingStats&) OVERRIDE; // Sets the rect to invalidate during the next call to prepareToUpdate(). After the next // call to prepareToUpdate() the rect is reset. - void setRectToInvalidate(const cc::IntRect&, FakeTiledLayerChromium*); + void setRectToInvalidate(const cc::IntRect&, FakeTiledLayer*); // Last rect passed to prepareToUpdate(). const cc::IntRect& lastUpdateRect() const { return m_lastUpdateRect; } @@ -67,53 +67,53 @@ private: cc::IntRect m_rectToInvalidate; cc::IntRect m_lastUpdateRect; cc::IntRect m_opaquePaintRect; - scoped_refptr<FakeTiledLayerChromium> m_layer; + scoped_refptr<FakeTiledLayer> m_layer; }; -class FakeCCTiledLayerImpl : public cc::CCTiledLayerImpl { +class FakeTiledLayerImpl : public cc::TiledLayerImpl { public: - explicit FakeCCTiledLayerImpl(int id); - virtual ~FakeCCTiledLayerImpl(); + explicit FakeTiledLayerImpl(int id); + virtual ~FakeTiledLayerImpl(); - using cc::CCTiledLayerImpl::hasTileAt; - using cc::CCTiledLayerImpl::hasResourceIdForTileAt; + using cc::TiledLayerImpl::hasTileAt; + using cc::TiledLayerImpl::hasResourceIdForTileAt; }; -class FakeTiledLayerChromium : public cc::TiledLayerChromium { +class FakeTiledLayer : public cc::TiledLayer { public: - explicit FakeTiledLayerChromium(cc::CCPrioritizedTextureManager*); + explicit FakeTiledLayer(cc::PrioritizedTextureManager*); static cc::IntSize tileSize() { return cc::IntSize(100, 100); } - using cc::TiledLayerChromium::invalidateContentRect; - using cc::TiledLayerChromium::needsIdlePaint; - using cc::TiledLayerChromium::skipsDraw; - using cc::TiledLayerChromium::numPaintedTiles; - using cc::TiledLayerChromium::idlePaintRect; + using cc::TiledLayer::invalidateContentRect; + using cc::TiledLayer::needsIdlePaint; + using cc::TiledLayer::skipsDraw; + using cc::TiledLayer::numPaintedTiles; + using cc::TiledLayer::idlePaintRect; virtual void setNeedsDisplayRect(const cc::FloatRect&) OVERRIDE; const cc::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; } - virtual void setTexturePriorities(const cc::CCPriorityCalculator&) OVERRIDE; + virtual void setTexturePriorities(const cc::PriorityCalculator&) OVERRIDE; - virtual cc::CCPrioritizedTextureManager* textureManager() const OVERRIDE; + virtual cc::PrioritizedTextureManager* textureManager() const OVERRIDE; FakeLayerTextureUpdater* fakeLayerTextureUpdater() { return m_fakeTextureUpdater.get(); } cc::FloatRect updateRect() { return m_updateRect; } protected: virtual cc::LayerTextureUpdater* textureUpdater() const OVERRIDE; virtual void createTextureUpdaterIfNeeded() OVERRIDE { } - virtual ~FakeTiledLayerChromium(); + virtual ~FakeTiledLayer(); private: scoped_refptr<FakeLayerTextureUpdater> m_fakeTextureUpdater; - cc::CCPrioritizedTextureManager* m_textureManager; + cc::PrioritizedTextureManager* m_textureManager; cc::FloatRect m_lastNeedsDisplayRect; }; -class FakeTiledLayerWithScaledBounds : public FakeTiledLayerChromium { +class FakeTiledLayerWithScaledBounds : public FakeTiledLayer { public: - explicit FakeTiledLayerWithScaledBounds(cc::CCPrioritizedTextureManager*); + explicit FakeTiledLayerWithScaledBounds(cc::PrioritizedTextureManager*); void setContentBounds(const cc::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; } virtual cc::IntSize contentBounds() const OVERRIDE; |