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 30 matching lines...) Expand all Loading... |
41 #include "ui/base/layout.h" | 41 #include "ui/base/layout.h" |
42 #include "webkit/compositor_bindings/web_compositor_support_impl.h" | 42 #include "webkit/compositor_bindings/web_compositor_support_impl.h" |
43 #include "webkit/glue/webkit_glue.h" | 43 #include "webkit/glue/webkit_glue.h" |
44 #include "webkit/glue/websocketstreamhandle_impl.h" | 44 #include "webkit/glue/websocketstreamhandle_impl.h" |
45 #include "webkit/glue/webthread_impl.h" | 45 #include "webkit/glue/webthread_impl.h" |
46 #include "webkit/glue/weburlloader_impl.h" | 46 #include "webkit/glue/weburlloader_impl.h" |
47 #include "webkit/glue/worker_task_runner.h" | 47 #include "webkit/glue/worker_task_runner.h" |
48 #include "webkit/media/audio_decoder.h" | 48 #include "webkit/media/audio_decoder.h" |
49 #include "webkit/plugins/npapi/plugin_instance.h" | 49 #include "webkit/plugins/npapi/plugin_instance.h" |
50 #include "webkit/plugins/webplugininfo.h" | 50 #include "webkit/plugins/webplugininfo.h" |
| 51 #include "webkit/user_agent/user_agent.h" |
51 | 52 |
52 #if defined(OS_ANDROID) | 53 #if defined(OS_ANDROID) |
53 #include "webkit/glue/fling_animator_impl_android.h" | 54 #include "webkit/glue/fling_animator_impl_android.h" |
54 #endif | 55 #endif |
55 | 56 |
56 #if defined(OS_LINUX) | 57 #if defined(OS_LINUX) |
57 #include "v8/include/v8.h" | 58 #include "v8/include/v8.h" |
58 #endif | 59 #endif |
59 | 60 |
60 using WebKit::WebAudioBus; | 61 using WebKit::WebAudioBus; |
(...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
807 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 808 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
808 } | 809 } |
809 | 810 |
810 #if defined(OS_ANDROID) | 811 #if defined(OS_ANDROID) |
811 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { | 812 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { |
812 return new FlingAnimatorImpl(); | 813 return new FlingAnimatorImpl(); |
813 } | 814 } |
814 #endif | 815 #endif |
815 | 816 |
816 } // namespace webkit_glue | 817 } // namespace webkit_glue |
OLD | NEW |