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

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

Issue 1023863002: Create an interface for KeySystems, migrate WebEncryptedMediaClientImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@robustness
Patch Set: Rebase. Created 5 years, 9 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 | « no previous file | media/base/eme_constants.h » ('j') | media/base/key_systems.h » ('J')
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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 97 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
98 #include "content/renderer/renderer_webcolorchooser_impl.h" 98 #include "content/renderer/renderer_webcolorchooser_impl.h"
99 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 99 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
100 #include "content/renderer/shared_worker_repository.h" 100 #include "content/renderer/shared_worker_repository.h"
101 #include "content/renderer/skia_benchmarking_extension.h" 101 #include "content/renderer/skia_benchmarking_extension.h"
102 #include "content/renderer/stats_collection_controller.h" 102 #include "content/renderer/stats_collection_controller.h"
103 #include "content/renderer/web_ui_extension.h" 103 #include "content/renderer/web_ui_extension.h"
104 #include "content/renderer/websharedworker_proxy.h" 104 #include "content/renderer/websharedworker_proxy.h"
105 #include "gin/modules/module_registry.h" 105 #include "gin/modules/module_registry.h"
106 #include "media/base/audio_renderer_mixer_input.h" 106 #include "media/base/audio_renderer_mixer_input.h"
107 #include "media/base/key_systems.h"
107 #include "media/base/media_log.h" 108 #include "media/base/media_log.h"
108 #include "media/blink/webencryptedmediaclient_impl.h" 109 #include "media/blink/webencryptedmediaclient_impl.h"
109 #include "media/blink/webmediaplayer_impl.h" 110 #include "media/blink/webmediaplayer_impl.h"
110 #include "media/blink/webmediaplayer_params.h" 111 #include "media/blink/webmediaplayer_params.h"
111 #include "media/renderers/gpu_video_accelerator_factories.h" 112 #include "media/renderers/gpu_video_accelerator_factories.h"
112 #include "net/base/data_url.h" 113 #include "net/base/data_url.h"
113 #include "net/base/net_errors.h" 114 #include "net/base/net_errors.h"
114 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 115 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
115 #include "net/http/http_util.h" 116 #include "net/http/http_util.h"
116 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" 117 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
(...skipping 3307 matching lines...) Expand 10 before | Expand all | Expand 10 after
3424 scoped_ptr<media::CdmFactory> cdm_factory( 3425 scoped_ptr<media::CdmFactory> cdm_factory(
3425 new RenderCdmFactory(GetCdmManager())); 3426 new RenderCdmFactory(GetCdmManager()));
3426 #else 3427 #else
3427 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory()); 3428 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory());
3428 #endif 3429 #endif
3429 3430
3430 if (!media_permission_dispatcher_) 3431 if (!media_permission_dispatcher_)
3431 media_permission_dispatcher_ = new MediaPermissionDispatcher(this); 3432 media_permission_dispatcher_ = new MediaPermissionDispatcher(this);
3432 3433
3433 web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl( 3434 web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
3434 cdm_factory.Pass(), media_permission_dispatcher_)); 3435 media::KeySystems::GetInstance(), cdm_factory.Pass(),
3436 media_permission_dispatcher_));
3435 } 3437 }
3436 return web_encrypted_media_client_.get(); 3438 return web_encrypted_media_client_.get();
3437 } 3439 }
3438 3440
3439 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() { 3441 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
3440 if (!midi_dispatcher_) 3442 if (!midi_dispatcher_)
3441 midi_dispatcher_ = new MidiDispatcher(this); 3443 midi_dispatcher_ = new MidiDispatcher(this);
3442 return midi_dispatcher_; 3444 return midi_dispatcher_;
3443 } 3445 }
3444 3446
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
4510 4512
4511 #if defined(ENABLE_BROWSER_CDMS) 4513 #if defined(ENABLE_BROWSER_CDMS)
4512 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4514 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4513 if (!cdm_manager_) 4515 if (!cdm_manager_)
4514 cdm_manager_ = new RendererCdmManager(this); 4516 cdm_manager_ = new RendererCdmManager(this);
4515 return cdm_manager_; 4517 return cdm_manager_;
4516 } 4518 }
4517 #endif // defined(ENABLE_BROWSER_CDMS) 4519 #endif // defined(ENABLE_BROWSER_CDMS)
4518 4520
4519 } // namespace content 4521 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/eme_constants.h » ('j') | media/base/key_systems.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698