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

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

Issue 23464080: [Android] Decouple pausing video from RenderView pause. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 7 years, 3 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
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 "content/renderer/media/android/webmediaplayer_android.h" 7 #include "content/renderer/media/android/webmediaplayer_android.h"
8 #include "ui/gfx/rect_f.h" 8 #include "ui/gfx/rect_f.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 15 matching lines...) Expand all
26 int RendererMediaPlayerManager::RegisterMediaPlayer( 26 int RendererMediaPlayerManager::RegisterMediaPlayer(
27 WebMediaPlayerAndroid* player) { 27 WebMediaPlayerAndroid* player) {
28 media_players_[next_media_player_id_] = player; 28 media_players_[next_media_player_id_] = player;
29 return next_media_player_id_++; 29 return next_media_player_id_++;
30 } 30 }
31 31
32 void RendererMediaPlayerManager::UnregisterMediaPlayer(int player_id) { 32 void RendererMediaPlayerManager::UnregisterMediaPlayer(int player_id) {
33 media_players_.erase(player_id); 33 media_players_.erase(player_id);
34 } 34 }
35 35
36 void RendererMediaPlayerManager::ReleaseMediaResources() { 36 void RendererMediaPlayerManager::ReleaseVideoResources() {
37 std::map<int, WebMediaPlayerAndroid*>::iterator player_it; 37 std::map<int, WebMediaPlayerAndroid*>::iterator player_it;
38 for (player_it = media_players_.begin(); 38 for (player_it = media_players_.begin();
39 player_it != media_players_.end(); ++player_it) { 39 player_it != media_players_.end(); ++player_it) {
40 WebMediaPlayerAndroid* player = player_it->second; 40 WebMediaPlayerAndroid* player = player_it->second;
41 41
42 // Do not release if an audio track is still playing 42 // Do not release if an audio track is still playing
43 if (player && (player->paused() || player->hasVideo())) 43 if (player && (player->paused() || player->hasVideo()))
44 player->ReleaseMediaResources(); 44 player->ReleaseMediaResources();
45 } 45 }
46 } 46 }
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 gfx::RectF rect; 84 gfx::RectF rect;
85 if (player->RetrieveGeometryChange(&rect)) { 85 if (player->RetrieveGeometryChange(&rect)) {
86 (*changes)[player_it->first] = rect; 86 (*changes)[player_it->first] = rect;
87 } 87 }
88 } 88 }
89 } 89 }
90 } 90 }
91 #endif 91 #endif
92 92
93 } // namespace content 93 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698