Diff
Modified: trunk/LayoutTests/ChangeLog (261159 => 261160)
--- trunk/LayoutTests/ChangeLog 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/ChangeLog 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,3 +1,30 @@
+2020-05-05 Charlie Turner <ctur...@igalia.com>
+
+ [EME] media/encrypted-media/encrypted-media-can-play-type.html is outdated
+ https://bugs.webkit.org/show_bug.cgi?id=154848
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Remove out-of-date EME tests and expectations.
+
+ * gpu-process/TestExpectations:
+ * media/encrypted-media/encrypted-media-events-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-events.html: Removed.
+ * media/encrypted-media/encrypted-media-not-loaded-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-not-loaded.html: Removed.
+ * media/encrypted-media/encrypted-media-syntax-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-syntax.html: Removed.
+ * media/encrypted-media/encrypted-media-v2-events-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-v2-events.html: Removed.
+ * media/encrypted-media/encrypted-media-v2-syntax-expected.txt: Removed.
+ * media/encrypted-media/encrypted-media-v2-syntax.html: Removed.
+ * platform/gtk/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/mac/media/encrypted-media/encrypted-media-can-play-type-expected.txt: Removed.
+ * platform/win/TestExpectations:
+ * platform/win/media/encrypted-media/encrypted-media-can-play-type-expected.txt: Removed.
+ * platform/wpe/TestExpectations:
+
2020-05-05 Diego Pino Garcia <dp...@igalia.com>
[GTK] Gardening, update baselines after r260889
Modified: trunk/LayoutTests/gpu-process/TestExpectations (261159 => 261160)
--- trunk/LayoutTests/gpu-process/TestExpectations 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/gpu-process/TestExpectations 2020-05-05 11:49:18 UTC (rev 261160)
@@ -198,9 +198,6 @@
media/encrypted-media/clearKey [ Skip ]
-media/encrypted-media/encrypted-media-events.html [ Skip ]
-media/encrypted-media/encrypted-media-not-loaded.html [ Skip ]
-media/encrypted-media/encrypted-media-syntax.html [ Skip ]
media/encrypted-media/mock-MediaKeySession-remove.html [ Skip ]
media/encrypted-media/mock-MediaKeySystemAccess.html [ Skip ]
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-events-expected.txt (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-events-expected.txt 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-events-expected.txt 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,128 +0,0 @@
-Test all the key-related events.
-
-*** Verify the presence of on* attributes. These would return undefined if they are not present. ***
-EXPECTED (video._onwebkitkeyadded_ === 'null') OK
-EXPECTED (video._onwebkitkeyerror_ === 'null') OK
-EXPECTED (video._onwebkitkeymessage_ === 'null') OK
-EXPECTED (video._onwebkitneedkey_ === 'null') OK
-
-*** Test events using on* attributes. ***
-EVENT(loadstart)
-
-RUN(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData))
-keymessage event occurred
-EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.WebKitMediaKeyEvent == 'true') OK
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-The sessionId should be a non-empty string containing an integer.
-EXPECTED (event.sessionId != '') OK
-EXPECTED (event.sessionId != 'null') OK
-EXPECTED (event.sessionId != 'undefined') OK
-EXPECTED (isNaN(event.sessionId) == 'false') OK
-EXPECTED (String(event.sessionId) == String(parseInt(event.sessionId)) == 'true') OK
-Implementations should avoid sessionIds of 0.
-EXPECTED (event.sessionId > '0') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message.length == '3') OK
-EXPECTED (event.message[0] == '65') OK
-EXPECTED (event.message[1] == '66') OK
-EXPECTED (event.message[2] == '67') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode === 'null') OK
-EXPECTED (event.systemCode == '0') OK
-
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key, event.initData, event.sessionId))
-keyadded event occurred
-EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.WebKitMediaKeyEvent == 'true') OK
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-EXPECTED (event.sessionId == keyMessageSessionId == 'true') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message === 'null') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode === 'null') OK
-EXPECTED (event.systemCode == '0') OK
-
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', invalidKey, null, event.sessionId))
-keyerror event occurred
-EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.WebKitMediaKeyEvent == 'true') OK
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-EXPECTED (event.sessionId == keyMessageSessionId == 'true') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message === 'null') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode.code == '1') OK
-EXPECTED (event.systemCode == '0') OK
-
-*** Test events using addEventListener(). ***
-EVENT(loadstart)
-
-RUN(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData))
-EVENT(webkitkeymessage)
-keymessage event occurred
-EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.WebKitMediaKeyEvent == 'true') OK
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-The sessionId should be a non-empty string containing an integer.
-EXPECTED (event.sessionId != '') OK
-EXPECTED (event.sessionId != 'null') OK
-EXPECTED (event.sessionId != 'undefined') OK
-EXPECTED (isNaN(event.sessionId) == 'false') OK
-EXPECTED (String(event.sessionId) == String(parseInt(event.sessionId)) == 'true') OK
-Implementations should avoid sessionIds of 0.
-EXPECTED (event.sessionId > '0') OK
-The sessionsId should be different from the first run.
-EXPECTED (event.sessionId != '1') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message.length == '3') OK
-EXPECTED (event.message[0] == '65') OK
-EXPECTED (event.message[1] == '66') OK
-EXPECTED (event.message[2] == '67') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode === 'null') OK
-EXPECTED (event.systemCode == '0') OK
-
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key, event.initData, event.sessionId))
-EVENT(webkitkeyadded)
-keyadded event occurred
-EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.WebKitMediaKeyEvent == 'true') OK
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-EXPECTED (event.sessionId == keyMessageSessionId == 'true') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message === 'null') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode === 'null') OK
-EXPECTED (event.systemCode == '0') OK
-
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', invalidKey, null, event.sessionId))
-EVENT(webkitkeyerror)
-keyerror event occurred
-EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.WebKitMediaKeyEvent == 'true') OK
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-EXPECTED (event.sessionId == keyMessageSessionId == 'true') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message === 'null') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode.code == '1') OK
-EXPECTED (event.systemCode == '0') OK
-
-Attributes are read-only.
-RUN(event.keySystem = 'blah')
-RUN(event.sessionId = 'blah')
-RUN(event.initData = new Uint8Array([0x12]))
-RUN(event.message = new Uint8Array([0x12]))
-RUN(event.defaultURL = 'example.com')
-RUN(event.errorCode.code = WebKitMediaKeyError.MEDIA_KEYERR_CLIENT)
-RUN(event.systemCode = 123)
-EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
-EXPECTED (event.sessionId == keyMessageSessionId == 'true') OK
-EXPECTED (event.initData === 'null') OK
-EXPECTED (event.message === 'null') OK
-EXPECTED (event.defaultURL == '') OK
-EXPECTED (event.errorCode.code == '1') OK
-EXPECTED (event.systemCode == '0') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-events.html (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-events.html 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-events.html 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,197 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Test all the key-related events.</p>
-
- <script src=""
- <script src=""
- <script>
- // The test runs twice, once using on* and then using addEventListener().
- var isFirstRun = true;
-
- var initData = new Uint8Array([0x41, 0x42, 0x43]);
- // 128 bit key.
- var key = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
- 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70]);
- // This key will cause an asynchronous error because it is too short.
- var invalidKey = new Uint8Array([0x61]);
-
- // After the first keyMessage event, the sessionId should always be the same.
- // Initialize it to an invalid value until then.
- var keyMessageSessionId = -1;
- // Remember the first ID to make sure the second one is different.
- var firstRunKeyMessageSessionId = -1;
-
- function keyAdded(event)
- {
- consoleWrite("keyadded event occurred");
-
- testExpected("event.target", video);
- testExpected("event instanceof window.WebKitMediaKeyEvent", true);
-
- testExpected("event.keySystem", "webkit-org.w3.clearkey");
- testExpected("event.sessionId == keyMessageSessionId", true);
- // The other attributes are not used for this event.
- testExpected("event.initData", null, "===");
- testExpected("event.message", null, "===");
- testExpected("event.defaultURL", "");
- testExpected("event.errorCode", null, "===");
- testExpected("event.systemCode", 0);
-
- consoleWrite("");
- // Cause a keyerror by passing an invalid key.
- run("video.webkitAddKey('webkit-org.w3.clearkey', invalidKey, null, event.sessionId)");
- }
-
- function keyError(event)
- {
- consoleWrite("keyerror event occurred");
-
- testExpected("event.target", video);
- testExpected("event instanceof window.WebKitMediaKeyEvent", true);
-
- testExpected("event.keySystem", "webkit-org.w3.clearkey");
- testExpected("event.sessionId == keyMessageSessionId", true);
- // The next three attributes are not used for this event.
- testExpected("event.initData", null, "===");
- testExpected("event.message", null, "===");
- testExpected("event.defaultURL", "");
- testExpected("event.errorCode.code", WebKitMediaKeyError.MEDIA_KEYERR_UNKNOWN);
- // systemCode is not supported by the Clear Key key system.
- testExpected("event.systemCode", 0);
-
- if (isFirstRun) {
- isFirstRun = false;
- runTest();
- } else {
- consoleWrite("");
- consoleWrite("Attributes are read-only.");
- run("event.keySystem = 'blah'");
- run("event.sessionId = 'blah'");
- run("event.initData = new Uint8Array([0x12])");
- run("event.message = new Uint8Array([0x12])");
- run("event.defaultURL = 'example.com'");
- run("event.errorCode.code = WebKitMediaKeyError.MEDIA_KEYERR_CLIENT");
- run("event.systemCode = 123");
-
- testExpected("event.keySystem", "webkit-org.w3.clearkey");
- testExpected("event.sessionId == keyMessageSessionId", true);
- testExpected("event.initData", null, "===");
- testExpected("event.message", null, "===");
- testExpected("event.defaultURL", "");
- testExpected("event.errorCode.code", WebKitMediaKeyError.MEDIA_KEYERR_UNKNOWN);
- testExpected("event.systemCode", 0);
-
- endTest();
- }
- }
-
- function keyMessage(event)
- {
- consoleWrite("keymessage event occurred");
-
- testExpected("event.target", video);
- testExpected("event instanceof window.WebKitMediaKeyEvent", true);
-
- testExpected("event.keySystem", "webkit-org.w3.clearkey");
-
- consoleWrite("The sessionId should be a non-empty string containing an integer.");
- testExpected("event.sessionId", "", "!=");
- testExpected("event.sessionId", null, "!=");
- testExpected("event.sessionId", undefined, "!=");
- testExpected("isNaN(event.sessionId)", false);
- // Make sure the number is not a float.
- testExpected("String(event.sessionId) == String(parseInt(event.sessionId))", true);
- consoleWrite("Implementations should avoid sessionIds of 0.");
- testExpected("event.sessionId", 0, ">");
- // All other events should have this same sessionId.
- keyMessageSessionId = event.sessionId;
- if (isFirstRun)
- firstRunKeyMessageSessionId = keyMessageSessionId;
- else {
- consoleWrite("The sessionsId should be different from the first run.");
- testExpected("event.sessionId", firstRunKeyMessageSessionId, "!=");
- }
-
- // initData is not used for this event.
- testExpected("event.initData", null, "===");
- // At least for now, the Clear Key message is the initData.
- testArraysEqual("event.message", initData);
- // Not supported by the test file.
- testExpected("event.defaultURL", "");
- // The error attributes are not used for this event.
- testExpected("event.errorCode", null, "===");
- testExpected("event.systemCode", 0);
-
- consoleWrite("");
- run("video.webkitAddKey('webkit-org.w3.clearkey', key, event.initData, event.sessionId)");
- }
-
- function needKey(event)
- {
- consoleWrite("needKey event occurred");
-
- testExpected("event.target", video);
- testExpected("event instanceof window.WebKitMediaKeyEvent", true);
-
- testExpected("event.keySystem", "webkit-org.w3.clearkey");
- testExpected("event.sessionId", "");
- testArraysEqual("event.initData", initData);
- // The other attributes are not used for this event.
- testExpected("event.message", null, "===");
- testExpected("event.defaultURL", "");
- testExpected("event.errorCode", null, "===");
- testExpected("event.systemCode", 0);
-
- consoleWrite("");
- run("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData)");
- }
-
- function runTest()
- {
- consoleWrite("");
- if (isFirstRun) {
- consoleWrite("*** Test events using on* attributes. ***");
- video._onwebkitkeyadded_=keyAdded;
- video._onwebkitkeyerror_=keyError;
- video._onwebkitkeymessage_=keyMessage;
- video._onwebkitneedkey_=needKey;
- } else {
- consoleWrite("*** Test events using addEventListener(). ***");
-
- // Clear the on* handlers.
- video._onwebkitkeyadded_=null;
- video._onwebkitkeyerror_=null;
- video._onwebkitkeymessage_=null;
- video._onwebkitneedkey_=null;
-
- waitForEvent('webkitkeyadded', keyAdded);
- waitForEvent('webkitkeyerror', keyError);
- waitForEvent('webkitkeymessage', keyMessage);
- waitForEvent('webkitneedkey', needKey);
- }
-
- // FIXME(82952): Temproary until we have a "test-encrypted" file that causes the needKey event.
- waitForEventOnce('loadstart',
- function() {
- consoleWrite("");
- run("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData)");
- });
-
- video.setAttribute("src", findMediaFile("video", "../content/test"));
- }
-
- consoleWrite("*** Verify the presence of on* attributes. These would return undefined if they are not present. ***");
- testExpected("video.onwebkitkeyadded", null, "===");
- testExpected("video.onwebkitkeyerror", null, "===");
- testExpected("video.onwebkitkeymessage", null, "===");
- testExpected("video.onwebkitneedkey", null, "===");
-
- runTest();
-
- </script>
- </body>
-</html>
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-not-loaded-expected.txt (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-not-loaded-expected.txt 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-not-loaded-expected.txt 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,28 +0,0 @@
-Test that the methods throw INVALID_STATE_ERR when the media element has not loaded. canPlayType() never throws.
-
-EXPECTED (video.networkState == '0') OK
-EXPECTED (video.currentSrc == '') OK
-No 'src'. Verify that all methods except canPlayType() throw INVALID_STATE_ERR.
-TEST(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey')) THROWS(DOMException.INVALID_STATE_ERR) OK
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', key)) THROWS(DOMException.INVALID_STATE_ERR) OK
-TEST(video.webkitCancelKeyRequest('webkit-org.w3.clearkey')) THROWS(DOMException.INVALID_STATE_ERR) OK
-RUN(video.canPlayType('audio/wav', 'webkit-org.w3.clearkey'))
-
-'src' has been set, but loading has not yet started. Verify that all methods except canPlayType() throw INVALID_STATE_ERR.
-EXPECTED (video.networkState == '3') OK
-EXPECTED (video.currentSrc == '') OK
-TEST(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey')) THROWS(DOMException.INVALID_STATE_ERR) OK
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', key)) THROWS(DOMException.INVALID_STATE_ERR) OK
-TEST(video.webkitCancelKeyRequest('webkit-org.w3.clearkey')) THROWS(DOMException.INVALID_STATE_ERR) OK
-RUN(video.canPlayType('audio/wav', 'webkit-org.w3.clearkey'))
-
-EVENT(loadstart)
-TEST(video.networkState == video.NETWORK_LOADING || video.networkState == video.NETWORK_IDLE) OK
-EXPECTED (video.currentSrc != '') OK
-Verify that none of the methods throw when load has started.
-RUN(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey'))
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key))
-RUN(video.webkitCancelKeyRequest('webkit-org.w3.clearkey'))
-RUN(video.canPlayType('audio/wav', 'webkit-org.w3.clearkey'))
-END OF TEST
-
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-not-loaded.html (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-not-loaded.html 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-not-loaded.html 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,54 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Test that the methods throw INVALID_STATE_ERR when the media element has not loaded. canPlayType() never throws.</p>
-
- <script src=""
- <script src=""
- <script>
- var key = new Uint8Array([0x51, 0x52, 0x53]);
-
- function loadStarted()
- {
- test("video.networkState == video.NETWORK_LOADING || video.networkState == video.NETWORK_IDLE");
- testExpected("video.currentSrc", "", "!=");
- consoleWrite("Verify that none of the methods throw when load has started.");
- run("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey')");
- run("video.webkitAddKey('webkit-org.w3.clearkey', key)");
- run("video.webkitCancelKeyRequest('webkit-org.w3.clearkey')");
- run("video.canPlayType('audio/wav', 'webkit-org.w3.clearkey')");
-
- endTest();
- }
-
- // Confirms the unloaded state.
- testExpected("video.networkState", video.NETWORK_EMPTY);
- testExpected("video.currentSrc", "");
-
- consoleWrite("No 'src'. Verify that all methods except canPlayType() throw INVALID_STATE_ERR.");
- testDOMException("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey')", "DOMException.INVALID_STATE_ERR");
- testDOMException("video.webkitAddKey('webkit-org.w3.clearkey', key)", "DOMException.INVALID_STATE_ERR");
- testDOMException("video.webkitCancelKeyRequest('webkit-org.w3.clearkey')", "DOMException.INVALID_STATE_ERR");
- run("video.canPlayType('audio/wav', 'webkit-org.w3.clearkey')");
-
- video.setAttribute("src", findMediaFile("video", "../content/test"));
-
- consoleWrite("<br>'src' has been set, but loading has not yet started. Verify that all methods except canPlayType() throw INVALID_STATE_ERR.");
-
- testExpected("video.networkState", video.NETWORK_NO_SOURCE);
- testExpected("video.currentSrc", "");
-
- testDOMException("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey')", "DOMException.INVALID_STATE_ERR");
- testDOMException("video.webkitAddKey('webkit-org.w3.clearkey', key)", "DOMException.INVALID_STATE_ERR");
- testDOMException("video.webkitCancelKeyRequest('webkit-org.w3.clearkey')", "DOMException.INVALID_STATE_ERR");
- run("video.canPlayType('audio/wav', 'webkit-org.w3.clearkey')");
-
-
- consoleWrite("");
- waitForEvent('loadstart', loadStarted);
- </script>
- </body>
-</html>
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax-expected.txt 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,53 +0,0 @@
-Tests invalid and valid syntaxes.
-
-Test calling functions with too few parameters.
-TEST(video.webkitGenerateKeyRequest()) THROWS("TypeError: Not enough arguments") OK
-TEST(video.webkitAddKey()) THROWS("TypeError: Not enough arguments") OK
-TEST(video.webkitAddKey('webkit-org.w3.clearkey')) THROWS("TypeError: Not enough arguments") OK
-TEST(video.webkitCancelKeyRequest()) THROWS("TypeError: Not enough arguments") OK
-
-Verify invalid key system parameter is caught before checking whether loading has started.
-EXPECTED (video.networkState == '0') OK
-EXPECTED (video.currentSrc == '') OK
-TEST(video.webkitGenerateKeyRequest('')) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitGenerateKeyRequest(null)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitGenerateKeyRequest(undefined)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitAddKey('', key)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitAddKey(null, key)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitAddKey(undefined, key)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitCancelKeyRequest('')) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitCancelKeyRequest(null)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitCancelKeyRequest(undefined)) THROWS(DOMException.SYNTAX_ERR) OK
-
-null key is caught before load state is checked.
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', '')) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', null)) THROWS(DOMException.SYNTAX_ERR) OK
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', undefined)) THROWS(DOMException.SYNTAX_ERR) OK
-
-0-length key is caught before load state is checked.
-TEST(video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())) THROWS(DOMException.TYPE_MISMATCH_ERR) OK
-
-Key system validity is not checked before loading.
-TEST(video.webkitGenerateKeyRequest('com.example.invalid')) THROWS(DOMException.INVALID_STATE_ERR) OK
-TEST(video.webkitAddKey('com.example.invalid', key)) THROWS(DOMException.INVALID_STATE_ERR) OK
-TEST(video.webkitCancelKeyRequest('com.example.invalid')) THROWS(DOMException.INVALID_STATE_ERR) OK
-
-EVENT(loadstart)
-Verify valid syntaxes do not throw.
-EXPECTED (video.networkState == '2') OK
-EXPECTED (video.currentSrc != '') OK
-RUN(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey'))
-RUN(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData))
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key))
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key, 'session'))
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key, initData))
-RUN(video.webkitAddKey('webkit-org.w3.clearkey', key, initData, 'session'))
-RUN(video.webkitCancelKeyRequest('webkit-org.w3.clearkey'))
-RUN(video.webkitCancelKeyRequest('webkit-org.w3.clearkey', 'session'))
-
-Unsupported key systems result in NOT_SUPPORTED_ERR.
-TEST(video.webkitGenerateKeyRequest('com.example.invalid')) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
-TEST(video.webkitAddKey('com.example.invalid', key)) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
-TEST(video.webkitCancelKeyRequest('com.example.invalid')) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax.html (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax.html 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-syntax.html 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,78 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Tests invalid and valid syntaxes.</p>
-
- <script src=""
- <script src=""
- <script>
- var initData = new Uint8Array([0x51, 0x52, 0x53]);
- var key = initData;
-
- function loadStarted()
- {
- consoleWrite("Verify valid syntaxes do not throw.");
- testExpected("video.networkState", video.NETWORK_LOADING);
- testExpected("video.currentSrc", "", "!=");
- run("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey')");
- run("video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData)");
- run("video.webkitAddKey('webkit-org.w3.clearkey', key)");
- run("video.webkitAddKey('webkit-org.w3.clearkey', key, 'session')");
- run("video.webkitAddKey('webkit-org.w3.clearkey', key, initData)");
- run("video.webkitAddKey('webkit-org.w3.clearkey', key, initData, 'session')");
- run("video.webkitCancelKeyRequest('webkit-org.w3.clearkey')");
- run("video.webkitCancelKeyRequest('webkit-org.w3.clearkey', 'session')");
-
- consoleWrite("<br>Unsupported key systems result in NOT_SUPPORTED_ERR.");
- testDOMException("video.webkitGenerateKeyRequest('com.example.invalid')", "DOMException.NOT_SUPPORTED_ERR");
- testDOMException("video.webkitAddKey('com.example.invalid', key)", "DOMException.NOT_SUPPORTED_ERR");
- testDOMException("video.webkitCancelKeyRequest('com.example.invalid')", "DOMException.NOT_SUPPORTED_ERR");
-
- endTest();
- }
-
- consoleWrite("Test calling functions with too few parameters.");
- var notEnoughArgumentsException = '"TypeError: Not enough arguments"';
- testException("video.webkitGenerateKeyRequest()", notEnoughArgumentsException);
- testException("video.webkitAddKey()", notEnoughArgumentsException);
- testException("video.webkitAddKey('webkit-org.w3.clearkey')", notEnoughArgumentsException);
- testException("video.webkitCancelKeyRequest()", notEnoughArgumentsException);
-
- consoleWrite("<br>Verify invalid key system parameter is caught before checking whether loading has started.");
- // If the above was not the case, all of these would be INVALID_STATE_ERR.
- // Also tests "null" case for first parameter.
- testExpected("video.networkState", video.NETWORK_EMPTY);
- testExpected("video.currentSrc", "");
- testDOMException("video.webkitGenerateKeyRequest('')", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitGenerateKeyRequest(null)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitGenerateKeyRequest(undefined)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitAddKey('', key)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitAddKey(null, key)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitAddKey(undefined, key)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitCancelKeyRequest('')", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitCancelKeyRequest(null)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitCancelKeyRequest(undefined)", "DOMException.SYNTAX_ERR");
-
- consoleWrite("<br>null key is caught before load state is checked.");
- testDOMException("video.webkitAddKey('webkit-org.w3.clearkey', '')", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitAddKey('webkit-org.w3.clearkey', null)", "DOMException.SYNTAX_ERR");
- testDOMException("video.webkitAddKey('webkit-org.w3.clearkey', undefined)", "DOMException.SYNTAX_ERR");
-
- consoleWrite("<br>0-length key is caught before load state is checked.");
- testDOMException("video.webkitAddKey('webkit-org.w3.clearkey', new Uint8Array())", "DOMException.TYPE_MISMATCH_ERR");
-
- consoleWrite("<br>Key system validity is not checked before loading.");
- testDOMException("video.webkitGenerateKeyRequest('com.example.invalid')", "DOMException.INVALID_STATE_ERR");
- testDOMException("video.webkitAddKey('com.example.invalid', key)", "DOMException.INVALID_STATE_ERR");
- testDOMException("video.webkitCancelKeyRequest('com.example.invalid')", "DOMException.INVALID_STATE_ERR");
-
- // FIXME(82952): Add "test-encrypted" file.
- video.setAttribute("src", findMediaFile("video", "../content/test"));
- consoleWrite("");
- waitForEvent('loadstart', loadStarted);
- </script>
- </body>
-</html>
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-events-expected.txt (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-events-expected.txt 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-events-expected.txt 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,11 +0,0 @@
-This tests the events created by WebKitMediaKeys.
-
-RUN(mediaKeys = new WebKitMediaKeys("com.webcore.mock"))
-RUN(mediaKeySession = mediaKeys.createSession("video/mock", initData))
-EVENT(webkitkeymessage)
-RUN(mediaKeySession.update(invalidKey))
-EVENT(webkitkeyerror)
-RUN(mediaKeySession.update(validKey))
-EVENT(webkitkeyadded)
-END OF TEST
-
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-events.html (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-events.html 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-events.html 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>WebKitMediaKeys</title>
- <script src=""
- <script>
- function stringToUint8Array(str)
- {
- var arr=[];
- for(var i=0,j=str.length;i<j;++i)
- arr[i]=str.charCodeAt(i);
- return new Uint8Array(arr);
- }
-
- var mediaKeys;
- var mediaKeySession;
- var initData = stringToUint8Array('mock');
- var invalidKey = stringToUint8Array('invalid');
- var validKey = stringToUint8Array('key');
-
- function runTest()
- {
- // Initialize the MockCDM. It supports the key system 'com.apple.mock', the
- // mime type 'video/mock'. It requires init data to begin with 'mock', and
- // keys to begin with 'key'.
- if (internals)
- internals.initializeMockCDM();
-
- run('mediaKeys = new WebKitMediaKeys("com.webcore.mock")');
- run('mediaKeySession = mediaKeys.createSession("video/mock", initData)');
- waitForEvent('webkitkeymessage', keyMessage, false, false, mediaKeySession);
- waitForEvent('webkitkeyerror', keyError, false, false, mediaKeySession);
- waitForEvent('webkitkeyadded', null, true, false, mediaKeySession);
- }
-
- function keyMessage(event)
- {
- run('mediaKeySession.update(invalidKey)');
- }
-
- function keyError(event)
- {
- run('mediaKeySession.update(validKey)');
- }
- </script>
- </head>
- <body _onload_="runTest()">
- <p>This tests the events created by WebKitMediaKeys.</p>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,27 +0,0 @@
-This tests the basic API of WebKitMediaKeys and WebKitMediaKeySession.
-
-Test WebKitMediaKeys.
-EXPECTED (typeof window.WebKitMediaKeys == 'function') OK
-TEST(new WebKitMediaKeys("")) THROWS(DOMException.INVALID_ACCESS_ERR) OK
-TEST(new WebKitMediaKeys("unsupported")) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
-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('TypeError: Not enough arguments') OK
-TEST(mediaKeys.createSession("unsupported/type", new Uint8Array(1))) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
-
-Test WebKitMediaKeySession.
-RUN(mediaKeySession = mediaKeys.createSession("video/mock", initData))
-EXPECTED (typeof mediaKeySession == 'object') OK
-EXPECTED (typeof mediaKeySession.addEventListener == 'function') OK
-EXPECTED (typeof mediaKeySession.update == 'function') OK
-EXPECTED (mediaKeySession.error == 'null') OK
-EXPECTED (mediaKeySession.keySystem == 'com.webcore.mock') OK
-EXPECTED (mediaKeySession.sessionId != 'null') OK
-EXPECTED (mediaKeySession._onwebkitkeyadded_ == 'null') OK
-EXPECTED (mediaKeySession._onwebkitkeyerror_ == 'null') OK
-EXPECTED (mediaKeySession._onwebkitkeymessage_ == 'null') OK
-TEST(mediaKeySession.update(null)) THROWS('TypeError: Argument 1 (\'key\') to WebKitMediaKeySession.update must be an instance of Uint8Array') OK
-END OF TEST
-
Deleted: trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html (261159 => 261160)
--- trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>WebKitMediaKeys</title>
- <script src=""
- <script>
- function stringToUint8Array(str)
- {
- var arr=[];
- for(var i=0,j=str.length;i<j;++i)
- arr[i]=str.charCodeAt(i);
- return new Uint8Array(arr);
- }
-
- var mediaKeys;
- var mediaKeySession;
- var initData = stringToUint8Array('mock');
-
- function runTest()
- {
- // Initialize the MockCDM. It supports the key system 'com.apple.mock', the
- // mime type 'video/mock'. It requires init data to begin with 'mock', and
- // keys to begin with 'key'.
- if (internals)
- internals.initializeMockCDM();
-
- consoleWrite("Test WebKitMediaKeys.");
- testExpected('typeof window.WebKitMediaKeys', 'function');
- testDOMException('new WebKitMediaKeys("")', "DOMException.INVALID_ACCESS_ERR");
- testDOMException('new WebKitMediaKeys("unsupported")', "DOMException.NOT_SUPPORTED_ERR");
- run('mediaKeys = new WebKitMediaKeys("com.webcore.mock")');
- testExpected('mediaKeys.keySystem', 'com.webcore.mock');
- testExpected('typeof mediaKeys.createSession', 'function');
- testDOMException('mediaKeys.createSession("", new Uint8Array(1))', "DOMException.INVALID_ACCESS_ERR");
- testException('mediaKeys.createSession("unsupported/type")', "'TypeError: Not enough arguments'");
- testDOMException('mediaKeys.createSession("unsupported/type", new Uint8Array(1))', "DOMException.NOT_SUPPORTED_ERR");
- consoleWrite("");
-
- consoleWrite("Test WebKitMediaKeySession.");
- run('mediaKeySession = mediaKeys.createSession("video/mock", initData)');
- testExpected('typeof mediaKeySession', 'object');
- testExpected('typeof mediaKeySession.addEventListener', 'function');
- testExpected('typeof mediaKeySession.update', 'function');
- testExpected('mediaKeySession.error', null);
- testExpected('mediaKeySession.keySystem', 'com.webcore.mock');
- testExpected('mediaKeySession.sessionId', null, '!=');
- testExpected('mediaKeySession.onwebkitkeyadded', null);
- testExpected('mediaKeySession.onwebkitkeyerror', null);
- testExpected('mediaKeySession.onwebkitkeymessage', null);
- testException('mediaKeySession.update(null)', "'TypeError: Argument 1 (\\'key\\') to WebKitMediaKeySession.update must be an instance of Uint8Array'");
- endTest();
- }
- </script>
- </head>
- <body _onload_="runTest()">
- <p>This tests the basic API of WebKitMediaKeys and WebKitMediaKeySession.</p>
- </body>
-</html>
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (261159 => 261160)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1713,8 +1713,6 @@
webkit.org/b/98133 fast/css/sticky/sticky-writing-mode-vertical-rl.html [ ImageOnlyFailure Pass ]
webkit.org/b/104809 media/adopt-node-crash.html [ Crash Timeout Pass ]
-webkit.org/b/104809 media/encrypted-media/encrypted-media-not-loaded.html [ Failure Timeout Crash ]
-webkit.org/b/104809 media/encrypted-media/encrypted-media-syntax.html [ Failure Timeout Crash ]
webkit.org/b/104809 media/track/track-cues-pause-on-exit.html [ Timeout Pass Crash ]
# This test also crashes after the FTL merge
@@ -4429,10 +4427,7 @@
webkit.org/b/190991 imported/w3c/web-platform-tests/encrypted-media/ [ Skip ]
webkit.org/b/190991 media/encrypted-media/encrypted-media-constants.html [ Failure ]
webkit.org/b/190991 media/encrypted-media/encrypted-media-is-type-supported.html [ Failure ]
-webkit.org/b/190991 media/encrypted-media/encrypted-media-events.html [ Crash Timeout ]
webkit.org/b/190991 media/encrypted-media/encrypted-media-session-lifetime.html [ Timeout ]
-webkit.org/b/190991 media/encrypted-media/encrypted-media-v2-events.html [ Timeout ]
-webkit.org/b/190991 media/encrypted-media/encrypted-media-v2-syntax.html [ Timeout ]
webkit.org/b/190991 http/tests/navigation/page-cache-mediakeysession.html [ Skip ]
webkit.org/b/191000 imported/w3c/web-platform-tests/shadow-dom/input-element-list.html [ Failure ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (261159 => 261160)
--- trunk/LayoutTests/platform/mac/TestExpectations 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2020-05-05 11:49:18 UTC (rev 261160)
@@ -719,11 +719,6 @@
# This test uses movie matricies, which AVFoundation and QTKit64 do not support.
media/video-size-intrinsic-scale.html [ WontFix ]
-# These tests are for an obsolete version of the EME spec.
-media/encrypted-media/encrypted-media-events.html [ WontFix ]
-media/encrypted-media/encrypted-media-not-loaded.html [ WontFix ]
-media/encrypted-media/encrypted-media-syntax.html [ WontFix ]
-
# This test requires media engines not purge buffered date before currentTime.
http/tests/media/video-buffered.html [ WontFix ]
## --- End media wontfix tests ---
Deleted: trunk/LayoutTests/platform/mac/media/encrypted-media/encrypted-media-can-play-type-expected.txt (261159 => 261160)
--- trunk/LayoutTests/platform/mac/media/encrypted-media/encrypted-media-can-play-type-expected.txt 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/platform/mac/media/encrypted-media/encrypted-media-can-play-type-expected.txt 2020-05-05 11:49:18 UTC (rev 261160)
@@ -1,76 +0,0 @@
-
-Test Encrypted Media extension of HTMLMediaElement canPlayType() method.
-
-The test is designed to pass with any implementation regardless of supported media types and relies on the expected log to detect the expected results for some types. To get sufficient coverage, it is important that an implementation support clearkey encryption of at least one of the types below.
-
-Always return the empty string for no type.
-TEST(video.canPlayType()) THROWS('TypeError: Not enough arguments') OK
-
-Always return the empty string for an empty type.
-EXPECTED (video.canPlayType('') == '') OK
-EXPECTED (video.canPlayType('', '') == '') OK
-EXPECTED (video.canPlayType('', null) == '') OK
-EXPECTED (video.canPlayType('', undefined) == '') OK
-EXPECTED (video.canPlayType('', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('', 'com.example.invalid') == '') OK
-
-Always return the empty string for when no container is specified.
-EXPECTED (video.canPlayType('video/') == '') OK
-EXPECTED (video.canPlayType('video/', '') == '') OK
-EXPECTED (video.canPlayType('video/', null) == '') OK
-EXPECTED (video.canPlayType('video/', undefined) == '') OK
-EXPECTED (video.canPlayType('video/', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/', 'com.example.invalid') == '') OK
-
-Always return the empty string for an unsupported container.
-EXPECTED (video.canPlayType('video/blahblah') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', '') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', null) == '') OK
-EXPECTED (video.canPlayType('video/blahblah', undefined) == '') OK
-EXPECTED (video.canPlayType('video/blahblah', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/blahblah', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of video/mp4 types.
-Result of video.canPlayType('video/mp4; Codecs="avc1.4D400C"'): 'probably'
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', '') == 'probably') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', null) == 'probably') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', undefined) == 'probably') OK
-There are currently no implementations supporting encryption of video/mp4.
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/mp4; Codecs="avc1.4D400C"', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of audio/mpeg types.
-Result of video.canPlayType('audio/mpeg'): 'maybe'
-EXPECTED (video.canPlayType('audio/mpeg', '') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/mpeg', null) == 'maybe') OK
-EXPECTED (video.canPlayType('audio/mpeg', undefined) == 'maybe') OK
-There are currently no implementations supporting encryption of audio/mpeg.
-EXPECTED (video.canPlayType('audio/mpeg', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('audio/mpeg', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('audio/mpeg', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of audio/wav types.
-Result of video.canPlayType('audio/wav'): 'maybe'
-EXPECTED (video.canPlayType('audio/wav', '') == 'maybe') OK
-EXPECTED (video.canPlayType('audio/wav', null) == 'maybe') OK
-EXPECTED (video.canPlayType('audio/wav', undefined) == 'maybe') OK
-There are currently no implementations supporting encryption of audio/wav.
-EXPECTED (video.canPlayType('audio/wav', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('audio/wav', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('audio/wav', 'com.example.invalid') == '') OK
-
-Empty key system parameters should not affect the result of video/webm types.
-Result of video.canPlayType('video/webm'): ''
-EXPECTED (video.canPlayType('video/webm', '') == '') OK
-EXPECTED (video.canPlayType('video/webm', null) == '') OK
-EXPECTED (video.canPlayType('video/webm', undefined) == '') OK
-All implementations that support WebM and Encrypted Media support encrypted WebM.
-EXPECTED (video.canPlayType('video/webm', 'webkit-org.w3.clearkey') == '') OK
-EXPECTED (video.canPlayType('video/webm', 'WeBkIt-OrG.W3.ClEaRkEy') == '') OK
-EXPECTED (video.canPlayType('video/webm', 'com.example.invalid') == '') OK
-END OF TEST
-
Modified: trunk/LayoutTests/platform/win/TestExpectations (261159 => 261160)
--- trunk/LayoutTests/platform/win/TestExpectations 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/platform/win/TestExpectations 2020-05-05 11:49:18 UTC (rev 261160)
@@ -897,11 +897,6 @@
webkit.org/b/64731 fast/history/page-cache-removed-source-buffer.html [ Skip ]
webkit.org/b/161906 imported/w3c/web-platform-tests/media-source [ Skip ]
-# These tests are for an obsolete version of the EME spec.
-media/encrypted-media/encrypted-media-events.html [ Skip ] # [ WontFix ]
-media/encrypted-media/encrypted-media-not-loaded.html [ Skip ] # [ WontFix ]
-media/encrypted-media/encrypted-media-syntax.html [ Skip ] # [ WontFix ]
-
webkit.org/b/103442 media/W3C/video/networkState/networkState_during_progress.html [ Skip ]
# No CORS support for media elements is implemented yet.
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (261159 => 261160)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2020-05-05 11:33:21 UTC (rev 261159)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2020-05-05 11:49:18 UTC (rev 261160)
@@ -2018,13 +2018,8 @@
media/encrypted-media [ Pass ]
media/encrypted-media/encrypted-media-constants.html [ Skip ]
-media/encrypted-media/encrypted-media-events.html [ Skip ]
media/encrypted-media/encrypted-media-is-type-supported.html [ Skip ]
-media/encrypted-media/encrypted-media-not-loaded.html [ Skip ]
media/encrypted-media/encrypted-media-session-lifetime.html [ Skip ]
-media/encrypted-media/encrypted-media-syntax.html [ Skip ]
-media/encrypted-media/encrypted-media-v2-events.html [ Skip ]
-media/encrypted-media/encrypted-media-v2-syntax.html [ Skip ]
webkit.org/b/182050 http/wpt/fetch/response-opaque-clone.html [ Pass Crash ]
webkit.org/b/168543 http/wpt/resource-timing/rt-nextHopProtocol.html [ Failure ]
