| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
| 8 #include <malloc.h> | 8 #include <malloc.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 855 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 855 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); |
| 856 worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 856 worker_task_runner->OnWorkerRunLoopStarted(runLoop); |
| 857 } | 857 } |
| 858 | 858 |
| 859 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 859 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( |
| 860 const WebKit::WebWorkerRunLoop& runLoop) { | 860 const WebKit::WebWorkerRunLoop& runLoop) { |
| 861 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 861 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); |
| 862 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 862 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
| 863 } | 863 } |
| 864 | 864 |
| 865 #if defined(OS_ANDROID) | |
| 866 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { | |
| 867 return new FlingAnimatorImpl(); | |
| 868 } | |
| 869 #endif | |
| 870 | |
| 871 WebKit::WebGestureCurve* WebKitPlatformSupportImpl::createFlingAnimationCurve( | 865 WebKit::WebGestureCurve* WebKitPlatformSupportImpl::createFlingAnimationCurve( |
| 872 int device_source, | 866 int device_source, |
| 873 const WebKit::WebFloatPoint& velocity, | 867 const WebKit::WebFloatPoint& velocity, |
| 874 const WebKit::WebSize& cumulative_scroll) { | 868 const WebKit::WebSize& cumulative_scroll) { |
| 875 | 869 |
| 876 #if defined(OS_ANDROID) | 870 #if defined(OS_ANDROID) |
| 877 return FlingAnimatorImpl::CreateAndroidGestureCurve(velocity, | 871 return FlingAnimatorImpl::CreateAndroidGestureCurve(velocity, |
| 878 cumulative_scroll); | 872 cumulative_scroll); |
| 879 #endif | 873 #endif |
| 880 | 874 |
| 881 if (device_source == WebKit::WebGestureEvent::Touchscreen) | 875 if (device_source == WebKit::WebGestureEvent::Touchscreen) |
| 882 return TouchFlingGestureCurve::CreateForTouchScreen(velocity, | 876 return TouchFlingGestureCurve::CreateForTouchScreen(velocity, |
| 883 cumulative_scroll); | 877 cumulative_scroll); |
| 884 | 878 |
| 885 return TouchFlingGestureCurve::CreateForTouchPad(velocity, cumulative_scroll); | 879 return TouchFlingGestureCurve::CreateForTouchPad(velocity, cumulative_scroll); |
| 886 } | 880 } |
| 887 | 881 |
| 888 } // namespace webkit_glue | 882 } // namespace webkit_glue |
| OLD | NEW |