Remove WTF dependencies from webkit_compositor_bindings

webkit/compositor_bindings/WebToCCInputHandlerAdapter.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "WebToCCInputHandlerAdapter.h"
 
-#include "IntPoint.h"
-#include "IntSize.h"
+#include "cc/stubs/int_point.h"
+#include "cc/stubs/int_size.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebInputHandlerClient.h"
 #include "webcore_convert.h"
-#include <public/WebInputHandlerClient.h>
 
 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, cc_name) \
     COMPILE_ASSERT(int(WebKit::webkit_name) == int(cc::cc_name), mismatching_enums)
 
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusOnMainThread, CCInputHandlerClient::ScrollOnMainThread);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusStarted, CCInputHandlerClient::ScrollStarted);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusIgnored, CCInputHandlerClient::ScrollIgnored);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeGesture, CCInputHandlerClient::Gesture);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeWheel, CCInputHandlerClient::Wheel);
 
 namespace WebKit {
 
-scoped_ptr<WebToCCInputHandlerAdapter> WebToCCInputHandlerAdapter::create(PassOwnPtr<WebInputHandler> handler)
+scoped_ptr<WebToCCInputHandlerAdapter> WebToCCInputHandlerAdapter::create(scoped_ptr<WebInputHandler> handler)
 {
-    return scoped_ptr<WebToCCInputHandlerAdapter>(new WebToCCInputHandlerAdapter(handler));
+    return scoped_ptr<WebToCCInputHandlerAdapter>(new WebToCCInputHandlerAdapter(handler.Pass()));
 }
 
-WebToCCInputHandlerAdapter::WebToCCInputHandlerAdapter(PassOwnPtr<WebInputHandler> handler)
-    : m_handler(handler)
+WebToCCInputHandlerAdapter::WebToCCInputHandlerAdapter(scoped_ptr<WebInputHandler> handler)
+    : m_handler(handler.Pass())
 {
 }
 
 WebToCCInputHandlerAdapter::~WebToCCInputHandlerAdapter()
 {
 }
 
 class WebToCCInputHandlerAdapter::ClientAdapter : public WebInputHandlerClient {
 public:
     ClientAdapter(cc::CCInputHandlerClient* client)
@@ skipping 49 matching lines @@
         m_client->scheduleAnimation();
     }
 
 private:
     cc::CCInputHandlerClient* m_client;
 };
 
 
 void WebToCCInputHandlerAdapter::bindToClient(cc::CCInputHandlerClient* client)
 {
-    m_clientAdapter = adoptPtr(new ClientAdapter(client));
+    m_clientAdapter.reset(new ClientAdapter(client));
     m_handler->bindToClient(m_clientAdapter.get());
 }
 
 void WebToCCInputHandlerAdapter::animate(double monotonicTime)
 {
     m_handler->animate(monotonicTime);
 }
 
 }