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

Side by Side Diff: content/browser/media/android/browser_media_session_manager.cc

Issue 2252783004: Implement MediaSession (metadata) per frame [NOT READY, HAS DEPENDENCY] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 3 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/browser/media/android/browser_media_session_manager.h" 5 #include "content/browser/media/android/browser_media_session_manager.h"
6 6
7 #include "base/optional.h" 7 #include "base/optional.h"
8 #include "content/browser/media/session/media_session.h" 8 #include "content/browser/media/session/media_session.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/common/media/media_metadata_sanitizer.h" 10 #include "content/common/media/media_metadata_sanitizer.h"
11 #include "content/common/media/media_session_messages_android.h" 11 #include "content/common/media/media_session_messages_android.h"
12 #include "content/public/browser/render_frame_host.h" 12 #include "content/public/browser/render_frame_host.h"
13 #include "content/public/browser/render_process_host.h" 13 #include "content/public/browser/render_process_host.h"
14 #include "content/public/common/media_metadata.h"
15 14
16 namespace content { 15 namespace content {
17 16
18 BrowserMediaSessionManager::BrowserMediaSessionManager( 17 BrowserMediaSessionManager::BrowserMediaSessionManager(
19 RenderFrameHost* render_frame_host) 18 RenderFrameHost* render_frame_host,
20 : render_frame_host_(render_frame_host) {} 19 WebContentsImpl* contents)
20 : render_frame_host_(render_frame_host), contents_(contents) {}
21
22 BrowserMediaSessionManager::~BrowserMediaSessionManager() = default;
21 23
22 void BrowserMediaSessionManager::OnActivate(int session_id, int request_id) { 24 void BrowserMediaSessionManager::OnActivate(int session_id, int request_id) {
23 NOTIMPLEMENTED(); 25 NOTIMPLEMENTED();
24 Send(new MediaSessionMsg_DidActivate(GetRoutingID(), request_id, false)); 26 Send(new MediaSessionMsg_DidActivate(GetRoutingID(), request_id, false));
25 } 27 }
26 28
27 void BrowserMediaSessionManager::OnDeactivate(int session_id, int request_id) { 29 void BrowserMediaSessionManager::OnDeactivate(int session_id, int request_id) {
28 NOTIMPLEMENTED(); 30 NOTIMPLEMENTED();
29 Send(new MediaSessionMsg_DidDeactivate(GetRoutingID(), request_id)); 31 Send(new MediaSessionMsg_DidDeactivate(GetRoutingID(), request_id));
30 } 32 }
31 33
32 void BrowserMediaSessionManager::OnSetMetadata( 34 void BrowserMediaSessionManager::OnSetMetadata(
33 int session_id, 35 int session_id,
34 const base::Optional<MediaMetadata>& insecure_metadata) { 36 const base::Optional<MediaMetadata>& insecure_metadata) {
37 // Non-top-level frames should not receive metadata.
38 if (render_frame_host_->GetParent()) {
39 render_frame_host_->GetProcess()->ShutdownForBadMessage();
40 return;
41 }
42
35 // When receiving a MediaMetadata, the browser process can't trust that it is 43 // When receiving a MediaMetadata, the browser process can't trust that it is
36 // coming from a known and secure source. It must be processed accordingly. 44 // coming from a known and secure source. It must be processed accordingly.
37 if (insecure_metadata.has_value() && 45 if (insecure_metadata.has_value() &&
38 !MediaMetadataSanitizer::CheckSanity(insecure_metadata.value())) { 46 !MediaMetadataSanitizer::CheckSanity(insecure_metadata.value())) {
39 render_frame_host_->GetProcess()->ShutdownForBadMessage(); 47 render_frame_host_->GetProcess()->ShutdownForBadMessage();
40 return; 48 return;
41 } 49 }
42 50
43 NOTIMPLEMENTED(); 51 media_metadata_ = insecure_metadata;
52 contents_->OnMediaSessionStateChanged();
44 } 53 }
45 54
46 int BrowserMediaSessionManager::GetRoutingID() const { 55 int BrowserMediaSessionManager::GetRoutingID() const {
47 return render_frame_host_->GetRoutingID(); 56 return render_frame_host_->GetRoutingID();
48 } 57 }
49 58
50 bool BrowserMediaSessionManager::Send(IPC::Message* msg) { 59 bool BrowserMediaSessionManager::Send(IPC::Message* msg) {
51 return render_frame_host_->Send(msg); 60 return render_frame_host_->Send(msg);
52 } 61 }
53 62
54 } // namespace content 63 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698