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

Side by Side Diff: content/renderer/media/android/renderer_media_player_manager.cc

Issue 278353003: Make RendererMediaPlayerManager a RenderFrameObserver. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/common/media/cdm_messages.h" 9 #include "content/common/media/cdm_messages.h"
10 #include "content/common/media/media_player_messages_android.h" 10 #include "content/common/media/media_player_messages_android.h"
11 #include "content/public/common/renderer_preferences.h" 11 #include "content/public/common/renderer_preferences.h"
12 #include "content/renderer/media/android/proxy_media_keys.h" 12 #include "content/renderer/media/android/proxy_media_keys.h"
13 #include "content/renderer/media/android/renderer_media_player_manager.h" 13 #include "content/renderer/media/android/renderer_media_player_manager.h"
14 #include "content/renderer/media/android/webmediaplayer_android.h" 14 #include "content/renderer/media/android/webmediaplayer_android.h"
15 #include "content/renderer/render_view_impl.h" 15 #include "content/renderer/render_view_impl.h"
16 #include "ui/gfx/rect_f.h" 16 #include "ui/gfx/rect_f.h"
17 17
18 namespace content { 18 namespace content {
19 19
20 // Maximum sizes for various EME API parameters. These are checks to prevent 20 // Maximum sizes for various EME API parameters. These are checks to prevent
21 // unnecessarily large messages from being passed around, and the sizes 21 // unnecessarily large messages from being passed around, and the sizes
22 // are somewhat arbitrary as the EME spec doesn't specify any limits. 22 // are somewhat arbitrary as the EME spec doesn't specify any limits.
23 const size_t kMaxWebSessionIdLength = 512; 23 const size_t kMaxWebSessionIdLength = 512;
24 const size_t kMaxSessionMessageLength = 10240; // 10 KB 24 const size_t kMaxSessionMessageLength = 10240; // 10 KB
25 25
26 RendererMediaPlayerManager::RendererMediaPlayerManager(RenderView* render_view) 26 RendererMediaPlayerManager::RendererMediaPlayerManager(
27 : RenderViewObserver(render_view), 27 RenderFrame* render_frame)
28 : RenderFrameObserver(render_frame),
28 next_media_player_id_(0), 29 next_media_player_id_(0),
29 fullscreen_frame_(NULL), 30 fullscreen_frame_(NULL),
30 pending_fullscreen_frame_(NULL) {} 31 pending_fullscreen_frame_(NULL) {
32 }
31 33
32 RendererMediaPlayerManager::~RendererMediaPlayerManager() { 34 RendererMediaPlayerManager::~RendererMediaPlayerManager() {
33 std::map<int, WebMediaPlayerAndroid*>::iterator player_it; 35 std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
34 for (player_it = media_players_.begin(); 36 for (player_it = media_players_.begin();
35 player_it != media_players_.end(); ++player_it) { 37 player_it != media_players_.end(); ++player_it) {
36 WebMediaPlayerAndroid* player = player_it->second; 38 WebMediaPlayerAndroid* player = player_it->second;
37 player->Detach(); 39 player->Detach();
38 } 40 }
39 41
40 Send(new MediaPlayerHostMsg_DestroyAllMediaPlayers(routing_id())); 42 Send(new MediaPlayerHostMsg_DestroyAllMediaPlayers(routing_id()));
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 438
437 if (player && player->hasVideo()) { 439 if (player && player->hasVideo()) {
438 if (player->UpdateBoundaryRectangle()) 440 if (player->UpdateBoundaryRectangle())
439 (*changes)[player_it->first] = player->GetBoundaryRectangle(); 441 (*changes)[player_it->first] = player->GetBoundaryRectangle();
440 } 442 }
441 } 443 }
442 } 444 }
443 445
444 bool 446 bool
445 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 447 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
446 const RendererPreferences& prefs = static_cast<RenderViewImpl*>( 448 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
447 render_view())->renderer_preferences(); 449 render_frame())->render_view()->renderer_preferences();
448 return prefs.use_video_overlay_for_embedded_encrypted_video; 450 return prefs.use_video_overlay_for_embedded_encrypted_video;
449 } 451 }
450 #endif // defined(VIDEO_HOLE) 452 #endif // defined(VIDEO_HOLE)
451 453
452 } // namespace content 454 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698