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/android/renderer_media_session_manager.h" | 5 #include "content/renderer/media/android/renderer_media_session_manager.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/optional.h" | 8 #include "base/optional.h" |
9 #include "content/common/media/media_metadata_sanitizer.h" | 9 #include "content/common/media/media_metadata_sanitizer.h" |
10 #include "content/common/media/media_session_messages_android.h" | 10 #include "content/common/media/media_session_messages_android.h" |
11 #include "content/public/common/media_metadata.h" | 11 #include "content/public/common/media_metadata.h" |
12 #include "content/public/renderer/render_frame.h" | |
12 #include "content/public/renderer/render_thread.h" | 13 #include "content/public/renderer/render_thread.h" |
13 #include "content/renderer/media/android/webmediasession_android.h" | 14 #include "content/renderer/media/android/webmediasession_android.h" |
15 #include "third_party/WebKit/public/web/WebLocalFrame.h" | |
14 | 16 |
15 namespace content { | 17 namespace content { |
16 | 18 |
17 RendererMediaSessionManager::RendererMediaSessionManager( | 19 RendererMediaSessionManager::RendererMediaSessionManager( |
18 RenderFrame* render_frame) | 20 RenderFrame* render_frame) |
19 : RenderFrameObserver(render_frame), | 21 : RenderFrameObserver(render_frame), |
20 next_session_id_(blink::WebMediaSession::DefaultID + 1) {} | 22 next_session_id_(blink::WebMediaSession::DefaultID + 1) {} |
21 | 23 |
22 RendererMediaSessionManager::~RendererMediaSessionManager() { | 24 RendererMediaSessionManager::~RendererMediaSessionManager() { |
23 DCHECK(sessions_.empty()) | |
whywhat
2016/09/13 16:23:26
why removing this? no longer true?
Zhiqiang Zhang (Slow)
2016/09/13 17:27:29
It was even not true before this patch.
blink::Med
| |
24 << "RendererMediaSessionManager is owned by RenderFrameImpl and is " | |
25 "destroyed only after all media sessions are destroyed."; | |
26 } | 25 } |
27 | 26 |
28 bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) { | 27 bool RendererMediaSessionManager::OnMessageReceived(const IPC::Message& msg) { |
29 bool handled = true; | 28 bool handled = true; |
30 IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg) | 29 IPC_BEGIN_MESSAGE_MAP(RendererMediaSessionManager, msg) |
31 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate) | 30 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidActivate, OnDidActivate) |
32 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate) | 31 IPC_MESSAGE_HANDLER(MediaSessionMsg_DidDeactivate, OnDidDeactivate) |
33 IPC_MESSAGE_UNHANDLED(handled = false) | 32 IPC_MESSAGE_UNHANDLED(handled = false) |
34 IPC_END_MESSAGE_MAP() | 33 IPC_END_MESSAGE_MAP() |
35 return handled; | 34 return handled; |
(...skipping 23 matching lines...) Expand all Loading... | |
59 void RendererMediaSessionManager::Deactivate( | 58 void RendererMediaSessionManager::Deactivate( |
60 int session_id, | 59 int session_id, |
61 std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback) { | 60 std::unique_ptr<blink::WebMediaSessionDeactivateCallback> callback) { |
62 int request_id = pending_deactivation_requests_.Add(callback.release()); | 61 int request_id = pending_deactivation_requests_.Add(callback.release()); |
63 Send( | 62 Send( |
64 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); | 63 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); |
65 } | 64 } |
66 | 65 |
67 void RendererMediaSessionManager::SetMetadata( | 66 void RendererMediaSessionManager::SetMetadata( |
68 int session_id, const base::Optional<MediaMetadata>& metadata) { | 67 int session_id, const base::Optional<MediaMetadata>& metadata) { |
68 // Non-MainFrames will be ignored. | |
69 if (render_frame()->GetWebFrame()->parent()) | |
70 return; | |
whywhat
2016/09/13 16:23:26
print a message here too?
are we 100% sure GetWebF
Zhiqiang Zhang (Slow)
2016/09/13 18:51:52
Seems not 100%. Fixed.
| |
69 | 71 |
70 // TODO(zqzhang): print a console warning when metadata is dirty. See | 72 // TODO(zqzhang): print a console warning when metadata is dirty. See |
71 // https://crbug.com/625244. | 73 // https://crbug.com/625244. |
72 Send(new MediaSessionHostMsg_SetMetadata( | 74 Send(new MediaSessionHostMsg_SetMetadata( |
73 routing_id(), session_id, | 75 routing_id(), session_id, |
74 (!metadata.has_value() || | 76 (!metadata.has_value() || |
75 MediaMetadataSanitizer::CheckSanity(metadata.value())) | 77 MediaMetadataSanitizer::CheckSanity(metadata.value())) |
76 ? metadata | 78 ? metadata |
77 : MediaMetadataSanitizer::Sanitize(metadata.value()))); | 79 : MediaMetadataSanitizer::Sanitize(metadata.value()))); |
78 } | 80 } |
(...skipping 11 matching lines...) Expand all Loading... | |
90 pending_activation_requests_.Remove(request_id); | 92 pending_activation_requests_.Remove(request_id); |
91 } | 93 } |
92 | 94 |
93 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { | 95 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { |
94 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; | 96 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; |
95 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); | 97 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); |
96 pending_deactivation_requests_.Remove(request_id); | 98 pending_deactivation_requests_.Remove(request_id); |
97 } | 99 } |
98 | 100 |
99 } // namespace content | 101 } // namespace content |
OLD | NEW |