Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / encryptedmedia / MediaKeySession.h

diff --git a/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h b/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h
index 6a5451d..2458d0f 100644 (file)
--- a/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/src/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h
@@ -27,8 +27,9 @@
 #define MediaKeySession_h
 
 #include "bindings/v8/ScriptWrappable.h"
-#include "core/dom/ContextLifecycleObserver.h"
+#include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
+#include "heap/Handle.h"
 #include "platform/Timer.h"
 #include "platform/drm/ContentDecryptionModuleSession.h"
 #include "wtf/Deque.h"
@@ -51,11 +52,12 @@ class MediaKeys;
 // it may outlive any references to it as long as the MediaKeys object is alive.
 // The ContentDecryptionModuleSession has the same lifetime as this object.
 class MediaKeySession FINAL
-    : public RefCounted<MediaKeySession>, public ScriptWrappable, public EventTargetWithInlineData, public ContextLifecycleObserver
+    : public RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>, public ActiveDOMObject, public ScriptWrappable, public EventTargetWithInlineData
     , private ContentDecryptionModuleSessionClient {
-    REFCOUNTED_EVENT_TARGET(MediaKeySession);
+    DECLARE_GC_INFO;
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<MediaKeySession>);
 public:
-    static PassRefPtr<MediaKeySession> create(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
+    static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
     virtual ~MediaKeySession();
 
     const String& keySystem() const { return m_keySystem; }
@@ -70,9 +72,16 @@ public:
 
     void enqueueEvent(PassRefPtr<Event>);
 
+    // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
+    // ActiveDOMObject
+    virtual bool hasPendingActivity() const OVERRIDE;
+    virtual void stop() OVERRIDE;
+
+    void trace(Visitor*) { }
+
 private:
     MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
     void updateTimerFired(Timer<MediaKeySession>*);