OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/renderer_webmediaplayer_delegate.h" | 5 #include "content/renderer/media/renderer_webmediaplayer_delegate.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 : RenderFrameObserver(render_frame), | 29 : RenderFrameObserver(render_frame), |
30 default_tick_clock_(new base::DefaultTickClock()), | 30 default_tick_clock_(new base::DefaultTickClock()), |
31 tick_clock_(default_tick_clock_.get()) { | 31 tick_clock_(default_tick_clock_.get()) { |
32 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); | 32 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); |
33 idle_timeout_ = base::TimeDelta::FromSeconds(15); | 33 idle_timeout_ = base::TimeDelta::FromSeconds(15); |
34 } | 34 } |
35 | 35 |
36 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} | 36 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} |
37 | 37 |
38 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { | 38 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { |
39 return id_map_.Add(observer); | 39 const int delegate_id = id_map_.Add(observer); |
| 40 // Start players in the idle state to ensure we capture players which are |
| 41 // consuming resources, but which have never played. |
| 42 AddIdleDelegate(delegate_id); |
| 43 return delegate_id; |
40 } | 44 } |
41 | 45 |
42 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { | 46 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { |
43 DCHECK(id_map_.Lookup(delegate_id)); | 47 DCHECK(id_map_.Lookup(delegate_id)); |
44 id_map_.Remove(delegate_id); | 48 id_map_.Remove(delegate_id); |
45 RemoveIdleDelegate(delegate_id); | 49 RemoveIdleDelegate(delegate_id); |
46 playing_videos_.erase(delegate_id); | 50 playing_videos_.erase(delegate_id); |
47 } | 51 } |
48 | 52 |
49 void RendererWebMediaPlayerDelegate::DidPlay( | 53 void RendererWebMediaPlayerDelegate::DidPlay( |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 #endif // OS_ANDROID | 238 #endif // OS_ANDROID |
235 | 239 |
236 is_playing_background_video_ = is_playing; | 240 is_playing_background_video_ = is_playing; |
237 } | 241 } |
238 | 242 |
239 void RendererWebMediaPlayerDelegate::OnDestruct() { | 243 void RendererWebMediaPlayerDelegate::OnDestruct() { |
240 delete this; | 244 delete this; |
241 } | 245 } |
242 | 246 |
243 } // namespace media | 247 } // namespace media |
OLD | NEW |