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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 24 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |
25 #include "content/common/mime_registry_messages.h" | 25 #include "content/common/mime_registry_messages.h" |
26 #include "content/common/view_messages.h" | 26 #include "content/common/view_messages.h" |
27 #include "content/public/common/content_switches.h" | 27 #include "content/public/common/content_switches.h" |
28 #include "content/public/renderer/content_renderer_client.h" | 28 #include "content/public/renderer/content_renderer_client.h" |
29 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" | 29 #include "content/renderer/dom_storage/webstoragenamespace_impl.h" |
30 #include "content/renderer/gamepad_shared_memory_reader.h" | 30 #include "content/renderer/gamepad_shared_memory_reader.h" |
31 #include "content/renderer/hyphenator/hyphenator.h" | 31 #include "content/renderer/hyphenator/hyphenator.h" |
32 #include "content/renderer/media/media_stream_dependency_factory.h" | 32 #include "content/renderer/media/media_stream_dependency_factory.h" |
33 #include "content/renderer/media/renderer_webaudiodevice_impl.h" | 33 #include "content/renderer/media/renderer_webaudiodevice_impl.h" |
| 34 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" |
34 #include "content/renderer/render_thread_impl.h" | 35 #include "content/renderer/render_thread_impl.h" |
35 #include "content/renderer/renderer_clipboard_client.h" | 36 #include "content/renderer/renderer_clipboard_client.h" |
36 #include "content/renderer/websharedworkerrepository_impl.h" | 37 #include "content/renderer/websharedworkerrepository_impl.h" |
37 #include "googleurl/src/gurl.h" | 38 #include "googleurl/src/gurl.h" |
38 #include "gpu/config/gpu_info.h" | 39 #include "gpu/config/gpu_info.h" |
39 #include "ipc/ipc_sync_message_filter.h" | 40 #include "ipc/ipc_sync_message_filter.h" |
40 #include "media/audio/audio_output_device.h" | 41 #include "media/audio/audio_output_device.h" |
41 #include "media/base/audio_hardware_config.h" | 42 #include "media/base/audio_hardware_config.h" |
42 #include "net/base/net_util.h" | 43 #include "net/base/net_util.h" |
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
725 media::AudioParameters params( | 726 media::AudioParameters params( |
726 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, | 727 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, |
727 layout, input_channels, | 728 layout, input_channels, |
728 static_cast<int>(sample_rate), 16, buffer_size); | 729 static_cast<int>(sample_rate), 16, buffer_size); |
729 | 730 |
730 return new RendererWebAudioDeviceImpl(params, callback, session_id); | 731 return new RendererWebAudioDeviceImpl(params, callback, session_id); |
731 } | 732 } |
732 | 733 |
733 //------------------------------------------------------------------------------ | 734 //------------------------------------------------------------------------------ |
734 | 735 |
| 736 WebKit::WebContentDecryptionModule* |
| 737 RendererWebKitPlatformSupportImpl::createContentDecryptionModule( |
| 738 const WebKit::WebString& key_system) { |
| 739 return WebContentDecryptionModuleImpl::Create(key_system); |
| 740 } |
| 741 |
| 742 //------------------------------------------------------------------------------ |
| 743 |
735 WebKit::WebString | 744 WebKit::WebString |
736 RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString( | 745 RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString( |
737 unsigned key_size_index, | 746 unsigned key_size_index, |
738 const WebKit::WebString& challenge, | 747 const WebKit::WebString& challenge, |
739 const WebKit::WebURL& url) { | 748 const WebKit::WebURL& url) { |
740 std::string signed_public_key; | 749 std::string signed_public_key; |
741 RenderThread::Get()->Send(new ViewHostMsg_Keygen( | 750 RenderThread::Get()->Send(new ViewHostMsg_Keygen( |
742 static_cast<uint32>(key_size_index), | 751 static_cast<uint32>(key_size_index), |
743 challenge.utf8(), | 752 challenge.utf8(), |
744 GURL(url), | 753 GURL(url), |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
906 | 915 |
907 //------------------------------------------------------------------------------ | 916 //------------------------------------------------------------------------------ |
908 | 917 |
909 WebKit::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode( | 918 WebKit::WebString RendererWebKitPlatformSupportImpl::convertIDNToUnicode( |
910 const WebKit::WebString& host, | 919 const WebKit::WebString& host, |
911 const WebKit::WebString& languages) { | 920 const WebKit::WebString& languages) { |
912 return net::IDNToUnicode(host.utf8(), languages.utf8()); | 921 return net::IDNToUnicode(host.utf8(), languages.utf8()); |
913 } | 922 } |
914 | 923 |
915 } // namespace content | 924 } // namespace content |
OLD | NEW |