Unreviewed, rolling out r225899
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Dec 2017 22:34:18 +0000 (22:34 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Dec 2017 22:34:18 +0000 (22:34 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

13 files changed:
LayoutTests/ChangeLog
LayoutTests/media/content/encrypted/VideoClearKeyCenc.mp4 [deleted file]
LayoutTests/media/content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4 [deleted file]
LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-expected.txt [deleted file]
LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse-expected.txt [deleted file]
LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html [deleted file]
LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html [deleted file]
LayoutTests/media/encrypted-media/medias-enc.js [deleted file]
LayoutTests/media/media-source/media-source-loader-simple.js [deleted file]
LayoutTests/platform/gtk/TestExpectations
LayoutTests/platform/mac-elcapitan/TestExpectations
LayoutTests/platform/mac/TestExpectations
LayoutTests/platform/wpe/TestExpectations

index 3be279a1e2905bdf241bc6cc83afc223daefe6df..56b2f3c1582e6d5d5ea547038b34bcf3974f6496 100644 (file)
@@ -1,3 +1,21 @@
+2017-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        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  <mitz@apple.com>
 
         Crash beneath ScriptedAnimationController::serviceScriptedAnimations after a requestAnimationFrame callback removes the requesting iframe
diff --git a/LayoutTests/media/content/encrypted/VideoClearKeyCenc.mp4 b/LayoutTests/media/content/encrypted/VideoClearKeyCenc.mp4
deleted file mode 100644 (file)
index b00d472..0000000
Binary files a/LayoutTests/media/content/encrypted/VideoClearKeyCenc.mp4 and /dev/null differ
diff --git a/LayoutTests/media/content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4 b/LayoutTests/media/content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4
deleted file mode 100644 (file)
index 52c1de2..0000000
Binary files a/LayoutTests/media/content/encrypted/segments/VideoClearKeyCenc-seg-0.mp4 and /dev/null differ
diff --git a/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-expected.txt b/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-expected.txt
deleted file mode 100644 (file)
index 84384e9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-
-EME API is supported OK
-EVENT(encrypted)
-EXPECTED (onEncryptedEvent.target == '[object HTMLVideoElement]') OK
-EXPECTED (onEncryptedEvent instanceof 'function MediaEncryptedEvent() { [native code] }') OK
-EXPECTED (onEncryptedEvent.initDataType.toLowerCase() == 'cenc') OK
-EXPECTED (onEncryptedEvent.initData != 'null') OK
-END OF TEST
-
diff --git a/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse-expected.txt b/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse-expected.txt
deleted file mode 100644 (file)
index 8c9272a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-EME API is supported OK
-Media source is opened OK
-EVENT(encrypted)
-EXPECTED (onEncryptedEvent.target == '[object HTMLVideoElement]') OK
-EXPECTED (onEncryptedEvent instanceof 'function MediaEncryptedEvent() { [native code] }') OK
-EXPECTED (onEncryptedEvent.initDataType.toLowerCase() == 'cenc') OK
-EXPECTED (onEncryptedEvent.initData != 'null') OK
-END OF TEST
-
diff --git a/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html b/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event-mse.html
deleted file mode 100644 (file)
index e02d677..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Encrypted ClearKey CENC Event</title>
-    <script src="../medias-enc.js"></script>
-    <script src="../../video-test.js"></script>
-    <script src="../../media-source/media-source-loader-simple.js"></script>
-    <script>
-    var onEncryptedEvent;
-
-    function runTest() {
-        if (!navigator.requestMediaKeySystemAccess) {
-            logResult(false, "EME API is not supported");
-            return;
-        } else {
-            logResult(true, "EME API is supported");
-        }
-
-        findMediaElement();
-
-        waitForEventOn(video, "encrypted", encrypted);
-
-        function encrypted(event) {
-            onEncryptedEvent = event;
-            testExpected("onEncryptedEvent.target", video);
-            testExpected("onEncryptedEvent", window.MediaEncryptedEvent, "instanceof");
-            testExpected("onEncryptedEvent.initDataType.toLowerCase()", "cenc");
-            testExpected("onEncryptedEvent.initData", null, "!=");
-            endTest();
-        }
-
-        var ms = new MediaSourceLoaderSimple(video);
-
-        ms.onready = function() {
-            logResult(true, "Media source is opened");
-            ms.createSourceBuffer(streamMedias["simpleClearKeyMSE"].video, 1);
-        };
-    }
-    </script>
-</head>
-<body onload="runTest()">
-    <video></video>
-</body>
-</html>
diff --git a/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html b/LayoutTests/media/encrypted-media/clearKey/clearKey-encrypted-cenc-event.html
deleted file mode 100644 (file)
index a65cb01..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Encrypted ClearKey CENC Event</title>
-    <script src="../medias-enc.js"></script>
-    <script src="../../video-test.js"></script>
-    <script>
-    var onEncryptedEvent;
-
-    function runTest() {
-        if (!navigator.requestMediaKeySystemAccess) {
-            logResult(false, "EME API is not supported");
-            return;
-        } else {
-            logResult(true, "EME API is supported");
-        }
-
-        findMediaElement();
-
-        waitForEventOn(video, "encrypted", encrypted);
-
-        function encrypted(event) {
-            onEncryptedEvent = event;
-            testExpected("onEncryptedEvent.target", video);
-            testExpected("onEncryptedEvent", window.MediaEncryptedEvent, "instanceof");
-            testExpected("onEncryptedEvent.initDataType.toLowerCase()", "cenc");
-            testExpected("onEncryptedEvent.initData", null, "!=");
-            endTest();
-        }
-
-        var source = document.createElement('source');
-        source.setAttribute("src", streamMedias["simpleClearKey"].video.path);
-        source.setAttribute("type", streamMedias["simpleClearKey"].video.mimeType);
-        video.appendChild(source);
-        video.play();
-    }
-    </script>
-</head>
-<body onload="runTest()">
-    <video></video>
-</body>
-</html>
diff --git a/LayoutTests/media/encrypted-media/medias-enc.js b/LayoutTests/media/encrypted-media/medias-enc.js
deleted file mode 100644 (file)
index 6844ebe..0000000
+++ /dev/null
@@ -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" }
-                                       }
-                          }
-                   };
diff --git a/LayoutTests/media/media-source/media-source-loader-simple.js b/LayoutTests/media/media-source/media-source-loader-simple.js
deleted file mode 100644 (file)
index ecba458..0000000
+++ /dev/null
@@ -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 = window.URL.createObjectURL(this.ms);
-    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();
-    }
-};
index fb9e5936a056156f9ecc676412a5a6a317129bde..f38e9c611f74b610c5ba170bec6985e00f680206 100644 (file)
@@ -1403,9 +1403,6 @@ webkit.org/b/104809 media/encrypted-media/encrypted-media-not-loaded.html [ Fail
 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 ]
 
index ad0613ddf4c998d0d8b79067d0a4235f9c9fcb58..f0c0a7f9e5d29380d991d96ec3d03ddba9e058c4 100644 (file)
@@ -8,7 +8,6 @@ media/modern-media-controls/pip-support [ Skip ]
 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 ]
index 23cd335ff523cb84b79797c3891cb7f2211a97f3..a36b17948dd39c0624cdc3ab856476230e7006a6 100644 (file)
@@ -1351,9 +1351,6 @@ media/encrypted-media/mock-MediaKeySession-load.html [ Skip ]
 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 ]
index a67da79b659e8bf992307b3f9912ca88bc0828df..b9ce441e5835fa0cb4b515c985648c8bab43ae28 100644 (file)
@@ -994,9 +994,6 @@ media/encrypted-media/encrypted-media-syntax.html [ Skip ]
 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 ]