Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
index 61e5e92143e36ae9fc2b535495e91239f5bbe83a..77786c646798bf2de7212e6ac0b7625354e44d64 100644 |
--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h |
@@ -26,6 +26,7 @@ |
#ifndef MediaKeySession_h |
#define MediaKeySession_h |
+#include "bindings/core/v8/ActiveScriptWrappable.h" |
#include "bindings/core/v8/ScriptPromiseProperty.h" |
#include "core/dom/ActiveDOMObject.h" |
#include "core/dom/DOMArrayPiece.h" |
@@ -60,6 +61,7 @@ class MediaKeys; |
// The WebContentDecryptionModuleSession has the same lifetime as this object. |
class MediaKeySession final |
: public RefCountedGarbageCollectedEventTargetWithInlineData<MediaKeySession> |
+ , public ActiveScriptWrappable |
, public ActiveDOMObject |
, private WebContentDecryptionModuleSession::Client { |
REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaKeySession); |
@@ -85,8 +87,10 @@ public: |
const AtomicString& interfaceName() const override; |
ExecutionContext* getExecutionContext() const override; |
+ // ActiveScriptWrappable |
+ bool hasPendingActivity() const final; |
+ |
// ActiveDOMObject |
- bool hasPendingActivity() const override; |
void stop() override; |
// Oilpan: eagerly release owned m_session, which in turn |