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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 896673003: Propagate audible state from player to the containing tab (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing copyright notice Created 5 years, 9 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 #include "ui/gfx/screen.h" 101 #include "ui/gfx/screen.h"
102 #include "ui/gl/gl_switches.h" 102 #include "ui/gl/gl_switches.h"
103 103
104 #if defined(ENABLE_BROWSER_CDMS) 104 #if defined(ENABLE_BROWSER_CDMS)
105 #include "content/browser/media/media_web_contents_observer.h" 105 #include "content/browser/media/media_web_contents_observer.h"
106 #endif 106 #endif
107 107
108 #if defined(OS_ANDROID) 108 #if defined(OS_ANDROID)
109 #include "content/browser/android/content_video_view.h" 109 #include "content/browser/android/content_video_view.h"
110 #include "content/browser/android/date_time_chooser_android.h" 110 #include "content/browser/android/date_time_chooser_android.h"
111 #include "content/browser/android/media_players_observer.h"
111 #include "content/browser/media/android/browser_media_player_manager.h" 112 #include "content/browser/media/android/browser_media_player_manager.h"
112 #include "content/browser/web_contents/web_contents_android.h" 113 #include "content/browser/web_contents/web_contents_android.h"
113 #endif 114 #endif
114 115
115 #if defined(OS_MACOSX) 116 #if defined(OS_MACOSX)
116 #include "base/mac/foundation_util.h" 117 #include "base/mac/foundation_util.h"
117 #endif 118 #endif
118 119
119 namespace content { 120 namespace content {
120 namespace { 121 namespace {
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 render_view_message_source_(NULL), 352 render_view_message_source_(NULL),
352 render_frame_message_source_(NULL), 353 render_frame_message_source_(NULL),
353 fullscreen_widget_routing_id_(MSG_ROUTING_NONE), 354 fullscreen_widget_routing_id_(MSG_ROUTING_NONE),
354 fullscreen_widget_had_focus_at_shutdown_(false), 355 fullscreen_widget_had_focus_at_shutdown_(false),
355 is_subframe_(false), 356 is_subframe_(false),
356 force_disable_overscroll_content_(false), 357 force_disable_overscroll_content_(false),
357 last_dialog_suppressed_(false), 358 last_dialog_suppressed_(false),
358 geolocation_service_context_(new GeolocationServiceContext()), 359 geolocation_service_context_(new GeolocationServiceContext()),
359 accessibility_mode_( 360 accessibility_mode_(
360 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()), 361 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()),
361 audio_stream_monitor_(this),
362 virtual_keyboard_requested_(false), 362 virtual_keyboard_requested_(false),
363 loading_weak_factory_(this) { 363 loading_weak_factory_(this) {
364 frame_tree_.SetFrameRemoveListener( 364 frame_tree_.SetFrameRemoveListener(
365 base::Bind(&WebContentsImpl::OnFrameRemoved, 365 base::Bind(&WebContentsImpl::OnFrameRemoved,
366 base::Unretained(this))); 366 base::Unretained(this)));
367 #if defined(ENABLE_BROWSER_CDMS) 367 #if defined(ENABLE_BROWSER_CDMS)
368 media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); 368 media_web_contents_observer_.reset(new MediaWebContentsObserver(this));
369 #endif 369 #endif
370
371 #if defined(OS_ANDROID)
372 audio_state_provider_.reset(new MediaPlayersObserver(this));
373 #else
374 audio_state_provider_.reset(new AudioStreamMonitor(this));
375 #endif
370 } 376 }
371 377
372 WebContentsImpl::~WebContentsImpl() { 378 WebContentsImpl::~WebContentsImpl() {
373 is_being_destroyed_ = true; 379 is_being_destroyed_ = true;
374 380
375 // Delete all RFH pending shutdown, which will lead the corresponding RVH to 381 // Delete all RFH pending shutdown, which will lead the corresponding RVH to
376 // shutdown and be deleted as well. 382 // shutdown and be deleted as well.
377 frame_tree_.ForEach( 383 frame_tree_.ForEach(
378 base::Bind(&RenderFrameHostManager::ClearRFHsPendingShutdown)); 384 base::Bind(&RenderFrameHostManager::ClearRFHsPendingShutdown));
379 385
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 1040
1035 bool WebContentsImpl::IsBeingDestroyed() const { 1041 bool WebContentsImpl::IsBeingDestroyed() const {
1036 return is_being_destroyed_; 1042 return is_being_destroyed_;
1037 } 1043 }
1038 1044
1039 void WebContentsImpl::NotifyNavigationStateChanged( 1045 void WebContentsImpl::NotifyNavigationStateChanged(
1040 InvalidateTypes changed_flags) { 1046 InvalidateTypes changed_flags) {
1041 // Create and release the audio power save blocker depending on whether the 1047 // Create and release the audio power save blocker depending on whether the
1042 // tab is actively producing audio or not. 1048 // tab is actively producing audio or not.
1043 if ((changed_flags & INVALIDATE_TYPE_TAB) && 1049 if ((changed_flags & INVALIDATE_TYPE_TAB) &&
1044 AudioStreamMonitor::monitoring_available()) { 1050 audio_state_provider_->IsAudioStateAvailable()) {
1045 if (WasRecentlyAudible()) { 1051 if (WasRecentlyAudible()) {
1046 if (!audio_power_save_blocker_) 1052 if (!audio_power_save_blocker_)
1047 CreateAudioPowerSaveBlocker(); 1053 CreateAudioPowerSaveBlocker();
1048 } else { 1054 } else {
1049 audio_power_save_blocker_.reset(); 1055 audio_power_save_blocker_.reset();
1050 } 1056 }
1051 } 1057 }
1052 1058
1053 if (delegate_) 1059 if (delegate_)
1054 delegate_->NavigationStateChanged(this, changed_flags); 1060 delegate_->NavigationStateChanged(this, changed_flags);
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after
2509 } 2515 }
2510 Send(new ViewMsg_StopFinding(GetRoutingID(), action)); 2516 Send(new ViewMsg_StopFinding(GetRoutingID(), action));
2511 } 2517 }
2512 2518
2513 void WebContentsImpl::InsertCSS(const std::string& css) { 2519 void WebContentsImpl::InsertCSS(const std::string& css) {
2514 GetMainFrame()->Send(new FrameMsg_CSSInsertRequest( 2520 GetMainFrame()->Send(new FrameMsg_CSSInsertRequest(
2515 GetMainFrame()->GetRoutingID(), css)); 2521 GetMainFrame()->GetRoutingID(), css));
2516 } 2522 }
2517 2523
2518 bool WebContentsImpl::WasRecentlyAudible() { 2524 bool WebContentsImpl::WasRecentlyAudible() {
2519 return audio_stream_monitor_.WasRecentlyAudible(); 2525 return audio_state_provider_->WasRecentlyAudible();
2520 } 2526 }
2521 2527
2522 void WebContentsImpl::GetManifest(const GetManifestCallback& callback) { 2528 void WebContentsImpl::GetManifest(const GetManifestCallback& callback) {
2523 manifest_manager_host_->GetManifest(GetMainFrame(), callback); 2529 manifest_manager_host_->GetManifest(GetMainFrame(), callback);
2524 } 2530 }
2525 2531
2526 void WebContentsImpl::ExitFullscreen() { 2532 void WebContentsImpl::ExitFullscreen() {
2527 // Clean up related state and initiate the fullscreen exit. 2533 // Clean up related state and initiate the fullscreen exit.
2528 GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary(); 2534 GetRenderViewHostImpl()->RejectMouseLockOrUnlockIfNecessary();
2529 ExitFullscreenMode(); 2535 ExitFullscreenMode();
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
3196 static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get()) 3202 static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())
3197 ->InitDisplaySleepBlocker(GetView()->GetNativeView()); 3203 ->InitDisplaySleepBlocker(GetView()->GetNativeView());
3198 #endif 3204 #endif
3199 } 3205 }
3200 3206
3201 void WebContentsImpl::MaybeReleasePowerSaveBlockers() { 3207 void WebContentsImpl::MaybeReleasePowerSaveBlockers() {
3202 // If there are no more audio players and we don't have audio stream 3208 // If there are no more audio players and we don't have audio stream
3203 // monitoring, release the audio power save blocker here instead of during 3209 // monitoring, release the audio power save blocker here instead of during
3204 // NotifyNavigationStateChanged(). 3210 // NotifyNavigationStateChanged().
3205 if (active_audio_players_.empty() && 3211 if (active_audio_players_.empty() &&
3206 !AudioStreamMonitor::monitoring_available()) { 3212 !audio_state_provider_->IsAudioStateAvailable()) {
3207 audio_power_save_blocker_.reset(); 3213 audio_power_save_blocker_.reset();
3208 } 3214 }
3209 3215
3210 // If there are no more video players, clear the video power save blocker. 3216 // If there are no more video players, clear the video power save blocker.
3211 if (active_video_players_.empty()) 3217 if (active_video_players_.empty())
3212 video_power_save_blocker_.reset(); 3218 video_power_save_blocker_.reset();
3213 } 3219 }
3214 3220
3215 void WebContentsImpl::OnMediaPlayingNotification(int64 player_cookie, 3221 void WebContentsImpl::OnMediaPlayingNotification(int64 player_cookie,
3216 bool has_video, 3222 bool has_video,
3217 bool has_audio, 3223 bool has_audio,
3218 bool is_remote) { 3224 bool is_remote) {
3219 // Ignore the videos playing remotely and don't hold the wake lock for the 3225 // Ignore the videos playing remotely and don't hold the wake lock for the
3220 // screen. 3226 // screen.
3221 if (is_remote) return; 3227 if (is_remote) return;
3222 3228
3223 if (has_audio) { 3229 if (has_audio) {
3224 AddMediaPlayerEntry(player_cookie, &active_audio_players_); 3230 AddMediaPlayerEntry(player_cookie, &active_audio_players_);
3225 3231
3226 // If we don't have audio stream monitoring, allocate the audio power save 3232 // If we don't have audio stream monitoring, allocate the audio power save
3227 // blocker here instead of during NotifyNavigationStateChanged(). 3233 // blocker here instead of during NotifyNavigationStateChanged().
3228 if (!audio_power_save_blocker_ && 3234 if (!audio_power_save_blocker_ &&
3229 !AudioStreamMonitor::monitoring_available()) { 3235 !audio_state_provider_->IsAudioStateAvailable()) {
3230 CreateAudioPowerSaveBlocker(); 3236 CreateAudioPowerSaveBlocker();
3231 } 3237 }
3232 } 3238 }
3233 3239
3234 if (has_video) { 3240 if (has_video) {
3235 AddMediaPlayerEntry(player_cookie, &active_video_players_); 3241 AddMediaPlayerEntry(player_cookie, &active_video_players_);
3236 3242
3237 // If we're not hidden and have just created a player, create a blocker. 3243 // If we're not hidden and have just created a player, create a blocker.
3238 if (!video_power_save_blocker_ && !IsHidden()) 3244 if (!video_power_save_blocker_ && !IsHidden())
3239 CreateVideoPowerSaveBlocker(); 3245 CreateVideoPowerSaveBlocker();
(...skipping 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after
4516 node->render_manager()->ResumeResponseDeferredAtStart(); 4522 node->render_manager()->ResumeResponseDeferredAtStart();
4517 } 4523 }
4518 4524
4519 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4525 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4520 force_disable_overscroll_content_ = force_disable; 4526 force_disable_overscroll_content_ = force_disable;
4521 if (view_) 4527 if (view_)
4522 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4528 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4523 } 4529 }
4524 4530
4525 } // namespace content 4531 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/browser/web_contents/web_contents_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698