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

Side by Side Diff: webkit/glue/webkitplatformsupport_impl.cc

Issue 10823239: Upstream android's fling animator. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webkitplatformsupport_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 30 matching lines...) Expand all
41 #include "ui/base/layout.h" 41 #include "ui/base/layout.h"
42 #include "webkit/glue/webkit_glue.h" 42 #include "webkit/glue/webkit_glue.h"
43 #include "webkit/glue/websocketstreamhandle_impl.h" 43 #include "webkit/glue/websocketstreamhandle_impl.h"
44 #include "webkit/glue/webthread_impl.h" 44 #include "webkit/glue/webthread_impl.h"
45 #include "webkit/glue/weburlloader_impl.h" 45 #include "webkit/glue/weburlloader_impl.h"
46 #include "webkit/glue/worker_task_runner.h" 46 #include "webkit/glue/worker_task_runner.h"
47 #include "webkit/media/audio_decoder.h" 47 #include "webkit/media/audio_decoder.h"
48 #include "webkit/plugins/npapi/plugin_instance.h" 48 #include "webkit/plugins/npapi/plugin_instance.h"
49 #include "webkit/plugins/webplugininfo.h" 49 #include "webkit/plugins/webplugininfo.h"
50 50
51 #if defined(OS_ANDROID)
52 #include "webkit/glue/fling_animator_impl_android.h"
53 #endif
54
51 #if defined(OS_LINUX) 55 #if defined(OS_LINUX)
52 #include "v8/include/v8.h" 56 #include "v8/include/v8.h"
53 #endif 57 #endif
54 58
55 using WebKit::WebAudioBus; 59 using WebKit::WebAudioBus;
56 using WebKit::WebCookie; 60 using WebKit::WebCookie;
57 using WebKit::WebData; 61 using WebKit::WebData;
58 using WebKit::WebLocalizedString; 62 using WebKit::WebLocalizedString;
59 using WebKit::WebPluginListBuilder; 63 using WebKit::WebPluginListBuilder;
60 using WebKit::WebString; 64 using WebKit::WebString;
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); 786 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
783 worker_task_runner->OnWorkerRunLoopStarted(runLoop); 787 worker_task_runner->OnWorkerRunLoopStarted(runLoop);
784 } 788 }
785 789
786 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( 790 void WebKitPlatformSupportImpl::didStopWorkerRunLoop(
787 const WebKit::WebWorkerRunLoop& runLoop) { 791 const WebKit::WebWorkerRunLoop& runLoop) {
788 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); 792 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance();
789 worker_task_runner->OnWorkerRunLoopStopped(runLoop); 793 worker_task_runner->OnWorkerRunLoopStopped(runLoop);
790 } 794 }
791 795
796 #if defined(OS_ANDROID)
797 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() {
798 return new FlingAnimatorImpl();
799 }
800 #endif
801
792 } // namespace webkit_glue 802 } // namespace webkit_glue
OLDNEW
« 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