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 "content/common/media/media_session_messages_android.h" | 8 #include "content/common/media/media_session_messages_android.h" |
9 #include "content/public/common/media_metadata.h" | |
9 #include "content/public/renderer/render_thread.h" | 10 #include "content/public/renderer/render_thread.h" |
10 #include "content/renderer/media/android/webmediasession_android.h" | 11 #include "content/renderer/media/android/webmediasession_android.h" |
11 | 12 |
12 namespace content { | 13 namespace content { |
13 | 14 |
14 static const int kDefaultMediaSessionID = 0; | 15 static const int kDefaultMediaSessionID = 0; |
15 | 16 |
16 RendererMediaSessionManager::RendererMediaSessionManager( | 17 RendererMediaSessionManager::RendererMediaSessionManager( |
17 RenderFrame* render_frame) | 18 RenderFrame* render_frame) |
18 : RenderFrameObserver(render_frame), | 19 : RenderFrameObserver(render_frame), |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 } | 53 } |
53 | 54 |
54 void RendererMediaSessionManager::Deactivate( | 55 void RendererMediaSessionManager::Deactivate( |
55 int session_id, | 56 int session_id, |
56 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback) { | 57 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback) { |
57 int request_id = pending_deactivation_requests_.Add(callback.release()); | 58 int request_id = pending_deactivation_requests_.Add(callback.release()); |
58 Send( | 59 Send( |
59 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); | 60 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); |
60 } | 61 } |
61 | 62 |
63 void RendererMediaSessionManager::SetMetadata( | |
64 int session_id, | |
65 const content::MediaMetadata& metadata) { | |
66 // Apply some security rules on the MediaMetadata before sending over IPC. | |
philipj_slow
2015/12/14 14:09:24
Does it help to apply this on the renderer side as
mlamouri (slow - plz ping)
2016/01/05 16:01:17
This is mostly sanity check: a string more than 40
philipj_slow
2016/01/18 12:31:43
If it's only a sanity check, maybe s/security rule
mlamouri (slow - plz ping)
2016/01/19 14:20:09
Updated the comment. I was asked to do that a whil
| |
67 MediaMetadata ipc_metadata = metadata; | |
68 ipc_metadata.title = base::NullableString16( | |
jochen (gone - plz use gerrit)
2015/12/14 12:38:30
i'm surprised this has to be done manually, and yo
mlamouri (slow - plz ping)
2016/01/05 16:01:17
AFAICT, it isn't done very often.
| |
69 ipc_metadata.title.string().substr(0, MediaMetadata::kMaxIPCStringLength), | |
70 ipc_metadata.title.is_null()); | |
71 ipc_metadata.artist = base::NullableString16( | |
72 ipc_metadata.artist.string().substr(0, | |
73 MediaMetadata::kMaxIPCStringLength), | |
74 ipc_metadata.artist.is_null()); | |
75 ipc_metadata.album = base::NullableString16( | |
76 ipc_metadata.album.string().substr(0, MediaMetadata::kMaxIPCStringLength), | |
77 ipc_metadata.album.is_null()); | |
78 | |
79 Send(new MediaSessionHostMsg_SetMetadata(routing_id(), | |
80 session_id, | |
81 ipc_metadata)); | |
82 } | |
83 | |
62 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { | 84 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { |
63 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; | 85 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; |
64 blink::WebMediaSessionActivateCallback* callback = | 86 blink::WebMediaSessionActivateCallback* callback = |
65 pending_activation_requests_.Lookup(request_id); | 87 pending_activation_requests_.Lookup(request_id); |
66 if (success) { | 88 if (success) { |
67 callback->onSuccess(); | 89 callback->onSuccess(); |
68 } else { | 90 } else { |
69 callback->onError( | 91 callback->onError( |
70 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); | 92 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); |
71 } | 93 } |
72 pending_activation_requests_.Remove(request_id); | 94 pending_activation_requests_.Remove(request_id); |
73 } | 95 } |
74 | 96 |
75 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { | 97 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { |
76 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; | 98 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; |
77 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); | 99 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); |
78 pending_deactivation_requests_.Remove(request_id); | 100 pending_deactivation_requests_.Remove(request_id); |
79 } | 101 } |
80 | 102 |
81 } // namespace content | 103 } // namespace content |
OLD | NEW |