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

Unified 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: Exclude media/blink from Android GN builds for now like cc/blink does. 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index baa500a2d3961067443f8a0a01ca631171c6bd89..3627d3f45470b28e4a38f7e5840bb93ff49d8605 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -73,9 +73,7 @@
#include "content/renderer/media/render_media_log.h"
#include "content/renderer/media/user_media_client_impl.h"
#include "content/renderer/media/webcontentdecryptionmodule_impl.h"
-#include "content/renderer/media/webmediaplayer_impl.h"
#include "content/renderer/media/webmediaplayer_ms.h"
-#include "content/renderer/media/webmediaplayer_params.h"
#include "content/renderer/notification_permission_dispatcher.h"
#include "content/renderer/notification_provider.h"
#include "content/renderer/npapi/plugin_channel_host.h"
@@ -92,6 +90,8 @@
#include "content/renderer/v8_value_converter_impl.h"
#include "content/renderer/websharedworker_proxy.h"
#include "media/base/audio_renderer_mixer_input.h"
+#include "media/blink/webmediaplayer_impl.h"
+#include "media/blink/webmediaplayer_params.h"
#include "media/filters/gpu_video_accelerator_factories.h"
#include "net/base/data_url.h"
#include "net/base/net_errors.h"
@@ -1573,7 +1573,7 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
return CreateAndroidWebMediaPlayer(url, client);
#else
RenderThreadImpl* render_thread = RenderThreadImpl::current();
- WebMediaPlayerParams params(
+ media::WebMediaPlayerParams params(
base::Bind(&ContentRendererClient::DeferMediaLoad,
base::Unretained(GetContentClient()->renderer()),
static_cast<RenderFrame*>(this)),
@@ -1585,8 +1585,10 @@ blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer(
render_thread->GetMediaThreadTaskRunner(),
render_thread->compositor_message_loop_proxy(),
base::Bind(&EncryptedMediaPlayerSupportImpl::Create));
- return new WebMediaPlayerImpl(frame, client, weak_factory_.GetWeakPtr(),
- params);
+ return new media::WebMediaPlayerImpl(frame,
+ client,
+ weak_factory_.GetWeakPtr(),
+ params);
#endif // defined(OS_ANDROID)
}

Powered by Google App Engine
This is Rietveld 408576698