OLD | NEW |
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/media/android/renderer_media_player_manager.h" | 5 #include "content/renderer/media/android/renderer_media_player_manager.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "content/common/media/media_player_messages_android.h" | 8 #include "content/common/media/media_player_messages_android.h" |
9 #include "content/public/common/renderer_preferences.h" | 9 #include "content/public/common/renderer_preferences.h" |
10 #include "content/renderer/media/android/webmediaplayer_android.h" | 10 #include "content/renderer/media/android/webmediaplayer_android.h" |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 | 274 |
275 media::RendererMediaPlayerInterface* RendererMediaPlayerManager::GetMediaPlayer( | 275 media::RendererMediaPlayerInterface* RendererMediaPlayerManager::GetMediaPlayer( |
276 int player_id) { | 276 int player_id) { |
277 std::map<int, media::RendererMediaPlayerInterface*>::iterator iter = | 277 std::map<int, media::RendererMediaPlayerInterface*>::iterator iter = |
278 media_players_.find(player_id); | 278 media_players_.find(player_id); |
279 if (iter != media_players_.end()) | 279 if (iter != media_players_.end()) |
280 return iter->second; | 280 return iter->second; |
281 return NULL; | 281 return NULL; |
282 } | 282 } |
283 | 283 |
| 284 void RendererMediaPlayerManager::OnDestruct() { |
| 285 delete this; |
| 286 } |
| 287 |
284 #if defined(VIDEO_HOLE) | 288 #if defined(VIDEO_HOLE) |
285 void RendererMediaPlayerManager::RequestExternalSurface( | 289 void RendererMediaPlayerManager::RequestExternalSurface( |
286 int player_id, | 290 int player_id, |
287 const gfx::RectF& geometry) { | 291 const gfx::RectF& geometry) { |
288 Send(new MediaPlayerHostMsg_NotifyExternalSurface( | 292 Send(new MediaPlayerHostMsg_NotifyExternalSurface( |
289 routing_id(), player_id, true, geometry)); | 293 routing_id(), player_id, true, geometry)); |
290 } | 294 } |
291 | 295 |
292 void RendererMediaPlayerManager::DidCommitCompositorFrame() { | 296 void RendererMediaPlayerManager::DidCommitCompositorFrame() { |
293 std::map<int, gfx::RectF> geometry_change; | 297 std::map<int, gfx::RectF> geometry_change; |
(...skipping 24 matching lines...) Expand all Loading... |
318 | 322 |
319 bool | 323 bool |
320 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { | 324 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { |
321 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( | 325 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( |
322 render_frame())->render_view()->renderer_preferences(); | 326 render_frame())->render_view()->renderer_preferences(); |
323 return prefs.use_video_overlay_for_embedded_encrypted_video; | 327 return prefs.use_video_overlay_for_embedded_encrypted_video; |
324 } | 328 } |
325 #endif // defined(VIDEO_HOLE) | 329 #endif // defined(VIDEO_HOLE) |
326 | 330 |
327 } // namespace content | 331 } // namespace content |
OLD | NEW |