Changeset 144093 in webkit

Timestamp:

Feb 26, 2013, 1:01:25 PM (14 years ago)

Author:

Lucas Forschler

Message:

Merged r142819. <rdar://problem/13254985>

Location:

tags/Safari-537.31.10/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)
• platform/graphics/MediaPlayer.cpp (modified) (1 diff)
• platform/graphics/MediaPlayer.h (modified) (2 diffs)

tags/Safari-537.31.10/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r142819
+
+    2013-02-13  Jer Noble  <jer.noble@apple.com>
+
+            EME: MediaPlayer::keyNeede() should return a bool indicating whether an event listener was triggered.
+            https://bugs.webkit.org/show_bug.cgi?id=109701
+
+            Reviewed by Eric Carlson.
+
+            Clients of MediaPlayer may need to do cleanup if calling keyNeeded()
+            results in no event listener being triggered. Return a bool (like the
+            v1 equivalent keyNeeded method) to indicate this.
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
+            * html/HTMLMediaElement.h:
+            * platform/graphics/MediaPlayer.cpp:
+            (WebCore::MediaPlayer::keyNeeded):
+            * platform/graphics/MediaPlayer.h:
+            (WebCore::MediaPlayerClient::mediaPlayerKeyNeeded):
+
 2013-02-26  Lucas Forschler  <lforschler@apple.com>
 

tags/Safari-537.31.10/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1973 +1973 @@
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
-void HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
-{
+bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
+{
+    if (!hasEventListeners("webkitneedkey")) {
+        m_error = MediaError::create(MediaError::MEDIA_ERR_ENCRYPTED);
+        scheduleEvent(eventNames().errorEvent);
+        return false;
+    }
+
     MediaKeyNeededEventInit initializer;
     initializer.initData = initData;
@@ -1983 +1989 @@
     event->setTarget(this);
     m_asyncEventQueue->enqueueEvent(event.release());
+
+    return true;
 }
 

tags/Safari-537.31.10/Source/WebCore/html/HTMLMediaElement.h

@@ -456 +456 @@
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
-    virtual void mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*);
+    virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*);
 #endif
 

tags/Safari-537.31.10/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -1083 +1083 @@
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
-void MediaPlayer::keyNeeded(Uint8Array* initData)
-{
-    if (m_mediaPlayerClient)
-        m_mediaPlayerClient->mediaPlayerKeyNeeded(this, initData);
+bool MediaPlayer::keyNeeded(Uint8Array* initData)
+{
+    if (m_mediaPlayerClient)
+        return m_mediaPlayerClient->mediaPlayerKeyNeeded(this, initData);
+    return false;
 }
 #endif

tags/Safari-537.31.10/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -195 +195 @@
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
-    virtual void mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) { }
+    virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) { return false; }
 #endif
     
@@ -436 +436 @@
 
 #if ENABLE(ENCRYPTED_MEDIA_V2)
-    void keyNeeded(Uint8Array* initData);
+    bool keyNeeded(Uint8Array* initData);
 #endif