| Index: cc/CCSingleThreadProxy.cpp
|
| diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp
|
| index 6e342a00be7d88da1a015ed02be0935544ee3bbc..42451e12041f97b7ecdc1adccf9d002ee8d55ad0 100644
|
| --- a/cc/CCSingleThreadProxy.cpp
|
| +++ b/cc/CCSingleThreadProxy.cpp
|
| @@ -18,9 +18,9 @@ using namespace WTF;
|
|
|
| namespace cc {
|
|
|
| -PassOwnPtr<CCProxy> CCSingleThreadProxy::create(CCLayerTreeHost* layerTreeHost)
|
| +scoped_ptr<CCProxy> CCSingleThreadProxy::create(CCLayerTreeHost* layerTreeHost)
|
| {
|
| - return adoptPtr(new CCSingleThreadProxy(layerTreeHost));
|
| + return make_scoped_ptr(new CCSingleThreadProxy(layerTreeHost)).PassAs<CCProxy>();
|
| }
|
|
|
| CCSingleThreadProxy::CCSingleThreadProxy(CCLayerTreeHost* layerTreeHost)
|
| @@ -272,11 +272,11 @@ void CCSingleThreadProxy::setNeedsCommitOnImplThread()
|
| m_layerTreeHost->scheduleComposite();
|
| }
|
|
|
| -void CCSingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector> events, double wallClockTime)
|
| +void CCSingleThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime)
|
| {
|
| ASSERT(CCProxy::isImplThread());
|
| DebugScopedSetMainThread main;
|
| - m_layerTreeHost->setAnimationEvents(events, wallClockTime);
|
| + m_layerTreeHost->setAnimationEvents(events.Pass(), wallClockTime);
|
| }
|
|
|
| void CCSingleThreadProxy::releaseContentsTexturesOnImplThread()
|
|
|