Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chromecast/renderer/cast_content_renderer_client.h" | 5 #include "chromecast/renderer/cast_content_renderer_client.h" |
| 6 | 6 |
| 7 #include <sys/sysinfo.h> | 7 #include <sys/sysinfo.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/memory/memory_pressure_listener.h" | 10 #include "base/memory/memory_pressure_listener.h" |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 133 | 133 |
| 134 void CastContentRendererClient::AddKeySystems( | 134 void CastContentRendererClient::AddKeySystems( |
| 135 std::vector< ::media::KeySystemInfo>* key_systems) { | 135 std::vector< ::media::KeySystemInfo>* key_systems) { |
| 136 AddChromecastKeySystems(key_systems); | 136 AddChromecastKeySystems(key_systems); |
| 137 AddChromecastPlatformKeySystems(key_systems); | 137 AddChromecastPlatformKeySystems(key_systems); |
| 138 } | 138 } |
| 139 | 139 |
| 140 #if !defined(OS_ANDROID) | 140 #if !defined(OS_ANDROID) |
| 141 scoped_ptr<::media::RendererFactory> | 141 scoped_ptr<::media::RendererFactory> |
| 142 CastContentRendererClient::CreateMediaRendererFactory( | 142 CastContentRendererClient::CreateMediaRendererFactory( |
| 143 ::content::RenderFrame* render_frame) { | 143 ::content::RenderFrame* render_frame, |
| 144 scoped_refptr<media::MediaLog> media_log) { | |
|
DaleCurtis
2015/02/20 03:18:33
const & here and elsewhere.
| |
| 144 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); | 145 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
| 145 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) | 146 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) |
| 146 return nullptr; | 147 return nullptr; |
| 147 | 148 |
| 148 return scoped_ptr<::media::RendererFactory>( | 149 return scoped_ptr<::media::RendererFactory>( |
| 149 new chromecast::media::CmaMediaRendererFactory( | 150 new chromecast::media::CmaMediaRendererFactory( |
| 150 render_frame->GetRoutingID())); | 151 render_frame->GetRoutingID())); |
| 151 } | 152 } |
| 152 #endif | 153 #endif |
| 153 | 154 |
| 154 blink::WebPrescientNetworking* | 155 blink::WebPrescientNetworking* |
| 155 CastContentRendererClient::GetPrescientNetworking() { | 156 CastContentRendererClient::GetPrescientNetworking() { |
| 156 return prescient_networking_dispatcher_.get(); | 157 return prescient_networking_dispatcher_.get(); |
| 157 } | 158 } |
| 158 | 159 |
| 159 void CastContentRendererClient::DeferMediaLoad( | 160 void CastContentRendererClient::DeferMediaLoad( |
| 160 content::RenderFrame* render_frame, | 161 content::RenderFrame* render_frame, |
| 161 const base::Closure& closure) { | 162 const base::Closure& closure) { |
| 162 if (!render_frame->IsHidden()) { | 163 if (!render_frame->IsHidden()) { |
| 163 closure.Run(); | 164 closure.Run(); |
| 164 return; | 165 return; |
| 165 } | 166 } |
| 166 | 167 |
| 167 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. | 168 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. |
| 168 new CastMediaLoadDeferrer(render_frame, closure); | 169 new CastMediaLoadDeferrer(render_frame, closure); |
| 169 } | 170 } |
| 170 | 171 |
| 171 } // namespace shell | 172 } // namespace shell |
| 172 } // namespace chromecast | 173 } // namespace chromecast |
| OLD | NEW |