Changeset 173520 in webkit

Timestamp:

Sep 11, 2014, 11:24:17 AM (12 years ago)

Author:

jer.noble@apple.com

Message:

[EME] REGRESSION(??): test media/encrypted-media/encrypted-media-v2-syntax.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=136723

Source/WebCore:

Reviewed by Eric Carlson.

Update a comment to point to the implemented Working Draft 18 Feburary 2014 version of the spec.

• Modules/encryptedmedia/MediaKeys.cpp:

(WebCore::MediaKeys::createSession):

LayoutTests:

Update the test to match the implemented Working Draft 18 Feburary 2014 version of the spec.

Reviewed by Eric Carlson.

• media/encrypted-media/encrypted-media-v2-syntax-expected.txt:
• media/encrypted-media/encrypted-media-v2-syntax.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt (modified) (1 diff)
• LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-09-11  Jer Noble  <jer.noble@apple.com>
+
+        [EME] REGRESSION(??): test media/encrypted-media/encrypted-media-v2-syntax.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=136723
+
+        Update the test to match the implemented Working Draft 18 Feburary 2014 version of the spec.
+
+        Reviewed by Eric Carlson.
+
+        * media/encrypted-media/encrypted-media-v2-syntax-expected.txt:
+        * media/encrypted-media/encrypted-media-v2-syntax.html:
+
 2014-09-11  Jer Noble  <jer.noble@apple.com>
 

trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt

@@ -9 +9 @@
 EXPECTED (typeof mediaKeys.createSession == 'function') OK
 TEST(mediaKeys.createSession("", new Uint8Array(1))) THROWS(DOMException.INVALID_ACCESS_ERR) OK
-TEST(mediaKeys.createSession("unsupported/type")) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
+TEST(mediaKeys.createSession("unsupported/type")) THROWS(DOMException.INVALID_ACCESS_ERR) OK
+TEST(mediaKeys.createSession("unsupported/type", new Uint8Array(1))) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
 
 Test WebKitMediaKeySession.

trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html

@@ -33 +33 @@
                 testExpected('typeof mediaKeys.createSession', 'function');
                 testDOMException('mediaKeys.createSession("", new Uint8Array(1))', "DOMException.INVALID_ACCESS_ERR");
-                testDOMException('mediaKeys.createSession("unsupported/type")', "DOMException.NOT_SUPPORTED_ERR");
+                testDOMException('mediaKeys.createSession("unsupported/type")', "DOMException.INVALID_ACCESS_ERR");
+                testDOMException('mediaKeys.createSession("unsupported/type", new Uint8Array(1))', "DOMException.NOT_SUPPORTED_ERR");
                 consoleWrite("");
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-11  Jer Noble  <jer.noble@apple.com>
+
+        [EME] REGRESSION(??): test media/encrypted-media/encrypted-media-v2-syntax.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=136723
+
+        Reviewed by Eric Carlson.
+
+        Update a comment to point to the implemented Working Draft 18 Feburary 2014 version of the spec.
+
+        * Modules/encryptedmedia/MediaKeys.cpp:
+        (WebCore::MediaKeys::createSession):
+
 2014-09-11  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp

@@ -86 +86 @@
 PassRefPtr<MediaKeySession> MediaKeys::createSession(ScriptExecutionContext* context, const String& type, Uint8Array* initData, ExceptionCode& ec)
 {
-    // From <http://dvcs.w3.org/hg/html-media/raw-file/tip/encrypted-media/encrypted-media.html#dom-createsession>:
+    // From <http://www.w3.org/TR/2014/WD-encrypted-media-20140218/#dom-createsession>:
     // The createSession(type, initData) method must run the following steps:
     // Note: The contents of initData are container-specific Initialization Data.