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

Unified Diff: cc/test/CCTiledLayerTestCommon.h

Issue 10914268: Change cc files from namespace WebCore to cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 3 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
« no previous file with comments | « cc/test/CCTestCommon.h ('k') | cc/test/CCTiledLayerTestCommon.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/CCTiledLayerTestCommon.h
diff --git a/cc/test/CCTiledLayerTestCommon.h b/cc/test/CCTiledLayerTestCommon.h
index c9a38b47763b14a3901eb1696de6f6ce77d2fa6f..c708d1d29072c6be23ca3114da716ceb6796d55b 100644
--- a/cc/test/CCTiledLayerTestCommon.h
+++ b/cc/test/CCTiledLayerTestCommon.h
@@ -22,15 +22,15 @@ namespace WebKitTests {
class FakeTiledLayerChromium;
-class FakeLayerTextureUpdater : public WebCore::LayerTextureUpdater {
+class FakeLayerTextureUpdater : public cc::LayerTextureUpdater {
public:
- class Texture : public WebCore::LayerTextureUpdater::Texture {
+ class Texture : public cc::LayerTextureUpdater::Texture {
public:
- Texture(FakeLayerTextureUpdater*, PassOwnPtr<WebCore::CCPrioritizedTexture>);
+ Texture(FakeLayerTextureUpdater*, PassOwnPtr<cc::CCPrioritizedTexture>);
virtual ~Texture();
- virtual void updateRect(WebCore::CCResourceProvider* , const WebCore::IntRect&, const WebCore::IntSize&) OVERRIDE;
- virtual void prepareRect(const WebCore::IntRect&, WebCore::CCRenderingStats&) OVERRIDE;
+ virtual void updateRect(cc::CCResourceProvider* , const cc::IntRect&, const cc::IntSize&) OVERRIDE;
+ virtual void prepareRect(const cc::IntRect&, cc::CCRenderingStats&) OVERRIDE;
private:
FakeLayerTextureUpdater* m_layer;
@@ -39,15 +39,15 @@ public:
FakeLayerTextureUpdater();
virtual ~FakeLayerTextureUpdater();
- virtual PassOwnPtr<WebCore::LayerTextureUpdater::Texture> createTexture(WebCore::CCPrioritizedTextureManager*) OVERRIDE;
+ virtual PassOwnPtr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE;
- virtual void prepareToUpdate(const WebCore::IntRect& contentRect, const WebCore::IntSize&, float, float, WebCore::IntRect& resultingOpaqueRect, WebCore::CCRenderingStats&) OVERRIDE;
+ virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) 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 WebCore::IntRect&, FakeTiledLayerChromium*);
+ void setRectToInvalidate(const cc::IntRect&, FakeTiledLayerChromium*);
// Last rect passed to prepareToUpdate().
- const WebCore::IntRect& lastUpdateRect() const { return m_lastUpdateRect; }
+ const cc::IntRect& lastUpdateRect() const { return m_lastUpdateRect; }
// Number of times prepareToUpdate has been invoked.
int prepareCount() const { return m_prepareCount; }
@@ -63,82 +63,82 @@ public:
void clearPrepareRectCount() { m_prepareRectCount = 0; }
void prepareRect() { m_prepareRectCount++; }
- void setOpaquePaintRect(const WebCore::IntRect& opaquePaintRect) { m_opaquePaintRect = opaquePaintRect; }
+ void setOpaquePaintRect(const cc::IntRect& opaquePaintRect) { m_opaquePaintRect = opaquePaintRect; }
private:
int m_prepareCount;
int m_updateCount;
int m_prepareRectCount;
- WebCore::IntRect m_rectToInvalidate;
- WebCore::IntRect m_lastUpdateRect;
- WebCore::IntRect m_opaquePaintRect;
+ cc::IntRect m_rectToInvalidate;
+ cc::IntRect m_lastUpdateRect;
+ cc::IntRect m_opaquePaintRect;
RefPtr<FakeTiledLayerChromium> m_layer;
};
-class FakeCCTiledLayerImpl : public WebCore::CCTiledLayerImpl {
+class FakeCCTiledLayerImpl : public cc::CCTiledLayerImpl {
public:
explicit FakeCCTiledLayerImpl(int id);
virtual ~FakeCCTiledLayerImpl();
- using WebCore::CCTiledLayerImpl::hasTileAt;
- using WebCore::CCTiledLayerImpl::hasTextureIdForTileAt;
+ using cc::CCTiledLayerImpl::hasTileAt;
+ using cc::CCTiledLayerImpl::hasTextureIdForTileAt;
};
-class FakeTiledLayerChromium : public WebCore::TiledLayerChromium {
+class FakeTiledLayerChromium : public cc::TiledLayerChromium {
public:
- explicit FakeTiledLayerChromium(WebCore::CCPrioritizedTextureManager*);
+ explicit FakeTiledLayerChromium(cc::CCPrioritizedTextureManager*);
virtual ~FakeTiledLayerChromium();
- static WebCore::IntSize tileSize() { return WebCore::IntSize(100, 100); }
+ static cc::IntSize tileSize() { return cc::IntSize(100, 100); }
- using WebCore::TiledLayerChromium::invalidateContentRect;
- using WebCore::TiledLayerChromium::needsIdlePaint;
- using WebCore::TiledLayerChromium::skipsDraw;
- using WebCore::TiledLayerChromium::numPaintedTiles;
- using WebCore::TiledLayerChromium::idlePaintRect;
+ using cc::TiledLayerChromium::invalidateContentRect;
+ using cc::TiledLayerChromium::needsIdlePaint;
+ using cc::TiledLayerChromium::skipsDraw;
+ using cc::TiledLayerChromium::numPaintedTiles;
+ using cc::TiledLayerChromium::idlePaintRect;
- virtual void setNeedsDisplayRect(const WebCore::FloatRect&) OVERRIDE;
- const WebCore::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
+ virtual void setNeedsDisplayRect(const cc::FloatRect&) OVERRIDE;
+ const cc::FloatRect& lastNeedsDisplayRect() const { return m_lastNeedsDisplayRect; }
- virtual void setTexturePriorities(const WebCore::CCPriorityCalculator&) OVERRIDE;
+ virtual void setTexturePriorities(const cc::CCPriorityCalculator&) OVERRIDE;
- virtual WebCore::CCPrioritizedTextureManager* textureManager() const OVERRIDE;
+ virtual cc::CCPrioritizedTextureManager* textureManager() const OVERRIDE;
FakeLayerTextureUpdater* fakeLayerTextureUpdater() { return m_fakeTextureUpdater.get(); }
- WebCore::FloatRect updateRect() { return m_updateRect; }
+ cc::FloatRect updateRect() { return m_updateRect; }
protected:
- virtual WebCore::LayerTextureUpdater* textureUpdater() const OVERRIDE;
+ virtual cc::LayerTextureUpdater* textureUpdater() const OVERRIDE;
virtual void createTextureUpdaterIfNeeded() OVERRIDE { }
private:
RefPtr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
- WebCore::CCPrioritizedTextureManager* m_textureManager;
- WebCore::FloatRect m_lastNeedsDisplayRect;
+ cc::CCPrioritizedTextureManager* m_textureManager;
+ cc::FloatRect m_lastNeedsDisplayRect;
};
class FakeTiledLayerWithScaledBounds : public FakeTiledLayerChromium {
public:
- explicit FakeTiledLayerWithScaledBounds(WebCore::CCPrioritizedTextureManager*);
+ explicit FakeTiledLayerWithScaledBounds(cc::CCPrioritizedTextureManager*);
- void setContentBounds(const WebCore::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
- virtual WebCore::IntSize contentBounds() const OVERRIDE;
+ void setContentBounds(const cc::IntSize& contentBounds) { m_forcedContentBounds = contentBounds; }
+ virtual cc::IntSize contentBounds() const OVERRIDE;
protected:
- WebCore::IntSize m_forcedContentBounds;
+ cc::IntSize m_forcedContentBounds;
};
-class FakeTextureCopier : public WebCore::TextureCopier {
+class FakeTextureCopier : public cc::TextureCopier {
public:
virtual void copyTexture(Parameters) OVERRIDE { }
virtual void flush() OVERRIDE { }
};
-class FakeTextureUploader : public WebCore::TextureUploader {
+class FakeTextureUploader : public cc::TextureUploader {
public:
virtual bool isBusy() OVERRIDE;
virtual void beginUploads() OVERRIDE { }
virtual void endUploads() OVERRIDE { }
- virtual void uploadTexture(WebCore::CCResourceProvider*, Parameters upload) OVERRIDE;
+ virtual void uploadTexture(cc::CCResourceProvider*, Parameters upload) OVERRIDE;
};
}
« no previous file with comments | « cc/test/CCTestCommon.h ('k') | cc/test/CCTiledLayerTestCommon.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698