Implement MediaKeySession.generateRequest()

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 47 matching lines @@
 // Because this object controls the lifetime of the WebContentDecryptionModuleSession,
 // it may outlive any JavaScript references as long as the MediaKeys object is alive.
 // The WebContentDecryptionModuleSession has the same lifetime as this object.
 class MediaKeySession FINAL
     : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaKeySession>, public ActiveDOMObject, public EventTargetWithInlineData
     , private WebContentDecryptionModuleSession::Client {
     DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<MediaKeySession>);
     DEFINE_WRAPPERTYPEINFO();
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
 public:
-    static ScriptPromise create(ScriptState*, MediaKeys*, const String& initDataType, PassRefPtr<ArrayBuffer> initData, const String& sessionType);
+    static MediaKeySession* create(ScriptState*, MediaKeys*, const String& sessionType);
     virtual ~MediaKeySession();
 
     const String& keySystem() const { return m_keySystem; }
-    String sessionId() const;
+    const String& sessionId() const { return m_sessionId; }
+    double expiration() const { return m_expiration; }

[ddorwin, 2014/09/09 00:44:36]

Ideally, expiration should have been added in a separate CL. At least mention it
in the description.

[jrummell, 2014/09/09 19:55:59]

Removed since it's not used. Adding expiration will come in a seperate CL.

     ScriptPromise closed(ScriptState*);
 
+    ScriptPromise generateRequest(ScriptState*, const String& initDataType, ArrayBuffer* initData);
+    ScriptPromise generateRequest(ScriptState*, const String& initDataType, ArrayBufferView* initData);
+
     void setError(MediaKeyError*);
     MediaKeyError* error() { return m_error.get(); }
 
     ScriptPromise update(ScriptState*, ArrayBuffer* response);
     ScriptPromise update(ScriptState*, ArrayBufferView* response);
     ScriptPromise release(ScriptState*);
 
     void enqueueEvent(PassRefPtrWillBeRawPtr<Event>);
 
     // EventTarget
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
     // ActiveDOMObject
     virtual bool hasPendingActivity() const OVERRIDE;
     virtual void stop() OVERRIDE;
 
     virtual void trace(Visitor*) OVERRIDE;
 
 private:
     class PendingAction;
-    friend class MediaKeySessionInitializer;
+    friend class NewSessionResult;
 
-    MediaKeySession(ExecutionContext*, MediaKeys*, PassOwnPtr<WebContentDecryptionModuleSession>);
+    MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType);
+
     void actionTimerFired(Timer<MediaKeySession>*);
 
     // WebContentDecryptionModuleSession::Client
     virtual void message(const unsigned char* message, size_t messageLength, const WebURL& destinationURL) OVERRIDE;
     virtual void ready() OVERRIDE;
     virtual void close() OVERRIDE;
     virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
     virtual void error(WebContentDecryptionModuleException, unsigned long systemCode, const WebString& errorMessage) OVERRIDE;
 
+    ScriptPromise generateRequestInternal(ScriptState*, const String& initDataType, PassRefPtr<ArrayBuffer> initData);
     ScriptPromise updateInternal(ScriptState*, PassRefPtr<ArrayBuffer> response);
 
+    // Called by NewSessionResult when the new sesison has been created.
+    void finishGenerateRequest();
+
     String m_keySystem;

[ddorwin, 2014/09/09 00:44:36]

This should be removed in a separate CL. It's no longer exposed by the IDL.

[jrummell, 2014/09/09 19:55:59]

Acknowledged.

     RefPtrWillBeMember<MediaKeyError> m_error;
     OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
     OwnPtr<WebContentDecryptionModuleSession> m_session;
 
-    // Used to determine if MediaKeys is still active.
+    // Used to determine if MediaKeys is still active. Until the session is
+    // initialized, keep a hard reference to MediaKeys (as it is needed during
+    // initialization). Afterwards, a weak reference is all that is needed.

[ddorwin, 2014/09/09 00:44:36]

We discussed a different solution that didn't require this odd transition. The
solution was to instantiate the WebCdmSessionImpl when the MKS is created.

[jrummell, 2014/09/09 19:55:59]

Done.

+    Member<MediaKeys> m_mediaKeys;
     WeakMember<MediaKeys> m_keys;

[ddorwin, 2014/09/09 00:44:36]

Eventually, this should be m_mediaKeys - I think that naming is clearer.

[jrummell, 2014/09/09 19:55:59]

Done.

 
+    // Session properties.
+    String m_sessionId;

[ddorwin, 2014/09/09 00:44:36]

Why is this being tracked here now?

[jrummell, 2014/09/09 19:55:59]

m_session wasn't being created until the generateRequest() call, so it needed
some value until then. Fixed.

+    double m_expiration;
+    String m_sessionType;
+    bool m_uninitialized;

[ddorwin, 2014/09/09 00:44:36]

m_isUn...
ditto below.

[jrummell, 2014/09/09 19:56:00]

Done.

+    bool m_callable;
+

[ddorwin, 2014/09/09 00:44:36]

nit: Keep the states together, separate from the properties. You can move the
comments to the right of the variable.

[jrummell, 2014/09/09 19:55:59]

Done.

     // Is the CDM finished with this session?
     bool m_isClosed;
 
     // Keep track of the closed promise.
     typedef ScriptPromiseProperty<Member<MediaKeySession>, V8UndefinedType, RefPtrWillBeMember<DOMException> > ClosedPromise;
     Member<ClosedPromise> m_closedPromise;
 
     HeapDeque<Member<PendingAction> > m_pendingActions;
     Timer<MediaKeySession> m_actionTimer;
 };
 
 } // namespace blink
 
 #endif // MediaKeySession_h