| 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 21 matching lines...) Expand all Loading... |
| 32 #include "grit/webkit_strings.h" | 32 #include "grit/webkit_strings.h" |
| 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" | 33 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" |
| 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.
h" | 34 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginListBuilder.
h" |
| 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 36 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookie.h" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCookie.h" |
| 37 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebData.h" |
| 38 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
| 39 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" |
| 40 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" |
| 41 #include "ui/base/layout.h" | 41 #include "ui/base/layout.h" |
| 42 #include "webkit/glue/user_agent.h" |
| 42 #include "webkit/glue/webkit_glue.h" | 43 #include "webkit/glue/webkit_glue.h" |
| 43 #include "webkit/glue/websocketstreamhandle_impl.h" | 44 #include "webkit/glue/websocketstreamhandle_impl.h" |
| 44 #include "webkit/glue/webthread_impl.h" | 45 #include "webkit/glue/webthread_impl.h" |
| 45 #include "webkit/glue/weburlloader_impl.h" | 46 #include "webkit/glue/weburlloader_impl.h" |
| 46 #include "webkit/glue/worker_task_runner.h" | 47 #include "webkit/glue/worker_task_runner.h" |
| 47 #include "webkit/media/audio_decoder.h" | 48 #include "webkit/media/audio_decoder.h" |
| 48 #include "webkit/plugins/npapi/plugin_instance.h" | 49 #include "webkit/plugins/npapi/plugin_instance.h" |
| 49 #include "webkit/plugins/webplugininfo.h" | 50 #include "webkit/plugins/webplugininfo.h" |
| 50 | 51 |
| 51 #if defined(OS_ANDROID) | 52 #if defined(OS_ANDROID) |
| (...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 802 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
| 802 } | 803 } |
| 803 | 804 |
| 804 #if defined(OS_ANDROID) | 805 #if defined(OS_ANDROID) |
| 805 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { | 806 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { |
| 806 return new FlingAnimatorImpl(); | 807 return new FlingAnimatorImpl(); |
| 807 } | 808 } |
| 808 #endif | 809 #endif |
| 809 | 810 |
| 810 } // namespace webkit_glue | 811 } // namespace webkit_glue |
| OLD | NEW |