Title: [232161] branches/safari-605-branch
- Revision
- 232161
- Author
- jer.no...@apple.com
- Date
- 2018-05-24 12:44:42 -0700 (Thu, 24 May 2018)
Log Message
[El Capitan] FAIL http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html
https://bugs.webkit.org/show_bug.cgi?id=185920
Reviewed by Eric Carlson.
Source/WebCore:
Disable the recently added CORS checks for MediaElementAudioSourceNode on El Capitan; no custom media loading
is available there, so we don't have the ability to tell if HTMLMediaElement loads are CORS-valid.
* Modules/webaudio/MediaElementAudioSourceNode.cpp:
(WebCore::MediaElementAudioSourceNode::setFormat):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: branches/safari-605-branch/LayoutTests/ChangeLog (232160 => 232161)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-05-24 19:32:12 UTC (rev 232160)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-05-24 19:44:42 UTC (rev 232161)
@@ -1,3 +1,12 @@
+2018-05-23 Jer Noble <jer.no...@apple.com>
+
+ [El Capitan] FAIL http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html
+ https://bugs.webkit.org/show_bug.cgi?id=185920
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
2018-05-17 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r229503. rdar://problem/39841080
Modified: branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations (232160 => 232161)
--- branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations 2018-05-24 19:32:12 UTC (rev 232160)
+++ branches/safari-605-branch/LayoutTests/platform/mac/TestExpectations 2018-05-24 19:44:42 UTC (rev 232161)
@@ -1770,4 +1770,7 @@
inspector/canvas/requestContent-webgl2.html [ Skip ]
webkit.org/b/182422 imported/w3c/web-platform-tests/2dcontext/imagebitmap/createImageBitmap-origin.sub.html [ Pass Failure ]
-webkit.org/b/181831 [ HighSierra+ ] fast/forms/searchfield-heights.html [ Pass Failure ]
\ No newline at end of file
+webkit.org/b/181831 [ HighSierra+ ] fast/forms/searchfield-heights.html [ Pass Failure ]
+
+# <rdar://problem/40334739> Custom Media Loading is not available on El Capitan, so CORS checks all fail
+[ ElCapitan ] http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin.html [ Skip ]
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (232160 => 232161)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-05-24 19:32:12 UTC (rev 232160)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-05-24 19:44:42 UTC (rev 232161)
@@ -1,3 +1,16 @@
+2018-05-23 Jer Noble <jer.no...@apple.com>
+
+ [El Capitan] FAIL http/tests/security/webaudio-render-remote-audio-allowed-crossorigin.html
+ https://bugs.webkit.org/show_bug.cgi?id=185920
+
+ Reviewed by Eric Carlson.
+
+ Disable the recently added CORS checks for MediaElementAudioSourceNode on El Capitan; no custom media loading
+ is available there, so we don't have the ability to tell if HTMLMediaElement loads are CORS-valid.
+
+ * Modules/webaudio/MediaElementAudioSourceNode.cpp:
+ (WebCore::MediaElementAudioSourceNode::setFormat):
+
2018-05-17 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r229503. rdar://problem/39841080
Modified: branches/safari-605-branch/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp (232160 => 232161)
--- branches/safari-605-branch/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp 2018-05-24 19:32:12 UTC (rev 232160)
+++ branches/safari-605-branch/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp 2018-05-24 19:44:42 UTC (rev 232161)
@@ -67,7 +67,9 @@
void MediaElementAudioSourceNode::setFormat(size_t numberOfChannels, float sourceSampleRate)
{
+#if !PLATFORM(MAC) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101200
m_muted = wouldTaintOrigin();
+#endif
if (numberOfChannels != m_sourceNumberOfChannels || sourceSampleRate != m_sourceSampleRate) {
if (!numberOfChannels || numberOfChannels > AudioContext::maxNumberOfChannels() || sourceSampleRate < minSampleRate || sourceSampleRate > maxSampleRate) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
