diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 08:12:22 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 08:12:22 +0000 |
commit | c4275290c0c077709a02a81b3690e51df92d7954 (patch) | |
tree | d826f6a65beb3fd9a2b62c839f49476410896184 /webkit/compositor_bindings/CCThreadImpl.cpp | |
parent | 06593364bc709899333d0c01d388c8fecd674599 (diff) | |
download | chromium_src-c4275290c0c077709a02a81b3690e51df92d7954.zip chromium_src-c4275290c0c077709a02a81b3690e51df92d7954.tar.gz chromium_src-c4275290c0c077709a02a81b3690e51df92d7954.tar.bz2 |
Remove WTF dependencies from webkit_compositor_bindings
This removes almost all the WTF uses from webkit_compositor_bindings and updates the includes of chromium-style headers to be chromium-style (full path, etc). Things that are still using wtf are:
- CCThreadTaskImpl uses OwnPtr/PassOwnPtr - fix will be a bit more involved
- WebTransformationMatrixTest uses wtf/MathExtras.h - will fix on its own
- WebTransformOperationsTest uses a Vector<OwnPtr<...> > - will rewrite this test on its own
Also removed WebCompositorInputHandlerImpl.h/cpp which don't compile and aren't listed in the gyp.
BUG=154451,144577
Review URL: https://chromiumcodereview.appspot.com/11142031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/compositor_bindings/CCThreadImpl.cpp')
-rw-r--r-- | webkit/compositor_bindings/CCThreadImpl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/compositor_bindings/CCThreadImpl.cpp b/webkit/compositor_bindings/CCThreadImpl.cpp index 4e09658..7830600 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() |