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& mimeType, const unsigned char* initData, unsigned initDataLength)

[acolwell GONE FROM CHROMIUM, 2014/01/11 01:11:25]

nit: s/mimeType/contentType/

[jrummell, 2014/01/11 01:56:56]

Done.

 {
-    if (!hasEventListeners(EventTypeNames::webkitneedkey)) {
-        m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
-        scheduleEvent(EventTypeNames::error);
-        return false;
+    bool result = false;
+
+    // Send event for prefixed EME.
+    // FIXME: Remove once prefixed EME is removed.
+    if (hasEventListeners(EventTypeNames::webkitneedkey)) {
+        MediaKeyEventInit initializer;
+        initializer.keySystem = String();
+        initializer.sessionId = String();
+        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());
+        result = true;
     }
 
-    MediaKeyEventInit initializer;
-    initializer.keySystem = keySystem;
-    initializer.sessionId = sessionId;
-    initializer.initData = Uint8Array::create(initData, initDataLength);
-    initializer.bubbles = false;
-    initializer.cancelable = false;
+    // Send event for non-prefixed EME.
+    if (hasEventListeners(EventTypeNames::needkey)) {

[acolwell GONE FROM CHROMIUM, 2014/01/11 01:11:25]

Do we really want to dispatch to both events? ISTM that we should dispatch
'needkey' if there are listeners for that OR 'webkitneedkey' if there are no
'needkey' listeners. That way an application that registers both, because they
want to work in prefixed and unprefixed worlds, will only get one notification.

[jrummell, 2014/01/11 01:56:56]

Good idea. Reordered so unprefixed event is preferred.

+        MediaKeyNeededEventInit initializer;
+        initializer.contentType = mimeType;
+        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 = MediaKeyNeededEvent::create(EventTypeNames::needkey, initializer);
+        event->setTarget(this);
+        m_asyncEventQueue->enqueueEvent(event.release());
+        result = true;

[acolwell GONE FROM CHROMIUM, 2014/01/11 01:11:25]

If you take my suggestion above then you should be able to return early here and
above.

[jrummell, 2014/01/11 01:56:56]

Done.

     }
 
-    MediaKeyNeededEventInit initializer;
-    initializer.initData = initData;
-    initializer.bubbles = false;
-    initializer.cancelable = false;
+    if (result)
+        return true;
 
-    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.
+    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);
 }
 
 }