Changeset 144095 in webkit

Timestamp:

Feb 26, 2013, 1:07:15 PM (14 years ago)

Author:

Lucas Forschler

Message:

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

Location:

tags/Safari-537.31.10/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/encryptedmedia/CDM.cpp (modified) (3 diffs)
• Modules/encryptedmedia/CDM.h (modified) (4 diffs)
• Modules/encryptedmedia/MediaKeys.cpp (modified) (3 diffs)
• Modules/encryptedmedia/MediaKeys.h (modified) (3 diffs)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• testing/MockCDM.cpp (modified) (1 diff)

tags/Safari-537.31.10/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r143072
+
+    2013-02-13  Jer Noble  <jer.noble@apple.com>
+
+            Add a CDMClient class which allows the CDM to query for the currently attached MediaPlayer.
+            https://bugs.webkit.org/show_bug.cgi?id=109702
+
+            Reviewed by Eric Carlson.
+
+            Some CDM implementations will need to work closely with an associated
+            MediaPlayer in order to generate key requests and provide keys. Add a
+            client protocol to be implemented by the MediaKeys object which can
+            provide access to the associated MediaPlayer if present.
+
+            * Modules/encryptedmedia/CDM.cpp:
+            (WebCore::CDM::CDM): Initialize the m_client ivar.
+            (WebCore::CDM::mediaPlayer): Pass to the client, if present.
+            * Modules/encryptedmedia/CDM.h:
+            (WebCore::CDM::client): Simple getter.
+            (WebCore::CDM::setClient): Simple setter.
+            * Modules/encryptedmedia/MediaKeys.cpp:
+            (WebCore::MediaKeys::MediaKeys): Initialize the m_mediaElement ivar
+                and call setClient() on the passed in CDM.
+            (WebCore::MediaKeys::setMediaElement): Simple setter.
+            (WebCore::MediaKeys::cdmMediaPlayer): Retrieve the MediaPlayer from
+                the m_mediaElement if present.
+            * Modules/encryptedmedia/MediaKeys.h:
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::~HTMLMediaElement): Call setMediaKeys(0)
+                to clear the mediaElement in any associated MediaKeys.
+            (WebCore::HTMLMediaElement::setMediaKeys): Clear the mediaElement on
+                any associated MediaKeys, and set the mediaElement on the newly
+                associated MediaKeys.
+
 2013-02-26  Lucas Forschler  <lforschler@apple.com>
 

tags/Safari-537.31.10/Source/WebCore/Modules/encryptedmedia/CDM.cpp

@@ -93 +93 @@
 CDM::CDM(const String& keySystem)
     : m_keySystem(keySystem)
+    , m_client(0)
 {
     m_private = CDMFactoryForKeySystem(keySystem)->constructor(this);
@@ -101 +102 @@
 }
 
-bool CDM::supportsMIMEType(const String& mimeType)
+bool CDM::supportsMIMEType(const String& mimeType) const
 {
     return m_private->supportsMIMEType(mimeType);
@@ -111 +112 @@
 }
 
+MediaPlayer* CDM::mediaPlayer() const
+{
+    if (!m_client)
+        return 0;
+    return m_client->cdmMediaPlayer(this);
+}
+
 }
 

tags/Safari-537.31.10/Source/WebCore/Modules/encryptedmedia/CDM.h

@@ -39 +39 @@
 class CDMPrivateInterface;
 class CDMSession;
-class MediaKeyError;
-class MediaKeySession;
-class MediaKeys;
+class MediaPlayer;
 
 typedef PassOwnPtr<CDMPrivateInterface> (*CreateCDM)(CDM*);
 typedef bool (*CDMSupportsKeySystem)(const String&);
+
+class CDMClient {
+public:
+    virtual ~CDMClient() { }
+
+    virtual MediaPlayer* cdmMediaPlayer(const CDM*) const = 0;
+};
 
 class CDMSession {
@@ -51 +56 @@
     virtual ~CDMSession() { }
 
-    virtual const String& sessionId() = 0;
+    virtual const String& sessionId() const = 0;
     virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) = 0;
     virtual void releaseKeys() = 0;
