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

Unified Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 16424008: move webkit/glue/fling_* to webkit/child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android 5 Created 7 years, 6 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/glue/webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkitplatformsupport_impl.cc
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index a6952aced7b7e74b98d47c67a751ada776c8cfcc..554ff3035ef783dee075a764ca28c240e4876f6e 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -31,6 +31,9 @@
#include "net/base/data_url.h"
#include "net/base/mime_util.h"
#include "net/base/net_errors.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
#include "third_party/WebKit/public/platform/WebCookie.h"
#include "third_party/WebKit/public/platform/WebData.h"
#include "third_party/WebKit/public/platform/WebDiscardableMemory.h"
@@ -39,13 +42,9 @@
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebVector.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
#include "ui/base/layout.h"
#include "webkit/base/file_path_string_conversions.h"
#include "webkit/common/user_agent/user_agent.h"
-#include "webkit/glue/fling_curve_configuration.h"
#include "webkit/glue/touch_fling_gesture_curve.h"
#include "webkit/glue/web_discardable_memory_impl.h"
#include "webkit/glue/webkit_glue.h"
@@ -57,10 +56,6 @@
#include "webkit/plugins/webplugininfo.h"
#include "webkit/renderer/media/audio_decoder.h"
-#if defined(OS_ANDROID)
-#include "webkit/glue/fling_animator_impl_android.h"
-#endif
-
using WebKit::WebAudioBus;
using WebKit::WebCookie;
using WebKit::WebData;
@@ -373,18 +368,11 @@ WebKitPlatformSupportImpl::WebKitPlatformSupportImpl()
shared_timer_fire_time_(0.0),
shared_timer_fire_time_was_set_while_suspended_(false),
shared_timer_suspended_(0),
- current_thread_slot_(&DestroyCurrentThread),
- fling_curve_configuration_(new FlingCurveConfiguration) {}
+ current_thread_slot_(&DestroyCurrentThread) {}
WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() {
}
-void WebKitPlatformSupportImpl::SetFlingCurveParameters(
- const std::vector<float>& new_touchpad,
- const std::vector<float>& new_touchscreen) {
- fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen);
-}
-
WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() {
return &native_theme_engine_;
}
@@ -986,24 +974,6 @@ void WebKitPlatformSupportImpl::didStopWorkerRunLoop(
worker_task_runner->OnWorkerRunLoopStopped(runLoop);
}
-WebKit::WebGestureCurve* WebKitPlatformSupportImpl::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::WebDiscardableMemory*
WebKitPlatformSupportImpl::allocateAndLockDiscardableMemory(size_t bytes) {
if (!base::DiscardableMemory::Supported())
« no previous file with comments | « webkit/glue/webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698