| 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 "content/common/media/media_player_delegate_messages.h" | 10 #include "content/common/media/media_player_delegate_messages.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 // TODO(dalecurtis): Eventually this should be enabled on all platforms. | 23 // TODO(dalecurtis): Eventually this should be enabled on all platforms. |
| 24 idle_cleanup_enabled_ = true; | 24 idle_cleanup_enabled_ = true; |
| 25 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); | 25 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); |
| 26 idle_timeout_ = base::TimeDelta::FromSeconds(15); | 26 idle_timeout_ = base::TimeDelta::FromSeconds(15); |
| 27 #endif | 27 #endif |
| 28 } | 28 } |
| 29 | 29 |
| 30 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} | 30 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} |
| 31 | 31 |
| 32 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { | 32 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { |
| 33 const int delegate_id = id_map_.Add(observer); | 33 return id_map_.Add(observer); |
| 34 AddIdleDelegate(delegate_id); | |
| 35 return delegate_id; | |
| 36 } | 34 } |
| 37 | 35 |
| 38 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { | 36 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { |
| 39 DCHECK(id_map_.Lookup(delegate_id)); | 37 DCHECK(id_map_.Lookup(delegate_id)); |
| 40 id_map_.Remove(delegate_id); | 38 id_map_.Remove(delegate_id); |
| 41 RemoveIdleDelegate(delegate_id); | 39 RemoveIdleDelegate(delegate_id); |
| 42 } | 40 } |
| 43 | 41 |
| 44 void RendererWebMediaPlayerDelegate::DidPlay(int delegate_id, | 42 void RendererWebMediaPlayerDelegate::DidPlay(int delegate_id, |
| 45 bool has_video, | 43 bool has_video, |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 else | 176 else |
| 179 ++it; | 177 ++it; |
| 180 } | 178 } |
| 181 | 179 |
| 182 // Shutdown the timer if no delegates are left. | 180 // Shutdown the timer if no delegates are left. |
| 183 if (idle_delegate_map_.empty()) | 181 if (idle_delegate_map_.empty()) |
| 184 idle_cleanup_timer_.Stop(); | 182 idle_cleanup_timer_.Stop(); |
| 185 } | 183 } |
| 186 | 184 |
| 187 } // namespace media | 185 } // namespace media |
| OLD | NEW |