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

Unified Diff: webkit/compositor_bindings/CCThreadImpl.cpp

Issue 11142031: Remove WTF dependencies from webkit_compositor_bindings (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
Index: webkit/compositor_bindings/CCThreadImpl.cpp
diff --git a/webkit/compositor_bindings/CCThreadImpl.cpp b/webkit/compositor_bindings/CCThreadImpl.cpp
index 4e09658386bee6fb7216efe918c9a94a9f497653..7830600ba105b3d9ce2fed996a03cd51862504cb 100644
--- a/webkit/compositor_bindings/CCThreadImpl.cpp
+++ b/webkit/compositor_bindings/CCThreadImpl.cpp
@@ -5,9 +5,9 @@
#include "config.h"
#include "CCThreadImpl.h"
-#include "CCCompletionEvent.h"
-#include <public/Platform.h>
-#include <public/WebThread.h>
+#include "cc/completion_event.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h"
using cc::CCThread;
using cc::CCCompletionEvent;
@@ -42,7 +42,7 @@ private:
// General adapter from a CCThread::Task to a WebThread::Task.
class CCThreadTaskAdapter : public WebThread::Task {
public:
- CCThreadTaskAdapter(PassOwnPtr<CCThread::Task> task) : m_task(task) { }
+ explicit CCThreadTaskAdapter(PassOwnPtr<CCThread::Task> task) : m_task(task) { }
virtual ~CCThreadTaskAdapter() { }
@@ -55,14 +55,14 @@ private:
OwnPtr<CCThread::Task> m_task;
};
-PassOwnPtr<CCThread> CCThreadImpl::createForCurrentThread()
+scoped_ptr<CCThread> CCThreadImpl::createForCurrentThread()
{
- return adoptPtr(new CCThreadImpl(Platform::current()->currentThread(), true));
+ return scoped_ptr<CCThread>(new CCThreadImpl(Platform::current()->currentThread(), true)).Pass();
}
-PassOwnPtr<CCThread> CCThreadImpl::createForDifferentThread(WebThread* thread)
+scoped_ptr<CCThread> CCThreadImpl::createForDifferentThread(WebThread* thread)
{
- return adoptPtr(new CCThreadImpl(thread, false));
+ return scoped_ptr<CCThread>(new CCThreadImpl(thread, false)).Pass();
}
CCThreadImpl::~CCThreadImpl()

Powered by Google App Engine
This is Rietveld 408576698