[webkit-changes] [278514] trunk/Source/WebKit

Fri, 04 Jun 2021 17:25:08 -0700

Title: [278514] trunk/Source/WebKit
Revision
278514
Author
[email protected]
Date
2021-06-04 17:24:16 -0700 (Fri, 04 Jun 2021)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (278513 => 278514)


--- 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)
@@ -1,3 +1,41 @@
+2021-06-04  Ryosuke Niwa  <[email protected]>
+
+        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):
+
 2021-06-04  Chris Dumez  <[email protected]>
 
         Flaky crash under UserMediaCaptureManagerProxy::SourceProxy::~SourceProxy() on the bots

Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (278513 => 278514)


--- 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)
@@ -177,7 +177,7 @@
         if (!createExtension()) {
             WTFLogAlways("Unable to create sandbox extension handle for GPUProcess url.\n");
             m_cachedState.networkState = MediaPlayer::NetworkState::FormatError;
-            if (auto player = makeRefPtr(m_player.get()); player)
+            if (auto player = makeRefPtr(m_player.get()))
                 player->networkStateChanged();
             return;
         }
@@ -316,7 +316,7 @@
 void MediaPlayerPrivateRemote::networkStateChanged(RemoteMediaPlayerState&& state)
 {
     updateCachedState(WTFMove(state));
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->networkStateChanged();
 }
 
@@ -323,7 +323,7 @@
 void MediaPlayerPrivateRemote::setReadyState(MediaPlayer::ReadyState readyState)
 {
     m_cachedState.readyState = readyState;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->readyStateChanged();
 }
 
@@ -330,7 +330,7 @@
 void MediaPlayerPrivateRemote::readyStateChanged(RemoteMediaPlayerState&& state)
 {
     updateCachedState(WTFMove(state));
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->readyStateChanged();
 }
 
@@ -337,7 +337,7 @@
 void MediaPlayerPrivateRemote::volumeChanged(double volume)
 {
     m_volume = volume;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->volumeChanged(volume);
 }
 
@@ -344,7 +344,7 @@
 void MediaPlayerPrivateRemote::muteChanged(bool muted)
 {
     m_muted = muted;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->muteChanged(muted);
 }
 
@@ -352,7 +352,7 @@
 {
     m_seeking = false;
     updateCachedState(WTFMove(state));
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->timeChanged();
 }
 
@@ -359,7 +359,7 @@
 void MediaPlayerPrivateRemote::durationChanged(RemoteMediaPlayerState&& state)
 {
     updateCachedState(WTFMove(state));
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->durationChanged();
 }
 
@@ -366,7 +366,7 @@
 void MediaPlayerPrivateRemote::rateChanged(double rate)
 {
     m_rate = rate;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->rateChanged();
 }
 
@@ -375,7 +375,7 @@
     m_cachedState.paused = paused;
     m_cachedMediaTime = mediaTime;
     m_cachedMediaTimeQueryTime = wallTime;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->playbackStateChanged();
 }
 
@@ -382,7 +382,7 @@
 void MediaPlayerPrivateRemote::engineFailedToLoad(long platformErrorCode)
 {
     m_platformErrorCode = platformErrorCode;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->remoteEngineFailedToLoad();
 }
 
@@ -389,7 +389,7 @@
 void MediaPlayerPrivateRemote::characteristicChanged(RemoteMediaPlayerState&& state)
 {
     updateCachedState(WTFMove(state));
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->characteristicChanged();
 }
 
@@ -396,7 +396,7 @@
 void MediaPlayerPrivateRemote::sizeChanged(WebCore::FloatSize naturalSize)
 {
     m_cachedState.naturalSize = naturalSize;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->sizeChanged();
 }
 
@@ -409,7 +409,7 @@
 void MediaPlayerPrivateRemote::firstVideoFrameAvailable()
 {
     INFO_LOG(LOGIDENTIFIER);
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->firstVideoFrameAvailable();
 }
 
