Index: webkit/child/webkitplatformsupport_child_impl.cc |
diff --git a/webkit/child/webkitplatformsupport_child_impl.cc b/webkit/child/webkitplatformsupport_child_impl.cc |
index 849dcb7b0a8fb5ba854c02209a63a857fa4f1794..74516439adb81bfd70a7c6d60904f1b51a5674ab 100644 |
--- a/webkit/child/webkitplatformsupport_child_impl.cc |
+++ b/webkit/child/webkitplatformsupport_child_impl.cc |
@@ -6,23 +6,17 @@ |
#include "base/memory/discardable_memory.h" |
#include "third_party/WebKit/public/web/WebInputEvent.h" |
-#include "webkit/child/fling_curve_configuration.h" |
#include "webkit/child/web_discardable_memory_impl.h" |
#include "webkit/child/webthread_impl.h" |
#include "webkit/child/worker_task_runner.h" |
-#if defined(OS_ANDROID) |
-#include "webkit/child/fling_animator_impl_android.h" |
-#endif |
- |
using WebKit::WebFallbackThemeEngine; |
using WebKit::WebThemeEngine; |
namespace webkit_glue { |
WebKitPlatformSupportChildImpl::WebKitPlatformSupportChildImpl() |
- : current_thread_slot_(&DestroyCurrentThread), |
- fling_curve_configuration_(new FlingCurveConfiguration) {} |
+ : current_thread_slot_(&DestroyCurrentThread) {} |
WebKitPlatformSupportChildImpl::~WebKitPlatformSupportChildImpl() {} |
@@ -34,30 +28,6 @@ WebFallbackThemeEngine* WebKitPlatformSupportChildImpl::fallbackThemeEngine() { |
return &fallback_theme_engine_; |
} |
-void WebKitPlatformSupportChildImpl::SetFlingCurveParameters( |
- const std::vector<float>& new_touchpad, |
- const std::vector<float>& new_touchscreen) { |
- fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); |
-} |
- |
-WebKit::WebGestureCurve* |
-WebKitPlatformSupportChildImpl::createFlingAnimationCurve( |
- int device_source, |
- const WebKit::WebFloatPoint& velocity, |
- const WebKit::WebSize& cumulative_scroll) { |
-#if defined(OS_ANDROID) |
- return FlingAnimatorImpl::CreateAndroidGestureCurve(velocity, |
- cumulative_scroll); |
-#endif |
- |
- if (device_source == WebKit::WebGestureEvent::Touchscreen) |
- return fling_curve_configuration_->CreateForTouchScreen(velocity, |
- cumulative_scroll); |
- |
- return fling_curve_configuration_->CreateForTouchPad(velocity, |
- cumulative_scroll); |
-} |
- |
WebKit::WebThread* WebKitPlatformSupportChildImpl::createThread( |
const char* name) { |
return new WebThreadImpl(name); |