Implement MediaKeySession.load()

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 50 matching lines @@
 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 MediaKeySession* create(ScriptState*, MediaKeys*, const String& sessionType);
     virtual ~MediaKeySession();
 
+    static bool isValidSessionType(const String& sessionType);

[ddorwin, 2014/10/08 23:08:49]

Move up with the other static method.

[jrummell, 2014/10/08 23:52:55]

Done.

+
     const String& keySystem() const { return m_keySystem; }
     String sessionId() const;
     ScriptPromise closed(ScriptState*);
 
     ScriptPromise generateRequest(ScriptState*, const String& initDataType, ArrayBuffer* initData);
     ScriptPromise generateRequest(ScriptState*, const String& initDataType, ArrayBufferView* initData);
+    ScriptPromise load(ScriptState*, const String& sessionId);
 
     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 NewSessionResult;
+    friend class LoadSessionResult;
 
     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.
+    // Called by NewSessionResult when the new session has been created.
     void finishGenerateRequest();
 
+    // Called by LoadSessionResult when the session has been loaded.
+    void finishLoad();
+
     String m_keySystem;
     RefPtrWillBeMember<MediaKeyError> m_error;
     OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
     OwnPtr<WebContentDecryptionModuleSession> m_session;
 
     // Used to determine if MediaKeys is still active.
     WeakMember<MediaKeys> m_mediaKeys;
 
     // Session properties.
     String m_sessionType;
 
     // Session states.
     bool m_isUninitialized;
     bool m_isCallable;
     bool m_isClosed; // Is the CDM finished with this session?
 
     // 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