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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.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-constants-expected.txt ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events-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-events.html
diff --git a/third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html b/third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html
deleted file mode 100644
index dcd60c7e6dc0731e1c20a970b2f8051af042c1eb..0000000000000000000000000000000000000000
--- a/third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!doctype html>
-<html lang="en">
- <head>
- </head>
- <body>
- <video></video>
- <p>Test all the key-related events.</p>
-
- <script src="../encrypted-media-utils.js"></script>
- <script src=../../media-file.js></script>
- <script src=../../video-test.js></script>
- <script>
- // First, try explicitly creating those events with specific IDL.
- var keyNeededEvent = document.createEvent("MediaKeyEvent");
- testExpected("keyNeededEvent", null, "!=");
- testExpected("keyNeededEvent instanceof window.MediaKeyEvent", true);
-
- // Next, The test runs twice, once using on* and then using addEventListener().
- var isFirstRun = true;
-
- // The Initialization Data in test-encrypted.webm.
- var expectedInitData = stringToUint8Array('0123456789012345');
- // A 128-bit key. It is not the actual key for test-encrypted.webm.
- 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.MediaKeyEvent", 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.MediaKeyEvent", 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", MediaKeyError.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 = MediaKeyError.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", MediaKeyError.MEDIA_KEYERR_UNKNOWN);
- testExpected("event.systemCode", 0);
-
- endTest();
- }
- }
-
- function keyMessage(event)
- {
- consoleWrite("keymessage event occurred");
-
- testExpected("event.target", video);
- testExpected("event instanceof window.MediaKeyEvent", 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", true);
- }
-
- // 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", expectedInitData);
- // 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");
- // Clear the handler (for the first case) to prevent the second needkey event
- // (there will be one each for audio and video) from being handled.
- video.onwebkitneedkey=null;
-
- testExpected("event.target", video);
- testExpected("event instanceof window.MediaKeyEvent", true);
-
- testExpected("event.keySystem", "");
- testExpected("event.sessionId", "");
- testArraysEqual("event.initData", expectedInitData);
- // 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', event.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);
- waitForEventOnce('webkitneedkey', needKey);
- }
-
- video.src = "../../content/test-encrypted.webm";
- }
-
- consoleWrite("");
- 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>
« media/test/data/eme_player_js/utils.js ('K') | « third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-constants-expected.txt ('k') | third_party/WebKit/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events-expected.txt » ('j') | third_party/WebKit/Source/core/html/HTMLMediaElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698