Attachment 341129 Details for Bug 185920 – Patch for landing

[patch] Patch for landing

bug-185920-20180523141323.patch (text/plain), 3.52 KB, created by Jer Noble on 2018-05-23 14:13:27 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-05-23 14:13:27 PDT

Size: 3.52 KB

patch

obsolete

>Subversion Revision: 232115
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 546f8b3d5cfdbb55a3a42bd2662de532c2b18c83..c463c68fd64a88817748e575dbaa14130127060d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-23  Jer Noble  <jer.noble@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-04-05  Jer Noble  <jer.noble@apple.com>
> 
>         ASSERTION FAILED: m_scriptExecutionContext under WebCore::AudioContext::isPlayingAudioDidChange()
>diff --git a/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp b/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp
>index 9eca86f2103ba2905ca7b24af17d97a9129483d1..264ba158f0e5ba768322e155296e80600699757a 100644
>--- a/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp
>+++ b/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp
>@@ -67,7 +67,9 @@ MediaElementAudioSourceNode::~MediaElementAudioSourceNode()
> 
> 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) {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 442708d1d2469ecb2d805e05c8f2815a85e0a04d..6f8d10cf2fdcd5845b7cf99adb87e4caaaa9f1cd 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,12 @@
>+2018-05-23  Jer Noble  <jer.noble@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-04-05  Jer Noble  <jer.noble@apple.com>
> 
>         ASSERTION FAILED: m_scriptExecutionContext under WebCore::AudioContext::isPlayingAudioDidChange()
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 52d1e533a44825ddaaf8008d30c243240e985d53..d423d4dd825fb2dea9ea525309b15f5eeee50fee 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -1925,3 +1925,6 @@ webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/i18n/css3-text-
> webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-115.html [ ImageOnlyFailure ]
> webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/i18n/css3-text-line-break-opclns-116.html [ ImageOnlyFailure ]
> webkit.org/b/183258 imported/w3c/web-platform-tests/css/css-text/word-break/word-break-break-all-006.html [ ImageOnlyFailure ]
>+
>+# <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 ]

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 185920: 341121 | 341123 | 341129 | 341143