| 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 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" | 35 #include "third_party/WebKit/Source/Platform/chromium/public/WebGestureCurve.h" |
| 36 #include "third_party/WebKit/Source/Platform/chromium/public/WebPluginListBuilde
r.h" | 36 #include "third_party/WebKit/Source/Platform/chromium/public/WebPluginListBuilde
r.h" |
| 37 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" | 37 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" |
| 38 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" | 38 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
| 39 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" | 39 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" |
| 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" |
| 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
| 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h" |
| 43 #include "ui/base/layout.h" | 43 #include "ui/base/layout.h" |
| 44 #include "webkit/base/file_path_string_conversions.h" | 44 #include "webkit/base/file_path_string_conversions.h" |
| 45 #include "webkit/compositor_bindings/web_compositor_support_impl.h" | |
| 46 #include "webkit/glue/fling_curve_configuration.h" | 45 #include "webkit/glue/fling_curve_configuration.h" |
| 47 #include "webkit/glue/touch_fling_gesture_curve.h" | 46 #include "webkit/glue/touch_fling_gesture_curve.h" |
| 48 #include "webkit/glue/web_discardable_memory_impl.h" | 47 #include "webkit/glue/web_discardable_memory_impl.h" |
| 49 #include "webkit/glue/webkit_glue.h" | 48 #include "webkit/glue/webkit_glue.h" |
| 50 #include "webkit/glue/websocketstreamhandle_impl.h" | 49 #include "webkit/glue/websocketstreamhandle_impl.h" |
| 51 #include "webkit/glue/webthread_impl.h" | 50 #include "webkit/glue/webthread_impl.h" |
| 52 #include "webkit/glue/weburlloader_impl.h" | 51 #include "webkit/glue/weburlloader_impl.h" |
| 53 #include "webkit/glue/worker_task_runner.h" | 52 #include "webkit/glue/worker_task_runner.h" |
| 54 #include "webkit/media/audio_decoder.h" | 53 #include "webkit/media/audio_decoder.h" |
| 55 #include "webkit/plugins/npapi/plugin_instance.h" | 54 #include "webkit/plugins/npapi/plugin_instance.h" |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 365 return -1; | 364 return -1; |
| 366 } | 365 } |
| 367 | 366 |
| 368 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() | 367 WebKitPlatformSupportImpl::WebKitPlatformSupportImpl() |
| 369 : main_loop_(base::MessageLoop::current()), | 368 : main_loop_(base::MessageLoop::current()), |
| 370 shared_timer_func_(NULL), | 369 shared_timer_func_(NULL), |
| 371 shared_timer_fire_time_(0.0), | 370 shared_timer_fire_time_(0.0), |
| 372 shared_timer_fire_time_was_set_while_suspended_(false), | 371 shared_timer_fire_time_was_set_while_suspended_(false), |
| 373 shared_timer_suspended_(0), | 372 shared_timer_suspended_(0), |
| 374 current_thread_slot_(&DestroyCurrentThread), | 373 current_thread_slot_(&DestroyCurrentThread), |
| 375 compositor_support_(new webkit::WebCompositorSupportImpl), | |
| 376 fling_curve_configuration_(new FlingCurveConfiguration) {} | 374 fling_curve_configuration_(new FlingCurveConfiguration) {} |
| 377 | 375 |
| 378 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { | 376 WebKitPlatformSupportImpl::~WebKitPlatformSupportImpl() { |
| 379 } | 377 } |
| 380 | 378 |
| 381 void WebKitPlatformSupportImpl::SetFlingCurveParameters( | 379 void WebKitPlatformSupportImpl::SetFlingCurveParameters( |
| 382 const std::vector<float>& new_touchpad, | 380 const std::vector<float>& new_touchpad, |
| 383 const std::vector<float>& new_touchscreen) { | 381 const std::vector<float>& new_touchscreen) { |
| 384 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); | 382 fling_curve_configuration_->SetCurveParameters(new_touchpad, new_touchscreen); |
| 385 } | 383 } |
| (...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 scoped_refptr<base::MessageLoopProxy> message_loop = | 822 scoped_refptr<base::MessageLoopProxy> message_loop = |
| 825 base::MessageLoopProxy::current(); | 823 base::MessageLoopProxy::current(); |
| 826 if (!message_loop) | 824 if (!message_loop) |
| 827 return NULL; | 825 return NULL; |
| 828 | 826 |
| 829 thread = new WebThreadImplForMessageLoop(message_loop); | 827 thread = new WebThreadImplForMessageLoop(message_loop); |
| 830 current_thread_slot_.Set(thread); | 828 current_thread_slot_.Set(thread); |
| 831 return thread; | 829 return thread; |
| 832 } | 830 } |
| 833 | 831 |
| 834 WebKit::WebCompositorSupport* WebKitPlatformSupportImpl::compositorSupport() { | |
| 835 return compositor_support_.get(); | |
| 836 } | |
| 837 | |
| 838 base::PlatformFile WebKitPlatformSupportImpl::databaseOpenFile( | 832 base::PlatformFile WebKitPlatformSupportImpl::databaseOpenFile( |
| 839 const WebKit::WebString& vfs_file_name, int desired_flags) { | 833 const WebKit::WebString& vfs_file_name, int desired_flags) { |
| 840 return base::kInvalidPlatformFileValue; | 834 return base::kInvalidPlatformFileValue; |
| 841 } | 835 } |
| 842 | 836 |
| 843 int WebKitPlatformSupportImpl::databaseDeleteFile( | 837 int WebKitPlatformSupportImpl::databaseDeleteFile( |
| 844 const WebKit::WebString& vfs_file_name, bool sync_dir) { | 838 const WebKit::WebString& vfs_file_name, bool sync_dir) { |
| 845 return -1; | 839 return -1; |
| 846 } | 840 } |
| 847 | 841 |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 998 } | 992 } |
| 999 | 993 |
| 1000 #if defined(OS_ANDROID) | 994 #if defined(OS_ANDROID) |
| 1001 webkit_media::WebAudioMediaCodecRunner | 995 webkit_media::WebAudioMediaCodecRunner |
| 1002 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { | 996 WebKitPlatformSupportImpl::GetWebAudioMediaCodecRunner() { |
| 1003 return base::Bind(&NullRunWebAudioMediaCodec); | 997 return base::Bind(&NullRunWebAudioMediaCodec); |
| 1004 } | 998 } |
| 1005 #endif | 999 #endif |
| 1006 | 1000 |
| 1007 } // namespace webkit_glue | 1001 } // namespace webkit_glue |
| OLD | NEW |