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

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

Issue 495353003: Move WebMediaPlayerImpl and its dependencies to media/blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 3 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/render_frame_impl.h ('k') | media/DEPS » ('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/ime_event_guard.h" 66 #include "content/renderer/ime_event_guard.h"
67 #include "content/renderer/internal_document_state_data.h" 67 #include "content/renderer/internal_document_state_data.h"
68 #include "content/renderer/media/audio_renderer_mixer_manager.h" 68 #include "content/renderer/media/audio_renderer_mixer_manager.h"
69 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h" 69 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
70 #include "content/renderer/media/media_stream_dispatcher.h" 70 #include "content/renderer/media/media_stream_dispatcher.h"
71 #include "content/renderer/media/media_stream_renderer_factory.h" 71 #include "content/renderer/media/media_stream_renderer_factory.h"
72 #include "content/renderer/media/midi_dispatcher.h" 72 #include "content/renderer/media/midi_dispatcher.h"
73 #include "content/renderer/media/render_media_log.h" 73 #include "content/renderer/media/render_media_log.h"
74 #include "content/renderer/media/user_media_client_impl.h" 74 #include "content/renderer/media/user_media_client_impl.h"
75 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 75 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
76 #include "content/renderer/media/webmediaplayer_impl.h"
77 #include "content/renderer/media/webmediaplayer_ms.h" 76 #include "content/renderer/media/webmediaplayer_ms.h"
78 #include "content/renderer/media/webmediaplayer_params.h"
79 #include "content/renderer/notification_permission_dispatcher.h" 77 #include "content/renderer/notification_permission_dispatcher.h"
80 #include "content/renderer/notification_provider.h" 78 #include "content/renderer/notification_provider.h"
81 #include "content/renderer/npapi/plugin_channel_host.h" 79 #include "content/renderer/npapi/plugin_channel_host.h"
82 #include "content/renderer/push_messaging_dispatcher.h" 80 #include "content/renderer/push_messaging_dispatcher.h"
83 #include "content/renderer/render_frame_proxy.h" 81 #include "content/renderer/render_frame_proxy.h"
84 #include "content/renderer/render_process.h" 82 #include "content/renderer/render_process.h"
85 #include "content/renderer/render_thread_impl.h" 83 #include "content/renderer/render_thread_impl.h"
86 #include "content/renderer/render_view_impl.h" 84 #include "content/renderer/render_view_impl.h"
87 #include "content/renderer/render_widget_fullscreen_pepper.h" 85 #include "content/renderer/render_widget_fullscreen_pepper.h"
88 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 86 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
89 #include "content/renderer/renderer_webcolorchooser_impl.h" 87 #include "content/renderer/renderer_webcolorchooser_impl.h"
90 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 88 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
91 #include "content/renderer/shared_worker_repository.h" 89 #include "content/renderer/shared_worker_repository.h"
92 #include "content/renderer/v8_value_converter_impl.h" 90 #include "content/renderer/v8_value_converter_impl.h"
93 #include "content/renderer/websharedworker_proxy.h" 91 #include "content/renderer/websharedworker_proxy.h"
94 #include "media/base/audio_renderer_mixer_input.h" 92 #include "media/base/audio_renderer_mixer_input.h"
93 #include "media/blink/webmediaplayer_impl.h"
94 #include "media/blink/webmediaplayer_params.h"
95 #include "media/filters/gpu_video_accelerator_factories.h" 95 #include "media/filters/gpu_video_accelerator_factories.h"
96 #include "net/base/data_url.h" 96 #include "net/base/data_url.h"
97 #include "net/base/net_errors.h" 97 #include "net/base/net_errors.h"
98 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 98 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
99 #include "net/http/http_util.h" 99 #include "net/http/http_util.h"
100 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" 100 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h"
101 #include "third_party/WebKit/public/platform/WebString.h" 101 #include "third_party/WebKit/public/platform/WebString.h"
102 #include "third_party/WebKit/public/platform/WebURL.h" 102 #include "third_party/WebKit/public/platform/WebURL.h"
103 #include "third_party/WebKit/public/platform/WebURLError.h" 103 #include "third_party/WebKit/public/platform/WebURLError.h"
104 #include "third_party/WebKit/public/platform/WebURLResponse.h" 104 #include "third_party/WebKit/public/platform/WebURLResponse.h"
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1591 1591
1592 blink::WebMediaStream web_stream( 1592 blink::WebMediaStream web_stream(
1593 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); 1593 blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
1594 if (!web_stream.isNull()) 1594 if (!web_stream.isNull())
1595 return CreateWebMediaPlayerForMediaStream(url, client); 1595 return CreateWebMediaPlayerForMediaStream(url, client);
1596 1596
1597 #if defined(OS_ANDROID) 1597 #if defined(OS_ANDROID)
1598 return CreateAndroidWebMediaPlayer(url, client); 1598 return CreateAndroidWebMediaPlayer(url, client);
1599 #else 1599 #else
1600 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 1600 RenderThreadImpl* render_thread = RenderThreadImpl::current();
1601 WebMediaPlayerParams params( 1601 media::WebMediaPlayerParams params(
1602 base::Bind(&ContentRendererClient::DeferMediaLoad, 1602 base::Bind(&ContentRendererClient::DeferMediaLoad,
1603 base::Unretained(GetContentClient()->renderer()), 1603 base::Unretained(GetContentClient()->renderer()),
1604 static_cast<RenderFrame*>(this)), 1604 static_cast<RenderFrame*>(this)),
1605 render_thread->GetAudioRendererMixerManager()->CreateInput( 1605 render_thread->GetAudioRendererMixerManager()->CreateInput(
1606 render_view_->routing_id_, routing_id_), 1606 render_view_->routing_id_, routing_id_),
1607 *render_thread->GetAudioHardwareConfig(), 1607 *render_thread->GetAudioHardwareConfig(),
1608 new RenderMediaLog(), 1608 new RenderMediaLog(),
1609 render_thread->GetGpuFactories(), 1609 render_thread->GetGpuFactories(),
1610 render_thread->GetMediaThreadTaskRunner(), 1610 render_thread->GetMediaThreadTaskRunner(),
1611 render_thread->compositor_message_loop_proxy(), 1611 render_thread->compositor_message_loop_proxy(),
1612 base::Bind(&EncryptedMediaPlayerSupportImpl::Create)); 1612 base::Bind(&EncryptedMediaPlayerSupportImpl::Create));
1613 return new WebMediaPlayerImpl(frame, client, weak_factory_.GetWeakPtr(), 1613 return new media::WebMediaPlayerImpl(frame,
1614 params); 1614 client,
1615 weak_factory_.GetWeakPtr(),
1616 params);
1615 #endif // defined(OS_ANDROID) 1617 #endif // defined(OS_ANDROID)
1616 } 1618 }
1617 1619
1618 blink::WebContentDecryptionModule* 1620 blink::WebContentDecryptionModule*
1619 RenderFrameImpl::createContentDecryptionModule( 1621 RenderFrameImpl::createContentDecryptionModule(
1620 blink::WebLocalFrame* frame, 1622 blink::WebLocalFrame* frame,
1621 const blink::WebSecurityOrigin& security_origin, 1623 const blink::WebSecurityOrigin& security_origin,
1622 const blink::WebString& key_system) { 1624 const blink::WebString& key_system) {
1623 DCHECK(!frame_ || frame_ == frame); 1625 DCHECK(!frame_ || frame_ == frame);
1624 return WebContentDecryptionModuleImpl::Create( 1626 return WebContentDecryptionModuleImpl::Create(
(...skipping 2250 matching lines...) Expand 10 before | Expand all | Expand 10 after
3875 3877
3876 #if defined(ENABLE_BROWSER_CDMS) 3878 #if defined(ENABLE_BROWSER_CDMS)
3877 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3879 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3878 if (!cdm_manager_) 3880 if (!cdm_manager_)
3879 cdm_manager_ = new RendererCdmManager(this); 3881 cdm_manager_ = new RendererCdmManager(this);
3880 return cdm_manager_; 3882 return cdm_manager_;
3881 } 3883 }
3882 #endif // defined(ENABLE_BROWSER_CDMS) 3884 #endif // defined(ENABLE_BROWSER_CDMS)
3883 3885
3884 } // namespace content 3886 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | media/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698