<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[245889] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/245889">245889</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2019-05-30 09:49:29 -0700 (Thu, 30 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>ASSERTION FAILED: m_scriptExecutionContext under WebCore::AudioContext::isPlayingAudioDidChange()
https://bugs.webkit.org/show_bug.cgi?id=181597
<rdar://problem/36474088>

Reviewed by Eric Carlson.

Because document() is usually null-checked before using (and we can add null-checks where missing),
there's no good reason to debug-assert that m_scriptExecutionContext is non-null before downcast<>ing
to Document*.

* Modules/webaudio/AudioContext.cpp:
(WebCore::AudioContext::constructCommon):
(WebCore::AudioContext::stop):
(WebCore::AudioContext::document const):
(WebCore::AudioContext::visibilityStateChanged):
(WebCore::AudioContext::willBeginPlayback):
(WebCore::AudioContext::willPausePlayback):
(WebCore::AudioContext::pageMutedStateDidChange):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (245888 => 245889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-30 16:36:44 UTC (rev 245888)
+++ trunk/Source/WebCore/ChangeLog      2019-05-30 16:49:29 UTC (rev 245889)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2019-05-30  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><ins>+        ASSERTION FAILED: m_scriptExecutionContext under WebCore::AudioContext::isPlayingAudioDidChange()
+        https://bugs.webkit.org/show_bug.cgi?id=181597
+        <rdar://problem/36474088>
+
+        Reviewed by Eric Carlson.
+
+        Because document() is usually null-checked before using (and we can add null-checks where missing),
+        there's no good reason to debug-assert that m_scriptExecutionContext is non-null before downcast<>ing
+        to Document*.
+
+        * Modules/webaudio/AudioContext.cpp:
+        (WebCore::AudioContext::constructCommon):
+        (WebCore::AudioContext::stop):
+        (WebCore::AudioContext::document const):
+        (WebCore::AudioContext::visibilityStateChanged):
+        (WebCore::AudioContext::willBeginPlayback):
+        (WebCore::AudioContext::willPausePlayback):
+        (WebCore::AudioContext::pageMutedStateDidChange):
+
+2019-05-30  Jer Noble  <jer.noble@apple.com>
+
</ins><span class="cx">         Video playback in Safari should continue when CarPlay is plugged in
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198345
</span><span class="cx">         <rdar://problem/45505750>
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (245888 => 245889)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp   2019-05-30 16:36:44 UTC (rev 245888)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp      2019-05-30 16:49:29 UTC (rev 245889)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> 
</span><span class="cx"> WTF_MAKE_ISO_ALLOCATED_IMPL(AudioContext);
</span><span class="cx"> 
</span><del>-#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(document()->page() && document()->page()->isAlwaysOnLoggingAllowed(), Media, "%p - AudioContext::" fmt, this, ##__VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(document() && document()->page() && document()->page()->isAlwaysOnLoggingAllowed(), Media, "%p - AudioContext::" fmt, this, ##__VA_ARGS__)
</ins><span class="cx">     
</span><span class="cx"> bool AudioContext::isSampleRateRangeGood(float sampleRate)
</span><span class="cx"> {
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx">     
</span><span class="cx">     m_listener = AudioListener::create();
</span><span class="cx"> 
</span><ins>+    ASSERT(document());
</ins><span class="cx">     if (document()->audioPlaybackRequiresUserGesture())
</span><span class="cx">         addBehaviorRestriction(RequireUserGestureForAudioStartRestriction);
</span><span class="cx">     else
</span><span class="lines">@@ -329,6 +330,7 @@
</span><span class="cx">         return;
</span><span class="cx">     m_isStopScheduled = true;
</span><span class="cx"> 
</span><ins>+    ASSERT(document());
</ins><span class="cx">     document()->updateIsPlayingMedia();
</span><span class="cx"> 
</span><span class="cx">     m_eventQueue->close();
</span><span class="lines">@@ -350,7 +352,6 @@
</span><span class="cx"> 
</span><span class="cx"> Document* AudioContext::document() const
</span><span class="cx"> {
</span><del>-    ASSERT(m_scriptExecutionContext);
</del><span class="cx">     return downcast<Document>(m_scriptExecutionContext);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -382,7 +383,7 @@
</span><span class="cx"> void AudioContext::visibilityStateChanged()
</span><span class="cx"> {
</span><span class="cx">     // Do not suspend if audio is audible.
</span><del>-    if (mediaState() == MediaProducer::IsPlayingAudio || m_isStopScheduled)
</del><ins>+    if (!document() || mediaState() == MediaProducer::IsPlayingAudio || m_isStopScheduled)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     if (document()->hidden()) {
</span><span class="lines">@@ -1083,6 +1084,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool AudioContext::willBeginPlayback()
</span><span class="cx"> {
</span><ins>+    if (!document())
+        return false;
+
</ins><span class="cx">     if (userGestureRequiredForAudioStart()) {
</span><span class="cx">         if (!processingUserGestureForMedia() && !document()->isCapturing()) {
</span><span class="cx">             ALWAYS_LOG(LOGIDENTIFIER, "returning false, not processing user gesture or capturing");
</span><span class="lines">@@ -1109,6 +1113,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool AudioContext::willPausePlayback()
</span><span class="cx"> {
</span><ins>+    if (!document())
+        return false;
+
</ins><span class="cx">     if (userGestureRequiredForAudioStart()) {
</span><span class="cx">         if (!processingUserGestureForMedia())
</span><span class="cx">             return false;
</span><span class="lines">@@ -1154,7 +1161,7 @@
</span><span class="cx"> 
</span><span class="cx"> void AudioContext::pageMutedStateDidChange()
</span><span class="cx"> {
</span><del>-    if (m_destinationNode && document()->page())
</del><ins>+    if (m_destinationNode && document() && document()->page())
</ins><span class="cx">         m_destinationNode->setMuted(document()->page()->isAudioMuted());
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>