Chromium Code Reviews| Index: Source/modules/encryptedmedia/MediaKeys.h |
| diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h |
| index b44dd7470927515ee30986278f61db139d432b32..7daf3194e83ad251acc647459a56c1fb10d92dc1 100644 |
| --- a/Source/modules/encryptedmedia/MediaKeys.h |
| +++ b/Source/modules/encryptedmedia/MediaKeys.h |
| @@ -47,9 +47,10 @@ class WebContentDecryptionModule; |
| class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ContextLifecycleObserver, public ScriptWrappable { |
| DEFINE_WRAPPERTYPEINFO(); |
| public: |
| - static ScriptPromise create(ScriptState*, const String& keySystem); |
| + MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule>); |
| virtual ~MediaKeys(); |
| + // FIXME: This should be removed after crbug.com/425186 is fully implemented. |
|
yhirano
2014/10/24 09:22:32
Please wrap the comment in 80 columns.
jrummell
2014/10/24 22:43:22
Done.
|
| const String& keySystem() const { return m_keySystem; } |
| MediaKeySession* createSession(ScriptState*, const String& sessionType); |
| @@ -57,6 +58,7 @@ public: |
| ScriptPromise setServerCertificate(ScriptState*, DOMArrayBuffer* serverCertificate); |
| ScriptPromise setServerCertificate(ScriptState*, DOMArrayBufferView* serverCertificate); |
| + // FIXME: Remove this method since it's not in the spec anymore. |
| static bool isTypeSupported(const String& keySystem, const String& contentType); |
| blink::WebContentDecryptionModule* contentDecryptionModule(); |
| @@ -68,8 +70,6 @@ public: |
| private: |
| class PendingAction; |
| - friend class MediaKeysInitializer; |
| - MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule>); |
| ScriptPromise setServerCertificateInternal(ScriptState*, PassRefPtr<ArrayBuffer> initData); |