Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax.html

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove all prefixed-related code from the EME browser tests. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/test/data/eme_player_js/utils.js ('K') | « third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-not-loaded-expected.txt ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax-expected.txt » ('j') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax.html b/third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax.html
deleted file mode 100644
index 80004c1d10ab2813c96a1c69865d734d8bdf0e4e..0000000000000000000000000000000000000000
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Tests invalid and valid syntaxes.</p>
-
- <script src=../../media-file.js></script>
- <script src=../../video-test.js></script>
- <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.");
- testException("video.webkitGenerateKeyRequest()", '"TypeError: Failed to execute \'webkitGenerateKeyRequest\' on \'HTMLMediaElement\': 1 argument required, but only 0 present."');
- testException("video.webkitAddKey()", '"TypeError: Failed to execute \'webkitAddKey\' on \'HTMLMediaElement\': 2 arguments required, but only 0 present."');
- testException("video.webkitAddKey('webkit-org.w3.clearkey')", '"TypeError: Failed to execute \'webkitAddKey\' on \'HTMLMediaElement\': 2 arguments required, but only 1 present."');
- testException("video.webkitCancelKeyRequest()", '"TypeError: Failed to execute \'webkitCancelKeyRequest\' on \'HTMLMediaElement\': 1 argument required, but only 0 present."');
-
- 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>
« media/test/data/eme_player_js/utils.js ('K') | « third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-not-loaded-expected.txt ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-syntax-expected.txt » ('j') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698