Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 660673002: Introduce CdmFactory interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_result_promise
Patch Set: comments addressed Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/renderer/media/webcontentdecryptionmodule_impl.cc ('k') | media/base/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "content/renderer/external_popup_menu.h" 66 #include "content/renderer/external_popup_menu.h"
67 #include "content/renderer/geolocation_dispatcher.h" 67 #include "content/renderer/geolocation_dispatcher.h"
68 #include "content/renderer/history_controller.h" 68 #include "content/renderer/history_controller.h"
69 #include "content/renderer/history_serialization.h" 69 #include "content/renderer/history_serialization.h"
70 #include "content/renderer/image_loading_helper.h" 70 #include "content/renderer/image_loading_helper.h"
71 #include "content/renderer/ime_event_guard.h" 71 #include "content/renderer/ime_event_guard.h"
72 #include "content/renderer/internal_document_state_data.h" 72 #include "content/renderer/internal_document_state_data.h"
73 #include "content/renderer/manifest/manifest_manager.h" 73 #include "content/renderer/manifest/manifest_manager.h"
74 #include "content/renderer/media/audio_renderer_mixer_manager.h" 74 #include "content/renderer/media/audio_renderer_mixer_manager.h"
75 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h" 75 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
76 #include "content/renderer/media/crypto/render_cdm_factory.h"
76 #include "content/renderer/media/media_stream_dispatcher.h" 77 #include "content/renderer/media/media_stream_dispatcher.h"
77 #include "content/renderer/media/media_stream_renderer_factory.h" 78 #include "content/renderer/media/media_stream_renderer_factory.h"
78 #include "content/renderer/media/midi_dispatcher.h" 79 #include "content/renderer/media/midi_dispatcher.h"
79 #include "content/renderer/media/render_media_log.h" 80 #include "content/renderer/media/render_media_log.h"
80 #include "content/renderer/media/user_media_client_impl.h" 81 #include "content/renderer/media/user_media_client_impl.h"
81 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 82 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
82 #include "content/renderer/media/webmediaplayer_ms.h" 83 #include "content/renderer/media/webmediaplayer_ms.h"
83 #include "content/renderer/mojo/service_registry_js_wrapper.h" 84 #include "content/renderer/mojo/service_registry_js_wrapper.h"
84 #include "content/renderer/notification_permission_dispatcher.h" 85 #include "content/renderer/notification_permission_dispatcher.h"
85 #include "content/renderer/notification_provider.h" 86 #include "content/renderer/notification_provider.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 #include <cpu-features.h> 147 #include <cpu-features.h>
147 148
148 #include "content/common/gpu/client/context_provider_command_buffer.h" 149 #include "content/common/gpu/client/context_provider_command_buffer.h"
149 #include "content/renderer/android/synchronous_compositor_factory.h" 150 #include "content/renderer/android/synchronous_compositor_factory.h"
150 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 151 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
151 #include "content/renderer/media/android/renderer_media_player_manager.h" 152 #include "content/renderer/media/android/renderer_media_player_manager.h"
152 #include "content/renderer/media/android/stream_texture_factory_impl.h" 153 #include "content/renderer/media/android/stream_texture_factory_impl.h"
153 #include "content/renderer/media/android/webmediaplayer_android.h" 154 #include "content/renderer/media/android/webmediaplayer_android.h"
154 #endif 155 #endif
155 156
156 #if defined(ENABLE_BROWSER_CDMS) 157 #if defined(ENABLE_PEPPER_CDMS)
158 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
159 #elif defined(ENABLE_BROWSER_CDMS)
157 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 160 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
158 #endif 161 #endif
159 162
160 using blink::WebContextMenuData; 163 using blink::WebContextMenuData;
161 using blink::WebData; 164 using blink::WebData;
162 using blink::WebDataSource; 165 using blink::WebDataSource;
163 using blink::WebDocument; 166 using blink::WebDocument;
164 using blink::WebElement; 167 using blink::WebElement;
165 using blink::WebExternalPopupMenu; 168 using blink::WebExternalPopupMenu;
166 using blink::WebExternalPopupMenuClient; 169 using blink::WebExternalPopupMenuClient;
(...skipping 1526 matching lines...) Expand 10 before | Expand all | Expand 10 after
1693 params); 1696 params);
1694 #endif // defined(OS_ANDROID) 1697 #endif // defined(OS_ANDROID)
1695 } 1698 }
1696 1699
1697 blink::WebContentDecryptionModule* 1700 blink::WebContentDecryptionModule*
1698 RenderFrameImpl::createContentDecryptionModule( 1701 RenderFrameImpl::createContentDecryptionModule(
1699 blink::WebLocalFrame* frame, 1702 blink::WebLocalFrame* frame,
1700 const blink::WebSecurityOrigin& security_origin, 1703 const blink::WebSecurityOrigin& security_origin,
1701 const blink::WebString& key_system) { 1704 const blink::WebString& key_system) {
1702 DCHECK(!frame_ || frame_ == frame); 1705 DCHECK(!frame_ || frame_ == frame);
1703 return WebContentDecryptionModuleImpl::Create( 1706
1707 RenderCdmFactory cdm_factory(
1704 #if defined(ENABLE_PEPPER_CDMS) 1708 #if defined(ENABLE_PEPPER_CDMS)
1705 frame, 1709 base::Bind(&PepperCdmWrapperImpl::Create, frame)
1706 #elif defined(ENABLE_BROWSER_CDMS) 1710 #elif defined(ENABLE_BROWSER_CDMS)
1707 GetCdmManager(), 1711 GetCdmManager()
1708 #endif 1712 #endif
1709 security_origin, 1713 );
1710 key_system); 1714
1715 return WebContentDecryptionModuleImpl::Create(&cdm_factory, security_origin,
1716 key_system);
1711 } 1717 }
1712 1718
1713 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 1719 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
1714 blink::WebLocalFrame* frame, 1720 blink::WebLocalFrame* frame,
1715 blink::WebApplicationCacheHostClient* client) { 1721 blink::WebApplicationCacheHostClient* client) {
1716 if (!frame || !frame->view()) 1722 if (!frame || !frame->view())
1717 return NULL; 1723 return NULL;
1718 DCHECK(!frame_ || frame_ == frame); 1724 DCHECK(!frame_ || frame_ == frame);
1719 return new RendererWebApplicationCacheHostImpl( 1725 return new RendererWebApplicationCacheHostImpl(
1720 RenderViewImpl::FromWebView(frame->view()), client, 1726 RenderViewImpl::FromWebView(frame->view()), client,
(...skipping 2347 matching lines...) Expand 10 before | Expand all | Expand 10 after
4068 4074
4069 #if defined(ENABLE_BROWSER_CDMS) 4075 #if defined(ENABLE_BROWSER_CDMS)
4070 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4076 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4071 if (!cdm_manager_) 4077 if (!cdm_manager_)
4072 cdm_manager_ = new RendererCdmManager(this); 4078 cdm_manager_ = new RendererCdmManager(this);
4073 return cdm_manager_; 4079 return cdm_manager_;
4074 } 4080 }
4075 #endif // defined(ENABLE_BROWSER_CDMS) 4081 #endif // defined(ENABLE_BROWSER_CDMS)
4076 4082
4077 } // namespace content 4083 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webcontentdecryptionmodule_impl.cc ('k') | media/base/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698