Move encryptedmedia module to oilpan

Source/modules/encryptedmedia/MediaKeySession.h

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef MediaKeySession_h
 #define MediaKeySession_h
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/events/EventTarget.h"
+#include "heap/Handle.h"
 #include "platform/Timer.h"
 #include "platform/drm/ContentDecryptionModuleSession.h"
 #include "wtf/Deque.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Uint8Array.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class ContentDecryptionModule;
 class ContentDecryptionModuleSession;
 class ExceptionState;
 class GenericEventQueue;
 class MediaKeyError;
 class MediaKeys;
 
 // References are held by JS and MediaKeys.
 // Because this object controls the lifetime of the ContentDecryptionModuleSession,
 // 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 RefCountedWillBeGarbageCollectedFinalized<MediaKeySession>, public ScriptWrappable, public EventTargetWithInlineData, public ContextLifecycleObserver

[Mads Ager (chromium), 2014/02/06 12:28:47]

I don't think you can move this to GarbageCollectedFinalized before you have
moved all event targets to our heap. EventTargets are held in RefPtrs and I
guess the REFCOUNTED_EVENT_TARGET macro has something to do with that.

You need to use RefCountedWillBeRefCountedGarbageCollected until all event
targets are moved.

     , private ContentDecryptionModuleSessionClient {
+    DECLARE_GC_INFO;
     REFCOUNTED_EVENT_TARGET(MediaKeySession);

[haraken, 2014/02/06 12:08:40]

This doesn't compile with the following error:

../../third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.h:58:5:
error: member 'deref' found in multiple base classes of different types
    REFCOUNTED_EVENT_TARGET(MediaKeySession);
    ^
../../third_party/WebKit/Source/core/events/EventTarget.h:243:44: note: expanded
from macro 'REFCOUNTED_EVENT_TARGET'
#define REFCOUNTED_EVENT_TARGET(className)
DEFINE_EVENT_TARGET_REFCOUNTING(RefCounted<className>)
                                           ^
../../third_party/WebKit/Source/core/events/EventTarget.h:237:54: note: expanded
from macro 'DEFINE_EVENT_TARGET_REFCOUNTING'
    virtual void derefEventTarget() OVERRIDE FINAL { deref(); } \
                                                     ^
../../third_party/WebKit/Source/heap/Heap.h:883:10: note: member found by
ambiguous name lookup
    void deref()
         ^
../../third_party/WebKit/Source/core/events/EventTarget.h:102:10: note: member
found by ambiguous name lookup
    void deref() { derefEventTarget(); }
         ^
In file included from gen/blink/bindings/V8GeneratedBindings04.cpp:54:
gen/blink/bindings/V8MediaKeySession.cpp:241:34: error: member 'deref' found in
multiple base classes of different types
    fromInternalPointer(object)->deref();
                                 ^
../../third_party/WebKit/Source/heap/Heap.h:883:10: note: member found by
ambiguous name lookup
    void deref()
         ^
../../third_party/WebKit/Source/core/events/EventTarget.h:102:10: note: member
found by ambiguous name lookup
    void deref() { derefEventTarget(); }


I wonder why RefCounted<MediaKeySession> doesn't cause the ambiguous error but
RefCountedWillBeGarbageCollectedFinalized<MediaKeySession> causes the ambiguous
error.

Would you give me advice? :)

 public:
-    static PassRefPtr<MediaKeySession> create(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
+    static PassRefPtrWillBeRawPtr<MediaKeySession> create(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
     virtual ~MediaKeySession();
 
     const String& keySystem() const { return m_keySystem; }
     String sessionId() const;
 
     void setError(MediaKeyError*);
     MediaKeyError* error() { return m_error.get(); }
 
     void initializeNewSession(const String& mimeType, const Uint8Array& initData);
     void update(Uint8Array* response, ExceptionState&);
     void release(ExceptionState&);
 
     void enqueueEvent(PassRefPtr<Event>);
 
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
+    void trace(Visitor*) { }
+
 private:
     MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
     void updateTimerFired(Timer<MediaKeySession>*);
 
     // ContentDecryptionModuleSessionClient
     virtual void message(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE;
     virtual void ready() OVERRIDE;
     virtual void close() OVERRIDE;
     virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
 
     String m_keySystem;
     RefPtr<MediaKeyError> m_error;
     OwnPtr<GenericEventQueue> m_asyncEventQueue;
     OwnPtr<ContentDecryptionModuleSession> m_session;
     // Used to remove the reference from the parent MediaKeys when close()'d.
     MediaKeys* m_keys;
 
     Deque<RefPtr<Uint8Array> > m_pendingUpdates;
     Timer<MediaKeySession> m_updateTimer;
 };
 
 }
 
 #endif // MediaKeySession_h