Title: [267525] trunk

Diff

Modified: trunk/LayoutTests/ChangeLog (267524 => 267525)


--- trunk/LayoutTests/ChangeLog	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/LayoutTests/ChangeLog	2020-09-24 11:49:36 UTC (rev 267525)
@@ -1,3 +1,17 @@
+2020-09-24  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r267507.
+        https://bugs.webkit.org/show_bug.cgi?id=216923
+
+        Broke two layout tests on windows
+
+        Reverted changeset:
+
+        "web audio api outputs silence for 302 redirected resource in
+        safari"
+        https://bugs.webkit.org/show_bug.cgi?id=214932
+        https://trac.webkit.org/changeset/267507
+
 2020-09-23  Alexey Shvayka  <[email protected]>
 
         Update Array.prototype.sort to be consistent with tightened spec

Deleted: trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect-expected.txt (267524 => 267525)


--- trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect-expected.txt	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect-expected.txt	2020-09-24 11:49:36 UTC (rev 267525)
@@ -1,10 +0,0 @@
-Ensure that audio is rendered when tainted by a remote audio resource when CORS is enabled.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS outputArray is not silentArray
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect.html (267524 => 267525)


--- trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect.html	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect.html	2020-09-24 11:49:36 UTC (rev 267525)
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src=""
-    <script src=""
-</head>
-<body>
-<pre id="console"></pre>
-<script>
-    description("Ensure that audio is rendered when tainted by a remote audio resource when CORS is enabled.");
-    window.jsTestIsAsync = true;
-
-    function go() {
-        let audio = new Audio();
-        audio.crossOrigin = "anonymous";
-        let mediaFile = findMediaFile("audio", "../../media/resources/1000Hz-sin");
-        let type = mimeTypeForExtension(mediaFile.split('.').pop());
-        audio.src = "" + encodeURIComponent("http://127.0.0.1:8080/security/resources/video-cross-origin-allow.php?name=" + mediaFile + "&type=" + type);
-
-        context = new AudioContext();
-        let mediaSource = context.createMediaElementSource(audio);
-        let analyser = context.createAnalyser();
-        analyser.fftSize = 32;
-
-        mediaSource.connect(analyser);
-
-        context.resume().then(() => {
-            audio.play();
-        });
-
-        window.outputArray = new Float32Array(analyser.frequencyBinCount);
-        window.silentArray = new Float32Array(analyser.frequencyBinCount);
-        silentArray.fill(-Infinity);
-
-        var intervalToken = setInterval(() => {
-            analyser.getFloatFrequencyData(outputArray);
-        }, 30);
-
-        audio.addEventListener("ended", event => {
-            clearInterval(intervalToken);
-            context.suspend().then(() => {
-                shouldNotBe("outputArray", "silentArray");
-                finishJSTest();
-            });
-        });
-    }
-    window.addEventListener('load', go);
-</script>
-<script src=""
-</body>
-</html>

Modified: trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html (267524 => 267525)


--- trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html	2020-09-24 11:49:36 UTC (rev 267525)
@@ -30,7 +30,7 @@
 
         window.outputArray = new Float32Array(analyser.frequencyBinCount);
         window.silentArray = new Float32Array(analyser.frequencyBinCount);
-        silentArray.fill(-Infinity);
+        silentArray.fill(analyser.minDecibels);
 
         var intervalToken = setInterval(() => {
             analyser.getFloatFrequencyData(outputArray);

Deleted: trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect-expected.txt (267524 => 267525)


--- trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect-expected.txt	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect-expected.txt	2020-09-24 11:49:36 UTC (rev 267525)
@@ -1,10 +0,0 @@
-Ensure that audio is not rendered when tainted by a remote audio resource when CORS is not enabled.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS outputArray is silentArray
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect.html (267524 => 267525)


--- trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect.html	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/LayoutTests/http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect.html	2020-09-24 11:49:36 UTC (rev 267525)
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <script src=""
-    <script src=""
-</head>
-<body>
-<pre id="console"></pre>
-<script>
-    description("Ensure that audio is not rendered when tainted by a remote audio resource when CORS is not enabled.");
-    window.jsTestIsAsync = true;
-
-    function go() {
-        let audio = new Audio();
-        let mediaFile = findMediaFile("audio", "../../media/resources/1000Hz-sin");
-        let type = mimeTypeForExtension(mediaFile.split('.').pop());
-        audio.src = "" + encodeURIComponent("http://127.0.0.1:8080/security/resources/video-cross-origin-allow.php?name=" + mediaFile + "&type=" + type);
-
-        context = new AudioContext();
-        let mediaSource = context.createMediaElementSource(audio);
-        let analyser = context.createAnalyser();
-        analyser.fftSize = 32;
-
-        mediaSource.connect(analyser);
-
-        context.resume().then(() => {
-            audio.play();
-        });
-
-        window.outputArray = new Float32Array(analyser.frequencyBinCount);
-        window.silentArray = new Float32Array(analyser.frequencyBinCount);
-        silentArray.fill(-Infinity);
-
-        var intervalToken = setInterval(() => {
-            analyser.getFloatFrequencyData(outputArray);
-        }, 30);
-
-        audio.addEventListener("ended", event => {
-            clearInterval(intervalToken);
-            context.suspend().then(() => {
-                shouldBe("outputArray", "silentArray");
-                finishJSTest();
-            });
-        });
-    }
-    window.addEventListener('load', go);
-</script>
-<script src=""
-</body>
-</html>

Modified: trunk/Source/WebCore/ChangeLog (267524 => 267525)


--- trunk/Source/WebCore/ChangeLog	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/Source/WebCore/ChangeLog	2020-09-24 11:49:36 UTC (rev 267525)
@@ -1,3 +1,17 @@
+2020-09-24  Commit Queue  <[email protected]>
+
+        Unreviewed, reverting r267507.
+        https://bugs.webkit.org/show_bug.cgi?id=216923
+
+        Broke two layout tests on windows
+
+        Reverted changeset:
+
+        "web audio api outputs silence for 302 redirected resource in
+        safari"
+        https://bugs.webkit.org/show_bug.cgi?id=214932
+        https://trac.webkit.org/changeset/267507
+
 2020-09-24  Youenn Fablet  <[email protected]>
 
         REGRESSION (iOS/Safari 14): MediaRecorder produces invalid video files

Modified: trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp (267524 => 267525)


--- trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp	2020-09-24 09:17:14 UTC (rev 267524)
+++ trunk/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp	2020-09-24 11:49:36 UTC (rev 267525)
@@ -123,9 +123,7 @@
 
 bool MediaElementAudioSourceNode::wouldTaintOrigin()
 {
-    // If the resource is redirected to another origin, treat it as tainted if the crossorigin attribute
-    // is not set. This is done for consistency with Blink.
-    if (!m_mediaElement->hasSingleSecurityOrigin() && m_mediaElement->crossOrigin().isNull())
+    if (!m_mediaElement->hasSingleSecurityOrigin())
         return true;
 
     if (m_mediaElement->didPassCORSAccessCheck())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to