| Index: cc/CCLayerTreeHost.cpp
|
| diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
|
| index 3f4b0dc4424ac9ab803c6a1ee5e13ea60cdf852d..a4090a43fc396b0e38d2afa73ec68c86e8f19c95 100644
|
| --- a/cc/CCLayerTreeHost.cpp
|
| +++ b/cc/CCLayerTreeHost.cpp
|
| @@ -134,9 +134,9 @@ CCLayerTreeHost::~CCLayerTreeHost()
|
| m_rootLayer->setLayerTreeHost(0);
|
| ASSERT(CCProxy::isMainThread());
|
| TRACE_EVENT0("cc", "CCLayerTreeHost::~CCLayerTreeHost");
|
| - ASSERT(m_proxy);
|
| + ASSERT(m_proxy.get());
|
| m_proxy->stop();
|
| - m_proxy.clear();
|
| + m_proxy.reset();
|
| numLayerTreeInstances--;
|
| RateLimiterMap::iterator it = m_rateLimiters.begin();
|
| if (it != m_rateLimiters.end())
|
| @@ -380,10 +380,10 @@ bool CCLayerTreeHost::commitRequested() const
|
| return m_proxy->commitRequested();
|
| }
|
|
|
| -void CCLayerTreeHost::setAnimationEvents(PassOwnPtr<CCAnimationEventsVector> events, double wallClockTime)
|
| +void CCLayerTreeHost::setAnimationEvents(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime)
|
| {
|
| ASSERT(CCThreadProxy::isMainThread());
|
| - setAnimationEventsRecursive(*events, m_rootLayer.get(), wallClockTime);
|
| + setAnimationEventsRecursive(*events.get(), m_rootLayer.get(), wallClockTime);
|
| }
|
|
|
| void CCLayerTreeHost::didAddAnimation()
|
| @@ -758,8 +758,8 @@ void CCLayerTreeHost::startRateLimiter(WebKit::WebGraphicsContext3D* context)
|
| it->second->start();
|
| #endif
|
| else {
|
| - RefPtr<RateLimiter> rateLimiter = RateLimiter::create(context, this);
|
| - m_rateLimiters.set(context, rateLimiter);
|
| + scoped_refptr<RateLimiter> rateLimiter = RateLimiter::create(context, this);
|
| + m_rateLimiters[context] = rateLimiter;
|
| rateLimiter->start();
|
| }
|
| }
|
| @@ -773,7 +773,7 @@ void CCLayerTreeHost::stopRateLimiter(WebKit::WebGraphicsContext3D* context)
|
| #else
|
| it->second->stop();
|
| #endif
|
| - m_rateLimiters.remove(it);
|
| + m_rateLimiters.erase(it);
|
| }
|
| }
|
|
|
| @@ -798,9 +798,9 @@ bool CCLayerTreeHost::requestPartialTextureUpdate()
|
| return true;
|
| }
|
|
|
| -void CCLayerTreeHost::deleteTextureAfterCommit(PassOwnPtr<CCPrioritizedTexture> texture)
|
| +void CCLayerTreeHost::deleteTextureAfterCommit(scoped_ptr<CCPrioritizedTexture> texture)
|
| {
|
| - m_deleteTextureAfterCommitList.append(texture);
|
| + m_deleteTextureAfterCommitList.append(texture.Pass());
|
| }
|
|
|
| void CCLayerTreeHost::setDeviceScaleFactor(float deviceScaleFactor)
|
|
|