Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1540)

Unified Diff: Source/modules/encryptedmedia/MediaKeys.h

Issue 665213002: Implement navigator.requestMediaKeySystemAccess() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: update Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/encryptedmedia/MediaKeys.h
diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h
index b44dd7470927515ee30986278f61db139d432b32..c30b05a34eb978a2a41ac197be2037cb506a9333 100644
--- a/Source/modules/encryptedmedia/MediaKeys.h
+++ b/Source/modules/encryptedmedia/MediaKeys.h
@@ -47,7 +47,7 @@ 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();
const String& keySystem() const { return m_keySystem; }
ddorwin 2014/10/23 18:02:31 FIXME: This should be removed after crbug.com/4251
jrummell 2014/10/23 22:13:15 Done.
@@ -57,6 +57,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 +69,6 @@ public:
private:
class PendingAction;
- friend class MediaKeysInitializer;
- MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule>);
ScriptPromise setServerCertificateInternal(ScriptState*, PassRefPtr<ArrayBuffer> initData);

Powered by Google App Engine
This is Rietveld 408576698