| 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())
|
|
|