diff options
Diffstat (limited to 'Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h')
| -rw-r--r-- | Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h b/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h index 4eb875b1e..68fef6420 100644 --- a/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h +++ b/Source/WebKit/chromium/tests/CCTiledLayerTestCommon.h @@ -25,7 +25,6 @@ #ifndef CCTiledLayerTestCommon_h #define CCTiledLayerTestCommon_h -#include "GraphicsContext3D.h" #include "IntRect.h" #include "IntSize.h" #include "LayerTextureUpdater.h" @@ -34,6 +33,7 @@ #include "TextureManager.h" #include "TextureUploader.h" #include "TiledLayerChromium.h" +#include "cc/CCGraphicsContext.h" #include "cc/CCTextureUpdater.h" #include "cc/CCTiledLayerImpl.h" @@ -48,8 +48,8 @@ public: Texture(FakeLayerTextureUpdater*, PassOwnPtr<WebCore::ManagedTexture>); virtual ~Texture(); - virtual void updateRect(WebCore::GraphicsContext3D*, WebCore::TextureAllocator* , const WebCore::IntRect&, const WebCore::IntRect&); - virtual void prepareRect(const WebCore::IntRect&); + virtual void updateRect(WebCore::CCGraphicsContext*, WebCore::TextureAllocator* , const WebCore::IntRect&, const WebCore::IntRect&) OVERRIDE; + virtual void prepareRect(const WebCore::IntRect&) OVERRIDE; private: FakeLayerTextureUpdater* m_layer; @@ -58,10 +58,10 @@ public: FakeLayerTextureUpdater(); virtual ~FakeLayerTextureUpdater(); - virtual PassOwnPtr<WebCore::LayerTextureUpdater::Texture> createTexture(WebCore::TextureManager*); - virtual SampledTexelFormat sampledTexelFormat(GC3Denum) { return SampledTexelFormatRGBA; } + virtual PassOwnPtr<WebCore::LayerTextureUpdater::Texture> createTexture(WebCore::TextureManager*) OVERRIDE; + virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE { return SampledTexelFormatRGBA; } - virtual void prepareToUpdate(const WebCore::IntRect& contentRect, const WebCore::IntSize&, int, float, WebCore::IntRect& resultingOpaqueRect); + virtual void prepareToUpdate(const WebCore::IntRect& contentRect, const WebCore::IntSize&, float, WebCore::IntRect& resultingOpaqueRect) 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*); @@ -156,7 +156,8 @@ public: class FakeTextureCopier : public WebCore::TextureCopier { public: - virtual void copyTexture(WebCore::GraphicsContext3D*, unsigned, unsigned, const WebCore::IntSize&) { } + virtual void copyTexture(WebCore::CCGraphicsContext*, unsigned, unsigned, const WebCore::IntSize&) { } + virtual void copyToTexture(WebCore::CCGraphicsContext*, const void*, unsigned, const WebCore::IntSize&, GC3Denum) { } }; class FakeTextureUploader : public WebCore::TextureUploader { @@ -164,7 +165,7 @@ public: virtual bool isBusy() { return false; } virtual void beginUploads() { } virtual void endUploads() { } - virtual void uploadTexture(WebCore::GraphicsContext3D* context, WebCore::LayerTextureUpdater::Texture* texture, WebCore::TextureAllocator* allocator, const WebCore::IntRect sourceRect, const WebCore::IntRect destRect) { texture->updateRect(context, allocator, sourceRect, destRect); } + virtual void uploadTexture(WebCore::CCGraphicsContext* context, WebCore::LayerTextureUpdater::Texture* texture, WebCore::TextureAllocator* allocator, const WebCore::IntRect sourceRect, const WebCore::IntRect destRect) { texture->updateRect(context, allocator, sourceRect, destRect); } }; } |