| Index: content/renderer/media/renderer_webmediaplayer_delegate.cc
|
| diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc
|
| index 08b4e709f4684ad4e36c4572b38fb043b02fd677..99d76f6b8715f2b3b2fc23e9277f6ccc27fbf962 100644
|
| --- a/content/renderer/media/renderer_webmediaplayer_delegate.cc
|
| +++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc
|
| @@ -38,14 +38,12 @@ RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate(
|
| idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5);
|
| idle_timeout_ = base::TimeDelta::FromSeconds(15);
|
|
|
| - // Idle players time out more aggressively on low end devices.
|
| - is_low_end_device_ = base::SysInfo::IsLowEndDevice();
|
| + is_jelly_bean_ = false;
|
|
|
| #if defined(OS_ANDROID)
|
| // On Android, due to the instability of the OS level media components, we
|
| - // consider all pre-KitKat devices to be low end.
|
| - is_low_end_device_ |=
|
| - base::android::BuildInfo::GetInstance()->sdk_int() <= 18;
|
| + // consider all pre-KitKat devices to be potentially buggy.
|
| + is_jelly_bean_ |= base::android::BuildInfo::GetInstance()->sdk_int() <= 18;
|
| #endif
|
| }
|
|
|
| @@ -209,11 +207,11 @@ bool RendererWebMediaPlayerDelegate::OnMessageReceived(
|
| void RendererWebMediaPlayerDelegate::SetIdleCleanupParamsForTesting(
|
| base::TimeDelta idle_timeout,
|
| base::TickClock* tick_clock,
|
| - bool is_low_end_device) {
|
| + bool is_jelly_bean) {
|
| idle_cleanup_interval_ = base::TimeDelta();
|
| idle_timeout_ = idle_timeout;
|
| tick_clock_ = tick_clock;
|
| - is_low_end_device_ = is_low_end_device;
|
| + is_jelly_bean_ = is_jelly_bean;
|
| }
|
|
|
| bool RendererWebMediaPlayerDelegate::IsIdleCleanupTimerRunningForTesting()
|
| @@ -311,12 +309,12 @@ void RendererWebMediaPlayerDelegate::UpdateTask() {
|
| // When we reach the maximum number of idle players, clean them up
|
| // aggressively. Values chosen after testing on a Galaxy Nexus device for
|
| // http://crbug.com/612909.
|
| - if (idle_player_map_.size() > (is_low_end_device_ ? 2u : 8u))
|
| + if (idle_player_map_.size() > (is_jelly_bean_ ? 2u : 8u))
|
| aggressive_cleanup = true;
|
|
|
| - // When a player plays on a low-end device, clean up idle players
|
| + // When a player plays on a buggy old device, clean up idle players
|
| // aggressively.
|
| - if (has_played_video_since_last_update_task && is_low_end_device_)
|
| + if (has_played_video_since_last_update_task && is_jelly_bean_)
|
| aggressive_cleanup = true;
|
|
|
| CleanUpIdlePlayers(aggressive_cleanup ? base::TimeDelta() : idle_timeout_);
|
|
|