Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: webkit/child/webkitplatformsupport_child_impl.cc

Issue 52663003: Remove all fling related stuff from the renderer assuming that browser side Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/child/webkitplatformsupport_child_impl.h ('k') | webkit/child/webkitplatformsupport_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « webkit/child/webkitplatformsupport_child_impl.h ('k') | webkit/child/webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698