cc: Remove all remaining use of WebCore Rect/Point/Size types from the compositor.

webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc

 // 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 "web_to_ccinput_handler_adapter.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"
 
 #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, InputHandlerClient::ScrollOnMainThread);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusStarted, InputHandlerClient::ScrollStarted);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollStatusIgnored, InputHandlerClient::ScrollIgnored);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeGesture, InputHandlerClient::Gesture);
 COMPILE_ASSERT_MATCHING_ENUM(WebInputHandlerClient::ScrollInputTypeWheel, InputHandlerClient::Wheel);
 
@@ skipping 24 matching lines @@
     {
     }
 
     virtual ScrollStatus scrollBegin(WebPoint point, ScrollInputType type) OVERRIDE
     {
         return static_cast<WebInputHandlerClient::ScrollStatus>(m_client->scrollBegin(point, static_cast<cc::InputHandlerClient::ScrollInputType>(type)));
     }
 
     virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE
     {
-        m_client->scrollBy(point, convert(offset));
+        m_client->scrollBy(point, offset);
     }
 
     virtual void scrollEnd() OVERRIDE
     {
         m_client->scrollEnd();
     }
 
     virtual void pinchGestureBegin() OVERRIDE
     {
         m_client->pinchGestureBegin();
     }
 
     virtual void pinchGestureUpdate(float magnifyDelta, WebPoint anchor) OVERRIDE
     {
-        m_client->pinchGestureUpdate(magnifyDelta, convert(anchor));
+        m_client->pinchGestureUpdate(magnifyDelta, anchor);
     }
 
     virtual void pinchGestureEnd() OVERRIDE
     {
         m_client->pinchGestureEnd();
     }
 
     virtual void startPageScaleAnimation(WebSize targetPosition,
                                          bool anchorPoint,
                                          float pageScale,
                                          double startTimeSec,
                                          double durationSec) OVERRIDE
     {
         base::TimeTicks startTime = base::TimeTicks::FromInternalValue(startTimeSec * base::Time::kMicrosecondsPerSecond);
         base::TimeDelta duration = base::TimeDelta::FromMicroseconds(durationSec * base::Time::kMicrosecondsPerSecond);
-        m_client->startPageScaleAnimation(convert(targetPosition), anchorPoint, pageScale, startTime, duration);
+        m_client->startPageScaleAnimation(targetPosition, anchorPoint, pageScale, startTime, duration);
     }
 
     virtual void scheduleAnimation() OVERRIDE
     {
         m_client->scheduleAnimation();
     }
 
 private:
     cc::InputHandlerClient* m_client;
 };
 
 
 void WebToCCInputHandlerAdapter::bindToClient(cc::InputHandlerClient* client)
 {
     m_clientAdapter.reset(new ClientAdapter(client));
     m_handler->bindToClient(m_clientAdapter.get());
 }
 
 void WebToCCInputHandlerAdapter::animate(base::TimeTicks time)
 {
     double monotonicTimeSeconds = (time - base::TimeTicks()).InSecondsF();
     m_handler->animate(monotonicTimeSeconds);
 }
 
 }