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 |