@@ -64 +69 @@
     ~CDM();
 
-    bool supportsMIMEType(const String&);
+    bool supportsMIMEType(const String&) const;
     PassOwnPtr<CDMSession> createSession();
 
     const String& keySystem() const { return m_keySystem; }
+
+    CDMClient* client() const { return m_client; }
+    void setClient(CDMClient* client) { m_client = client; }
+
+    MediaPlayer* mediaPlayer() const;
 
 private:
@@ -74 +84 @@
     String m_keySystem;
     OwnPtr<CDMPrivateInterface> m_private;
+    CDMClient* m_client;
 };
 

tags/Safari-537.31.10/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp

@@ -31 +31 @@
 #include "CDM.h"
 #include "EventNames.h"
+#include "HTMLMediaElement.h"
 #include "MediaKeyMessageEvent.h"
 #include "MediaKeySession.h"
@@ -66 +67 @@
 
 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<CDM> cdm)
-    : m_keySystem(keySystem)
+    : m_mediaElement(0)
+    , m_keySystem(keySystem)
     , m_cdm(cdm)
 {
+    m_cdm->setClient(this);
 }
 
@@ -116 +119 @@
 }
 
+void MediaKeys::setMediaElement(HTMLMediaElement* element)
+{
+    m_mediaElement = element;
+}
+
+MediaPlayer* MediaKeys::cdmMediaPlayer(const CDM*) const
+{
+    if (m_mediaElement)
+        return m_mediaElement->player();
+    return 0;
+}
+
 }
 

tags/Safari-537.31.10/Source/WebCore/Modules/encryptedmedia/MediaKeys.h

@@ -29 +29 @@
 #if ENABLE(ENCRYPTED_MEDIA_V2)
 
+#include "CDM.h"
 #include "EventTarget.h"
 #include "ExceptionCode.h"
@@ -40 +41 @@
 namespace WebCore {
 
-class CDM;
 class MediaKeySession;
+class HTMLMediaElement;
 
-class MediaKeys : public RefCounted<MediaKeys> {
+class MediaKeys : public RefCounted<MediaKeys>, public CDMClient {
 public:
     static PassRefPtr<MediaKeys> create(const String& keySystem, ExceptionCode&);
@@ -53 +54 @@
     CDM* cdm() { return m_cdm.get(); }
 
+    HTMLMediaElement* mediaElement() const { return m_mediaElement; }
+    void setMediaElement(HTMLMediaElement*);
+
 protected:
+    // CDMClient:
+    virtual MediaPlayer* cdmMediaPlayer(const CDM*) const OVERRIDE;
+
     MediaKeys(const String& keySystem, PassOwnPtr<CDM>);
 
     Vector<RefPtr<MediaKeySession> > m_sessions;
 
+    HTMLMediaElement* m_mediaElement;
     String m_keySystem;
     OwnPtr<CDM> m_cdm;

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

@@ -349 +349 @@
 #endif
 
+#if ENABLE(ENCRYPTED_MEDIA_V2)
+    setMediaKeys(0);
+#endif
+
     removeElementFromDocumentMap(this, document());
 }
@@ -1995 +1999 @@
 void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys)
 {
+    if (m_mediaKeys == mediaKeys)
+        return;
+
+    if (m_mediaKeys)
+        m_mediaKeys->setMediaElement(0);
     m_mediaKeys = mediaKeys;
+    if (m_mediaKeys)
+        m_mediaKeys->setMediaElement(this);
 }
 #endif

tags/Safari-537.31.10/Source/WebCore/testing/MockCDM.cpp

@@ -40 +40 @@
     virtual ~MockCDMSession() { }
 
-    virtual const String& sessionId() OVERRIDE { return m_sessionId; }
+    virtual const String& sessionId() const OVERRIDE { return m_sessionId; }
     virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) OVERRIDE;
     virtual void releaseKeys() OVERRIDE;