Remove WTF dependencies from webkit_compositor_bindings

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162101

[enne (OOO), 2012-10-16 01:17:35]

lgtm, with two small questions:

https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
File webkit/compositor_bindings/WebAnimationTest.cpp (left):

https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
webkit/compositor_bindings/WebAnimationTest.cpp:40: //
https://bugs.webkit.org/show_bug.cgi?id=90651
Should this bug be closed?

https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
File webkit/compositor_bindings/WebAnimationTest.cpp (right):

https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
webkit/compositor_bindings/WebAnimationTest.cpp:31: scoped_ptr<WebAnimation>
animation(new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1));
Is there a reason to change the groupId here?

[jamesr, 2012-10-16 01:19:12]

On 2012/10/16 01:17:35, enne wrote:
> lgtm, with two small questions:
> 
>
https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
> File webkit/compositor_bindings/WebAnimationTest.cpp (left):
> 
>
https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
> webkit/compositor_bindings/WebAnimationTest.cpp:40: //
> https://bugs.webkit.org/show_bug.cgi?id=90651
> Should this bug be closed?
> 

Yes, done.

>
https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
> File webkit/compositor_bindings/WebAnimationTest.cpp (right):
> 
>
https://codereview.chromium.org/11142031/diff/1/webkit/compositor_bindings/We...
> webkit/compositor_bindings/WebAnimationTest.cpp:31: scoped_ptr<WebAnimation>
> animation(new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity,
1));
> Is there a reason to change the groupId here?

This parameter is animationId - we have to specify it to the WebAnimationImpl
constructor but it doesn't matter what it is here. Goal is to avoid depending on
WebAnimation::create(), which is going away, and avoid pulling in a dependency
on WebKitPlatform which would really bloat this test setup.

[enne (OOO), 2012-10-16 01:23:37]

Ah, that makes more sense.  Thanks for the explanation.  :)

