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

Unified Diff: cc/CCThreadProxy.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/CCThreadProxy.h ('k') | cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCThreadProxy.cpp
diff --git a/cc/CCThreadProxy.cpp b/cc/CCThreadProxy.cpp
index 5f1c0caf952709deeb7196c8e6e2d20673e55b97..d28204f7ba5e9476ac495ae08bb8e48d0c3a08e9 100644
--- a/cc/CCThreadProxy.cpp
+++ b/cc/CCThreadProxy.cpp
@@ -31,9 +31,9 @@ static const double contextRecreationTickRate = 0.03;
namespace cc {
-PassOwnPtr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost)
+scoped_ptr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost)
{
- return adoptPtr(new CCThreadProxy(layerTreeHost));
+ return make_scoped_ptr(new CCThreadProxy(layerTreeHost)).PassAs<CCProxy>();
}
CCThreadProxy::CCThreadProxy(CCLayerTreeHost* layerTreeHost)
@@ -343,11 +343,11 @@ void CCThreadProxy::setNeedsForcedCommitOnImplThread()
m_schedulerOnImplThread->setNeedsForcedCommit();
}
-void CCThreadProxy::postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector> events, double wallClockTime)
+void CCThreadProxy::postAnimationEventsToMainThreadOnImplThread(scoped_ptr<CCAnimationEventsVector> events, double wallClockTime)
{
ASSERT(isImplThread());
TRACE_EVENT0("cc", "CCThreadProxy::postAnimationEventsToMainThreadOnImplThread");
- m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::setAnimationEvents, events, wallClockTime));
+ m_mainThreadProxy->postTask(createCCThreadTask(this, &CCThreadProxy::setAnimationEvents, events.release(), wallClockTime));
}
void CCThreadProxy::releaseContentsTexturesOnImplThread()
@@ -809,13 +809,15 @@ void CCThreadProxy::didCompleteSwapBuffers()
m_layerTreeHost->didCompleteSwapBuffers();
}
-void CCThreadProxy::setAnimationEvents(PassOwnPtr<CCAnimationEventsVector> events, double wallClockTime)
+void CCThreadProxy::setAnimationEvents(CCAnimationEventsVector* passed_events, double wallClockTime)
{
+ scoped_ptr<CCAnimationEventsVector> events(make_scoped_ptr(passed_events));
+
TRACE_EVENT0("cc", "CCThreadProxy::setAnimationEvents");
ASSERT(isMainThread());
if (!m_layerTreeHost)
return;
- m_layerTreeHost->setAnimationEvents(events, wallClockTime);
+ m_layerTreeHost->setAnimationEvents(events.Pass(), wallClockTime);
}
class CCThreadProxyContextRecreationTimer : public CCTimer, CCTimerClient {
« no previous file with comments | « cc/CCThreadProxy.h ('k') | cc/FrameBufferSkPictureCanvasLayerTextureUpdater.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698