Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2239)

Unified Diff: cc/CCLayerTreeHost.cpp

Issue 11091028: [cc] Remove all WTF #includes from CCLayerTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCLayerTreeHost.h ('k') | cc/CCLayerTreeHostImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCLayerTreeHost.cpp
diff --git a/cc/CCLayerTreeHost.cpp b/cc/CCLayerTreeHost.cpp
index ccd98359f87d1590932b2e4d00dab07f1d91a201..d75a3d36b784a3d7ed2036180797409ff2073b01 100644
--- a/cc/CCLayerTreeHost.cpp
+++ b/cc/CCLayerTreeHost.cpp
@@ -134,17 +134,13 @@ 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())
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
- it->value->stop();
-#else
it->second->stop();
-#endif
}
void CCLayerTreeHost::setSurfaceReady()
@@ -380,10 +376,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()
@@ -762,14 +758,10 @@ void CCLayerTreeHost::startRateLimiter(WebKit::WebGraphicsContext3D* context)
ASSERT(context);
RateLimiterMap::iterator it = m_rateLimiters.find(context);
if (it != m_rateLimiters.end())
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
- it->value->start();
-#else
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();
}
}
@@ -778,12 +770,8 @@ void CCLayerTreeHost::stopRateLimiter(WebKit::WebGraphicsContext3D* context)
{
RateLimiterMap::iterator it = m_rateLimiters.find(context);
if (it != m_rateLimiters.end()) {
-#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
- it->value->stop();
-#else
it->second->stop();
-#endif
- m_rateLimiters.remove(it);
+ m_rateLimiters.erase(it);
}
}
@@ -808,9 +796,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)
« no previous file with comments | « cc/CCLayerTreeHost.h ('k') | cc/CCLayerTreeHostImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698