| Index: Source/modules/encryptedmedia/MediaKeySession.h
|
| diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
|
| index 45072199301fd42012c494d5aba33a931f055356..0e76f52184b6f8d0ee6a7f46e197ef35ef13a717 100644
|
| --- a/Source/modules/encryptedmedia/MediaKeySession.h
|
| +++ b/Source/modules/encryptedmedia/MediaKeySession.h
|
| @@ -70,10 +70,6 @@ public:
|
|
|
| void enqueueEvent(PassRefPtr<Event>);
|
|
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
|
| - DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
|
| -
|
| virtual const AtomicString& interfaceName() const OVERRIDE;
|
| virtual ExecutionContext* executionContext() const OVERRIDE;
|
|
|
| @@ -83,9 +79,10 @@ private:
|
| void updateTimerFired(Timer<MediaKeySession>*);
|
|
|
| // ContentDecryptionModuleSessionClient
|
| - virtual void keyAdded() OVERRIDE;
|
| - virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
|
| - virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE;
|
| + virtual void message(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE;
|
| + virtual void ready() OVERRIDE;
|
| + virtual void close() OVERRIDE;
|
| + virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
|
|
|
| String m_keySystem;
|
| RefPtr<MediaKeyError> m_error;
|
|
|