| 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/compositor_bindings/web_compositor_support_impl.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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 break; | 227 break; |
| 227 } | 228 } |
| 228 return -1; | 229 return -1; |
| 229 } | 230 } |
| 230 | 231 |
| 231 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() | 232 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() |
| 232 : main_loop_(MessageLoop::current()), | 233 : main_loop_(MessageLoop::current()), |
| 233 shared_timer_func_(NULL), | 234 shared_timer_func_(NULL), |
| 234 shared_timer_fire_time_(0.0), | 235 shared_timer_fire_time_(0.0), |
| 235 shared_timer_suspended_(0), | 236 shared_timer_suspended_(0), |
| 236 current_thread_slot_(&DestroyCurrentThread) { | 237 current_thread_slot_(&DestroyCurrentThread), |
| 238 compositor_support_(new webkit::WebCompositorSupportImpl) { |
| 237 } | 239 } |
| 238 | 240 |
| 239 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { | 241 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { |
| 240 } | 242 } |
| 241 | 243 |
| 242 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() { | 244 WebThemeEngine* WebKitPlatformSupportImpl::themeEngine() { |
| 243 return &theme_engine_; | 245 return &theme_engine_; |
| 244 } | 246 } |
| 245 | 247 |
| 246 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() { | 248 WebURLLoader* WebKitPlatformSupportImpl::createURLLoader() { |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 scoped_refptr<base::MessageLoopProxy> message_loop = | 647 scoped_refptr<base::MessageLoopProxy> message_loop = |
| 646 base::MessageLoopProxy::current(); | 648 base::MessageLoopProxy::current(); |
| 647 if (!message_loop) | 649 if (!message_loop) |
| 648 return NULL; | 650 return NULL; |
| 649 | 651 |
| 650 thread = new WebThreadImplForMessageLoop(message_loop); | 652 thread = new WebThreadImplForMessageLoop(message_loop); |
| 651 current_thread_slot_.Set(thread); | 653 current_thread_slot_.Set(thread); |
| 652 return thread; | 654 return thread; |
| 653 } | 655 } |
| 654 | 656 |
| 657 WebKit::WebCompositorSupport* WebKitPlatformSupportImpl::compositorSupport() { |
| 658 return compositor_support_.get(); |
| 659 } |
| 660 |
| 655 base::PlatformFile WebKitPlatformSupportImpl::databaseOpenFile( | 661 base::PlatformFile WebKitPlatformSupportImpl::databaseOpenFile( |
| 656 const WebKit::WebString& vfs_file_name, int desired_flags) { | 662 const WebKit::WebString& vfs_file_name, int desired_flags) { |
| 657 return base::kInvalidPlatformFileValue; | 663 return base::kInvalidPlatformFileValue; |
| 658 } | 664 } |
| 659 | 665 |
| 660 int WebKitPlatformSupportImpl::databaseDeleteFile( | 666 int WebKitPlatformSupportImpl::databaseDeleteFile( |
| 661 const WebKit::WebString& vfs_file_name, bool sync_dir) { | 667 const WebKit::WebString& vfs_file_name, bool sync_dir) { |
| 662 return -1; | 668 return -1; |
| 663 } | 669 } |
| 664 | 670 |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 801 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 807 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
| 802 } | 808 } |
| 803 | 809 |
| 804 #if defined(OS_ANDROID) | 810 #if defined(OS_ANDROID) |
| 805 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { | 811 WebKit::WebFlingAnimator* WebKitPlatformSupportImpl::createFlingAnimator() { |
| 806 return new FlingAnimatorImpl(); | 812 return new FlingAnimatorImpl(); |
| 807 } | 813 } |
| 808 #endif | 814 #endif |
| 809 | 815 |
| 810 } // namespace webkit_glue | 816 } // namespace webkit_glue |
| OLD | NEW |