Schedule session initialization in MediaKeys.

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 "modules/encryptedmedia/MediaKeySession.h"

[acolwell GONE FROM CHROMIUM, 2014/01/13 18:35:37]

Why do you need to include this now?

[xhwang, 2014/01/13 19:06:03]

For the template parameter on l.80.

+#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 MediaKeySession;
 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 {
 public:
     static PassRefPtr<MediaKeys> create(const String& keySystem, ExceptionState&);
     ~MediaKeys();
 
     PassRefPtr<MediaKeySession> createSession(ExecutionContext*, const String& mimeType, Uint8Array* initData, ExceptionState&);
 
     const String& keySystem() const { return m_keySystem; }
 
     void setMediaElement(HTMLMediaElement*);
 
     blink::WebContentDecryptionModule* contentDecryptionModule();
 
 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& mimeType, Uint8Array* initData)

[acolwell GONE FROM CHROMIUM, 2014/01/13 18:35:37]

Use PassRefPtr<Uint8Array> for initData.

[xhwang, 2014/01/13 19:06:03]

Done.

+            : session(session)
+            , mimeType(mimeType)
+            , initData(initData) { }
+        RefPtr<MediaKeySession> session;
+        String mimeType;
+        RefPtr<Uint8Array> initData;
+    };
+    Deque<InitializeNewSessionData> m_pendingInitializeNewSessionData;
+    Timer<MediaKeys> m_initializeNewSessionTimer;
 };
 
 }
 
 #endif // MediaKeys_h