| 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 "content/renderer/renderer_webkitplatformsupport_impl.h" | 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
| 10 #include "base/memory/shared_memory.h" | 10 #include "base/memory/shared_memory.h" |
| (...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 887 // thread_safe_sender_ can be NULL when running some tests. | 887 // thread_safe_sender_ can be NULL when running some tests. |
| 888 if (!blob_registry_.get() && thread_safe_sender_.get()) | 888 if (!blob_registry_.get() && thread_safe_sender_.get()) |
| 889 blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); | 889 blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); |
| 890 return blob_registry_.get(); | 890 return blob_registry_.get(); |
| 891 } | 891 } |
| 892 | 892 |
| 893 //------------------------------------------------------------------------------ | 893 //------------------------------------------------------------------------------ |
| 894 | 894 |
| 895 void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) { | 895 void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) { |
| 896 if (g_test_gamepads == 0) { | 896 if (g_test_gamepads == 0) { |
| 897 if (!gamepad_shared_memory_reader_) | 897 RenderThreadImpl::current()->SampleGamepads(&gamepads); |
| 898 gamepad_shared_memory_reader_.reset(new GamepadSharedMemoryReader); | |
| 899 gamepad_shared_memory_reader_->SampleGamepads(gamepads); | |
| 900 } else { | 898 } else { |
| 901 gamepads = g_test_gamepads.Get(); | 899 gamepads = g_test_gamepads.Get(); |
| 902 return; | |
| 903 } | 900 } |
| 904 } | 901 } |
| 905 | 902 |
| 906 WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent( | 903 WebKit::WebString RendererWebKitPlatformSupportImpl::userAgent( |
| 907 const WebKit::WebURL& url) { | 904 const WebKit::WebURL& url) { |
| 908 return WebKitPlatformSupportImpl::userAgent(url); | 905 return WebKitPlatformSupportImpl::userAgent(url); |
| 909 } | 906 } |
| 910 | 907 |
| 911 //------------------------------------------------------------------------------ | 908 //------------------------------------------------------------------------------ |
| 912 | 909 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1092 return; | 1089 return; |
| 1093 QuotaDispatcher::ThreadSpecificInstance( | 1090 QuotaDispatcher::ThreadSpecificInstance( |
| 1094 thread_safe_sender_.get(), | 1091 thread_safe_sender_.get(), |
| 1095 quota_message_filter_.get())->QueryStorageUsageAndQuota( | 1092 quota_message_filter_.get())->QueryStorageUsageAndQuota( |
| 1096 storage_partition, | 1093 storage_partition, |
| 1097 static_cast<quota::StorageType>(type), | 1094 static_cast<quota::StorageType>(type), |
| 1098 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); | 1095 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); |
| 1099 } | 1096 } |
| 1100 | 1097 |
| 1101 } // namespace content | 1098 } // namespace content |
| OLD | NEW |