| Index: cc/test/tiled_layer_test_common.h
|
| diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h
|
| index 555180167dabae3aaabd2199171f2518e4553aa6..88db7116b20cdc053a3f4e3c2a7bc2c8b9d3b242 100644
|
| --- a/cc/test/tiled_layer_test_common.h
|
| +++ b/cc/test/tiled_layer_test_common.h
|
| @@ -36,9 +36,8 @@ public:
|
| };
|
|
|
| FakeLayerTextureUpdater();
|
| - virtual ~FakeLayerTextureUpdater();
|
|
|
| - virtual PassOwnPtr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
|
| + virtual scoped_ptr<cc::LayerTextureUpdater::Texture> createTexture(cc::CCPrioritizedTextureManager*) OVERRIDE;
|
| virtual SampledTexelFormat sampledTexelFormat(GC3Denum) OVERRIDE;
|
|
|
| virtual void prepareToUpdate(const cc::IntRect& contentRect, const cc::IntSize&, float, float, cc::IntRect& resultingOpaqueRect, cc::CCRenderingStats&) OVERRIDE;
|
| @@ -59,6 +58,9 @@ public:
|
|
|
| void setOpaquePaintRect(const cc::IntRect& opaquePaintRect) { m_opaquePaintRect = opaquePaintRect; }
|
|
|
| +protected:
|
| + virtual ~FakeLayerTextureUpdater();
|
| +
|
| private:
|
| int m_prepareCount;
|
| int m_updateCount;
|
| @@ -104,7 +106,7 @@ protected:
|
| virtual ~FakeTiledLayerChromium();
|
|
|
| private:
|
| - RefPtr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
|
| + scoped_refptr<FakeLayerTextureUpdater> m_fakeTextureUpdater;
|
| cc::CCPrioritizedTextureManager* m_textureManager;
|
| cc::FloatRect m_lastNeedsDisplayRect;
|
| };
|
|
|