| Index: cc/test/CCTiledLayerTestCommon.cpp
|
| diff --git a/cc/test/CCTiledLayerTestCommon.cpp b/cc/test/CCTiledLayerTestCommon.cpp
|
| index a1ba83c5124aadb37e5f453d4bb4caa1f33fd8ff..542d4591f477754ceea80d948a0d91d48a530743 100644
|
| --- a/cc/test/CCTiledLayerTestCommon.cpp
|
| +++ b/cc/test/CCTiledLayerTestCommon.cpp
|
| @@ -65,6 +65,11 @@ PassOwnPtr<LayerTextureUpdater::Texture> FakeLayerTextureUpdater::createTexture(
|
| return adoptPtr(new Texture(this, CCPrioritizedTexture::create(manager)));
|
| }
|
|
|
| +LayerTextureUpdater::SampledTexelFormat FakeLayerTextureUpdater::sampledTexelFormat(GC3Denum)
|
| +{
|
| + return SampledTexelFormatRGBA;
|
| +}
|
| +
|
| FakeCCTiledLayerImpl::FakeCCTiledLayerImpl(int id)
|
| : CCTiledLayerImpl(id)
|
| {
|
| @@ -85,6 +90,11 @@ FakeTiledLayerChromium::FakeTiledLayerChromium(CCPrioritizedTextureManager* text
|
| 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)
|
| +{
|
| +}
|
| +
|
| FakeTiledLayerChromium::~FakeTiledLayerChromium()
|
| {
|
| }
|
| @@ -112,9 +122,29 @@ void FakeTiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& ca
|
| }
|
| }
|
|
|
| -FakeTiledLayerWithScaledBounds::FakeTiledLayerWithScaledBounds(CCPrioritizedTextureManager* textureManager)
|
| - : FakeTiledLayerChromium(textureManager)
|
| +WebCore::CCPrioritizedTextureManager* FakeTiledLayerChromium::textureManager() const
|
| +{
|
| + return m_textureManager;
|
| +}
|
| +
|
| +WebCore::LayerTextureUpdater* FakeTiledLayerChromium::textureUpdater() const
|
| +{
|
| + return m_fakeTextureUpdater.get();
|
| +}
|
| +
|
| +WebCore::IntSize FakeTiledLayerWithScaledBounds::contentBounds() const
|
| +{
|
| + return m_forcedContentBounds;
|
| +}
|
| +
|
| +bool FakeTextureUploader::isBusy()
|
| +{
|
| + return false;
|
| +}
|
| +
|
| +void FakeTextureUploader::uploadTexture(WebCore::CCResourceProvider* resourceProvider, Parameters upload)
|
| {
|
| + upload.texture->updateRect(resourceProvider, upload.sourceRect, upload.destOffset);
|
| }
|
|
|
| } // namespace
|
|
|