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

Side by Side Diff: content/renderer/media/renderer_webmediaplayer_delegate.cc

Issue 1796403002: Don't mark a WebMediaPlayer as idle until it has size and first frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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"
11 #include "content/public/renderer/render_frame.h" 11 #include "content/public/renderer/render_frame.h"
12 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 12 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( 16 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate(
17 content::RenderFrame* render_frame) 17 content::RenderFrame* render_frame)
18 : RenderFrameObserver(render_frame), 18 : RenderFrameObserver(render_frame),
19 default_tick_clock_(new base::DefaultTickClock()), 19 default_tick_clock_(new base::DefaultTickClock()),
20 tick_clock_(default_tick_clock_.get()) { 20 tick_clock_(default_tick_clock_.get()) {
21 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); 21 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5);
22 idle_timeout_ = base::TimeDelta::FromSeconds(15); 22 idle_timeout_ = base::TimeDelta::FromSeconds(15);
23 } 23 }
24 24
25 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} 25 RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {}
26 26
27 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { 27 int RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) {
28 const int delegate_id = id_map_.Add(observer); 28 return id_map_.Add(observer);
29 AddIdleDelegate(delegate_id);
30 return delegate_id;
31 } 29 }
32 30
33 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) { 31 void RendererWebMediaPlayerDelegate::RemoveObserver(int delegate_id) {
34 DCHECK(id_map_.Lookup(delegate_id)); 32 DCHECK(id_map_.Lookup(delegate_id));
35 id_map_.Remove(delegate_id); 33 id_map_.Remove(delegate_id);
36 RemoveIdleDelegate(delegate_id); 34 RemoveIdleDelegate(delegate_id);
37 } 35 }
38 36
39 void RendererWebMediaPlayerDelegate::DidPlay(int delegate_id, 37 void RendererWebMediaPlayerDelegate::DidPlay(int delegate_id,
40 bool has_video, 38 bool has_video,
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 else 168 else
171 ++it; 169 ++it;
172 } 170 }
173 171
174 // Shutdown the timer if no delegates are left. 172 // Shutdown the timer if no delegates are left.
175 if (idle_delegate_map_.empty()) 173 if (idle_delegate_map_.empty())
176 idle_cleanup_timer_.Stop(); 174 idle_cleanup_timer_.Stop();
177 } 175 }
178 176
179 } // namespace media 177 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698