<!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>[277512] 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/277512">277512</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2021-05-14 15:27:45 -0700 (Fri, 14 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add ScriptDisallowedScope to MediaPlayerPrivateAVFoundation
https://bugs.webkit.org/show_bug.cgi?id=225797

Reviewed by Eric Carlson.

Deployed ScriptDisallowedScope to a bunch of functions in MediaPlayerPrivateAVFoundation.

* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::updateStates):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
(-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):
(-[WebCoreAVFMovieObserver metadataOutput:didOutputTimedMetadataGroups:fromPlayerItemTrack:]):
(-[WebCoreAVFLoaderDelegate resourceLoader:didCancelLoadingRequest:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (277511 => 277512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-14 22:26:31 UTC (rev 277511)
+++ trunk/Source/WebCore/ChangeLog      2021-05-14 22:27:45 UTC (rev 277512)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-05-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Add ScriptDisallowedScope to MediaPlayerPrivateAVFoundation
+        https://bugs.webkit.org/show_bug.cgi?id=225797
+
+        Reviewed by Eric Carlson.
+
+        Deployed ScriptDisallowedScope to a bunch of functions in MediaPlayerPrivateAVFoundation.
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::updateStates):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]):
+        (-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):
+        (-[WebCoreAVFMovieObserver metadataOutput:didOutputTimedMetadataGroups:fromPlayerItemTrack:]):
+        (-[WebCoreAVFLoaderDelegate resourceLoader:didCancelLoadingRequest:]):
+
</ins><span class="cx"> 2021-05-14  Jean-Yves Avenard  <jya@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Bad media session artwork URL results in blue "broken image" icon being shown in Now Playing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (277511 => 277512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp   2021-05-14 22:26:31 UTC (rev 277511)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp      2021-05-14 22:27:45 UTC (rev 277512)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "PlatformLayer.h"
</span><span class="cx"> #include "PlatformTimeRanges.h"
</span><ins>+#include "ScriptDisallowedScope.h"
</ins><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <CoreMedia/CoreMedia.h>
</span><span class="cx"> #include <JavaScriptCore/DataView.h>
</span><span class="lines">@@ -477,6 +478,8 @@
</span><span class="cx">     if (m_ignoreLoadStateChanges)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    ScriptDisallowedScope::InMainThread scriptDisallowedScope;
+
</ins><span class="cx">     MediaPlayer::NetworkState newNetworkState = m_networkState;
</span><span class="cx">     MediaPlayer::ReadyState newReadyState = m_readyState;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (277511 => 277512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm   2021-05-14 22:26:31 UTC (rev 277511)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm      2021-05-14 22:27:45 UTC (rev 277512)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> #import "PixelBufferConformerCV.h"
</span><span class="cx"> #import "PlatformTimeRanges.h"
</span><span class="cx"> #import "RuntimeApplicationChecks.h"
</span><ins>+#import "ScriptDisallowedScope.h"
</ins><span class="cx"> #import "SecurityOrigin.h"
</span><span class="cx"> #import "SerializedPlatformDataCueMac.h"
</span><span class="cx"> #import "SharedBuffer.h"
</span><span class="lines">@@ -3604,6 +3605,9 @@
</span><span class="cx">         m_taskQueue.enqueueTask([player = m_player, keyPath = WTFMove(keyPath), change = WTFMove(change), object = WTFMove(object), context] {
</span><span class="cx">             if (!player)
</span><span class="cx">                 return;
</span><ins>+
+            ScriptDisallowedScope::InMainThread scriptDisallowedScope;
+
</ins><span class="cx">             id newValue = [change valueForKey:NSKeyValueChangeNewKey];
</span><span class="cx">             bool willChange = [[change valueForKey:NSKeyValueChangeNotificationIsPriorKey] boolValue];
</span><span class="cx">             bool shouldLogValue = !willChange;
</span><span class="lines">@@ -3700,6 +3704,9 @@
</span><span class="cx">         m_taskQueue.enqueueTask([player = m_player, strings = WTFMove(strings), nativeSamples = WTFMove(nativeSamples), itemTime] {
</span><span class="cx">             if (!player)
</span><span class="cx">                 return;
</span><ins>+
+            ScriptDisallowedScope::InMainThread scriptDisallowedScope;
+
</ins><span class="cx">             MediaTime time = std::max(PAL::toMediaTime(itemTime), MediaTime::zeroTime());
</span><span class="cx">             player->processCue(strings.get(), nativeSamples.get(), time);
</span><span class="cx">         });
</span><span class="lines">@@ -3731,6 +3738,8 @@
</span><span class="cx">         if (!player)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><ins>+        ScriptDisallowedScope::InMainThread scriptDisallowedScope;
+
</ins><span class="cx">         for (AVTimedMetadataGroup *group in metadataGroups.get())
</span><span class="cx">             player->metadataDidArrive(retainPtr(group.items), currentTime);
</span><span class="cx">     });
</span><span class="lines">@@ -3800,6 +3809,9 @@
</span><span class="cx">     UNUSED_PARAM(resourceLoader);
</span><span class="cx">     ensureOnMainThread([self, strongSelf = retainPtr(self), loadingRequest = retainPtr(loadingRequest)]() mutable {
</span><span class="cx">         m_taskQueue.enqueueTask([player = m_player, loadingRequest = WTFMove(loadingRequest)] {
</span><ins>+
+            ScriptDisallowedScope::InMainThread scriptDisallowedScope;
+
</ins><span class="cx">             if (player)
</span><span class="cx">                 player->didCancelLoadingRequest(loadingRequest.get());
</span><span class="cx">         });
</span></span></pre>
</div>
</div>

</body>
</html>