Log Message
Source/WebCore: Temporarily remove webkitSourceAddId() & webkitSourceRemoveId() from DOM until the rest of the Media Source v0.5 methods are implemented. This is to prevent ambiguity about whether v0.5 is fully supported or not. https://bugs.webkit.org/show_bug.cgi?id=85295
Patch by Aaron Colwell <[email protected]> on 2012-05-01 Reviewed by Eric Carlson. No new tests. Removing methods from DOM so relevant tests are removed. * html/HTMLMediaElement.idl: LayoutTests: Temporarily removing tests for webkitSourceAddId() & webkitSourceRemoveId() until the rest of the Media Source v0.5 methods are implemented. https://bugs.webkit.org/show_bug.cgi?id=85295 Patch by Aaron Colwell <[email protected]> on 2012-05-01 Reviewed by Eric Carlson. * http/tests/media/media-source/webm/video-media-source-add-and-remove-ids-expected.txt: Removed. * http/tests/media/media-source/webm/video-media-source-add-and-remove-ids.html: Removed. * platform/chromium/test_expectations.txt:
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/LayoutTests/platform/chromium/test_expectations.txt
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/html/HTMLMediaElement.idl
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (115744 => 115745)
--- trunk/LayoutTests/ChangeLog 2012-05-01 19:21:06 UTC (rev 115744)
+++ trunk/LayoutTests/ChangeLog 2012-05-01 19:27:51 UTC (rev 115745)
@@ -1,3 +1,15 @@
+2012-05-01 Aaron Colwell <[email protected]>
+
+ Temporarily removing tests for webkitSourceAddId() & webkitSourceRemoveId()
+ until the rest of the Media Source v0.5 methods are implemented.
+ https://bugs.webkit.org/show_bug.cgi?id=85295
+
+ Reviewed by Eric Carlson.
+
+ * http/tests/media/media-source/webm/video-media-source-add-and-remove-ids-expected.txt: Removed.
+ * http/tests/media/media-source/webm/video-media-source-add-and-remove-ids.html: Removed.
+ * platform/chromium/test_expectations.txt:
+
2012-05-01 Eric Seidel <[email protected]>
Add seamless test cases (all of these will pass as we land the implementation patches)
Deleted: trunk/LayoutTests/http/tests/media/media-source/webm/video-media-source-add-and-remove-ids-expected.txt (115744 => 115745)
--- trunk/LayoutTests/http/tests/media/media-source/webm/video-media-source-add-and-remove-ids-expected.txt 2012-05-01 19:21:06 UTC (rev 115744)
+++ trunk/LayoutTests/http/tests/media/media-source/webm/video-media-source-add-and-remove-ids-expected.txt 2012-05-01 19:27:51 UTC (rev 115745)
@@ -1,42 +0,0 @@
-Tests webkitSourceAddId() & webkitSourceRemoveId() methods
-
-
-running testAddIdFailureCases
-Got expected exception Error: INVALID_STATE_ERR: DOM Exception 11
-EVENT(loadstart)
-EVENT(webkitsourceopen)
-Test empty ID case
-Got expected exception Error: INVALID_ACCESS_ERR: DOM Exception 15
-Test adding the same ID again.
-Got expected exception Error: INVALID_STATE_ERR: DOM Exception 11
-Test empty type.
-Got expected exception Error: INVALID_ACCESS_ERR: DOM Exception 15
-Test an unsupported type.
-Got expected exception Error: NOT_SUPPORTED_ERR: DOM Exception 9
-Test reaching sourceID limit.
-Got expected exception Error: INVALID_STATE_ERR: DOM Exception 11
-
-running testRemoveIdFailureCases
-EVENT(loadstart)
-EVENT(webkitsourceopen)
-Test empty ID case
-Got expected exception Error: INVALID_ACCESS_ERR: DOM Exception 15
-Test removing an ID that was never added.
-Got expected exception Error: SYNTAX_ERR: DOM Exception 12
-Got expected exception Error: SYNTAX_ERR: DOM Exception 12
-Test adding the same ID again.
-Test that an ID can be removed while in the ended state.
-
-running testAppendFailureCases
-EVENT(loadstart)
-EVENT(webkitsourceopen)
-Test append with empty ID.
-Got expected exception Error: INVALID_ACCESS_ERR: DOM Exception 15
-Test append with an invalid ID
-Got expected exception Error: SYNTAX_ERR: DOM Exception 12
-Test append with a null buffer.
-Got expected exception Error: INVALID_ACCESS_ERR: DOM Exception 15
-Test a successful append.
-Got expected exception Error: SYNTAX_ERR: DOM Exception 12
-END OF TEST
-
Deleted: trunk/LayoutTests/http/tests/media/media-source/webm/video-media-source-add-and-remove-ids.html (115744 => 115745)
--- trunk/LayoutTests/http/tests/media/media-source/webm/video-media-source-add-and-remove-ids.html 2012-05-01 19:21:06 UTC (rev 115744)
+++ trunk/LayoutTests/http/tests/media/media-source/webm/video-media-source-add-and-remove-ids.html 2012-05-01 19:27:51 UTC (rev 115745)
@@ -1,215 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <script src=""
- <script src=""
- <script>
- var defaultSourceMimetype = "video/webm; codecs=\"vp8, vorbis\"";
-
- function runOnSourceOpen(videoTag, onOpenFunction)
- {
- var eventHandlerFunction = function (event)
- {
- event.target.removeEventListener('webkitsourceopen', eventHandlerFunction);
- onOpenFunction(event.target);
- };
- videoTag.addEventListener('webkitsourceopen', eventHandlerFunction);
- setSrcToMediaSourceURL(videoTag);
- }
-
- // The index of the next cluster to send to appendData().
- var nextClusterIndex = 0;
-
- function expectExceptionOnAddId(videoTag, id, type, error)
- {
- try {
- videoTag.webkitSourceAddId(id, type);
- failTest("Expected an exception");
- } catch (e) {
- if (!(e.code == error)) {
- failTest("Unexpected exception " + e);
- throw e;
- }
- consoleWrite("Got expected exception " + e);
- }
- }
-
- function expectExceptionOnRemoveId(videoTag, id, error)
- {
- try {
- videoTag.webkitSourceRemoveId(id);
- failTest("Expected an exception");
- } catch (e) {
- if (!(e.code == error)) {
- failTest("Unexpected exception " + e);
- throw e;
- }
- consoleWrite("Got expected exception " + e);
- }
- }
-
- function expectExceptionOnAppend(videoTag, id, buf, error)
- {
- try {
- videoTag.webkitSourceAppend(id, buf);
- failTest("Expected an exception");
- } catch (e) {
- if (!(e.code == error)) {
- failTest("Unexpected exception " + e);
- throw e;
- }
- consoleWrite("Got expected exception " + e);
- }
- }
-
- function testAddIdFailureCases(videoTag)
- {
- // Test adding while closed.
- expectExceptionOnAddId(videoTag, "123", defaultSourceMimetype, DOMException.INVALID_STATE_ERR);
-
- runOnSourceOpen(videoTag, function (vt)
- {
- consoleWrite("Test empty ID case");
- expectExceptionOnAddId(vt, "", defaultSourceMimetype, DOMException.INVALID_ACCESS_ERR);
-
- vt.webkitSourceAddId("123", defaultSourceMimetype);
-
- consoleWrite("Test adding the same ID again.");
- expectExceptionOnAddId(vt, "123", defaultSourceMimetype, DOMException.INVALID_STATE_ERR);
- vt.webkitSourceRemoveId("123");
-
- consoleWrite("Test empty type.");
- expectExceptionOnAddId(vt, "234", "", DOMException.INVALID_ACCESS_ERR);
-
- consoleWrite("Test an unsupported type.");
- expectExceptionOnAddId(vt, "234", "audio/wav", DOMException.NOT_SUPPORTED_ERR);
-
- consoleWrite("Test reaching sourceID limit.");
- var reachedIdLimit = false;
-
- // The 20 here is an arbitrary upper limit to make sure the test terminates. This test
- // assumes that implementations won't support more than 20 sourceID's simultaneously.
- for (var i = 0; i < 20; ++i) {
- var sourceID = "sourceID-" + i;
- try {
- vt.webkitSourceAddId(sourceID, defaultSourceMimetype);
- } catch(e) {
- if (e.code != DOMException.QUOTA_EXCEEDED_ERR) {
- failTest("Unexpected exception " + e);
- throw e;
- }
- reachedIdLimit = true;
- break;
- }
- }
-
- if (!reachedIdLimit) {
- failTest("Failed to reach SourceID limit.");
- return;
- }
-
- // Test that SourceIDs can't be added while in the ended state.
- vt.webkitSourceEndOfStream(vt.EOS_NO_ERROR);
- expectExceptionOnAddId(vt, "123", defaultSourceMimetype, DOMException.INVALID_STATE_ERR);
-
- runNextTestCase(vt);
- });
- }
-
- function testRemoveIdFailureCases(videoTag)
- {
- runOnSourceOpen(videoTag, function (vt)
- {
- consoleWrite("Test empty ID case");
- expectExceptionOnRemoveId(vt, "", DOMException.INVALID_ACCESS_ERR);
-
- consoleWrite("Test removing an ID that was never added.");
- expectExceptionOnRemoveId(vt, "345", DOMException.SYNTAX_ERR);
-
- vt.webkitSourceAddId("123", defaultSourceMimetype);
- vt.webkitSourceRemoveId("123");
- expectExceptionOnRemoveId(vt, "123", DOMException.SYNTAX_ERR);
-
- consoleWrite("Test adding the same ID again.");
- vt.webkitSourceAddId("123", defaultSourceMimetype);
-
- consoleWrite("Test that an ID can be removed while in the ended state.");
- vt.webkitSourceEndOfStream(vt.EOS_NO_ERROR);
- vt.webkitSourceRemoveId("123");
-
- runNextTestCase(vt);
- });
- }
-
- function testAppendFailureCases(videoTag)
- {
- runOnSourceOpen(videoTag, function (vt)
- {
- vt.webkitSourceAddId("123", defaultSourceMimetype);
-
- consoleWrite("Test append with empty ID.");
- expectExceptionOnAppend(vt, "", getHeaders(), DOMException.INVALID_ACCESS_ERR);
-
- consoleWrite("Test append with an invalid ID");
- expectExceptionOnAppend(vt, "234", getHeaders(), DOMException.SYNTAX_ERR);
-
- consoleWrite("Test append with a null buffer.");
- expectExceptionOnAppend(vt, "123", null, DOMException.INVALID_ACCESS_ERR);
-
- consoleWrite("Test a successful append.");
- vt.webkitSourceAppend("123", getHeaders());
-
- vt.webkitSourceRemoveId("123");
- expectExceptionOnAppend(vt, "123", getCluster(0), DOMException.SYNTAX_ERR);
-
- runNextTestCase(vt);
- });
-
- }
-
- var testCases = [
- testAddIdFailureCases,
- testRemoveIdFailureCases,
- testAppendFailureCases,
- ];
-
- var testCaseIndex = 0;
-
- function runNextTestCase(videoTag)
- {
- if (testCaseIndex >= testCases.length) {
- endTest();
- return;
- }
-
- var testCaseFunction = testCases[testCaseIndex];
- testCaseIndex++;
-
- consoleWrite("");
- consoleWrite("running " + testCaseFunction.name);
- testCaseFunction(videoTag);
- }
-
- function onLoad()
- {
- findMediaElement();
-
- waitForEvent('loadstart');
- waitForEvent('webkitsourceopen');
-
- loadWebMData(function(success)
- {
- if (!success) {
- failTest("Failed to load WebM data");
- return;
- }
- runNextTestCase(video);
- });
- }
- </script>
- </head>
- <body _onload_="onLoad()">
- <video> </video>
- <p>Tests webkitSourceAddId() & webkitSourceRemoveId() methods</p>
- </body>
-</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (115744 => 115745)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-01 19:21:06 UTC (rev 115744)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-01 19:27:51 UTC (rev 115745)
@@ -3576,9 +3576,6 @@
BUGCR122462 WIN LINUX : http/tests/inspector/inspect-element.html = TEXT
-// Temporarily disabled until Chromium sourceAddId() & sourceRemoveId() code has been checked in.
-BUGWK83616 SKIP : http/tests/media/media-source/webm/video-media-source-add-and-remove-ids.html = FAIL
-
BUGWK83503 LINUX DEBUG : plugins/inner-html-display-none.html = CRASH
Modified: trunk/Source/WebCore/ChangeLog (115744 => 115745)
--- trunk/Source/WebCore/ChangeLog 2012-05-01 19:21:06 UTC (rev 115744)
+++ trunk/Source/WebCore/ChangeLog 2012-05-01 19:27:51 UTC (rev 115745)
@@ -1,3 +1,16 @@
+2012-05-01 Aaron Colwell <[email protected]>
+
+ Temporarily remove webkitSourceAddId() & webkitSourceRemoveId() from DOM
+ until the rest of the Media Source v0.5 methods are implemented. This is
+ to prevent ambiguity about whether v0.5 is fully supported or not.
+ https://bugs.webkit.org/show_bug.cgi?id=85295
+
+ Reviewed by Eric Carlson.
+
+ No new tests. Removing methods from DOM so relevant tests are removed.
+
+ * html/HTMLMediaElement.idl:
+
2012-05-01 Douglas Stockwell <[email protected]>
IndexedDB: stale index entries may not be removed in some cases
Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (115744 => 115745)
--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2012-05-01 19:21:06 UTC (rev 115744)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2012-05-01 19:27:51 UTC (rev 115745)
@@ -99,10 +99,6 @@
// URL passed to src attribute to enable the media source logic.
readonly attribute [V8EnabledAtRuntime=mediaSource, URL] DOMString webkitMediaSourceURL;
- // Manages IDs for appending media to the source.
- [V8EnabledAtRuntime=mediaSource] void webkitSourceAddId(in DOMString id, in DOMString type) raises (DOMException);
- [V8EnabledAtRuntime=mediaSource] void webkitSourceRemoveId(in DOMString id) raises (DOMException);
-
// Appends media to to the source.
[V8EnabledAtRuntime=mediaSource] void webkitSourceAppend(in Uint8Array data) raises (DOMException);
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
