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

Unified Diff: content/renderer/render_view_impl.cc

Issue 8095007: Defer loading of audio/video tags while prerendering. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressing Andrew's style comments. Created 9 years, 1 month 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_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index b5c40d864e5d8b06d02d5d2d0182b96be4383abe..14657247ab3b91e87d1da187ee5af15c612d90cd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1942,13 +1942,23 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
collection->AddVideoRenderer(renderer);
video_renderer = renderer;
- scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
- new webkit_glue::WebMediaPlayerImpl(client,
- AsWeakPtr(),
- collection.release(),
- message_loop_factory.release(),
- media_stream_impl_.get(),
- new RenderMediaLog()));
+ scoped_ptr<webkit_glue::WebMediaPlayerImpl> result;
+ if (content::GetContentClient()->renderer()
+ ->ShouldOverrideCreateWebMediaPlayer(this)) {
+ webkit_glue::WebMediaPlayerImpl* result_ptr;
+ content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
+ this, client, AsWeakPtr(), collection.release(),
+ message_loop_factory.release(), media_stream_impl_.get(),
+ new RenderMediaLog(), &result_ptr);
+ DCHECK(result_ptr);
+ result.reset(result_ptr);
+ } else {
+ result.reset(new webkit_glue::WebMediaPlayerImpl(client, AsWeakPtr(),
+ collection.release(), message_loop_factory.release(),
+ media_stream_impl_.get(), new RenderMediaLog()));
+ }
+ DCHECK(result.get());
+
if (!result->Initialize(frame,
cmd_line->HasSwitch(switches::kSimpleDataSource),
video_renderer)) {

Powered by Google App Engine
This is Rietveld 408576698