Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,5 +1,27 @@
2013-08-08 Lucas Forschler <lforsch...@apple.com>
+ Merge r153867
+
+ 2013-08-08 Jer Noble <jer.no...@apple.com>
+
+ [EME] MediaKey APIs should be prefixed.
+ https://bugs.webkit.org/show_bug.cgi?id=119606
+
+ Reviewed by Anders Carlsson.
+
+ * media/encrypted-media/encrypted-media-constants-expected.txt:
+ * media/encrypted-media/encrypted-media-constants.html:
+ * media/encrypted-media/encrypted-media-events-expected.txt:
+ * media/encrypted-media/encrypted-media-events.html:
+ * media/encrypted-media/encrypted-media-is-type-supported-expected.txt:
+ * media/encrypted-media/encrypted-media-is-type-supported.html:
+ * media/encrypted-media/encrypted-media-v2-events-expected.txt:
+ * media/encrypted-media/encrypted-media-v2-events.html:
+ * media/encrypted-media/encrypted-media-v2-syntax-expected.txt:
+ * media/encrypted-media/encrypted-media-v2-syntax.html:
+
+2013-08-08 Lucas Forschler <lforsch...@apple.com>
+
Merge r153851
2013-08-08 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-constants-expected.txt (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-constants-expected.txt 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-constants-expected.txt 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,11 +1,11 @@
-Test MediaKeyError constants and additional MediaError constant.
+Test WebKitMediaKeyError constants and additional MediaError constant.
-EXPECTED (MediaKeyError.MEDIA_KEYERR_UNKNOWN == '1') OK
-EXPECTED (MediaKeyError.MEDIA_KEYERR_CLIENT == '2') OK
-EXPECTED (MediaKeyError.MEDIA_KEYERR_SERVICE == '3') OK
-EXPECTED (MediaKeyError.MEDIA_KEYERR_OUTPUT == '4') OK
-EXPECTED (MediaKeyError.MEDIA_KEYERR_HARDWARECHANGE == '5') OK
-EXPECTED (MediaKeyError.MEDIA_KEYERR_DOMAIN == '6') OK
+EXPECTED (WebKitMediaKeyError.MEDIA_KEYERR_UNKNOWN == '1') OK
+EXPECTED (WebKitMediaKeyError.MEDIA_KEYERR_CLIENT == '2') OK
+EXPECTED (WebKitMediaKeyError.MEDIA_KEYERR_SERVICE == '3') OK
+EXPECTED (WebKitMediaKeyError.MEDIA_KEYERR_OUTPUT == '4') OK
+EXPECTED (WebKitMediaKeyError.MEDIA_KEYERR_HARDWARECHANGE == '5') OK
+EXPECTED (WebKitMediaKeyError.MEDIA_KEYERR_DOMAIN == '6') OK
EXPECTED (MediaError.MEDIA_ERR_ENCRYPTED == '5') OK
END OF TEST
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-constants.html (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-constants.html 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-constants.html 2013-08-09 00:16:44 UTC (rev 153870)
@@ -5,12 +5,12 @@
<script type="text/_javascript_">
function doTest ()
{
- testExpected("MediaKeyError.MEDIA_KEYERR_UNKNOWN", 1);
- testExpected("MediaKeyError.MEDIA_KEYERR_CLIENT", 2);
- testExpected("MediaKeyError.MEDIA_KEYERR_SERVICE", 3);
- testExpected("MediaKeyError.MEDIA_KEYERR_OUTPUT", 4);
- testExpected("MediaKeyError.MEDIA_KEYERR_HARDWARECHANGE", 5);
- testExpected("MediaKeyError.MEDIA_KEYERR_DOMAIN", 6);
+ testExpected("WebKitMediaKeyError.MEDIA_KEYERR_UNKNOWN", 1);
+ testExpected("WebKitMediaKeyError.MEDIA_KEYERR_CLIENT", 2);
+ testExpected("WebKitMediaKeyError.MEDIA_KEYERR_SERVICE", 3);
+ testExpected("WebKitMediaKeyError.MEDIA_KEYERR_OUTPUT", 4);
+ testExpected("WebKitMediaKeyError.MEDIA_KEYERR_HARDWARECHANGE", 5);
+ testExpected("WebKitMediaKeyError.MEDIA_KEYERR_DOMAIN", 6);
consoleWrite("");
testExpected("MediaError.MEDIA_ERR_ENCRYPTED", 5);
@@ -20,6 +20,6 @@
</script>
</head>
<body _onload_="doTest()">
- <p>Test MediaKeyError constants and additional MediaError constant.</p>
+ <p>Test WebKitMediaKeyError constants and additional MediaError constant.</p>
</body>
</html>
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-events-expected.txt (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-events-expected.txt 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-events-expected.txt 2013-08-09 00:16:44 UTC (rev 153870)
@@ -12,7 +12,7 @@
RUN(video.webkitGenerateKeyRequest('webkit-org.w3.clearkey', initData))
keymessage event occurred
EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.MediaKeyEvent == 'true') 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
@@ -34,7 +34,7 @@
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.MediaKeyEvent == 'true') 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
@@ -46,7 +46,7 @@
RUN(video.webkitAddKey('webkit-org.w3.clearkey', invalidKey, null, event.sessionId))
keyerror event occurred
EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.MediaKeyEvent == 'true') 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
@@ -62,7 +62,7 @@
EVENT(webkitkeymessage)
keymessage event occurred
EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.MediaKeyEvent == 'true') 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
@@ -87,7 +87,7 @@
EVENT(webkitkeyadded)
keyadded event occurred
EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.MediaKeyEvent == 'true') 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
@@ -100,7 +100,7 @@
EVENT(webkitkeyerror)
keyerror event occurred
EXPECTED (event.target == '[object HTMLVideoElement]') OK
-EXPECTED (event instanceof window.MediaKeyEvent == 'true') 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
@@ -115,7 +115,7 @@
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.errorCode.code = WebKitMediaKeyError.MEDIA_KEYERR_CLIENT)
RUN(event.systemCode = 123)
EXPECTED (event.keySystem == 'webkit-org.w3.clearkey') OK
EXPECTED (event.sessionId == keyMessageSessionId == 'true') OK
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-events.html (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-events.html 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-events.html 2013-08-09 00:16:44 UTC (rev 153870)
@@ -30,7 +30,7 @@
consoleWrite("keyadded event occurred");
testExpected("event.target", video);
- testExpected("event instanceof window.MediaKeyEvent", true);
+ testExpected("event instanceof window.WebKitMediaKeyEvent", true);
testExpected("event.keySystem", "webkit-org.w3.clearkey");
testExpected("event.sessionId == keyMessageSessionId", true);
@@ -51,7 +51,7 @@
consoleWrite("keyerror event occurred");
testExpected("event.target", video);
- testExpected("event instanceof window.MediaKeyEvent", true);
+ testExpected("event instanceof window.WebKitMediaKeyEvent", true);
testExpected("event.keySystem", "webkit-org.w3.clearkey");
testExpected("event.sessionId == keyMessageSessionId", true);
@@ -59,7 +59,7 @@
testExpected("event.initData", null, "===");
testExpected("event.message", null, "===");
testExpected("event.defaultURL", "");
- testExpected("event.errorCode.code", MediaKeyError.MEDIA_KEYERR_UNKNOWN);
+ testExpected("event.errorCode.code", WebKitMediaKeyError.MEDIA_KEYERR_UNKNOWN);
// systemCode is not supported by the Clear Key key system.
testExpected("event.systemCode", 0);
@@ -74,7 +74,7 @@
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.errorCode.code = WebKitMediaKeyError.MEDIA_KEYERR_CLIENT");
run("event.systemCode = 123");
testExpected("event.keySystem", "webkit-org.w3.clearkey");
@@ -82,7 +82,7 @@
testExpected("event.initData", null, "===");
testExpected("event.message", null, "===");
testExpected("event.defaultURL", "");
- testExpected("event.errorCode.code", MediaKeyError.MEDIA_KEYERR_UNKNOWN);
+ testExpected("event.errorCode.code", WebKitMediaKeyError.MEDIA_KEYERR_UNKNOWN);
testExpected("event.systemCode", 0);
endTest();
@@ -94,7 +94,7 @@
consoleWrite("keymessage event occurred");
testExpected("event.target", video);
- testExpected("event instanceof window.MediaKeyEvent", true);
+ testExpected("event instanceof window.WebKitMediaKeyEvent", true);
testExpected("event.keySystem", "webkit-org.w3.clearkey");
@@ -135,7 +135,7 @@
consoleWrite("needKey event occurred");
testExpected("event.target", video);
- testExpected("event instanceof window.MediaKeyEvent", true);
+ testExpected("event instanceof window.WebKitMediaKeyEvent", true);
testExpected("event.keySystem", "webkit-org.w3.clearkey");
testExpected("event.sessionId", "");
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-is-type-supported-expected.txt (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-is-type-supported-expected.txt 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-is-type-supported-expected.txt 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,22 +1,22 @@
-Test Encrypted Media extension of MediaKeys isTypeSupported() method.
+Test Encrypted Media extension of WebKitMediaKeys isTypeSupported() method.
Always return false for a null type.
-EXPECTED (MediaKeys.isTypeSupported(null) == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported(null) == 'false') OK
Always return false for an empty type.
-EXPECTED (MediaKeys.isTypeSupported('') == 'false') OK
-EXPECTED (MediaKeys.isTypeSupported('', '') == 'false') OK
-EXPECTED (MediaKeys.isTypeSupported('', null) == 'false') OK
-EXPECTED (MediaKeys.isTypeSupported('', undefined) == 'false') OK
-EXPECTED (MediaKeys.isTypeSupported('', 'video/invalid') == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('') == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('', '') == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('', null) == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('', undefined) == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('', 'video/invalid') == 'false') OK
Always return true for supported types.
-EXPECTED (MediaKeys.isTypeSupported('com.webcore.mock') == 'true') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('com.webcore.mock') == 'true') OK
Always return true for supported types and containers.
-EXPECTED (MediaKeys.isTypeSupported('com.webcore.mock', 'video/mock') == 'true') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('com.webcore.mock', 'video/mock') == 'true') OK
Always return false for supported types but unsupported containers.
-EXPECTED (MediaKeys.isTypeSupported('com.webcore.mock', 'video/invalid') == 'false') OK
+EXPECTED (WebKitMediaKeys.isTypeSupported('com.webcore.mock', 'video/invalid') == 'false') OK
END OF TEST
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-is-type-supported.html (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-is-type-supported.html 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-is-type-supported.html 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en">
<head>
- <title>MediaKeys.isTypeSupported()</title>
+ <title>WebKitMediaKeys.isTypeSupported()</title>
<script src=""
<script>
// Initialize the MockCDM. It supports the key system 'com.webcore.mock', the
@@ -12,29 +12,29 @@
function runTest() {
consoleWrite("Always return false for a null type.");
- testExpected("MediaKeys.isTypeSupported(null)", false);
+ testExpected("WebKitMediaKeys.isTypeSupported(null)", false);
consoleWrite("<br>Always return false for an empty type.");
- testExpected("MediaKeys.isTypeSupported('')", false);
- testExpected("MediaKeys.isTypeSupported('', '')", false);
- testExpected("MediaKeys.isTypeSupported('', null)", false);
- testExpected("MediaKeys.isTypeSupported('', undefined)", false);
- testExpected("MediaKeys.isTypeSupported('', 'video/invalid')", false);
+ testExpected("WebKitMediaKeys.isTypeSupported('')", false);
+ testExpected("WebKitMediaKeys.isTypeSupported('', '')", false);
+ testExpected("WebKitMediaKeys.isTypeSupported('', null)", false);
+ testExpected("WebKitMediaKeys.isTypeSupported('', undefined)", false);
+ testExpected("WebKitMediaKeys.isTypeSupported('', 'video/invalid')", false);
consoleWrite("<br>Always return true for supported types.");
- testExpected("MediaKeys.isTypeSupported('com.webcore.mock')", true);
+ testExpected("WebKitMediaKeys.isTypeSupported('com.webcore.mock')", true);
consoleWrite("<br>Always return true for supported types and containers.");
- testExpected("MediaKeys.isTypeSupported('com.webcore.mock', 'video/mock')", true);
+ testExpected("WebKitMediaKeys.isTypeSupported('com.webcore.mock', 'video/mock')", true);
consoleWrite("<br>Always return false for supported types but unsupported containers.");
- testExpected("MediaKeys.isTypeSupported('com.webcore.mock', 'video/invalid')", false);
+ testExpected("WebKitMediaKeys.isTypeSupported('com.webcore.mock', 'video/invalid')", false);
endTest();
}
</script>
</head>
<body _onload_="runTest()">
- <p>Test Encrypted Media extension of MediaKeys <em>isTypeSupported()</em> method.</p>
+ <p>Test Encrypted Media extension of WebKitMediaKeys <em>isTypeSupported()</em> method.</p>
</body>
</html>
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-events-expected.txt (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-events-expected.txt 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-events-expected.txt 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,6 +1,6 @@
-This tests the events created by MediaKeys.
+This tests the events created by WebKitMediaKeys.
-RUN(mediaKeys = new MediaKeys("com.webcore.mock"))
+RUN(mediaKeys = new WebKitMediaKeys("com.webcore.mock"))
RUN(mediaKeySession = mediaKeys.createSession("video/mock", initData))
EVENT(webkitkeymessage)
RUN(mediaKeySession.addKey(invalidKey))
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-events.html (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-events.html 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-events.html 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>MediaKeys</title>
+ <title>WebKitMediaKeys</title>
<script src=""
<script>
function stringToUint8Array(str)
@@ -26,7 +26,7 @@
if (internals)
internals.initializeMockCDM();
- run('mediaKeys = new MediaKeys("com.webcore.mock")');
+ 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);
@@ -45,5 +45,5 @@
</script>
</head>
<body _onload_="runTest()">
- <p>This tests the events created by MediaKeys.</p>
+ <p>This tests the events created by WebKitMediaKeys.</p>
</html>
\ No newline at end of file
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax-expected.txt 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,16 +1,16 @@
-This tests the basic API of MediaKeys and MediaKeySession.
+This tests the basic API of WebKitMediaKeys and WebKitMediaKeySession.
-Test MediaKeys.
-EXPECTED (typeof window.MediaKeys == 'object') OK
-TEST(new MediaKeys("")) THROWS(DOMException.INVALID_ACCESS_ERR) OK
-TEST(new MediaKeys("unsupported")) THROWS(DOMException.NOT_SUPPORTED_ERR) OK
-RUN(mediaKeys = new MediaKeys("com.webcore.mock"))
+Test WebKitMediaKeys.
+EXPECTED (typeof window.WebKitMediaKeys == 'object') 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(DOMException.NOT_SUPPORTED_ERR) OK
-Test MediaKeySession.
+Test WebKitMediaKeySession.
RUN(mediaKeySession = mediaKeys.createSession("video/mock", initData))
EXPECTED (typeof mediaKeySession == 'object') OK
EXPECTED (typeof mediaKeySession.addEventListener == 'function') OK
Modified: branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html (153869 => 153870)
--- branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
- <title>MediaKeys</title>
+ <title>WebKitMediaKeys</title>
<script src=""
<script>
function stringToUint8Array(str)
@@ -24,18 +24,18 @@
if (internals)
internals.initializeMockCDM();
- consoleWrite("Test MediaKeys.");
- testExpected('typeof window.MediaKeys', 'object');
- testDOMException('new MediaKeys("")', "DOMException.INVALID_ACCESS_ERR");
- testDOMException('new MediaKeys("unsupported")', "DOMException.NOT_SUPPORTED_ERR");
- run('mediaKeys = new MediaKeys("com.webcore.mock")');
+ consoleWrite("Test WebKitMediaKeys.");
+ testExpected('typeof window.WebKitMediaKeys', 'object');
+ 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");
testDOMException('mediaKeys.createSession("unsupported/type")', "DOMException.NOT_SUPPORTED_ERR");
consoleWrite("");
- consoleWrite("Test MediaKeySession.");
+ consoleWrite("Test WebKitMediaKeySession.");
run('mediaKeySession = mediaKeys.createSession("video/mock", initData)');
testExpected('typeof mediaKeySession', 'object');
testExpected('typeof mediaKeySession.addEventListener', 'function');
@@ -52,6 +52,6 @@
</script>
</head>
<body _onload_="runTest()">
- <p>This tests the basic API of MediaKeys and MediaKeySession.</p>
+ <p>This tests the basic API of WebKitMediaKeys and WebKitMediaKeySession.</p>
</body>
</html>
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153869 => 153870)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-09 00:16:44 UTC (rev 153870)
@@ -1,5 +1,27 @@
2013-08-08 Lucas Forschler <lforsch...@apple.com>
+ Merge r153867
+
+ 2013-08-08 Jer Noble <jer.no...@apple.com>
+
+ [EME] MediaKey APIs should be prefixed.
+ https://bugs.webkit.org/show_bug.cgi?id=119606
+
+ Reviewed by Anders Carlsson.
+
+ No new tests; updated exsisting tests with new names.
+
+ Prefix all new classes with "WebKit" and new methods on existing unprefixed
+ classes with "webkit"
+
+ * Modules/encryptedmedia/MediaKeyMessageEvent.idl: MediaKeyMessageEvent -> WebKitMediaKeyMessageEvent
+ * Modules/encryptedmedia/MediaKeySession.idl: MediaKeySession -> WebKitMediaKeySession
+ * Modules/encryptedmedia/MediaKeys.idl: MediaKeys -> WebKitMediaKeys
+ * html/HTMLMediaElement.idl: keys -> webkitKeys, setMediaKeys -> webkitSetMediaKeys
+ * html/MediaKeyError.idl: MediaKeyError -> WebKitMediaKeyError
+
+2013-08-08 Lucas Forschler <lforsch...@apple.com>
+
Merge r153851
2013-08-08 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl (153869 => 153870)
--- branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeyMessageEvent.idl 2013-08-09 00:16:44 UTC (rev 153870)
@@ -25,7 +25,8 @@
[
Conditional=ENCRYPTED_MEDIA_V2,
- ConstructorTemplate=Event
+ ConstructorTemplate=Event,
+ InterfaceName=WebKitMediaKeyMessageEvent
] interface MediaKeyMessageEvent : Event {
readonly attribute Uint8Array message;
[InitializedByEventConstructor] readonly attribute DOMString destinationURL;
Modified: branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl (153869 => 153870)
--- branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl 2013-08-09 00:16:44 UTC (rev 153870)
@@ -26,6 +26,7 @@
[
Conditional=ENCRYPTED_MEDIA_V2,
EventTarget,
+ InterfaceName=WebKitMediaKeySession
] interface MediaKeySession {
// error state
readonly attribute MediaKeyError error;
Modified: branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl (153869 => 153870)
--- branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/Source/WebCore/Modules/encryptedmedia/MediaKeys.idl 2013-08-09 00:16:44 UTC (rev 153870)
@@ -27,6 +27,7 @@
Conditional=ENCRYPTED_MEDIA_V2,
Constructor(DOMString keySystem),
ConstructorRaisesException,
+ InterfaceName=WebKitMediaKeys
] interface MediaKeys {
[CallWith=ScriptExecutionContext, RaisesException] MediaKeySession createSession([Default=Undefined] optional DOMString type, [Default=Undefined] optional Uint8Array initData);
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.idl (153869 => 153870)
--- branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.idl 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLMediaElement.idl 2013-08-09 00:16:44 UTC (rev 153870)
@@ -105,8 +105,8 @@
#endif
[Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2] attribute EventListener onwebkitneedkey;
#if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
- readonly attribute MediaKeys keys;
- void setMediaKeys(MediaKeys mediaKeys);
+ [ImplementedAs=keys] readonly attribute MediaKeys webkitKeys;
+ [ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys mediaKeys);
#endif
#if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
Modified: branches/safari-537-branch/Source/WebCore/html/MediaKeyError.idl (153869 => 153870)
--- branches/safari-537-branch/Source/WebCore/html/MediaKeyError.idl 2013-08-09 00:14:34 UTC (rev 153869)
+++ branches/safari-537-branch/Source/WebCore/html/MediaKeyError.idl 2013-08-09 00:16:44 UTC (rev 153870)
@@ -25,7 +25,8 @@
[
Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2,
- ImplementationLacksVTable
+ ImplementationLacksVTable,
+ InterfaceName=WebKitMediaKeyError
] interface MediaKeyError {
const unsigned short MEDIA_KEYERR_UNKNOWN = 1;
const unsigned short MEDIA_KEYERR_CLIENT = 2;
