| Index: cc/CCLayerTreeHostTest.cpp
|
| diff --git a/cc/CCLayerTreeHostTest.cpp b/cc/CCLayerTreeHostTest.cpp
|
| index 1f95759f49b9995264e6b9814de53c827ef68a9c..49c86d17a5f97ee2360de3d0316fd2cc64e41a21 100644
|
| --- a/cc/CCLayerTreeHostTest.cpp
|
| +++ b/cc/CCLayerTreeHostTest.cpp
|
| @@ -2401,7 +2401,7 @@ SINGLE_AND_MULTI_THREAD_TEST_F(CCLayerTreeHostTestSurfaceNotAllocatedForLayersOu
|
|
|
| class EvictionTrackingTexture : public LayerTextureUpdater::Texture {
|
| public:
|
| - static PassOwnPtr<EvictionTrackingTexture> create(PassOwnPtr<CCPrioritizedTexture> texture) { return adoptPtr(new EvictionTrackingTexture(texture)); }
|
| + static PassOwnPtr<EvictionTrackingTexture> create(scoped_ptr<CCPrioritizedTexture> texture) { return adoptPtr(new EvictionTrackingTexture(texture.Pass())); }
|
| virtual ~EvictionTrackingTexture() { }
|
|
|
| virtual void updateRect(CCResourceProvider* resourceProvider, const IntRect&, const IntSize&) OVERRIDE
|
| @@ -2414,8 +2414,8 @@ public:
|
| bool updated() const { return m_updated; }
|
|
|
| private:
|
| - explicit EvictionTrackingTexture(PassOwnPtr<CCPrioritizedTexture> texture)
|
| - : LayerTextureUpdater::Texture(texture)
|
| + explicit EvictionTrackingTexture(scoped_ptr<CCPrioritizedTexture> texture)
|
| + : LayerTextureUpdater::Texture(texture.Pass())
|
| , m_updated(false)
|
| { }
|
| bool m_updated;
|
|
|