<!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>[278514] trunk/Source/WebKit</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/278514">278514</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-04 17:24:16 -0700 (Fri, 04 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Store MediaPlayer using WeakPtr in MediaPlayerPrivateRemote
https://bugs.webkit.org/show_bug.cgi?id=224421

Unreviewed. Address Darin's post commit commnet.

* WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::load):
(WebKit::MediaPlayerPrivateRemote::networkStateChanged):
(WebKit::MediaPlayerPrivateRemote::setReadyState):
(WebKit::MediaPlayerPrivateRemote::readyStateChanged):
(WebKit::MediaPlayerPrivateRemote::volumeChanged):
(WebKit::MediaPlayerPrivateRemote::muteChanged):
(WebKit::MediaPlayerPrivateRemote::timeChanged):
(WebKit::MediaPlayerPrivateRemote::durationChanged):
(WebKit::MediaPlayerPrivateRemote::rateChanged):
(WebKit::MediaPlayerPrivateRemote::playbackStateChanged):
(WebKit::MediaPlayerPrivateRemote::engineFailedToLoad):
(WebKit::MediaPlayerPrivateRemote::characteristicChanged):
(WebKit::MediaPlayerPrivateRemote::sizeChanged):
(WebKit::MediaPlayerPrivateRemote::firstVideoFrameAvailable):
(WebKit::MediaPlayerPrivateRemote::renderingModeChanged):
(WebKit::MediaPlayerPrivateRemote::acceleratedRenderingStateChanged):
(WebKit::MediaPlayerPrivateRemote::addRemoteAudioTrack):
(WebKit::MediaPlayerPrivateRemote::removeRemoteAudioTrack):
(WebKit::MediaPlayerPrivateRemote::addRemoteTextTrack):
(WebKit::MediaPlayerPrivateRemote::removeRemoteTextTrack):
(WebKit::MediaPlayerPrivateRemote::addRemoteVideoTrack):
(WebKit::MediaPlayerPrivateRemote::removeRemoteVideoTrack):
(WebKit::MediaPlayerPrivateRemote::currentPlaybackTargetIsWirelessChanged):
(WebKit::MediaPlayerPrivateRemote::mediaPlayerKeyNeeded):
(WebKit::MediaPlayerPrivateRemote::waitingForKeyChanged):
(WebKit::MediaPlayerPrivateRemote::initializationDataEncountered):
(WebKit::MediaPlayerPrivateRemote::resourceNotSupported):
(WebKit::MediaPlayerPrivateRemote::activeSourceBuffersChanged):
(WebKit::MediaPlayerPrivateRemote::getRawCookies const):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessGPUmediaMediaPlayerPrivateRemotecpp">trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (278513 => 278514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-06-05 00:22:08 UTC (rev 278513)
+++ trunk/Source/WebKit/ChangeLog       2021-06-05 00:24:16 UTC (rev 278514)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2021-06-04  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Store MediaPlayer using WeakPtr in MediaPlayerPrivateRemote
+        https://bugs.webkit.org/show_bug.cgi?id=224421
+
+        Unreviewed. Address Darin's post commit commnet.
+
+        * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+        (WebKit::MediaPlayerPrivateRemote::load):
+        (WebKit::MediaPlayerPrivateRemote::networkStateChanged):
+        (WebKit::MediaPlayerPrivateRemote::setReadyState):
+        (WebKit::MediaPlayerPrivateRemote::readyStateChanged):
+        (WebKit::MediaPlayerPrivateRemote::volumeChanged):
+        (WebKit::MediaPlayerPrivateRemote::muteChanged):
+        (WebKit::MediaPlayerPrivateRemote::timeChanged):
+        (WebKit::MediaPlayerPrivateRemote::durationChanged):
+        (WebKit::MediaPlayerPrivateRemote::rateChanged):
+        (WebKit::MediaPlayerPrivateRemote::playbackStateChanged):
+        (WebKit::MediaPlayerPrivateRemote::engineFailedToLoad):
+        (WebKit::MediaPlayerPrivateRemote::characteristicChanged):
+        (WebKit::MediaPlayerPrivateRemote::sizeChanged):
+        (WebKit::MediaPlayerPrivateRemote::firstVideoFrameAvailable):
+        (WebKit::MediaPlayerPrivateRemote::renderingModeChanged):
+        (WebKit::MediaPlayerPrivateRemote::acceleratedRenderingStateChanged):
+        (WebKit::MediaPlayerPrivateRemote::addRemoteAudioTrack):
+        (WebKit::MediaPlayerPrivateRemote::removeRemoteAudioTrack):
+        (WebKit::MediaPlayerPrivateRemote::addRemoteTextTrack):
+        (WebKit::MediaPlayerPrivateRemote::removeRemoteTextTrack):
+        (WebKit::MediaPlayerPrivateRemote::addRemoteVideoTrack):
+        (WebKit::MediaPlayerPrivateRemote::removeRemoteVideoTrack):
+        (WebKit::MediaPlayerPrivateRemote::currentPlaybackTargetIsWirelessChanged):
+        (WebKit::MediaPlayerPrivateRemote::mediaPlayerKeyNeeded):
+        (WebKit::MediaPlayerPrivateRemote::waitingForKeyChanged):
+        (WebKit::MediaPlayerPrivateRemote::initializationDataEncountered):
+        (WebKit::MediaPlayerPrivateRemote::resourceNotSupported):
+        (WebKit::MediaPlayerPrivateRemote::activeSourceBuffersChanged):
+        (WebKit::MediaPlayerPrivateRemote::getRawCookies const):
+
</ins><span class="cx"> 2021-06-04  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Flaky crash under UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy() on the bots
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessGPUmediaMediaPlayerPrivateRemotecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (278513 => 278514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp    2021-06-05 00:22:08 UTC (rev 278513)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp       2021-06-05 00:24:16 UTC (rev 278514)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">         if (!createExtension()) {
</span><span class="cx">             WTFLogAlways("Unable to create sandbox extension handle for GPUProcess url.\n");
</span><span class="cx">             m_cachedState.networkState = MediaPlayer::NetworkState::FormatError;
</span><del>-            if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+            if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">                 player->networkStateChanged();
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::networkStateChanged(RemoteMediaPlayerState&& state)
</span><span class="cx"> {
</span><span class="cx">     updateCachedState(WTFMove(state));
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->networkStateChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::setReadyState(MediaPlayer::ReadyState readyState)
</span><span class="cx"> {
</span><span class="cx">     m_cachedState.readyState = readyState;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->readyStateChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::readyStateChanged(RemoteMediaPlayerState&& state)
</span><span class="cx"> {
</span><span class="cx">     updateCachedState(WTFMove(state));
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->readyStateChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::volumeChanged(double volume)
</span><span class="cx"> {
</span><span class="cx">     m_volume = volume;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->volumeChanged(volume);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::muteChanged(bool muted)
</span><span class="cx"> {
</span><span class="cx">     m_muted = muted;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->muteChanged(muted);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> {
</span><span class="cx">     m_seeking = false;
</span><span class="cx">     updateCachedState(WTFMove(state));
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->timeChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::durationChanged(RemoteMediaPlayerState&& state)
</span><span class="cx"> {
</span><span class="cx">     updateCachedState(WTFMove(state));
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->durationChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::rateChanged(double rate)
</span><span class="cx"> {
</span><span class="cx">     m_rate = rate;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->rateChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx">     m_cachedState.paused = paused;
</span><span class="cx">     m_cachedMediaTime = mediaTime;
</span><span class="cx">     m_cachedMediaTimeQueryTime = wallTime;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->playbackStateChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::engineFailedToLoad(long platformErrorCode)
</span><span class="cx"> {
</span><span class="cx">     m_platformErrorCode = platformErrorCode;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->remoteEngineFailedToLoad();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::characteristicChanged(RemoteMediaPlayerState&& state)
</span><span class="cx"> {
</span><span class="cx">     updateCachedState(WTFMove(state));
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->characteristicChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::sizeChanged(WebCore::FloatSize naturalSize)
</span><span class="cx"> {
</span><span class="cx">     m_cachedState.naturalSize = naturalSize;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->sizeChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::firstVideoFrameAvailable()
</span><span class="cx"> {
</span><span class="cx">     INFO_LOG(LOGIDENTIFIER);
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->firstVideoFrameAvailable();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::renderingModeChanged()
</span><span class="cx"> {
</span><span class="cx">     INFO_LOG(LOGIDENTIFIER);
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->renderingModeChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivateRemote::acceleratedRenderingStateChanged()
</span><span class="cx"> {
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         connection().send(Messages::RemoteMediaPlayerProxy::AcceleratedRenderingStateChanged(player->supportsAcceleratedRendering()), m_id);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx">         return;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         m_player->addAudioTrack(addResult.iterator->value);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx">     ASSERT(m_audioTracks.contains(identifier));
</span><span class="cx"> 
</span><span class="cx">     if (auto* track = m_audioTracks.get(identifier)) {
</span><del>-        if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+        if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">             player->removeAudioTrack(*track);
</span><span class="cx">         m_audioTracks.remove(identifier);
</span><span class="cx">     }
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx">         return;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->addTextTrack(addResult.iterator->value);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -592,7 +592,7 @@
</span><span class="cx">     ASSERT(m_textTracks.contains(identifier));
</span><span class="cx"> 
</span><span class="cx">     if (auto* track = m_textTracks.get(identifier)) {
</span><del>-        if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+        if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">             player->removeTextTrack(*track);
</span><span class="cx">         m_textTracks.remove(identifier);
</span><span class="cx">     }
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx">         return;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->addVideoTrack(addResult.iterator->value);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx">     ASSERT(m_videoTracks.contains(identifier));
</span><span class="cx"> 
</span><span class="cx">     if (auto* track = m_videoTracks.get(identifier)) {
</span><del>-        if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+        if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">             player->removeVideoTrack(*track);
</span><span class="cx">         m_videoTracks.remove(identifier);
</span><span class="cx">     }
</span><span class="lines">@@ -993,7 +993,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::currentPlaybackTargetIsWirelessChanged(bool isCurrentPlaybackTargetWireless)
</span><span class="cx"> {
</span><span class="cx">     m_isCurrentPlaybackTargetWireless = isCurrentPlaybackTargetWireless;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->currentPlaybackTargetIsWirelessChanged(isCurrentPlaybackTargetWireless);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivateRemote::mediaPlayerKeyNeeded(IPC::DataReference&& message)
</span><span class="cx"> {
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->keyNeeded(Uint8Array::create(message.data(), message.size()).ptr());
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1154,7 +1154,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::waitingForKeyChanged(bool waitingForKey)
</span><span class="cx"> {
</span><span class="cx">     m_waitingForKey = waitingForKey;
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->waitingForKeyChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1161,7 +1161,7 @@
</span><span class="cx"> void MediaPlayerPrivateRemote::initializationDataEncountered(const String& initDataType, IPC::DataReference&& initData)
</span><span class="cx"> {
</span><span class="cx">     auto initDataBuffer = ArrayBuffer::create(initData.data(), initData.size());
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->initializationDataEncountered(initDataType, WTFMove(initDataBuffer));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1336,13 +1336,13 @@
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivateRemote::resourceNotSupported()
</span><span class="cx"> {
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->resourceNotSupported();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MediaPlayerPrivateRemote::activeSourceBuffersChanged()
</span><span class="cx"> {
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->activeSourceBuffersChanged();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1349,7 +1349,7 @@
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx"> void MediaPlayerPrivateRemote::getRawCookies(const URL& url, WebCore::MediaPlayerClient::GetRawCookiesCallback&& completionHandler) const
</span><span class="cx"> {
</span><del>-    if (auto player = makeRefPtr(m_player.get()); player)
</del><ins>+    if (auto player = makeRefPtr(m_player.get()))
</ins><span class="cx">         player->getRawCookies(url, WTFMove(completionHandler));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>

</body>
</html>