Changeset 144094 in webkit

Timestamp:

Feb 26, 2013, 1:04:11 PM (14 years ago)

Author:

Lucas Forschler

Message:

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

Location:

tags/Safari-537.31.10

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt (modified) (2 diffs)
• LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/encryptedmedia/CDM.h (modified) (1 diff)
• Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (modified) (3 diffs)
• Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (modified) (1 diff)
• Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• Source/WebCore/testing/MockCDM.cpp (modified) (2 diffs)

tags/Safari-537.31.10/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-26  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r142918
+
+    2013-02-14  Jer Noble  <jer.noble@apple.com>
+
+            EME: replace MediaKeySession.addKey() -> update()
+            https://bugs.webkit.org/show_bug.cgi?id=109461
+
+            Rebaseline after API change.
+
+            Reviewed by Eric Carlson.
+
+            * media/encrypted-media/encrypted-media-v2-syntax-expected.txt:
+            * media/encrypted-media/encrypted-media-v2-syntax.html:
+
 2013-02-24  Lucas Forschler  <lforschler@apple.com>
 

tags/Safari-537.31.10/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt

@@ -15 +15 @@
 EXPECTED (typeof mediaKeySession == 'object') OK
 EXPECTED (typeof mediaKeySession.addEventListener == 'function') OK
-EXPECTED (typeof mediaKeySession.addKey == 'function') OK
+EXPECTED (typeof mediaKeySession.update == 'function') OK
 EXPECTED (mediaKeySession.error == 'null') OK
 EXPECTED (mediaKeySession.keySystem == 'com.webcore.mock') OK
@@ -22 +22 @@
 EXPECTED (mediaKeySession.onwebkitkeyerror == 'null') OK
 EXPECTED (mediaKeySession.onwebkitkeymessage == 'null') OK
-TEST(mediaKeySession.addKey(null)) THROWS(DOMException.INVALID_ACCESS_ERR) OK
+TEST(mediaKeySession.update(null)) THROWS(DOMException.INVALID_ACCESS_ERR) OK
 END OF TEST
 

tags/Safari-537.31.10/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html

@@ -40 +40 @@
                 testExpected('typeof mediaKeySession', 'object');
                 testExpected('typeof mediaKeySession.addEventListener', 'function');
-                testExpected('typeof mediaKeySession.addKey', 'function');
+                testExpected('typeof mediaKeySession.update', 'function');
                 testExpected('mediaKeySession.error', null);
                 testExpected('mediaKeySession.keySystem', 'com.webcore.mock');
@@ -47 +47 @@
                 testExpected('mediaKeySession.onwebkitkeyerror', null);
                 testExpected('mediaKeySession.onwebkitkeymessage', null);
-                testException('mediaKeySession.addKey(null)', "DOMException.INVALID_ACCESS_ERR");
+                testException('mediaKeySession.update(null)', "DOMException.INVALID_ACCESS_ERR");
                 endTest();
             }

tags/Safari-537.31.10/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r142918
+
+    2013-02-14  Jer Noble  <jer.noble@apple.com>
+
+            EME: replace MediaKeySession.addKey() -> update()
+            https://bugs.webkit.org/show_bug.cgi?id=109461
+
+            Reviewed by Eric Carlson.
+
+            No new tests; updated media/encrypted-media/encrypted-media-v2-syntax.html test.
+
+            In the latest draft of the Encrypted Media Spec, the addKeys() method has been replaced
+            with update().
+
+            * Modules/encryptedmedia/CDM.h:
+            * Modules/encryptedmedia/MediaKeySession.cpp:
+            (WebCore::MediaKeySession::update):
+            (WebCore::MediaKeySession::addKeyTimerFired):
+            * Modules/encryptedmedia/MediaKeySession.h:
+            * Modules/encryptedmedia/MediaKeySession.idl:
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::webkitAddKey):
+            * testing/MockCDM.cpp:
+            (WebCore::MockCDMSession::update):
+
 2013-02-26  Lucas Forschler  <lforschler@apple.com>
 

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

@@ -54 +54 @@
     virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) = 0;
     virtual void releaseKeys() = 0;
-    virtual bool addKey(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) = 0;
+    virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) = 0;
 };
 

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

@@ -139 +139 @@
 }
 
-void MediaKeySession::addKey(Uint8Array* key, ExceptionCode& ec)
+void MediaKeySession::update(Uint8Array* key, ExceptionCode& ec)
 {
     // From <http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#dom-addkey>:
@@ -166 +166 @@
         unsigned long systemCode = 0;
 
-        // NOTE: Continued from step 2. of MediaKeySession::addKey()
+        // NOTE: Continued from step 2. of MediaKeySession::update()
         // 2.1. Let cdm be the cdm loaded in the MediaKeys constructor.
         // NOTE: This is m_session.
@@ -174 +174 @@
         RefPtr<Uint8Array> nextMessage;
         // 2.4. Use cdm to handle key.
-        didStoreKey = m_session->addKey(pendingKey.get(), nextMessage, errorCode, systemCode);
+        didStoreKey = m_session->update(pendingKey.get(), nextMessage, errorCode, systemCode);
         // 2.5. If did store key is true and the media element is waiting for a key, queue a task to attempt to resume playback.
         // TODO: Find and restart the media element

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

@@ -61 +61 @@
 
     void generateKeyRequest(const String& mimeType, Uint8Array* initData);
-    void addKey(Uint8Array* key, ExceptionCode&);
+    void update(Uint8Array* key, ExceptionCode&);
     void close();
 

tags/Safari-537.31.10/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl

@@ -37 +37 @@
 
     // session operations
-    void addKey(in Uint8Array key)
+    void update(in Uint8Array key)
         raises(DOMException);
     void close();

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

@@ -2543 +2543 @@
     static bool firstTime = true;
     if (firstTime && context() && context()->scriptExecutionContext()) {
-        context()->scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "'HTMLMediaElement.webkitAddKey()' is deprecated.  Use 'MediaKeySession.addKey()' instead.");
+        context()->scriptExecutionContext()->addConsoleMessage(JSMessageSource, WarningMessageLevel, "'HTMLMediaElement.webkitAddKey()' is deprecated.  Use 'MediaKeySession.update()' instead.");
         firstTime = false;
     }

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

@@ -43 +43 @@
     virtual PassRefPtr<Uint8Array> generateKeyRequest(const String& mimeType, Uint8Array* initData, String& destinationURL, unsigned short& errorCode, unsigned long& systemCode) OVERRIDE;
     virtual void releaseKeys() OVERRIDE;
-    virtual bool addKey(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) OVERRIDE;
+    virtual bool update(Uint8Array*, RefPtr<Uint8Array>& nextMessage, unsigned short& errorCode, unsigned long& systemCode) OVERRIDE;
 
 protected:
@@ -129 +129 @@
 }
 
-bool MockCDMSession::addKey(Uint8Array* key, RefPtr<Uint8Array>&, unsigned short& errorCode, unsigned long&)
+bool MockCDMSession::update(Uint8Array* key, RefPtr<Uint8Array>&, unsigned short& errorCode, unsigned long&)
 {
     for (unsigned i = 0; i < keyPrefix()->length(); ++i) {