[commit-bot: I haz the power, 2012-10-16 01:27:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11142031/1

[commit-bot: I haz the power, 2012-10-16 02:02:50]

Retried try job too often for step(s) sync_integration_tests

[commit-bot: I haz the power, 2012-10-16 02:21:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11142031/1

[commit-bot: I haz the power, 2012-10-16 02:21:25]

Failed to apply patch for webkit/compositor_bindings/WebLayerTreeViewTest.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file webkit/compositor_bindings/WebLayerTreeViewTest.cpp
  Hunk #1 FAILED at 4.
  1 out of 9 hunks FAILED -- saving rejects to file
webkit/compositor_bindings/WebLayerTreeViewTest.cpp.rej

Patch:       webkit/compositor_bindings/WebLayerTreeViewTest.cpp
Index: webkit/compositor_bindings/WebLayerTreeViewTest.cpp
diff --git a/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
index
cf35185c0d06d233b90efbcd2b114d91285ffcd6..c1f3c12390dd149c6129cc9548a039e557eda092
100644
--- a/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
+++ b/webkit/compositor_bindings/WebLayerTreeViewTest.cpp
@@ -4,19 +4,19 @@
 
 #include "config.h"
 
-#include <public/WebLayerTreeView.h>
-
 #include "CompositorFakeWebGraphicsContext3D.h"
 #include "FakeWebCompositorOutputSurface.h"
 #include "WebLayerTreeViewTestCommon.h"
-#include <gmock/gmock.h>
-#include <public/Platform.h>
-#include <public/WebCompositorSupport.h>
-#include <public/WebLayer.h>
-#include <public/WebLayerTreeViewClient.h>
-#include <public/WebThread.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
+#include "WebLayerImpl.h"
+#include "WebLayerTreeViewImpl.h"
+#include "base/memory/ref_counted.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
+#include
"third_party/WebKit/Source/Platform/chromium/public/WebCompositorSupport.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebLayer.h"
+#include
"third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h"
+#include
"third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebThread.h"
 
 using namespace WebKit;
 using testing::Mock;
@@ -42,8 +42,10 @@ public:
     virtual void SetUp()
     {
         initializeCompositor();
-        m_rootLayer = adoptPtr(WebLayer::create());
-        ASSERT_TRUE(m_view = adoptPtr(WebLayerTreeView::create(client(),
*m_rootLayer, WebLayerTreeView::Settings())));
+        m_rootLayer.reset(new WebLayerImpl);
+        m_view.reset(new WebLayerTreeViewImpl(client()));
+        ASSERT_TRUE(m_view->initialize(WebLayerTreeView::Settings()));
+        m_view->setRootLayer(*m_rootLayer);
         m_view->setSurfaceReady();
     }
 
@@ -51,14 +53,14 @@ public:
     {
         Mock::VerifyAndClearExpectations(client());
 
-        m_rootLayer.clear();
-        m_view.clear();
+        m_rootLayer.reset();
+        m_view.reset();
         WebKit::Platform::current()->compositorSupport()->shutdown();
     }
 
 protected:
-    OwnPtr<WebLayer> m_rootLayer;
-    OwnPtr<WebLayerTreeView> m_view;
+    scoped_ptr<WebLayer> m_rootLayer;
+    scoped_ptr<WebLayerTreeViewImpl> m_view;
 };
 
 class WebLayerTreeViewSingleThreadTest : public WebLayerTreeViewTestBase {
@@ -81,7 +83,7 @@ protected:
     MockWebLayerTreeViewClient m_client;
 };
 
-class CancelableTaskWrapper : public RefCounted<CancelableTaskWrapper> {
+class CancelableTaskWrapper : public base::RefCounted<CancelableTaskWrapper> {
     class Task : public WebThread::Task {
     public:
         Task(CancelableTaskWrapper* cancelableTask)
@@ -95,14 +97,13 @@ class CancelableTaskWrapper : public
RefCounted<CancelableTaskWrapper> {
             m_cancelableTask->runIfNotCanceled();
         }
 
-        RefPtr<CancelableTaskWrapper> m_cancelableTask;
+        scoped_refptr<CancelableTaskWrapper> m_cancelableTask;
     };
 
 public:
     CancelableTaskWrapper(PassOwnPtr<WebThread::Task> task)
         : m_task(task)
     {
-        turnOffVerifier();
     }
 
     void cancel()
@@ -125,6 +126,9 @@ public:
     }
 
 private:
+    friend class base::RefCounted<CancelableTaskWrapper>;
+    ~CancelableTaskWrapper() { }
+
     OwnPtr<WebThread::Task> m_task;
 };
 
@@ -140,7 +144,7 @@ protected:
     void composite()
     {
         m_view->setNeedsRedraw();
-        RefPtr<CancelableTaskWrapper> timeoutTask = adoptRef(new
CancelableTaskWrapper(adoptPtr(new TimeoutTask())));
+        scoped_refptr<CancelableTaskWrapper> timeoutTask(new
CancelableTaskWrapper(adoptPtr(new TimeoutTask())));
        
WebKit::Platform::current()->currentThread()->postDelayedTask(timeoutTask->createTask(),
5000);
         WebKit::Platform::current()->currentThread()->enterRunLoop();
         timeoutTask->cancel();
@@ -149,7 +153,7 @@ protected:
 
     virtual void initializeCompositor() OVERRIDE
     {
-        m_webThread =
adoptPtr(WebKit::Platform::current()->createThread("WebLayerTreeViewTest"));
+       
m_webThread.reset(WebKit::Platform::current()->createThread("WebLayerTreeViewTest"));
        
WebKit::Platform::current()->compositorSupport()->initialize(m_webThread.get());
     }
 
@@ -159,7 +163,7 @@ protected:
     }
 
     MockWebLayerTreeViewClientForThreadedTests m_client;
-    OwnPtr<WebThread> m_webThread;
+    scoped_ptr<WebThread> m_webThread;
 };
 
 TEST_F(WebLayerTreeViewSingleThreadTest, InstrumentationCallbacks)

[commit-bot: I haz the power, 2012-10-16 06:14:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jamesr@chromium.org/11142031/9001

[commit-bot: I haz the power, 2012-10-16 08:12:23]

Change committed as 162101