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" |
11 #include "content/public/renderer/render_frame.h" | 11 #include "content/public/renderer/render_frame.h" |
12 #include "services/shell/public/cpp/interface_provider.h" | |
12 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" | 13 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
13 | 14 |
14 namespace media { | 15 namespace media { |
15 | 16 |
16 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( | 17 RendererWebMediaPlayerDelegate::RendererWebMediaPlayerDelegate( |
17 content::RenderFrame* render_frame) | 18 content::RenderFrame* render_frame) |
18 : RenderFrameObserver(render_frame), | 19 : RenderFrameObserver(render_frame), |
19 default_tick_clock_(new base::DefaultTickClock()), | 20 default_tick_clock_(new base::DefaultTickClock()), |
20 tick_clock_(default_tick_clock_.get()) { | 21 tick_clock_(default_tick_clock_.get()) { |
21 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); | 22 idle_cleanup_interval_ = base::TimeDelta::FromSeconds(5); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
58 DCHECK(id_map_.Lookup(delegate_id)); | 59 DCHECK(id_map_.Lookup(delegate_id)); |
59 RemoveIdleDelegate(delegate_id); | 60 RemoveIdleDelegate(delegate_id); |
60 Send(new MediaPlayerDelegateHostMsg_OnMediaDestroyed(routing_id(), | 61 Send(new MediaPlayerDelegateHostMsg_OnMediaDestroyed(routing_id(), |
61 delegate_id)); | 62 delegate_id)); |
62 } | 63 } |
63 | 64 |
64 bool RendererWebMediaPlayerDelegate::IsHidden() { | 65 bool RendererWebMediaPlayerDelegate::IsHidden() { |
65 return render_frame()->IsHidden(); | 66 return render_frame()->IsHidden(); |
66 } | 67 } |
67 | 68 |
69 mojom::Remoter* RendererWebMediaPlayerDelegate::GetRemoter() { | |
70 if (!remoter_) | |
71 render_frame()->GetRemoteInterfaces()->GetInterface(GetProxy(&remoter_)); | |
Ken Rockot(use gerrit already)
2016/07/27 22:31:15
nit: for convenience you can also just GetInterfac
miu
2016/09/02 22:13:29
Acknowledged. (Not making changes to WMPIDelegate
| |
72 return remoter_.get(); | |
73 } | |
74 | |
68 void RendererWebMediaPlayerDelegate::WasHidden() { | 75 void RendererWebMediaPlayerDelegate::WasHidden() { |
69 for (IDMap<Observer>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) | 76 for (IDMap<Observer>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) |
70 it.GetCurrentValue()->OnHidden(); | 77 it.GetCurrentValue()->OnHidden(); |
71 } | 78 } |
72 | 79 |
73 void RendererWebMediaPlayerDelegate::WasShown() { | 80 void RendererWebMediaPlayerDelegate::WasShown() { |
74 for (IDMap<Observer>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) | 81 for (IDMap<Observer>::iterator it(&id_map_); !it.IsAtEnd(); it.Advance()) |
75 it.GetCurrentValue()->OnShown(); | 82 it.GetCurrentValue()->OnShown(); |
76 } | 83 } |
77 | 84 |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
172 // Shutdown the timer if no delegates are left. | 179 // Shutdown the timer if no delegates are left. |
173 if (idle_delegate_map_.empty()) | 180 if (idle_delegate_map_.empty()) |
174 idle_cleanup_timer_.Stop(); | 181 idle_cleanup_timer_.Stop(); |
175 } | 182 } |
176 | 183 |
177 void RendererWebMediaPlayerDelegate::OnDestruct() { | 184 void RendererWebMediaPlayerDelegate::OnDestruct() { |
178 delete this; | 185 delete this; |
179 } | 186 } |
180 | 187 |
181 } // namespace media | 188 } // namespace media |
OLD | NEW |