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

Side by Side Diff: content/browser/media/session/media_session_service_impl.cc

Issue 2526533002: Allow MediaSession in iframes to be routed (Closed)
Patch Set: nits Created 4 years 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/session/media_session_service_impl.h" 5 #include "content/browser/media/session/media_session_service_impl.h"
6 6
7 #include "content/browser/media/session/media_metadata_sanitizer.h" 7 #include "content/browser/media/session/media_metadata_sanitizer.h"
8 #include "content/browser/media/session/media_session_impl.h" 8 #include "content/browser/media/session/media_session_impl.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 MediaSessionServiceImpl::MediaSessionServiceImpl( 15 MediaSessionServiceImpl::MediaSessionServiceImpl(
16 RenderFrameHost* render_frame_host) 16 RenderFrameHost* render_frame_host)
17 : render_frame_host_(render_frame_host) { 17 : render_frame_host_(render_frame_host) {
18 MediaSessionImpl* session = GetMediaSession(); 18 MediaSessionImpl* session = GetMediaSession();
19 if (session) 19 if (session)
20 session->SetMediaSessionService(this); 20 session->OnServiceCreated(this);
21 } 21 }
22 22
23 MediaSessionServiceImpl::~MediaSessionServiceImpl() { 23 MediaSessionServiceImpl::~MediaSessionServiceImpl() {
24 MediaSessionImpl* session = GetMediaSession(); 24 MediaSessionImpl* session = GetMediaSession();
25 if (session && session->GetMediaSessionService() == this) 25 if (session)
26 session->SetMediaSessionService(nullptr); 26 session->OnServiceDestroyed(this);
27 } 27 }
28 28
29 // static 29 // static
30 void MediaSessionServiceImpl::Create( 30 void MediaSessionServiceImpl::Create(
31 RenderFrameHost* render_frame_host, 31 RenderFrameHost* render_frame_host,
32 blink::mojom::MediaSessionServiceRequest request) { 32 blink::mojom::MediaSessionServiceRequest request) {
33 MediaSessionServiceImpl* impl = 33 MediaSessionServiceImpl* impl =
34 new MediaSessionServiceImpl(render_frame_host); 34 new MediaSessionServiceImpl(render_frame_host);
35 impl->Bind(std::move(request)); 35 impl->Bind(std::move(request));
36 } 36 }
37 37
38 void MediaSessionServiceImpl::SetClient( 38 void MediaSessionServiceImpl::SetClient(
39 blink::mojom::MediaSessionClientPtr client) { 39 blink::mojom::MediaSessionClientPtr client) {
40 client_ = std::move(client); 40 client_ = std::move(client);
41 } 41 }
42 42
43 void MediaSessionServiceImpl::SetMetadata( 43 void MediaSessionServiceImpl::SetMetadata(
44 const base::Optional<content::MediaMetadata>& metadata) { 44 const base::Optional<content::MediaMetadata>& metadata) {
45 // When receiving a MediaMetadata, the browser process can't trust that it is 45 // When receiving a MediaMetadata, the browser process can't trust that it is
46 // coming from a known and secure source. It must be processed accordingly. 46 // coming from a known and secure source. It must be processed accordingly.
47 if (metadata.has_value() && 47 if (metadata.has_value() &&
48 !MediaMetadataSanitizer::CheckSanity(metadata.value())) { 48 !MediaMetadataSanitizer::CheckSanity(metadata.value())) {
49 render_frame_host_->GetProcess()->ShutdownForBadMessage( 49 render_frame_host_->GetProcess()->ShutdownForBadMessage(
50 RenderProcessHost::CrashReportMode::GENERATE_CRASH_DUMP); 50 RenderProcessHost::CrashReportMode::GENERATE_CRASH_DUMP);
51 return; 51 return;
52 } 52 }
53 metadata_ = metadata;
53 54
54 MediaSessionImpl* session = GetMediaSession(); 55 MediaSessionImpl* session = GetMediaSession();
55 if (session) 56 if (session)
56 session->SetMetadata(metadata); 57 session->OnMediaSessionMetadataChanged(this);
57 } 58 }
58 59
59 void MediaSessionServiceImpl::EnableAction( 60 void MediaSessionServiceImpl::EnableAction(
60 blink::mojom::MediaSessionAction action) { 61 blink::mojom::MediaSessionAction action) {
62 actions_.insert(action);
61 MediaSessionImpl* session = GetMediaSession(); 63 MediaSessionImpl* session = GetMediaSession();
62 if (session) 64 if (session)
63 session->OnMediaSessionEnabledAction(action); 65 session->OnMediaSessionActionsChanged(this);
64 } 66 }
65 67
66 void MediaSessionServiceImpl::DisableAction( 68 void MediaSessionServiceImpl::DisableAction(
67 blink::mojom::MediaSessionAction action) { 69 blink::mojom::MediaSessionAction action) {
70 actions_.erase(action);
68 MediaSessionImpl* session = GetMediaSession(); 71 MediaSessionImpl* session = GetMediaSession();
69 if (session) 72 if (session)
70 session->OnMediaSessionDisabledAction(action); 73 session->OnMediaSessionActionsChanged(this);
71 } 74 }
72 75
73 MediaSessionImpl* MediaSessionServiceImpl::GetMediaSession() { 76 MediaSessionImpl* MediaSessionServiceImpl::GetMediaSession() {
74 WebContentsImpl* contents = static_cast<WebContentsImpl*>( 77 WebContentsImpl* contents = static_cast<WebContentsImpl*>(
75 WebContentsImpl::FromRenderFrameHost(render_frame_host_)); 78 WebContentsImpl::FromRenderFrameHost(render_frame_host_));
76 if (!contents) 79 if (!contents)
77 return nullptr; 80 return nullptr;
78 if (render_frame_host_ != contents->GetMainFrame())
79 return nullptr;
80 return MediaSessionImpl::Get(contents); 81 return MediaSessionImpl::Get(contents);
81 } 82 }
82 83
83 void MediaSessionServiceImpl::Bind( 84 void MediaSessionServiceImpl::Bind(
84 blink::mojom::MediaSessionServiceRequest request) { 85 blink::mojom::MediaSessionServiceRequest request) {
85 binding_.reset(new mojo::Binding<blink::mojom::MediaSessionService>( 86 binding_.reset(new mojo::Binding<blink::mojom::MediaSessionService>(
86 this, std::move(request))); 87 this, std::move(request)));
87 } 88 }
88 89
89 } // namespace content 90 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698