| Index: webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
|
| diff --git a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
|
| index 58794b595ad949940fd2877696f7f8f808141d1d..3e0d5e2a73c2e8c4f0250b69bd97be5d2072ecef 100644
|
| --- a/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
|
| +++ b/webkit/compositor_bindings/web_to_ccinput_handler_adapter.cc
|
| @@ -6,10 +6,7 @@
|
|
|
| #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)
|
| @@ -54,7 +51,7 @@ public:
|
|
|
| virtual void scrollBy(WebPoint point, WebSize offset) OVERRIDE
|
| {
|
| - m_client->scrollBy(point, convert(offset));
|
| + m_client->scrollBy(point, offset);
|
| }
|
|
|
| virtual void scrollEnd() OVERRIDE
|
| @@ -69,7 +66,7 @@ public:
|
|
|
| virtual void pinchGestureUpdate(float magnifyDelta, WebPoint anchor) OVERRIDE
|
| {
|
| - m_client->pinchGestureUpdate(magnifyDelta, convert(anchor));
|
| + m_client->pinchGestureUpdate(magnifyDelta, anchor);
|
| }
|
|
|
| virtual void pinchGestureEnd() OVERRIDE
|
| @@ -85,7 +82,7 @@ public:
|
| {
|
| 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
|
|
|