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/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "content/common/file_utilities_messages.h" | 23 #include "content/common/file_utilities_messages.h" |
24 #include "content/common/gpu/client/context_provider_command_buffer.h" | 24 #include "content/common/gpu/client/context_provider_command_buffer.h" |
25 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 25 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
26 #include "content/common/mime_registry_messages.h" | 26 #include "content/common/mime_registry_messages.h" |
27 #include "content/common/view_messages.h" | 27 #include "content/common/view_messages.h" |
28 #include "content/public/common/content_switches.h" | 28 #include "content/public/common/content_switches.h" |
29 #include "content/public/renderer/content_renderer_client.h" | 29 #include "content/public/renderer/content_renderer_client.h" |
30 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 30 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
31 #include "content/renderer/gamepad_shared_memory_reader.h" | 31 #include "content/renderer/gamepad_shared_memory_reader.h" |
32 #include "content/renderer/hyphenator/hyphenator.h" | 32 #include "content/renderer/hyphenator/hyphenator.h" |
| 33 #include "content/renderer/media/audio_decoder.h" |
33 #include "content/renderer/media/media_stream_dependency_factory.h" | 34 #include "content/renderer/media/media_stream_dependency_factory.h" |
34 #include "content/renderer/media/renderer_webaudiodevice_impl.h" | 35 #include "content/renderer/media/renderer_webaudiodevice_impl.h" |
35 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" | 36 #include "content/renderer/media/renderer_webmidiaccessor_impl.h" |
36 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" | 37 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" |
37 #include "content/renderer/render_thread_impl.h" | 38 #include "content/renderer/render_thread_impl.h" |
38 #include "content/renderer/renderer_clipboard_client.h" | 39 #include "content/renderer/renderer_clipboard_client.h" |
39 #include "content/renderer/webclipboard_impl.h" | 40 #include "content/renderer/webclipboard_impl.h" |
40 #include "content/renderer/websharedworkerrepository_impl.h" | 41 #include "content/renderer/websharedworkerrepository_impl.h" |
41 #include "googleurl/src/gurl.h" | 42 #include "googleurl/src/gurl.h" |
42 #include "gpu/config/gpu_info.h" | 43 #include "gpu/config/gpu_info.h" |
(...skipping 10 matching lines...) Expand all Loading... |
53 #include "third_party/WebKit/public/platform/WebGamepads.h" | 54 #include "third_party/WebKit/public/platform/WebGamepads.h" |
54 #include "third_party/WebKit/public/platform/WebHyphenator.h" | 55 #include "third_party/WebKit/public/platform/WebHyphenator.h" |
55 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h" | 56 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h" |
56 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" | 57 #include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" |
57 #include "third_party/WebKit/public/platform/WebURL.h" | 58 #include "third_party/WebKit/public/platform/WebURL.h" |
58 #include "third_party/WebKit/public/platform/WebVector.h" | 59 #include "third_party/WebKit/public/platform/WebVector.h" |
59 #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" | 60 #include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" |
60 #include "webkit/glue/simple_webmimeregistry_impl.h" | 61 #include "webkit/glue/simple_webmimeregistry_impl.h" |
61 #include "webkit/glue/webfileutilities_impl.h" | 62 #include "webkit/glue/webfileutilities_impl.h" |
62 #include "webkit/glue/webkit_glue.h" | 63 #include "webkit/glue/webkit_glue.h" |
63 #include "webkit/renderer/media/audio_decoder.h" | |
64 #include "webkit/renderer/media/crypto/key_systems.h" | 64 #include "webkit/renderer/media/crypto/key_systems.h" |
65 | 65 |
66 #if defined(OS_WIN) | 66 #if defined(OS_WIN) |
67 #include "content/common/child_process_messages.h" | 67 #include "content/common/child_process_messages.h" |
68 #include "third_party/WebKit/public/platform/win/WebSandboxSupport.h" | 68 #include "third_party/WebKit/public/platform/win/WebSandboxSupport.h" |
69 #endif | 69 #endif |
70 | 70 |
71 #if defined(OS_MACOSX) | 71 #if defined(OS_MACOSX) |
72 #include "content/common/mac/font_descriptor.h" | 72 #include "content/common/mac/font_descriptor.h" |
73 #include "content/common/mac/font_loader.h" | 73 #include "content/common/mac/font_loader.h" |
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
839 return DecodeAudioFileData(destination_bus, | 839 return DecodeAudioFileData(destination_bus, |
840 audio_file_data, | 840 audio_file_data, |
841 data_size, | 841 data_size, |
842 sample_rate, | 842 sample_rate, |
843 thread_safe_sender_); | 843 thread_safe_sender_); |
844 } | 844 } |
845 #else | 845 #else |
846 bool RendererWebKitPlatformSupportImpl::loadAudioResource( | 846 bool RendererWebKitPlatformSupportImpl::loadAudioResource( |
847 WebKit::WebAudioBus* destination_bus, const char* audio_file_data, | 847 WebKit::WebAudioBus* destination_bus, const char* audio_file_data, |
848 size_t data_size, double sample_rate) { | 848 size_t data_size, double sample_rate) { |
849 return webkit_media::DecodeAudioFileData(destination_bus, | 849 return DecodeAudioFileData( |
850 audio_file_data, | 850 destination_bus, audio_file_data, data_size, sample_rate); |
851 data_size, | |
852 sample_rate); | |
853 } | 851 } |
854 #endif // defined(OS_ANDROID) | 852 #endif // defined(OS_ANDROID) |
855 | 853 |
856 //------------------------------------------------------------------------------ | 854 //------------------------------------------------------------------------------ |
857 | 855 |
858 WebKit::WebContentDecryptionModule* | 856 WebKit::WebContentDecryptionModule* |
859 RendererWebKitPlatformSupportImpl::createContentDecryptionModule( | 857 RendererWebKitPlatformSupportImpl::createContentDecryptionModule( |
860 const WebKit::WebString& key_system) { | 858 const WebKit::WebString& key_system) { |
861 return WebContentDecryptionModuleImpl::Create(key_system); | 859 return WebContentDecryptionModuleImpl::Create(key_system); |
862 } | 860 } |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1050 | 1048 |
1051 //------------------------------------------------------------------------------ | 1049 //------------------------------------------------------------------------------ |
1052 | 1050 |
1053 WebKit::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode( | 1051 WebKit::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode( |
1054 const WebKit::WebString& host, | 1052 const WebKit::WebString& host, |
1055 const WebKit::WebString& languages) { | 1053 const WebKit::WebString& languages) { |
1056 return net::IDNToUnicode(host.utf8(), languages.utf8()); | 1054 return net::IDNToUnicode(host.utf8(), languages.utf8()); |
1057 } | 1055 } |
1058 | 1056 |
1059 } // namespace content | 1057 } // namespace content |
OLD | NEW |