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

Side by Side Diff: third_party/WebKit/Source/modules/mediasession/MediaSession.cpp

Issue 1441883003: Hook up RendererMediaSessionManager with browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comment from philipj: ActiveDOMObject Created 5 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 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 "config.h" 5 #include "config.h"
6 #include "modules/mediasession/MediaSession.h" 6 #include "modules/mediasession/MediaSession.h"
7 7
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" 8 #include "bindings/core/v8/CallbackPromiseAdapter.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "bindings/core/v8/ScriptState.h" 10 #include "bindings/core/v8/ScriptState.h"
11 #include "core/dom/DOMException.h" 11 #include "core/dom/DOMException.h"
12 #include "core/dom/ExceptionCode.h" 12 #include "core/dom/ExceptionCode.h"
13 #include "core/frame/LocalDOMWindow.h" 13 #include "core/frame/LocalDOMWindow.h"
14 #include "core/frame/LocalFrame.h" 14 #include "core/frame/LocalFrame.h"
15 #include "core/loader/FrameLoaderClient.h" 15 #include "core/loader/FrameLoaderClient.h"
16 #include "modules/mediasession/MediaSessionError.h" 16 #include "modules/mediasession/MediaSessionError.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 MediaSession::MediaSession(PassOwnPtr<WebMediaSession> webMediaSession) 20 MediaSession::MediaSession(ExecutionContext* context, PassOwnPtr<WebMediaSession > webMediaSession)
21 : m_webMediaSession(webMediaSession) 21 : ActiveDOMObject(context)
22 , m_webMediaSession(webMediaSession)
22 { 23 {
23 ASSERT(m_webMediaSession); 24 ASSERT(m_webMediaSession);
24 } 25 }
25 26
26 MediaSession* MediaSession::create(ExecutionContext* context, ExceptionState& ex ceptionState) 27 MediaSession* MediaSession::create(ExecutionContext* context, ExceptionState& ex ceptionState)
27 { 28 {
28 Document* document = toDocument(context); 29 Document* document = toDocument(context);
29 LocalFrame* frame = document->frame(); 30 LocalFrame* frame = document->frame();
30 FrameLoaderClient* client = frame->loader().client(); 31 FrameLoaderClient* client = frame->loader().client();
31 OwnPtr<WebMediaSession> webMediaSession = client->createWebMediaSession(); 32 OwnPtr<WebMediaSession> webMediaSession = client->createWebMediaSession();
32 if (!webMediaSession) { 33 if (!webMediaSession) {
33 exceptionState.throwDOMException(NotSupportedError, "Missing platform im plementation."); 34 exceptionState.throwDOMException(NotSupportedError, "Missing platform im plementation.");
34 return nullptr; 35 return nullptr;
35 } 36 }
36 return new MediaSession(webMediaSession.release()); 37 return new MediaSession(context, webMediaSession.release());
37 } 38 }
38 39
39 ScriptPromise MediaSession::activate(ScriptState* scriptState) 40 ScriptPromise MediaSession::activate(ScriptState* scriptState)
40 { 41 {
41 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 42 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
42 ScriptPromise promise = resolver->promise(); 43 ScriptPromise promise = resolver->promise();
43 44
44 m_webMediaSession->activate(new CallbackPromiseAdapter<void, MediaSessionErr or>(resolver)); 45 m_webMediaSession->activate(new CallbackPromiseAdapter<void, MediaSessionErr or>(resolver));
45 return promise; 46 return promise;
46 } 47 }
47 48
48 ScriptPromise MediaSession::deactivate(ScriptState* scriptState) 49 ScriptPromise MediaSession::deactivate(ScriptState* scriptState)
49 { 50 {
50 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 51 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
51 ScriptPromise promise = resolver->promise(); 52 ScriptPromise promise = resolver->promise();
52 53
53 m_webMediaSession->deactivate(new CallbackPromiseAdapter<void, void>(resolve r)); 54 m_webMediaSession->deactivate(new CallbackPromiseAdapter<void, void>(resolve r));
54 return promise; 55 return promise;
55 } 56 }
56 57
58 bool MediaSession::hasPendingActivity() const
59 {
60 return m_webMediaSession->hasPendingCallbacks();
61 }
62
57 } // namespace blink 63 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698