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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/mediasession/MediaSession.cpp
diff --git a/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp b/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp
index 316a3ed7423067215a4257bbaf01394aaba2c0eb..8425f5fed076bb5fb1f470f74aa5196831f491d9 100644
--- a/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp
+++ b/third_party/WebKit/Source/modules/mediasession/MediaSession.cpp
@@ -17,8 +17,9 @@
namespace blink {
-MediaSession::MediaSession(PassOwnPtr<WebMediaSession> webMediaSession)
- : m_webMediaSession(webMediaSession)
+MediaSession::MediaSession(ExecutionContext* context, PassOwnPtr<WebMediaSession> webMediaSession)
+ : ActiveDOMObject(context)
+ , m_webMediaSession(webMediaSession)
{
ASSERT(m_webMediaSession);
}
@@ -33,7 +34,7 @@ MediaSession* MediaSession::create(ExecutionContext* context, ExceptionState& ex
exceptionState.throwDOMException(NotSupportedError, "Missing platform implementation.");
return nullptr;
}
- return new MediaSession(webMediaSession.release());
+ return new MediaSession(context, webMediaSession.release());
}
ScriptPromise MediaSession::activate(ScriptState* scriptState)
@@ -54,4 +55,9 @@ ScriptPromise MediaSession::deactivate(ScriptState* scriptState)
return promise;
}
+bool MediaSession::hasPendingActivity() const
+{
+ return m_webMediaSession->hasPendingCallbacks();
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698