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

Side by Side Diff: content/browser/media/android/browser_media_player_manager.cc

Issue 845193005: Tear down ContentVideoView from content-layer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only include content_video_view.h on Android Created 5 years, 10 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/browser/media/android/browser_media_player_manager.h" 5 #include "content/browser/media/android/browser_media_player_manager.h"
6 6
7 #include "base/android/scoped_java_ref.h" 7 #include "base/android/scoped_java_ref.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "content/browser/android/content_view_core_impl.h" 9 #include "content/browser/android/content_view_core_impl.h"
10 #include "content/browser/media/android/browser_demuxer_android.h" 10 #include "content/browser/media/android/browser_demuxer_android.h"
11 #include "content/browser/media/android/media_resource_getter_impl.h" 11 #include "content/browser/media/android/media_resource_getter_impl.h"
12 #include "content/browser/renderer_host/render_view_host_impl.h" 12 #include "content/browser/renderer_host/render_view_host_impl.h"
13 #include "content/browser/web_contents/web_contents_view_android.h" 13 #include "content/browser/web_contents/web_contents_view_android.h"
14 #include "content/common/media/media_player_messages_android.h" 14 #include "content/common/media/media_player_messages_android.h"
15 #include "content/public/browser/android/content_view_core.h" 15 #include "content/public/browser/android/content_view_core.h"
16 #include "content/public/browser/android/external_video_surface_container.h" 16 #include "content/public/browser/android/external_video_surface_container.h"
17 #include "content/public/browser/browser_context.h" 17 #include "content/public/browser/browser_context.h"
18 #include "content/public/browser/content_browser_client.h" 18 #include "content/public/browser/content_browser_client.h"
19 #include "content/public/browser/render_frame_host.h" 19 #include "content/public/browser/render_frame_host.h"
20 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
21 #include "content/public/browser/render_view_host.h" 21 #include "content/public/browser/render_view_host.h"
22 #include "content/public/browser/storage_partition.h" 22 #include "content/public/browser/storage_partition.h"
23 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
24 #include "content/public/browser/web_contents_delegate.h"
25 #include "content/public/common/content_client.h" 24 #include "content/public/common/content_client.h"
26 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
27 #include "media/base/android/media_player_bridge.h" 26 #include "media/base/android/media_player_bridge.h"
28 #include "media/base/android/media_source_player.h" 27 #include "media/base/android/media_source_player.h"
29 #include "media/base/android/media_url_interceptor.h" 28 #include "media/base/android/media_url_interceptor.h"
30 #include "media/base/media_switches.h" 29 #include "media/base/media_switches.h"
31 30
32 using media::MediaPlayerAndroid; 31 using media::MediaPlayerAndroid;
33 using media::MediaPlayerBridge; 32 using media::MediaPlayerBridge;
34 using media::MediaPlayerManager; 33 using media::MediaPlayerManager;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 129 }
131 130
132 BrowserMediaPlayerManager::~BrowserMediaPlayerManager() { 131 BrowserMediaPlayerManager::~BrowserMediaPlayerManager() {
133 // During the tear down process, OnDestroyPlayer() may or may not be called 132 // During the tear down process, OnDestroyPlayer() may or may not be called
134 // (e.g. the WebContents may be destroyed before the render process). So 133 // (e.g. the WebContents may be destroyed before the render process). So
135 // we cannot DCHECK(players_.empty()) here. Instead, all media players in 134 // we cannot DCHECK(players_.empty()) here. Instead, all media players in
136 // |players_| will be destroyed here because |player_| is a ScopedVector. 135 // |players_| will be destroyed here because |player_| is a ScopedVector.
137 } 136 }
138 137
139 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { 138 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) {
140 if (WebContentsDelegate* delegate = web_contents_->GetDelegate())
141 delegate->ExitFullscreenModeForTab(web_contents_);
142 if (RenderWidgetHostViewAndroid* view_android = 139 if (RenderWidgetHostViewAndroid* view_android =
143 static_cast<RenderWidgetHostViewAndroid*>( 140 static_cast<RenderWidgetHostViewAndroid*>(
144 web_contents_->GetRenderWidgetHostView())) { 141 web_contents_->GetRenderWidgetHostView())) {
145 view_android->SetOverlayVideoMode(false); 142 view_android->SetOverlayVideoMode(false);
146 } 143 }
147 144
148 Send( 145 Send(
149 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); 146 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_));
150 video_view_.reset(); 147 video_view_.reset();
151 MediaPlayerAndroid* player = GetFullscreenPlayer(); 148 MediaPlayerAndroid* player = GetFullscreenPlayer();
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); 574 external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
578 #endif // defined(VIDEO_HOLE) 575 #endif // defined(VIDEO_HOLE)
579 } 576 }
580 577
581 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { 578 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) {
582 player->Release(); 579 player->Release();
583 ReleaseMediaResources(player->player_id()); 580 ReleaseMediaResources(player->player_id());
584 } 581 }
585 582
586 } // namespace content 583 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698