[EME] REGRESSION(??): test media/encrypted-media/encrypted-media-v2-syntax.html is...

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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173520 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2cf9e85..4d68dfe 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 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>
+
         Unreviewed gardening. Rebaseline tests and remove duplicate entry from TestExpectations.
 
         * platform/mac/TestExpectations:

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt b/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt
index edbea0b..d693d89 100644 (file)
--- a/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt
+++ b/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt
@@ -8,7 +8,8 @@ RUN(mediaKeys = new WebKitMediaKeys("com.webcore.mock"))
 EXPECTED (mediaKeys.keySystem == 'com.webcore.mock') OK
 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.
 RUN(mediaKeySession = mediaKeys.createSession("video/mock", initData))

diff --git a/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html b/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html
index 6bbd2b0..ff64b32 100644 (file)
--- a/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html
@@ -32,7 +32,8 @@
                 testExpected('mediaKeys.keySystem', 'com.webcore.mock');
                 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("");
 
                 consoleWrite("Test WebKitMediaKeySession.");

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e5962c6..8378935 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+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>
 
         [WK2] Authentication dialog is displayed for cross-origin XHR

diff --git a/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp b/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
index f3e37b1..dbf70ab 100644 (file)
--- a/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
+++ b/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp
@@ -85,7 +85,7 @@ MediaKeys::~MediaKeys()
 
 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.