@@ -416,7 +416,7 @@
 void MediaPlayerPrivateRemote::renderingModeChanged()
 {
     INFO_LOG(LOGIDENTIFIER);
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->renderingModeChanged();
 }
 
@@ -447,7 +447,7 @@
 
 void MediaPlayerPrivateRemote::acceleratedRenderingStateChanged()
 {
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         connection().send(Messages::RemoteMediaPlayerProxy::AcceleratedRenderingStateChanged(player->supportsAcceleratedRendering()), m_id);
 }
 
@@ -545,7 +545,7 @@
         return;
 #endif
 
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         m_player->addAudioTrack(addResult.iterator->value);
 }
 
@@ -554,7 +554,7 @@
     ASSERT(m_audioTracks.contains(identifier));
 
     if (auto* track = m_audioTracks.get(identifier)) {
-        if (auto player = makeRefPtr(m_player.get()); player)
+        if (auto player = makeRefPtr(m_player.get()))
             player->removeAudioTrack(*track);
         m_audioTracks.remove(identifier);
     }
@@ -583,7 +583,7 @@
         return;
 #endif
 
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->addTextTrack(addResult.iterator->value);
 }
 
@@ -592,7 +592,7 @@
     ASSERT(m_textTracks.contains(identifier));
 
     if (auto* track = m_textTracks.get(identifier)) {
-        if (auto player = makeRefPtr(m_player.get()); player)
+        if (auto player = makeRefPtr(m_player.get()))
             player->removeTextTrack(*track);
         m_textTracks.remove(identifier);
     }
@@ -703,7 +703,7 @@
         return;
 #endif
 
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->addVideoTrack(addResult.iterator->value);
 }
 
@@ -712,7 +712,7 @@
     ASSERT(m_videoTracks.contains(identifier));
 
     if (auto* track = m_videoTracks.get(identifier)) {
-        if (auto player = makeRefPtr(m_player.get()); player)
+        if (auto player = makeRefPtr(m_player.get()))
             player->removeVideoTrack(*track);
         m_videoTracks.remove(identifier);
     }
@@ -993,7 +993,7 @@
 void MediaPlayerPrivateRemote::currentPlaybackTargetIsWirelessChanged(bool isCurrentPlaybackTargetWireless)
 {
     m_isCurrentPlaybackTargetWireless = isCurrentPlaybackTargetWireless;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->currentPlaybackTargetIsWirelessChanged(isCurrentPlaybackTargetWireless);
 }
 
@@ -1127,7 +1127,7 @@
 
 void MediaPlayerPrivateRemote::mediaPlayerKeyNeeded(IPC::DataReference&& message)
 {
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->keyNeeded(Uint8Array::create(message.data(), message.size()).ptr());
 }
 #endif
@@ -1154,7 +1154,7 @@
 void MediaPlayerPrivateRemote::waitingForKeyChanged(bool waitingForKey)
 {
     m_waitingForKey = waitingForKey;
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->waitingForKeyChanged();
 }
 
@@ -1161,7 +1161,7 @@
 void MediaPlayerPrivateRemote::initializationDataEncountered(const String& initDataType, IPC::DataReference&& initData)
 {
     auto initDataBuffer = ArrayBuffer::create(initData.data(), initData.size());
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->initializationDataEncountered(initDataType, WTFMove(initDataBuffer));
 }
 
@@ -1336,13 +1336,13 @@
 
 void MediaPlayerPrivateRemote::resourceNotSupported()
 {
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->resourceNotSupported();
 }
 
 void MediaPlayerPrivateRemote::activeSourceBuffersChanged()
 {
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->activeSourceBuffersChanged();
 }
 
@@ -1349,7 +1349,7 @@
 #if PLATFORM(IOS_FAMILY)
 void MediaPlayerPrivateRemote::getRawCookies(const URL& url, WebCore::MediaPlayerClient::GetRawCookiesCallback&& completionHandler) const
 {
-    if (auto player = makeRefPtr(m_player.get()); player)
+    if (auto player = makeRefPtr(m_player.get()))
         player->getRawCookies(url, WTFMove(completionHandler));
 }
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to