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

Issue 686893004: Remove obsolete ready and error events from MediaKeySession. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Completely remove events 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/MediaKeySession.h
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
index 2eccbcc436789be64cfb243ba89d870424a7d18e..80235044643b447c235368b49f5e4d65b5bd777e 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -67,7 +67,6 @@ public:
static bool isValidSessionType(const String& sessionType);
virtual ~MediaKeySession();
- const String& keySystem() const { return m_keySystem; }
String sessionId() const;
double expiration() const { return m_expiration; }
ScriptPromise closed(ScriptState*);
@@ -76,9 +75,6 @@ public:
ScriptPromise generateRequest(ScriptState*, const String& initDataType, DOMArrayBufferView* initData);
ScriptPromise load(ScriptState*, const String& sessionId);
- void setError(MediaKeyError*);
- MediaKeyError* error() { return m_error.get(); }
-
ScriptPromise update(ScriptState*, DOMArrayBuffer* response);
ScriptPromise update(ScriptState*, DOMArrayBufferView* response);
ScriptPromise close(ScriptState*);
@@ -107,10 +103,7 @@ private:
// 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;
virtual void expirationChanged(double updatedExpiryTimeInMS) override;
ScriptPromise generateRequestInternal(ScriptState*, const String& initDataType, PassRefPtr<ArrayBuffer> initData);
@@ -123,7 +116,6 @@ private:
void finishLoad();
String m_keySystem;
- RefPtrWillBeMember<MediaKeyError> m_error;
OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
OwnPtr<WebContentDecryptionModuleSession> m_session;

Powered by Google App Engine
This is Rietveld 408576698