Update MediaKeySession events to match latest EME spec

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 52 matching lines @@
 
     void setError(MediaKeyError*);
     MediaKeyError* error() { return m_error.get(); }
 
     void generateKeyRequest(const String& mimeType, Uint8Array* initData);
     void update(Uint8Array* key, ExceptionState&);
     void close();
 
     void enqueueEvent(PassRefPtr<Event>);
 
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
-    DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
+    DEFINE_ATTRIBUTE_EVENT_LISTENER(error);

[ddorwin, 2014/01/07 23:44:41]

on* attributes do not exist in the WD, except for needkey, where it is necessary
to handle declarative cases. (Just FYI, using addEventListener() is preferred to
using such attributes.)

[jrummell, 2014/01/08 18:05:52]

Removed.

+    DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
+    DEFINE_ATTRIBUTE_EVENT_LISTENER(ready);
+    DEFINE_ATTRIBUTE_EVENT_LISTENER(closed);
 
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
 private:
     MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
     void keyRequestTimerFired(Timer<MediaKeySession>*);
     void addKeyTimerFired(Timer<MediaKeySession>*);
 
     // ContentDecryptionModuleSessionClient
-    virtual void keyAdded() OVERRIDE;
     virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;

[ddorwin, 2014/01/07 23:44:41]

I think we should drop "key" here.

[jrummell, 2014/01/08 18:05:52]

Done.

     virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE;
+    virtual void keyReady() OVERRIDE;
+    virtual void keyClosed() OVERRIDE;
 
     String m_keySystem;
     RefPtr<MediaKeyError> m_error;
     OwnPtr<GenericEventQueue> m_asyncEventQueue;
     OwnPtr<ContentDecryptionModuleSession> m_session;
     // Used to remove the reference from the parent MediaKeys when close()'d.
     MediaKeys* m_keys;
 
     struct PendingKeyRequest {
         PendingKeyRequest(const String& mimeType, Uint8Array* initData) : mimeType(mimeType), initData(initData) { }
         String mimeType;
         RefPtr<Uint8Array> initData;
     };
     Deque<PendingKeyRequest> m_pendingKeyRequests;
     Timer<MediaKeySession> m_keyRequestTimer;
 
     Deque<RefPtr<Uint8Array> > m_pendingKeys;
     Timer<MediaKeySession> m_addKeyTimer;
 };
 
 }
 
 #endif // MediaKeySession_h