<!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>[246001] branches/safari-607-branch/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/246001">246001</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-05-31 16:49:14 -0700 (Fri, 31 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Apply patch. rdar://problem/50871594</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchSourceWebCoreChangeLog">branches/safari-607-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCoreModulesmediastreamMediaStreamTrackcpp">branches/safari-607-branch/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp</a></li>
<li><a href="#branchessafari607branchSourceWebCorehtmlHTMLMediaElementh">branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (246000 => 246001)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/ChangeLog      2019-05-31 23:43:29 UTC (rev 246000)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-05-31 23:49:14 UTC (rev 246001)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2019-05-31  Alan Coon  <alancoon@apple.com>
+
+        Apply patch. rdar://problem/50871594
+
+    2019-05-31  youenn fablet  <youennf@gmail.com>
+
+            REGRESSION(245357): Netflix, Hulu, Amazon, YouTube Rental video playback crash at com.apple.WebCore: WebCore::WebKitMediaKeys::setMediaElement
+            rdar://problem/50871594
+
+            Do not cast WeakPtr<MediaProducer> into WeakPtr<HTMLMediaElement>.
+            Instead, make HTMLMediaElement again a CanMakeWeakPtr<HTMLMediaElement>
+            and directly create WeakPtr<HTMLMediaElement>.
+
+            For MediaStreamTrack, rely on weakThis to know whether 'this' is still alive and use 'this' directly.
+
+            Manually tested.
+
+            * Modules/mediastream/MediaStreamTrack.cpp:
+            (WebCore::MediaStreamTrack::applyConstraints):
+            * html/HTMLMediaElement.h:
+
</ins><span class="cx"> 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Apply patch. rdar://problem/50801017
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCoreModulesmediastreamMediaStreamTrackcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (246000 => 246001)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp       2019-05-31 23:43:29 UTC (rev 246000)
+++ branches/safari-607-branch/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp  2019-05-31 23:49:14 UTC (rev 246001)
</span><span class="lines">@@ -331,16 +331,16 @@
</span><span class="cx">     m_promise = WTFMove(promise);
</span><span class="cx"> 
</span><span class="cx">     auto weakThis = makeWeakPtr(*this);
</span><del>-    auto failureHandler = [weakThis, this] (const String& failedConstraint, const String& message) {
-        if (!weakThis || !m_promise)
</del><ins>+    auto failureHandler = [weakThis] (const String& failedConstraint, const String& message) {
+        if (!weakThis || !weakThis->m_promise)
</ins><span class="cx">             return;
</span><del>-        m_promise->rejectType<IDLInterface<OverconstrainedError>>(OverconstrainedError::create(failedConstraint, message).get());
</del><ins>+        weakThis->m_promise->rejectType<IDLInterface<OverconstrainedError>>(OverconstrainedError::create(failedConstraint, message).get());
</ins><span class="cx">     };
</span><del>-    auto successHandler = [weakThis, this, constraints] () {
-        if (!weakThis || !m_promise)
</del><ins>+    auto successHandler = [weakThis, constraints] () {
+        if (!weakThis || !weakThis->m_promise)
</ins><span class="cx">             return;
</span><del>-        m_promise->resolve();
-        m_constraints = constraints.valueOr(MediaTrackConstraints { });
</del><ins>+        weakThis->m_promise->resolve();
+        weakThis->m_constraints = constraints.valueOr(MediaTrackConstraints { });
</ins><span class="cx">     };
</span><span class="cx">     m_private->applyConstraints(createMediaConstraints(constraints), WTFMove(successHandler), WTFMove(failureHandler));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.h (246000 => 246001)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.h        2019-05-31 23:43:29 UTC (rev 246000)
+++ branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.h   2019-05-31 23:49:14 UTC (rev 246001)
</span><span class="lines">@@ -126,11 +126,10 @@
</span><span class="cx">     : public HTMLElement
</span><span class="cx">     , public ActiveDOMObject
</span><span class="cx">     , public MediaControllerInterface
</span><del>-    , public CanMakeWeakPtr<HTMLMediaElement>
</del><span class="cx">     , public PlatformMediaSessionClient
</span><span class="cx">     , private MediaCanStartListener
</span><span class="cx">     , private MediaPlayerClient
</span><del>-    , private MediaProducer
</del><ins>+    , public MediaProducer
</ins><span class="cx">     , private VisibilityChangeClient
</span><span class="cx">     , private ApplicationStateChangeListener
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="lines">@@ -188,8 +187,6 @@
</span><span class="cx">     MediaPlayerEnums::VideoGravity videoFullscreenGravity() const { return m_videoFullscreenGravity; }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    using CanMakeWeakPtr<HTMLMediaElement>::weakPtrFactory;
-
</del><span class="cx">     void scheduleCheckPlaybackTargetCompatability();
</span><span class="cx">     void checkPlaybackTargetCompatablity();
</span><span class="cx">     void scheduleResolvePendingPlayPromises();
</span></span></pre>
</div>
</div>

</body>
</html>