Title: [173520] trunk
- Revision
- 173520
- Author
- [email protected]
- Date
- 2014-09-11 11:24:17 -0700 (Thu, 11 Sep 2014)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (173519 => 173520)
--- trunk/LayoutTests/ChangeLog 2014-09-11 18:21:04 UTC (rev 173519)
+++ trunk/LayoutTests/ChangeLog 2014-09-11 18:24:17 UTC (rev 173520)
@@ -1,5 +1,17 @@
2014-09-11 Jer Noble <[email protected]>
+ [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 <[email protected]>
+
Unreviewed gardening. Rebaseline tests and remove duplicate entry from TestExpectations.
* platform/mac/TestExpectations:
Modified: trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt (173519 => 173520)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt 2014-09-11 18:21:04 UTC (rev 173519)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt 2014-09-11 18:24:17 UTC (rev 173520)
@@ -8,7 +8,8 @@
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))
Modified: trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html (173519 => 173520)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html 2014-09-11 18:21:04 UTC (rev 173519)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html 2014-09-11 18:24:17 UTC (rev 173520)
@@ -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.");
Modified: trunk/Source/WebCore/ChangeLog (173519 => 173520)
--- trunk/Source/WebCore/ChangeLog 2014-09-11 18:21:04 UTC (rev 173519)
+++ trunk/Source/WebCore/ChangeLog 2014-09-11 18:24:17 UTC (rev 173520)
@@ -1,3 +1,15 @@
+2014-09-11 Jer Noble <[email protected]>
+
+ [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 <[email protected]>
[WK2] Authentication dialog is displayed for cross-origin XHR
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp (173519 => 173520)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2014-09-11 18:21:04 UTC (rev 173519)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2014-09-11 18:24:17 UTC (rev 173520)
@@ -85,7 +85,7 @@
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.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
