Move encryptedmedia module to oilpan

Source/modules/encryptedmedia/MediaKeys.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 10 matching lines @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef MediaKeys_h
 #define MediaKeys_h
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/events/EventTarget.h"
+#include "heap/Handle.h"
 #include "modules/encryptedmedia/MediaKeySession.h"
 #include "platform/Timer.h"
 #include "wtf/Deque.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Uint8Array.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 class WebContentDecryptionModule;
 }
 
 namespace WebCore {
 
 class ContentDecryptionModule;
 class HTMLMediaElement;
 class ExceptionState;
 
 // References are held by JS and HTMLMediaElement.
 // The ContentDecryptionModule has the same lifetime as this object.
 // Maintains a reference to all MediaKeySessions created to ensure they live as
 // long as this object unless explicitly close()'d.
-class MediaKeys : public RefCounted<MediaKeys>, public ScriptWrappable {
+class MediaKeys : public RefCountedWillBeGarbageCollectedFinalized<MediaKeys>, public ScriptWrappable {
+    DECLARE_GC_INFO;
 public:
-    static PassRefPtr<MediaKeys> create(const String& keySystem, ExceptionState&);
+    static PassRefPtrWillBeRawPtr<MediaKeys> create(const String& keySystem, ExceptionState&);
     ~MediaKeys();
 
-    PassRefPtr<MediaKeySession> createSession(ExecutionContext*, const String& contentType, Uint8Array* initData, ExceptionState&);
+    PassRefPtrWillBeRawPtr<MediaKeySession> createSession(ExecutionContext*, const String& contentType, Uint8Array* initData, ExceptionState&);
 
     const String& keySystem() const { return m_keySystem; }
 
     void setMediaElement(HTMLMediaElement*);
 
     blink::WebContentDecryptionModule* contentDecryptionModule();
 
+    void trace(Visitor*) { }
+
 protected:
     MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule>);
     void initializeNewSessionTimerFired(Timer<MediaKeys>*);
 
     Vector<RefPtr<MediaKeySession> > m_sessions;
 
     HTMLMediaElement* m_mediaElement;
     const String m_keySystem;
     OwnPtr<ContentDecryptionModule> m_cdm;
 
     // FIXME: Check whether |initData| can be changed by JS. Maybe we should not pass it as a pointer.
     struct InitializeNewSessionData {
-        InitializeNewSessionData(PassRefPtr<MediaKeySession> session, const String& contentType, PassRefPtr<Uint8Array> initData)
+        InitializeNewSessionData(PassRefPtrWillBeRawPtr<MediaKeySession> session, const String& contentType, PassRefPtr<Uint8Array> initData)
             : session(session)
             , contentType(contentType)
             , initData(initData) { }
-        RefPtr<MediaKeySession> session;
+        RefPtrWillBePersistent<MediaKeySession> session;

[Mads Ager (chromium), 2014/02/07 07:19:25]

I think this is fine. My guess would be that this is not very performance
critical and that we will not have many of these. The alternative would be to
make this a Member and define a trace method in InitializeNewSessionData which
will trace the session. When tracing MediaKeys would would then trace all the
pending new session data objects as well.

[haraken, 2014/02/07 07:22:54]

I'll keep the current CL since this wouldn't be performance critical, but your
point completely makes sense.

[zerny-chromium, 2014/02/07 08:30:07]

I agree with Mads that this should be traced and
m_pendingInitializeNewSessionData traced from MediaKeys. We have support for
tracing non-pointer structures in collections so it should be a matter of making
sure tracing a Deque is supported.

[Mads Ager (chromium), 2014/02/07 08:52:34]

It looks like that code was not moved from the branch. I will do that once Erik
change to fix OffHeapCollectionTraceTrait is in.

         String contentType;
         RefPtr<Uint8Array> initData;
     };
     Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
     Timer<MediaKeys> m_initializeNewSessionTimer;
 };
 
 }
 
 #endif // MediaKeys_h