<!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>[278056] 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/278056">278056</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2021-05-25 16:17:31 -0700 (Tue, 25 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] ASSERTION FAILED: !isMainThread() in WebCore::SpeechRecognitionCaptureSourceImpl::audioSamplesAvailable
https://bugs.webkit.org/show_bug.cgi?id=226247
<rdar://problem/78481513>

Unreviewed, drop threading assertions I added in <a href="http://trac.webkit.org/projects/webkit/changeset/277921">r277921</a> as my understanding was wrong
about which thread the functions run on and they are hitting on the bots.

* Modules/speech/SpeechRecognitionCaptureSourceImpl.cpp:
(WebCore::SpeechRecognitionCaptureSourceImpl::updateDataSource):
* Modules/speech/SpeechRecognitionCaptureSourceImpl.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesspeechSpeechRecognitionCaptureSourceImplcpp">trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesspeechSpeechRecognitionCaptureSourceImplh">trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278055 => 278056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-25 23:14:19 UTC (rev 278055)
+++ trunk/Source/WebCore/ChangeLog      2021-05-25 23:17:31 UTC (rev 278056)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-05-25  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] ASSERTION FAILED: !isMainThread() in WebCore::SpeechRecognitionCaptureSourceImpl::audioSamplesAvailable
+        https://bugs.webkit.org/show_bug.cgi?id=226247
+        <rdar://problem/78481513>
+
+        Unreviewed, drop threading assertions I added in r277921 as my understanding was wrong
+        about which thread the functions run on and they are hitting on the bots.
+
+        * Modules/speech/SpeechRecognitionCaptureSourceImpl.cpp:
+        (WebCore::SpeechRecognitionCaptureSourceImpl::updateDataSource):
+        * Modules/speech/SpeechRecognitionCaptureSourceImpl.h:
+
</ins><span class="cx"> 2021-05-25  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Make error returned by SQLiteIDBBackingStore::getOrEstablishDatabaseInfo more detailed
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesspeechSpeechRecognitionCaptureSourceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.cpp (278055 => 278056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.cpp       2021-05-25 23:14:19 UTC (rev 278055)
+++ trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.cpp  2021-05-25 23:17:31 UTC (rev 278056)
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> bool SpeechRecognitionCaptureSourceImpl::updateDataSource(const CAAudioStreamDescription& audioDescription)
</span><span class="cx"> {
</span><del>-    ASSERT(!isMainThread());
-
</del><span class="cx">     if (!m_dataSourceLock.tryLock())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="lines">@@ -128,7 +126,6 @@
</span><span class="cx"> // FIXME: It is unclear why it is safe to use m_dataSource without locking in this function.
</span><span class="cx"> void SpeechRecognitionCaptureSourceImpl::audioSamplesAvailable(const MediaTime& time, const PlatformAudioData& data, const AudioStreamDescription& description, size_t sampleCount) WTF_IGNORES_THREAD_SAFETY_ANALYSIS
</span><span class="cx"> {
</span><del>-    ASSERT(!isMainThread());
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     DisableMallocRestrictionsForCurrentThreadScope scope;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesspeechSpeechRecognitionCaptureSourceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.h (278055 => 278056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.h 2021-05-25 23:14:19 UTC (rev 278055)
+++ trunk/Source/WebCore/Modules/speech/SpeechRecognitionCaptureSourceImpl.h    2021-05-25 23:17:31 UTC (rev 278056)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">     Ref<RealtimeMediaSource> m_source;
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-    RefPtr<AudioSampleDataSource> m_dataSource WTF_GUARDED_BY_LOCK(m_dataSourceLock); // Only modified on the audio thread but may get used on the main thread.
</del><ins>+    RefPtr<AudioSampleDataSource> m_dataSource WTF_GUARDED_BY_LOCK(m_dataSourceLock);
</ins><span class="cx">     Lock m_dataSourceLock;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>