- Revision
- 226278
- Author
- [email protected]
- Date
- 2017-12-22 14:34:18 -0800 (Fri, 22 Dec 2017)
Log Message
Unreviewed, rolling out r225899
https://bugs.webkit.org/show_bug.cgi?id=180430
* media/content/encrypted/VideoClearKeyCenc.mp4: Removed.
* media/content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4: Removed.
* media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-expected.txt: Removed.
* media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse-expected.txt: Removed.
* media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html: Removed.
* media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html: Removed.
* media/encrypted-media/medias-enc.js: Removed.
* media/media-source/media-source-loader-simple.js: Removed.
* platform/gtk/TestExpectations:
* platform/mac-elcapitan/TestExpectations:
* platform/mac/TestExpectations:
* platform/wpe/TestExpectations:
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (226277 => 226278)
--- trunk/LayoutTests/ChangeLog 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/ChangeLog 2017-12-22 22:34:18 UTC (rev 226278)
@@ -1,3 +1,21 @@
+2017-12-22 Michael Catanzaro <[email protected]>
+
+ Unreviewed, rolling out r225899
+ https://bugs.webkit.org/show_bug.cgi?id=180430
+
+ * media/content/encrypted/VideoClearKeyCenc.mp4: Removed.
+ * media/content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4: Removed.
+ * media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-expected.txt: Removed.
+ * media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse-expected.txt: Removed.
+ * media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html: Removed.
+ * media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html: Removed.
+ * media/encrypted-media/medias-enc.js: Removed.
+ * media/media-source/media-source-loader-simple.js: Removed.
+ * platform/gtk/TestExpectations:
+ * platform/mac-elcapitan/TestExpectations:
+ * platform/mac/TestExpectations:
+ * platform/wpe/TestExpectations:
+
2017-12-22 Dan Bernstein <[email protected]>
Crash beneath ScriptedAnimationController::serviceScriptedAnimations after a requestAnimationFrame callback removes the requesting iframe
Deleted: trunk/LayoutTests/media/encrypted-media/medias-enc.js (226277 => 226278)
--- trunk/LayoutTests/media/encrypted-media/medias-enc.js 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/media/encrypted-media/medias-enc.js 2017-12-22 22:34:18 UTC (rev 226278)
@@ -1,16 +0,0 @@
-var streamMedias = {
- "simpleClearKeyMSE" : { video : { initDataType : "cenc",
- mimetype : 'video/mp4; codecs="avc1.64001F"',
- segments : [ "../../content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4" ],
- keys : { KID : "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf",
- Key : "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf" }
- }
- },
- "simpleClearKey" : { video : { initDataType : "cenc",
- mimeType : 'video/mp4; codecs="avc1.64001F"',
- path : "../../content/encrypted/VideoClearKeyCenc.mp4",
- keys : { KID : "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf",
- Key : "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf" }
- }
- }
- };
Deleted: trunk/LayoutTests/media/media-source/media-source-loader-simple.js (226277 => 226278)
--- trunk/LayoutTests/media/media-source/media-source-loader-simple.js 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/media/media-source/media-source-loader-simple.js 2017-12-22 22:34:18 UTC (rev 226278)
@@ -1,92 +0,0 @@
-function SourceBufferLoaderSimple(sb, ms, media, nbSeg)
-{
- this.ms = ms;
- this.sb = sb;
- this.name = name;
- this.indexSeg = 0;
- this.nbSeg = nbSeg ? nbSeg : media.segments.length;
- this.segments = media.segments;
-
-};
-
-SourceBufferLoaderSimple.prototype = {
-
- appendSegment : function(index)
- {
- var segmentFile = this.segments[index];
- var request = new XMLHttpRequest();
- var sourcebuff = this.sb;
- request.open("GET", segmentFile);
- request.responseType = "arraybuffer";
- request.addEventListener("load", function() {
- sourcebuff.appendBuffer(new Uint8Array(request.response));
- });
- request.addEventListener("error", function() {
- logResult(false, "Error request " + segmentFile);
- endTest();
- });
- request.addEventListener("abort", function() {
- logResult(false, "Aborted request" + segmentFile);
- endTest();
- });
- request.send(null);
- },
-
- onupdateend : function()
- {
- if (this.ms.readyState == "closed")
- return;
-
- if (this.indexSeg >= this.nbSeg)
- return;
-
- var index = this.indexSeg++;
- this.appendSegment(index);
- },
-
- start : function()
- {
- if (this.ms.readyState == "closed")
- return;
-
- if (this.indexSeg >= this.nbSeg)
- return;
-
- this.sb.addEventListener("updateend", this.onupdateend.bind(this));
- var index = this.indexSeg++;
- this.appendSegment(index);
- }
-};
-
-function MediaSourceLoaderSimple(video)
-{
- this.video = video;
- this.ms = new MediaSource();
- this._onSourceOpenBind_ = this.onsourceopen.bind(this);
- this.ms.addEventListener("sourceopen", this.onSourceOpenBind);
- this.video.addEventListener("canplay", this.oncanplay.bind(this));
- this.video.src = ""
- this._onready_ = function() {
- };
-};
-
-MediaSourceLoaderSimple.prototype = {
- createSourceBuffer : function(media, maxSeg)
- {
- var sb = this.ms.addSourceBuffer(media.mimetype);
- var sbBase = new SourceBufferLoaderSimple(sb, this.ms, media, maxSeg);
- sbBase.start();
- },
-
- onsourceopen : function()
- {
- this.ms.removeEventListener("sourceopen", this.onSourceOpenBind);
- this._onSourceOpenBind_ = undefined;
- this.onready();
- },
-
- oncanplay : function()
- {
- this.video.play();
- }
-};
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (226277 => 226278)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2017-12-22 22:34:18 UTC (rev 226278)
@@ -1403,9 +1403,6 @@
webkit.org/b/104809 media/encrypted-media/encrypted-media-syntax.html [ Failure Timeout ]
webkit.org/b/104809 media/track/track-cues-pause-on-exit.html [ Timeout Pass ]
-webkit.org/b/180071 media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html [ Failure ]
-webkit.org/b/180071 media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html [ Failure ]
-
# This test also crashes after the FTL merge
webkit.org/b/106415 webkit.org/b/119255 fast/workers/worker-close-more.html [ Timeout Crash Pass ]
Modified: trunk/LayoutTests/platform/mac/TestExpectations (226277 => 226278)
--- trunk/LayoutTests/platform/mac/TestExpectations 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-12-22 22:34:18 UTC (rev 226278)
@@ -1351,9 +1351,6 @@
media/encrypted-media/mock-MediaKeySession-remove.html [ Skip ]
media/encrypted-media/mock-MediaKeySession-update.html [ Skip ]
-webkit.org/b/180430 media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html [ Skip ]
-webkit.org/b/180430 media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html [ Skip ]
-
webkit.org/b/162507 http/tests/media/hls/hls-video-resize.html [ Pass Failure ]
webkit.org/b/167642 imported/w3c/web-platform-tests/shadow-dom/slotchange.html [ Pass Failure ]
Modified: trunk/LayoutTests/platform/mac-elcapitan/TestExpectations (226277 => 226278)
--- trunk/LayoutTests/platform/mac-elcapitan/TestExpectations 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/platform/mac-elcapitan/TestExpectations 2017-12-22 22:34:18 UTC (rev 226278)
@@ -8,7 +8,6 @@
media/modern-media-controls/button/button-focus-state.html [ Skip ]
media/modern-media-controls/media-controller/media-controller-inline-to-fullscreen-to-pip-to-inline.html [ Skip ]
-
webkit.org/b/176229 imported/w3c/web-platform-tests/IndexedDB/idbobjectstore-query-exception-order.html [ Pass Failure ]
webkit.org/b/178526 webarchive/adopt-attribute-styled-node-webarchive.html [ Crash ]
Modified: trunk/LayoutTests/platform/wpe/TestExpectations (226277 => 226278)
--- trunk/LayoutTests/platform/wpe/TestExpectations 2017-12-22 22:23:27 UTC (rev 226277)
+++ trunk/LayoutTests/platform/wpe/TestExpectations 2017-12-22 22:34:18 UTC (rev 226278)
@@ -994,9 +994,6 @@
media/encrypted-media/encrypted-media-v2-events.html [ Skip ]
media/encrypted-media/encrypted-media-v2-syntax.html [ Skip ]
-webkit.org/b/180071 media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html [ Failure ]
-webkit.org/b/180071 media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html [ Failure ]
-
webkit.org/b/172815 imported/w3c/i18n/bidi/bidi-plaintext-011.html [ Pass ImageOnlyFailure ]
webkit.org/b/176174 media/event-queue-crash.html [ Pass Failure ]
