Index: cc/LayerChromium.h |
diff --git a/cc/LayerChromium.h b/cc/LayerChromium.h |
index 2b0b20dcfbe88c20a7d8265df3e9c52e1dce963b..3750dea66f38ab1b744d9f197f1038d24923a9a0 100644 |
--- a/cc/LayerChromium.h |
+++ b/cc/LayerChromium.h |
@@ -197,7 +197,7 @@ public: |
virtual void pushPropertiesTo(CCLayerImpl*); |
- void clearRenderSurface() { m_renderSurface.clear(); } |
+ void clearRenderSurface() { m_renderSurface.reset(); } |
RenderSurfaceChromium* renderSurface() const { return m_renderSurface.get(); } |
void createRenderSurface(); |
@@ -244,7 +244,7 @@ public: |
// Set the priority of all desired textures in this layer. |
virtual void setTexturePriorities(const CCPriorityCalculator&) { } |
- bool addAnimation(PassOwnPtr<CCActiveAnimation>); |
+ bool addAnimation(scoped_ptr<CCActiveAnimation>); |
void pauseAnimation(int animationId, double timeOffset); |
void removeAnimation(int animationId); |
@@ -252,8 +252,8 @@ public: |
void resumeAnimations(double monotonicTime); |
CCLayerAnimationController* layerAnimationController() { return m_layerAnimationController.get(); } |
- void setLayerAnimationController(PassOwnPtr<CCLayerAnimationController>); |
- PassOwnPtr<CCLayerAnimationController> releaseLayerAnimationController(); |
+ void setLayerAnimationController(scoped_ptr<CCLayerAnimationController>); |
+ scoped_ptr<CCLayerAnimationController> releaseLayerAnimationController(); |
void setLayerAnimationDelegate(WebKit::WebAnimationDelegate* layerAnimationDelegate) { m_layerAnimationDelegate = layerAnimationDelegate; } |
@@ -318,7 +318,7 @@ private: |
// updated via setLayerTreeHost() if a layer moves between trees. |
CCLayerTreeHost* m_layerTreeHost; |
- OwnPtr<CCLayerAnimationController> m_layerAnimationController; |
+ scoped_ptr<CCLayerAnimationController> m_layerAnimationController; |
// Layer properties. |
IntSize m_bounds; |
@@ -362,7 +362,7 @@ private: |
scoped_refptr<LayerChromium> m_replicaLayer; |
// Transient properties. |
- OwnPtr<RenderSurfaceChromium> m_renderSurface; |
+ scoped_ptr<RenderSurfaceChromium> m_renderSurface; |
float m_drawOpacity; |
bool m_drawOpacityIsAnimating; |