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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1414853003: Add options for audio/video autoplay to chrome://settings/content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 7910d84a9867a3b0e6b7b9220ddec95c07cb4469..40a7f8bbd5d25dd258f7042bf26b42dc59e44e1c 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -635,10 +635,15 @@ void ChromeContentRendererClient::DeferMediaLoad(
// NOTE: This is also used to defer media loading for prerender.
//
// TODO(dalecurtis): Include an idle check too. http://crbug.com/509135
- if (render_frame->IsHidden() && !has_played_media_before) {
- // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
- new MediaLoadDeferrer(render_frame, closure);
- return;
+ const bool is_hidden = render_frame->IsHidden();
+ if (is_hidden && !has_played_media_before) {
+ ContentSettingsObserver* observer =
+ ContentSettingsObserver::Get(render_frame);
+ if (!observer->allowMediaAutoplay(is_hidden)) {
philipj_slow 2015/10/23 12:17:30 What's happening here? On the face of things it se
DaleCurtis 2015/10/23 19:21:27 Chrome has long had a load deferral mechanism for
philipj_slow 2015/10/28 10:30:40 So is this entirely related to prerender and sessi
DaleCurtis 2015/10/30 19:25:56 Ah, you're not missing anything, this does in fact
+ // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
+ new MediaLoadDeferrer(render_frame, closure);
+ return;
+ }
}
closure.Run();

Powered by Google App Engine
This is Rietveld 408576698