Index: content/child/blink_platform_impl.cc |
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc |
index fb4bc561b4de1a80bc7fbae15ad09ba298ecc198..f753c388410e555dd4a0a08672b3204cfea9f568 100644 |
--- a/content/child/blink_platform_impl.cc |
+++ b/content/child/blink_platform_impl.cc |
@@ -31,7 +31,7 @@ |
#include "content/app/strings/grit/content_strings.h" |
#include "content/child/child_thread.h" |
#include "content/child/content_child_helpers.h" |
-#include "content/child/fling_curve_configuration.h" |
+#include "content/child/touch_fling_gesture_curve.h" |
#include "content/child/web_discardable_memory_impl.h" |
#include "content/child/web_socket_stream_handle_impl.h" |
#include "content/child/web_url_loader_impl.h" |
@@ -419,7 +419,6 @@ BlinkPlatformImpl::BlinkPlatformImpl() |
shared_timer_fire_time_(0.0), |
shared_timer_fire_time_was_set_while_suspended_(false), |
shared_timer_suspended_(0), |
- fling_curve_configuration_(new FlingCurveConfiguration), |
current_thread_slot_(&DestroyCurrentThread) {} |
BlinkPlatformImpl::~BlinkPlatformImpl() { |
@@ -991,12 +990,7 @@ blink::WebGestureCurve* BlinkPlatformImpl::createFlingAnimationCurve( |
cumulative_scroll); |
#endif |
- if (device_source == blink::WebGestureDeviceTouchscreen) |
- return fling_curve_configuration_->CreateForTouchScreen(velocity, |
- cumulative_scroll); |
- |
- return fling_curve_configuration_->CreateForTouchPad(velocity, |
- cumulative_scroll); |
+ return TouchFlingGestureCurve::Create(velocity, cumulative_scroll); |
} |
void BlinkPlatformImpl::didStartWorkerRunLoop( |
@@ -1177,12 +1171,6 @@ size_t BlinkPlatformImpl::maxDecodedImageBytes() { |
#endif |
} |
-void BlinkPlatformImpl::SetFlingCurveParameters( |
- const std::vector<float>& new_touchpad, |
- const std::vector<float>& new_touchscreen) { |
- fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); |
-} |
- |
void BlinkPlatformImpl::SuspendSharedTimer() { |
++shared_timer_suspended_; |
} |