Add new needkey event for EME.

Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 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 1692 matching lines @@
     initializer.message = Uint8Array::create(message, messageLength);
     initializer.defaultURL = defaultURL;
     initializer.bubbles = false;
     initializer.cancelable = false;
 
     RefPtr<Event> event = MediaKeyEvent::create(EventTypeNames::webkitkeymessage, initializer);
     event->setTarget(this);
     m_asyncEventQueue->enqueueEvent(event.release());
 }
 
-bool HTMLMediaElement::mediaPlayerKeyNeeded(const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength)
+bool HTMLMediaElement::mediaPlayerKeyNeeded(const String& contentType, const unsigned char* initData, unsigned initDataLength)
 {
-    if (!hasEventListeners(EventTypeNames::webkitneedkey)) {
-        m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
-        scheduleEvent(EventTypeNames::error);
-        return false;
+    // Send event for non-prefixed EME, if available.

[xhwang, 2014/01/13 18:42:40]

ditto, replace non-prefixed/prefixed to EME version.

[jrummell, 2014/01/13 19:01:32]

Done.

+    if (hasEventListeners(EventTypeNames::needkey)) {

[ddorwin, 2014/01/13 19:08:38]

The check this copies was related to part of the prefixed spec that fired an
error if needkey was not present. This does not exist in the WD, so we should
always fire.

[jrummell, 2014/01/13 22:43:44]

Done.

+        MediaKeyNeededEventInit initializer;
+        initializer.contentType = contentType;
+        initializer.initData = Uint8Array::create(initData, initDataLength);
+        initializer.bubbles = false;
+        initializer.cancelable = false;
+
+        RefPtr<Event> event = MediaKeyNeededEvent::create(EventTypeNames::needkey, initializer);
+        event->setTarget(this);
+        m_asyncEventQueue->enqueueEvent(event.release());
+        return true;
     }
 
-    MediaKeyEventInit initializer;
-    initializer.keySystem = keySystem;
-    initializer.sessionId = sessionId;
-    initializer.initData = Uint8Array::create(initData, initDataLength);
-    initializer.bubbles = false;
-    initializer.cancelable = false;
+    // Send event for prefixed EME, if available.
+    // FIXME: Remove once prefixed EME is removed.

[ddorwin, 2014/01/13 19:08:38]

Probably not necessary. We'll know to search for and delete this code.

[jrummell, 2014/01/13 22:43:44]

Done.

+    if (hasEventListeners(EventTypeNames::webkitneedkey)) {
+        MediaKeyEventInit initializer;
+        initializer.keySystem = String();
+        initializer.sessionId = String();

[acolwell GONE FROM CHROMIUM, 2014/01/13 18:19:04]

Where these always empty strings before?

[jrummell, 2014/01/13 19:01:32]

Yup.
https://code.google.com/p/chromium/codesearch#chromium/src/content/renderer/m...
is "client_->keyNeeded(WebString(), WebString(), init_data_ptr,
init_data.size());".

+        initializer.initData = Uint8Array::create(initData, initDataLength);
+        initializer.bubbles = false;
+        initializer.cancelable = false;
 
-    RefPtr<Event> event = MediaKeyEvent::create(EventTypeNames::webkitneedkey, initializer);
-    event->setTarget(this);
-    m_asyncEventQueue->enqueueEvent(event.release());
-    return true;
-}
-
-bool HTMLMediaElement::mediaPlayerKeyNeeded(Uint8Array* initData)
-{
-    // FIXME: This should be using the unprefixed event name ("needkey").
-    if (!hasEventListeners("webkitneedkey")) {
-        m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
-        scheduleEvent(EventTypeNames::error);
-        return false;
+        RefPtr<Event> event = MediaKeyEvent::create(EventTypeNames::webkitneedkey, initializer);
+        event->setTarget(this);
+        m_asyncEventQueue->enqueueEvent(event.release());
+        return true;
     }
 
-    MediaKeyNeededEventInit initializer;
-    initializer.initData = initData;
-    initializer.bubbles = false;
-    initializer.cancelable = false;
-
-    RefPtr<Event> event = MediaKeyNeededEvent::create(EventTypeNames::webkitneedkey, initializer);
-    event->setTarget(this);
-    m_asyncEventQueue->enqueueEvent(event.release());
-
-    return true;
+    // Unable to send an event, so send an error.

[ddorwin, 2014/01/13 19:08:38]

The error doesn't exist in the WD, and we never really used it in the prefixed
API. While we could figure out when to fire this, I'd say to just remove it
rather than adding the extra logic.

[jrummell, 2014/01/13 22:43:44]

Done.

+    m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
+    scheduleEvent(EventTypeNames::error);
+    return false;
 }
 
 blink::WebContentDecryptionModule* HTMLMediaElement::contentDecryptionModule()
 {
     return m_mediaKeys ? m_mediaKeys->contentDecryptionModule() : 0;
 }
 
 void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys)
 {
     if (m_mediaKeys == mediaKeys)
@@ skipping 2174 matching lines @@
 {
     m_mediaSource->setWebMediaSourceAndOpen(adoptPtr(webMediaSource));
 }
 
 bool HTMLMediaElement::isInteractiveContent() const
 {
     return fastHasAttribute(controlsAttr);
 }
 
 }