Make MediaPlayer::client() private
https://bugs.webkit.org/show_bug.cgi?id=204856
<rdar://problem/57633186>
Reviewed by Jer Noble.
Make MediaPlayer::client private and create accessors for all of the client methods
that were being accessed directly. Also remove the MediaPlayer* parameters from
the client methods since none of them were used.
No new tests, no behavioral change.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::mediaPlayerActiveSourceBuffersChanged):
(WebCore::HTMLMediaElement::mediaPlayerNetworkStateChanged):
(WebCore::HTMLMediaElement::mediaPlayerReadyStateChanged):
(WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
(WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
(WebCore::HTMLMediaElement::mediaPlayerVolumeChanged):
(WebCore::HTMLMediaElement::mediaPlayerMuteChanged):
(WebCore::HTMLMediaElement::mediaPlayerDurationChanged):
(WebCore::HTMLMediaElement::mediaPlayerRateChanged):
(WebCore::HTMLMediaElement::mediaPlayerPlaybackStateChanged):
(WebCore::HTMLMediaElement::mediaPlayerSawUnsupportedTracks):
(WebCore::HTMLMediaElement::mediaPlayerResourceNotSupported):
(WebCore::HTMLMediaElement::mediaPlayerRepaint):
(WebCore::HTMLMediaElement::mediaPlayerSizeChanged):
(WebCore::HTMLMediaElement::mediaPlayerRenderingCanBeAccelerated):
(WebCore::HTMLMediaElement::mediaPlayerRenderingModeChanged):
(WebCore::HTMLMediaElement::mediaPlayerEngineUpdated):
(WebCore::HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable):
(WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
(WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged):
* html/HTMLMediaElement.h:
* platform/graphics/MediaPlayer.cpp:
(WebCore::MediaPlayer::loadWithNextMediaEngine):
(WebCore::MediaPlayer::currentPlaybackTargetIsWirelessChanged):
(WebCore::MediaPlayer::networkStateChanged):
(WebCore::MediaPlayer::readyStateChanged):
(WebCore::MediaPlayer::volumeChanged):
(WebCore::MediaPlayer::muteChanged):
(WebCore::MediaPlayer::timeChanged):
(WebCore::MediaPlayer::sizeChanged):
(WebCore::MediaPlayer::repaint):
(WebCore::MediaPlayer::durationChanged):
(WebCore::MediaPlayer::rateChanged):
(WebCore::MediaPlayer::playbackStateChanged):
(WebCore::MediaPlayer::firstVideoFrameAvailable):
(WebCore::MediaPlayer::characteristicChanged):
(WebCore::MediaPlayer::keyNeeded):
(WebCore::MediaPlayer::graphicsDeviceAdapter const):
* platform/graphics/MediaPlayer.h:
(WebCore::MediaPlayerClient::mediaPlayerNetworkStateChanged):
(WebCore::MediaPlayerClient::mediaPlayerReadyStateChanged):
(WebCore::MediaPlayerClient::mediaPlayerVolumeChanged):
(WebCore::MediaPlayerClient::mediaPlayerMuteChanged):
(WebCore::MediaPlayerClient::mediaPlayerTimeChanged):
(WebCore::MediaPlayerClient::mediaPlayerDurationChanged):
(WebCore::MediaPlayerClient::mediaPlayerRateChanged):
(WebCore::MediaPlayerClient::mediaPlayerPlaybackStateChanged):
(WebCore::MediaPlayerClient::mediaPlayerSawUnsupportedTracks):
(WebCore::MediaPlayerClient::mediaPlayerResourceNotSupported):
(WebCore::MediaPlayerClient::mediaPlayerRepaint):
(WebCore::MediaPlayerClient::mediaPlayerSizeChanged):
(WebCore::MediaPlayerClient::mediaPlayerEngineUpdated):
(WebCore::MediaPlayerClient::mediaPlayerFirstVideoFrameAvailable):
(WebCore::MediaPlayerClient::mediaPlayerCharacteristicChanged):
(WebCore::MediaPlayerClient::mediaPlayerRenderingCanBeAccelerated):
(WebCore::MediaPlayerClient::mediaPlayerRenderingModeChanged):
(WebCore::MediaPlayerClient::mediaPlayerActiveSourceBuffersChanged):
(WebCore::MediaPlayerClient::mediaPlayerGraphicsDeviceAdapter const):
(WebCore::MediaPlayerClient::mediaPlayerKeyNeeded):
(WebCore::MediaPlayerClient::mediaPlayerCurrentPlaybackTargetIsWirelessChanged):
(WebCore::MediaPlayer::renderingCanBeAccelerated const):
(WebCore::MediaPlayer::renderingModeChanged const):
(WebCore::MediaPlayer::acceleratedCompositingEnabled):
(WebCore::MediaPlayer::activeSourceBuffersChanged):
(WebCore::MediaPlayer::playerContentBoxRect const):
(WebCore::MediaPlayer::playerContentsScale const):
(WebCore::MediaPlayer::shouldUsePersistentCache const):
(WebCore::MediaPlayer::mediaCacheDirectory const):
(WebCore::MediaPlayer::isVideoPlayer const):
(WebCore::MediaPlayer::mediaEngineUpdated):
(WebCore::MediaPlayer::isLooping const):
(WebCore::MediaPlayer::requestInstallMissingPlugins):
(WebCore::MediaPlayer::client const):
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode const):
(WebCore::MediaPlayerPrivateAVFoundation::setUpVideoRendering):
(WebCore::MediaPlayerPrivateAVFoundation::prepareForRendering):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::notifyActiveSourceBuffersChanged):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::destroyLayer):
(WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureDecompressionSession):
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayers):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateRenderingMode):
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::acceleratedRenderingStateChanged):
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps):
(WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio):
(WebCore::MediaPlayerPrivateGStreamer::updateTracks):
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
(WebCore::MediaPlayerPrivateGStreamer::didEnd):
(WebCore::MediaPlayerPrivateGStreamer::acceleratedRenderingStateChanged):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@253133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e6add3a..9675ad6 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,119 @@
+2019-12-04 Eric Carlson <eric.carlson@apple.com>
+
+ Make MediaPlayer::client() private
+ https://bugs.webkit.org/show_bug.cgi?id=204856
+ <rdar://problem/57633186>
+
+ Reviewed by Jer Noble.
+
+ Make MediaPlayer::client private and create accessors for all of the client methods
+ that were being accessed directly. Also remove the MediaPlayer* parameters from
+ the client methods since none of them were used.
+
+ No new tests, no behavioral change.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::mediaPlayerActiveSourceBuffersChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerNetworkStateChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerReadyStateChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerKeyNeeded):
+ (WebCore::HTMLMediaElement::mediaPlayerTimeChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerVolumeChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerMuteChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerDurationChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerRateChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerPlaybackStateChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerSawUnsupportedTracks):
+ (WebCore::HTMLMediaElement::mediaPlayerResourceNotSupported):
+ (WebCore::HTMLMediaElement::mediaPlayerRepaint):
+ (WebCore::HTMLMediaElement::mediaPlayerSizeChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerRenderingCanBeAccelerated):
+ (WebCore::HTMLMediaElement::mediaPlayerRenderingModeChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerEngineUpdated):
+ (WebCore::HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable):
+ (WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
+ (WebCore::HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged):
+ * html/HTMLMediaElement.h:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::loadWithNextMediaEngine):
+ (WebCore::MediaPlayer::currentPlaybackTargetIsWirelessChanged):
+ (WebCore::MediaPlayer::networkStateChanged):
+ (WebCore::MediaPlayer::readyStateChanged):
+ (WebCore::MediaPlayer::volumeChanged):
+ (WebCore::MediaPlayer::muteChanged):
+ (WebCore::MediaPlayer::timeChanged):
+ (WebCore::MediaPlayer::sizeChanged):
+ (WebCore::MediaPlayer::repaint):
+ (WebCore::MediaPlayer::durationChanged):
+ (WebCore::MediaPlayer::rateChanged):
+ (WebCore::MediaPlayer::playbackStateChanged):
+ (WebCore::MediaPlayer::firstVideoFrameAvailable):
+ (WebCore::MediaPlayer::characteristicChanged):
+ (WebCore::MediaPlayer::keyNeeded):
+ (WebCore::MediaPlayer::graphicsDeviceAdapter const):
+ * platform/graphics/MediaPlayer.h:
+ (WebCore::MediaPlayerClient::mediaPlayerNetworkStateChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerReadyStateChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerVolumeChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerMuteChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerTimeChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerDurationChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerRateChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerPlaybackStateChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerSawUnsupportedTracks):
+ (WebCore::MediaPlayerClient::mediaPlayerResourceNotSupported):
+ (WebCore::MediaPlayerClient::mediaPlayerRepaint):
+ (WebCore::MediaPlayerClient::mediaPlayerSizeChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerEngineUpdated):
+ (WebCore::MediaPlayerClient::mediaPlayerFirstVideoFrameAvailable):
+ (WebCore::MediaPlayerClient::mediaPlayerCharacteristicChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerRenderingCanBeAccelerated):
+ (WebCore::MediaPlayerClient::mediaPlayerRenderingModeChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerActiveSourceBuffersChanged):
+ (WebCore::MediaPlayerClient::mediaPlayerGraphicsDeviceAdapter const):
+ (WebCore::MediaPlayerClient::mediaPlayerKeyNeeded):
+ (WebCore::MediaPlayerClient::mediaPlayerCurrentPlaybackTargetIsWirelessChanged):
+ (WebCore::MediaPlayer::renderingCanBeAccelerated const):
+ (WebCore::MediaPlayer::renderingModeChanged const):
+ (WebCore::MediaPlayer::acceleratedCompositingEnabled):
+ (WebCore::MediaPlayer::activeSourceBuffersChanged):
+ (WebCore::MediaPlayer::playerContentBoxRect const):
+ (WebCore::MediaPlayer::playerContentsScale const):
+ (WebCore::MediaPlayer::shouldUsePersistentCache const):
+ (WebCore::MediaPlayer::mediaCacheDirectory const):
+ (WebCore::MediaPlayer::isVideoPlayer const):
+ (WebCore::MediaPlayer::mediaEngineUpdated):
+ (WebCore::MediaPlayer::isLooping const):
+ (WebCore::MediaPlayer::requestInstallMissingPlugins):
+ (WebCore::MediaPlayer::client const):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::preferredRenderingMode const):
+ (WebCore::MediaPlayerPrivateAVFoundation::setUpVideoRendering):
+ (WebCore::MediaPlayerPrivateAVFoundation::prepareForRendering):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVAssetForURL):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::notifyActiveSourceBuffersChanged):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureLayer):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::destroyLayer):
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::ensureDecompressionSession):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::ensureLayers):
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateRenderingMode):
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::acceleratedRenderingStateChanged):
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties):
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideo):
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps):
+ (WebCore::MediaPlayerPrivateGStreamer::notifyPlayerOfAudio):
+ (WebCore::MediaPlayerPrivateGStreamer::updateTracks):
+ (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+ (WebCore::MediaPlayerPrivateGStreamer::didEnd):
+ (WebCore::MediaPlayerPrivateGStreamer::acceleratedRenderingStateChanged):
+
2019-12-04 Alexey Shvayka <shvaikalesh@gmail.com>
Non-callable "handleEvent" property is silently ignored
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
index 3f87aee..37dfcd7 100644
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -1003,7 +1003,7 @@
});
}
-void HTMLMediaElement::mediaPlayerActiveSourceBuffersChanged(const MediaPlayer*)
+void HTMLMediaElement::mediaPlayerActiveSourceBuffersChanged()
{
m_hasEverHadAudio |= hasAudio();
m_hasEverHadVideo |= hasVideo();
@@ -2230,7 +2230,7 @@
rejectPendingPlayPromises(WTFMove(m_pendingPlayPromises), DOMException::create(AbortError));
}
-void HTMLMediaElement::mediaPlayerNetworkStateChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerNetworkStateChanged()
{
beginProcessingMediaPlayerCallback();
setNetworkState(m_player->networkState());
@@ -2376,7 +2376,7 @@
m_networkState = NETWORK_IDLE;
}
-void HTMLMediaElement::mediaPlayerReadyStateChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerReadyStateChanged()
{
beginProcessingMediaPlayerCallback();
@@ -2594,7 +2594,7 @@
return m_webKitMediaKeys ? m_webKitMediaKeys->cachedKeyForKeyId(keyId) : nullptr;
}
-bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
+bool HTMLMediaElement::mediaPlayerKeyNeeded(Uint8Array* initData)
{
if (!RuntimeEnabledFeatures::sharedFeatures().legacyEncryptedMediaAPIEnabled())
return false;
@@ -4821,7 +4821,7 @@
}
}
-void HTMLMediaElement::mediaPlayerTimeChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerTimeChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -4949,7 +4949,7 @@
#endif
}
-void HTMLMediaElement::mediaPlayerVolumeChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerVolumeChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -4965,7 +4965,7 @@
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerMuteChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerMuteChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -4975,14 +4975,14 @@
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerDurationChanged(MediaPlayer* player)
+void HTMLMediaElement::mediaPlayerDurationChanged()
{
INFO_LOG(LOGIDENTIFIER);
beginProcessingMediaPlayerCallback();
scheduleEvent(eventNames().durationchangeEvent);
- mediaPlayerCharacteristicChanged(player);
+ mediaPlayerCharacteristicChanged();
MediaTime now = currentMediaTime();
MediaTime dur = durationMediaTime();
@@ -4992,7 +4992,7 @@
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerRateChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerRateChanged()
{
beginProcessingMediaPlayerCallback();
@@ -5010,7 +5010,7 @@
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerPlaybackStateChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5028,7 +5028,7 @@
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerSawUnsupportedTracks(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerSawUnsupportedTracks()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5039,7 +5039,7 @@
downcast<MediaDocument>(document()).mediaElementSawUnsupportedTracks();
}
-void HTMLMediaElement::mediaPlayerResourceNotSupported(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerResourceNotSupported()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5048,7 +5048,7 @@
}
// MediaPlayerPresentation methods
-void HTMLMediaElement::mediaPlayerRepaint(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerRepaint()
{
beginProcessingMediaPlayerCallback();
updateDisplayState();
@@ -5057,7 +5057,7 @@
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerSizeChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerSizeChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5071,14 +5071,14 @@
endProcessingMediaPlayerCallback();
}
-bool HTMLMediaElement::mediaPlayerRenderingCanBeAccelerated(MediaPlayer*)
+bool HTMLMediaElement::mediaPlayerRenderingCanBeAccelerated()
{
auto* renderer = this->renderer();
return is<RenderVideo>(renderer)
&& downcast<RenderVideo>(*renderer).view().compositor().canAccelerateVideoRendering(downcast<RenderVideo>(*renderer));
}
-void HTMLMediaElement::mediaPlayerRenderingModeChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerRenderingModeChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5093,7 +5093,7 @@
#if PLATFORM(WIN) && USE(AVFOUNDATION)
-GraphicsDeviceAdapter* HTMLMediaElement::mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const
+GraphicsDeviceAdapter* HTMLMediaElement::mediaPlayerGraphicsDeviceAdapter() const
{
auto* page = document().page();
if (!page)
@@ -5153,7 +5153,7 @@
#endif
}
-void HTMLMediaElement::mediaPlayerEngineUpdated(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerEngineUpdated()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5166,19 +5166,19 @@
scheduleMediaEngineWasUpdated();
}
-void HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerFirstVideoFrameAvailable()
{
INFO_LOG(LOGIDENTIFIER, "current display mode = ", (int)displayMode());
beginProcessingMediaPlayerCallback();
if (displayMode() == PosterWaitingForVideo) {
setDisplayMode(Video);
- mediaPlayerRenderingModeChanged(m_player.get());
+ mediaPlayerRenderingModeChanged();
}
endProcessingMediaPlayerCallback();
}
-void HTMLMediaElement::mediaPlayerCharacteristicChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerCharacteristicChanged()
{
INFO_LOG(LOGIDENTIFIER);
@@ -5191,7 +5191,7 @@
if (potentiallyPlaying() && displayMode() == PosterWaitingForVideo) {
setDisplayMode(Video);
- mediaPlayerRenderingModeChanged(m_player.get());
+ mediaPlayerRenderingModeChanged();
}
if (hasMediaControls())
@@ -5866,7 +5866,7 @@
enqueuePlaybackTargetAvailabilityChangedEvent();
}
-void HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*)
+void HTMLMediaElement::mediaPlayerCurrentPlaybackTargetIsWirelessChanged()
{
setIsPlayingToWirelessTarget(m_player && m_player->isCurrentPlaybackTargetWireless());
}
diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
index a69cebb..12d107f 100644
--- a/Source/WebCore/html/HTMLMediaElement.h
+++ b/Source/WebCore/html/HTMLMediaElement.h
@@ -663,33 +663,33 @@
double effectivePlaybackRate() const;
double requestedPlaybackRate() const;
- void mediaPlayerNetworkStateChanged(MediaPlayer*) override;
- void mediaPlayerReadyStateChanged(MediaPlayer*) override;
- void mediaPlayerTimeChanged(MediaPlayer*) override;
- void mediaPlayerVolumeChanged(MediaPlayer*) override;
- void mediaPlayerMuteChanged(MediaPlayer*) override;
- void mediaPlayerDurationChanged(MediaPlayer*) override;
- void mediaPlayerRateChanged(MediaPlayer*) override;
- void mediaPlayerPlaybackStateChanged(MediaPlayer*) override;
- void mediaPlayerSawUnsupportedTracks(MediaPlayer*) override;
- void mediaPlayerResourceNotSupported(MediaPlayer*) override;
- void mediaPlayerRepaint(MediaPlayer*) override;
- void mediaPlayerSizeChanged(MediaPlayer*) override;
- bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*) override;
- void mediaPlayerRenderingModeChanged(MediaPlayer*) override;
- bool mediaPlayerAcceleratedCompositingEnabled() override;
- void mediaPlayerEngineUpdated(MediaPlayer*) override;
+ void mediaPlayerNetworkStateChanged() final;
+ void mediaPlayerReadyStateChanged() final;
+ void mediaPlayerTimeChanged() final;
+ void mediaPlayerVolumeChanged() final;
+ void mediaPlayerMuteChanged() final;
+ void mediaPlayerDurationChanged() final;
+ void mediaPlayerRateChanged() final;
+ void mediaPlayerPlaybackStateChanged() final;
+ void mediaPlayerSawUnsupportedTracks() final;
+ void mediaPlayerResourceNotSupported() final;
+ void mediaPlayerRepaint() final;
+ void mediaPlayerSizeChanged() final;
+ bool mediaPlayerRenderingCanBeAccelerated() final;
+ void mediaPlayerRenderingModeChanged() final;
+ bool mediaPlayerAcceleratedCompositingEnabled() final;
+ void mediaPlayerEngineUpdated() final;
void scheduleMediaEngineWasUpdated();
void mediaEngineWasUpdated();
- void mediaPlayerFirstVideoFrameAvailable(MediaPlayer*) override;
- void mediaPlayerCharacteristicChanged(MediaPlayer*) override;
+ void mediaPlayerFirstVideoFrameAvailable() final;
+ void mediaPlayerCharacteristicChanged() final;
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
- RefPtr<ArrayBuffer> mediaPlayerCachedKeyForKeyId(const String& keyId) const override;
- bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) override;
- String mediaPlayerMediaKeysStorageDirectory() const override;
+ RefPtr<ArrayBuffer> mediaPlayerCachedKeyForKeyId(const String& keyId) const final;
+ bool mediaPlayerKeyNeeded(Uint8Array*) final;
+ String mediaPlayerMediaKeysStorageDirectory() const final;
#endif
#if ENABLE(ENCRYPTED_MEDIA)
@@ -704,7 +704,7 @@
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) override;
+ void mediaPlayerCurrentPlaybackTargetIsWirelessChanged() final;
void enqueuePlaybackTargetAvailabilityChangedEvent();
using EventTarget::dispatchEvent;
@@ -737,10 +737,10 @@
const String& mediaPlayerMediaCacheDirectory() const override;
#if PLATFORM(WIN) && USE(AVFOUNDATION)
- GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const override;
+ GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter() const override;
#endif
- void mediaPlayerActiveSourceBuffersChanged(const MediaPlayer*) override;
+ void mediaPlayerActiveSourceBuffersChanged() override;
void mediaPlayerHandlePlaybackCommand(PlatformMediaSession::RemoteControlCommandType command) override { didReceiveRemoteControlCommand(command, nullptr); }
String sourceApplicationIdentifier() const override;
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/platform/graphics/MediaPlayer.cpp
index abe86941..7d5bccd 100644
--- a/Source/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp
@@ -490,7 +490,7 @@
} else if (m_currentMediaEngine != engine) {
m_currentMediaEngine = engine;
m_private = engine->constructor(this);
- client().mediaPlayerEngineUpdated(this);
+ client().mediaPlayerEngineUpdated();
m_private->setPrivateBrowsingMode(m_privateBrowsing);
m_private->setPreload(m_preload);
m_private->setPreservesPitch(preservesPitch());
@@ -512,8 +512,8 @@
m_private->load(m_url.string());
} else {
m_private = makeUnique<NullMediaPlayerPrivate>(this);
- client().mediaPlayerEngineUpdated(this);
- client().mediaPlayerResourceNotSupported(this);
+ client().mediaPlayerEngineUpdated();
+ client().mediaPlayerResourceNotSupported();
}
m_initializingMediaEngine = false;
@@ -991,7 +991,7 @@
void MediaPlayer::currentPlaybackTargetIsWirelessChanged()
{
- client().mediaPlayerCurrentPlaybackTargetIsWirelessChanged(this);
+ client().mediaPlayerCurrentPlaybackTargetIsWirelessChanged();
}
bool MediaPlayer::canPlayToWirelessPlaybackTarget() const
@@ -1177,12 +1177,12 @@
return;
}
}
- client().mediaPlayerNetworkStateChanged(this);
+ client().mediaPlayerNetworkStateChanged();
}
void MediaPlayer::readyStateChanged()
{
- client().mediaPlayerReadyStateChanged(this);
+ client().mediaPlayerReadyStateChanged();
}
void MediaPlayer::volumeChanged(double newVolume)
@@ -1193,7 +1193,7 @@
#else
m_volume = newVolume;
#endif
- client().mediaPlayerVolumeChanged(this);
+ client().mediaPlayerVolumeChanged();
}
void MediaPlayer::muteChanged(bool newMuted)
@@ -1202,47 +1202,47 @@
return;
m_muted = newMuted;
- client().mediaPlayerMuteChanged(this);
+ client().mediaPlayerMuteChanged();
}
void MediaPlayer::timeChanged()
{
- client().mediaPlayerTimeChanged(this);
+ client().mediaPlayerTimeChanged();
}
void MediaPlayer::sizeChanged()
{
- client().mediaPlayerSizeChanged(this);
+ client().mediaPlayerSizeChanged();
}
void MediaPlayer::repaint()
{
- client().mediaPlayerRepaint(this);
+ client().mediaPlayerRepaint();
}
void MediaPlayer::durationChanged()
{
- client().mediaPlayerDurationChanged(this);
+ client().mediaPlayerDurationChanged();
}
void MediaPlayer::rateChanged()
{
- client().mediaPlayerRateChanged(this);
+ client().mediaPlayerRateChanged();
}
void MediaPlayer::playbackStateChanged()
{
- client().mediaPlayerPlaybackStateChanged(this);
+ client().mediaPlayerPlaybackStateChanged();
}
void MediaPlayer::firstVideoFrameAvailable()
{
- client().mediaPlayerFirstVideoFrameAvailable(this);
+ client().mediaPlayerFirstVideoFrameAvailable();
}
void MediaPlayer::characteristicChanged()
{
- client().mediaPlayerCharacteristicChanged(this);
+ client().mediaPlayerCharacteristicChanged();
}
#if ENABLE(WEB_AUDIO)
@@ -1263,7 +1263,7 @@
bool MediaPlayer::keyNeeded(Uint8Array* initData)
{
- return client().mediaPlayerKeyNeeded(this, initData);
+ return client().mediaPlayerKeyNeeded(initData);
}
String MediaPlayer::mediaKeysStorageDirectory() const
@@ -1322,7 +1322,7 @@
#if PLATFORM(WIN) && USE(AVFOUNDATION)
GraphicsDeviceAdapter* MediaPlayer::graphicsDeviceAdapter() const
{
- return client().mediaPlayerGraphicsDeviceAdapter(this);
+ return client().mediaPlayerGraphicsDeviceAdapter();
}
#endif
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h
index dbbc456..fb9eba0 100644
--- a/Source/WebCore/platform/graphics/MediaPlayer.h
+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -99,72 +99,72 @@
virtual ~MediaPlayerClient() = default;
// the network state has changed
- virtual void mediaPlayerNetworkStateChanged(MediaPlayer*) { }
+ virtual void mediaPlayerNetworkStateChanged() { }
// the ready state has changed
- virtual void mediaPlayerReadyStateChanged(MediaPlayer*) { }
+ virtual void mediaPlayerReadyStateChanged() { }
// the volume state has changed
- virtual void mediaPlayerVolumeChanged(MediaPlayer*) { }
+ virtual void mediaPlayerVolumeChanged() { }
// the mute state has changed
- virtual void mediaPlayerMuteChanged(MediaPlayer*) { }
+ virtual void mediaPlayerMuteChanged() { }
// time has jumped, eg. not as a result of normal playback
- virtual void mediaPlayerTimeChanged(MediaPlayer*) { }
+ virtual void mediaPlayerTimeChanged() { }
// the media file duration has changed, or is now known
- virtual void mediaPlayerDurationChanged(MediaPlayer*) { }
+ virtual void mediaPlayerDurationChanged() { }
// the playback rate has changed
- virtual void mediaPlayerRateChanged(MediaPlayer*) { }
+ virtual void mediaPlayerRateChanged() { }
// the play/pause status changed
- virtual void mediaPlayerPlaybackStateChanged(MediaPlayer*) { }
+ virtual void mediaPlayerPlaybackStateChanged() { }
// The MediaPlayer has found potentially problematic media content.
// This is used internally to trigger swapping from a <video>
// element to an <embed> in standalone documents
- virtual void mediaPlayerSawUnsupportedTracks(MediaPlayer*) { }
+ virtual void mediaPlayerSawUnsupportedTracks() { }
// The MediaPlayer could not discover an engine which supports the requested resource.
- virtual void mediaPlayerResourceNotSupported(MediaPlayer*) { }
+ virtual void mediaPlayerResourceNotSupported() { }
// Presentation-related methods
// a new frame of video is available
- virtual void mediaPlayerRepaint(MediaPlayer*) { }
+ virtual void mediaPlayerRepaint() { }
// the movie size has changed
- virtual void mediaPlayerSizeChanged(MediaPlayer*) { }
+ virtual void mediaPlayerSizeChanged() { }
- virtual void mediaPlayerEngineUpdated(MediaPlayer*) { }
+ virtual void mediaPlayerEngineUpdated() { }
// The first frame of video is available to render. A media engine need only make this callback if the
// first frame is not available immediately when prepareForRendering is called.
- virtual void mediaPlayerFirstVideoFrameAvailable(MediaPlayer*) { }
+ virtual void mediaPlayerFirstVideoFrameAvailable() { }
// A characteristic of the media file, eg. video, audio, closed captions, etc, has changed.
- virtual void mediaPlayerCharacteristicChanged(MediaPlayer*) { }
+ virtual void mediaPlayerCharacteristicChanged() { }
// whether the rendering system can accelerate the display of this MediaPlayer.
- virtual bool mediaPlayerRenderingCanBeAccelerated(MediaPlayer*) { return false; }
+ virtual bool mediaPlayerRenderingCanBeAccelerated() { return false; }
// called when the media player's rendering mode changed, which indicates a change in the
// availability of the platformLayer().
- virtual void mediaPlayerRenderingModeChanged(MediaPlayer*) { }
+ virtual void mediaPlayerRenderingModeChanged() { }
// whether accelerated compositing is enabled for video rendering
virtual bool mediaPlayerAcceleratedCompositingEnabled() { return false; }
- virtual void mediaPlayerActiveSourceBuffersChanged(const MediaPlayer*) { }
+ virtual void mediaPlayerActiveSourceBuffersChanged() { }
#if PLATFORM(WIN) && USE(AVFOUNDATION)
- virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter(const MediaPlayer*) const { return nullptr; }
+ virtual GraphicsDeviceAdapter* mediaPlayerGraphicsDeviceAdapter() const { return nullptr; }
#endif
#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
virtual RefPtr<ArrayBuffer> mediaPlayerCachedKeyForKeyId(const String&) const { return nullptr; }
- virtual bool mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array*) { return false; }
+ virtual bool mediaPlayerKeyNeeded(Uint8Array*) { return false; }
virtual String mediaPlayerMediaKeysStorageDirectory() const { return emptyString(); }
#endif
@@ -174,7 +174,7 @@
#endif
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
- virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) { };
+ virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged() { };
#endif
virtual String mediaPlayerReferrer() const { return String(); }
@@ -416,8 +416,6 @@
void repaint();
- MediaPlayerClient& client() const { return *m_client; }
-
bool hasAvailableVideoFrame() const;
void prepareForRendering();
@@ -580,9 +578,27 @@
bool shouldIgnoreIntrinsicSize();
+ bool renderingCanBeAccelerated() const { return client().mediaPlayerRenderingCanBeAccelerated(); }
+ void renderingModeChanged() const { client().mediaPlayerRenderingModeChanged(); }
+ bool acceleratedCompositingEnabled() { return client().mediaPlayerAcceleratedCompositingEnabled(); }
+ void activeSourceBuffersChanged() { client().mediaPlayerActiveSourceBuffersChanged(); }
+ LayoutRect playerContentBoxRect() const { return client().mediaPlayerContentBoxRect(); }
+ float playerContentsScale() const { return client().mediaPlayerContentsScale(); }
+ bool shouldUsePersistentCache() const { return client().mediaPlayerShouldUsePersistentCache(); }
+ const String& mediaCacheDirectory() const { return client().mediaPlayerMediaCacheDirectory(); }
+ bool isVideoPlayer() const { return client().mediaPlayerIsVideo(); }
+ void mediaEngineUpdated() { client().mediaPlayerEngineUpdated(); }
+ bool isLooping() const { return client().mediaPlayerIsLooping(); }
+
+#if USE(GSTREAMER)
+ void requestInstallMissingPlugins(const String& details, const String& description, MediaPlayerRequestInstallMissingPluginsCallback& callback) { client().requestInstallMissingPlugins(details, description, callback); }
+#endif
+
private:
MediaPlayer(MediaPlayerClient&);
+ MediaPlayerClient& client() const { return *m_client; }
+
const MediaPlayerFactory* nextBestMediaEngine(const MediaPlayerFactory*) const;
void loadWithNextMediaEngine(const MediaPlayerFactory*);
void reloadTimerFired();
diff --git a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
index 1b9a921..a7d0470 100644
--- a/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
+++ b/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
@@ -110,7 +110,7 @@
if (!m_player->visible() || assetStatus() == MediaPlayerAVAssetStatusUnknown)
return MediaRenderingNone;
- if (supportsAcceleratedRendering() && m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player))
+ if (supportsAcceleratedRendering() && m_player->renderingCanBeAccelerated())
return MediaRenderingToLayer;
return MediaRenderingToContext;
@@ -146,7 +146,7 @@
// If using a movie layer, inform the client so the compositing tree is updated.
if (currentMode == MediaRenderingToLayer || preferredMode == MediaRenderingToLayer)
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
}
void MediaPlayerPrivateAVFoundation::tearDownVideoRendering()
@@ -452,7 +452,7 @@
setUpVideoRendering();
if (currentRenderingMode() == MediaRenderingToLayer || preferredRenderingMode() == MediaRenderingToLayer)
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
}
bool MediaPlayerPrivateAVFoundation::supportsFullscreen() const
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
index 8421123..24c5ca4 100644
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
@@ -576,7 +576,7 @@
createVideoOutput();
#endif
- player()->client().mediaPlayerRenderingModeChanged(player());
+ player()->renderingModeChanged();
});
}
@@ -593,8 +593,8 @@
#endif
[m_videoLayer addObserver:m_objcObserver.get() forKeyPath:@"readyForDisplay" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextAVPlayerLayer];
updateVideoLayerGravity();
- [m_videoLayer setContentsScale:player()->client().mediaPlayerContentsScale()];
- IntSize defaultSize = snappedIntRect(player()->client().mediaPlayerContentBoxRect()).size();
+ [m_videoLayer setContentsScale:player()->playerContentsScale()];
+ IntSize defaultSize = snappedIntRect(player()->playerContentBoxRect()).size();
ALWAYS_LOG(LOGIDENTIFIER);
m_videoFullscreenLayerManager->setVideoLayer(m_videoLayer.get(), defaultSize);
@@ -836,11 +836,11 @@
}
#endif
- bool usePersistentCache = player()->client().mediaPlayerShouldUsePersistentCache();
+ bool usePersistentCache = player()->shouldUsePersistentCache();
[options setObject:@(!usePersistentCache) forKey:AVURLAssetUsesNoPersistentCacheKey];
if (usePersistentCache)
- [options setObject:assetCacheForPath(player()->client().mediaPlayerMediaCacheDirectory()) forKey:AVURLAssetCacheKey];
+ [options setObject:assetCacheForPath(player()->mediaCacheDirectory()) forKey:AVURLAssetCacheKey];
NSURL *cocoaURL = canonicalURL(url);
m_avAsset = adoptNS([PAL::allocAVURLAssetInstance() initWithURL:cocoaURL options:options.get()]);
@@ -922,7 +922,7 @@
[m_avPlayer.get() setMuted:m_muted];
}
- if (player()->client().mediaPlayerIsVideo())
+ if (player()->isVideoPlayer())
createAVPlayerLayer();
if (m_avPlayerItem)
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
index 9e85bd3..71528c9 100644
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm
@@ -677,7 +677,7 @@
void MediaPlayerPrivateMediaSourceAVFObjC::notifyActiveSourceBuffersChanged()
{
- m_player->client().mediaPlayerActiveSourceBuffersChanged(m_player);
+ m_player->activeSourceBuffersChanged();
}
MediaPlayer::MovieLoadType MediaPlayerPrivateMediaSourceAVFObjC::movieLoadType() const
@@ -764,8 +764,8 @@
[m_synchronizer addRenderer:m_sampleBufferDisplayLayer.get()];
if (m_mediaSourcePrivate)
m_mediaSourcePrivate->setVideoLayer(m_sampleBufferDisplayLayer.get());
- m_videoFullscreenLayerManager->setVideoLayer(m_sampleBufferDisplayLayer.get(), snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size());
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_videoFullscreenLayerManager->setVideoLayer(m_sampleBufferDisplayLayer.get(), snappedIntRect(m_player->playerContentBoxRect()).size());
+ m_player->renderingModeChanged();
}
void MediaPlayerPrivateMediaSourceAVFObjC::destroyLayer()
@@ -783,7 +783,7 @@
m_videoFullscreenLayerManager->didDestroyVideoLayer();
m_sampleBufferDisplayLayer = nullptr;
setHasAvailableVideoFrame(false);
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
}
void MediaPlayerPrivateMediaSourceAVFObjC::ensureDecompressionSession()
@@ -797,7 +797,7 @@
if (m_mediaSourcePrivate)
m_mediaSourcePrivate->setDecompressionSession(m_decompressionSession.get());
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
}
void MediaPlayerPrivateMediaSourceAVFObjC::destroyDecompressionSession()
@@ -1128,7 +1128,7 @@
[audioRenderer setAudioTimePitchAlgorithm:(m_player->preservesPitch() ? AVAudioTimePitchAlgorithmSpectral : AVAudioTimePitchAlgorithmVarispeed)];
[m_synchronizer addRenderer:audioRenderer];
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
}
ALLOW_NEW_API_WITHOUT_GUARDS_BEGIN
@@ -1145,7 +1145,7 @@
}];
m_sampleBufferAudioRendererMap.remove(iter);
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
}
void MediaPlayerPrivateMediaSourceAVFObjC::characteristicsChanged()
diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
index f3e27d8..6314814 100644
--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
@@ -485,7 +485,7 @@
m_backgroundLayer.get().backgroundColor = cachedCGColor(Color::black);
m_backgroundLayer.get().needsDisplayOnBoundsChange = YES;
- auto size = snappedIntRect(m_player->client().mediaPlayerContentBoxRect()).size();
+ auto size = snappedIntRect(m_player->playerContentBoxRect()).size();
m_backgroundLayer.get().bounds = CGRectMake(0, 0, size.width(), size.height());
[m_statusChangeListener beginObservingLayers];
@@ -828,7 +828,7 @@
scheduleDeferredTask([this] {
m_transformIsValid = false;
if (m_player)
- m_player->client().mediaPlayerRenderingModeChanged(m_player);
+ m_player->renderingModeChanged();
});
}
@@ -1114,7 +1114,7 @@
void MediaPlayerPrivateMediaStreamAVFObjC::acceleratedRenderingStateChanged()
{
- if (m_player->client().mediaPlayerRenderingCanBeAccelerated(m_player))
+ if (m_player->renderingCanBeAccelerated())
ensureLayers();
else
destroyLayers();
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
index f5a95f9..0127c57 100644
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
@@ -1063,7 +1063,7 @@
if (g_strcmp0(G_OBJECT_TYPE_NAME(object), "GstPulseSink"))
return;
- const char* role = m_player->client().mediaPlayerIsVideo() ? "video" : "music";
+ const char* role = m_player->isVideoPlayer() ? "video" : "music";
GstStructure* structure = gst_structure_new("stream-properties", "media.role", G_TYPE_STRING, role, nullptr);
g_object_set(object, "stream-properties", structure, nullptr);
gst_structure_free(structure);
@@ -1168,7 +1168,7 @@
if (useMediaSource) {
GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
- m_player->client().mediaPlayerEngineUpdated(m_player);
+ m_player->mediaEngineUpdated();
return;
}
@@ -1199,7 +1199,7 @@
purgeInvalidVideoTracks(validVideoStreams);
#endif
- m_player->client().mediaPlayerEngineUpdated(m_player);
+ m_player->mediaEngineUpdated();
}
void MediaPlayerPrivateGStreamer::videoSinkCapsChangedCallback(MediaPlayerPrivateGStreamer* player)
@@ -1212,7 +1212,7 @@
void MediaPlayerPrivateGStreamer::notifyPlayerOfVideoCaps()
{
m_videoSize = IntSize();
- m_player->client().mediaPlayerEngineUpdated(m_player);
+ m_player->mediaEngineUpdated();
}
void MediaPlayerPrivateGStreamer::audioChangedCallback(MediaPlayerPrivateGStreamer* player)
@@ -1242,7 +1242,7 @@
if (useMediaSource) {
GST_DEBUG_OBJECT(pipeline(), "Tracks managed by source element. Bailing out now.");
- m_player->client().mediaPlayerEngineUpdated(m_player);
+ m_player->mediaEngineUpdated();
return;
}
@@ -1273,7 +1273,7 @@
purgeInvalidAudioTracks(validAudioStreams);
#endif
- m_player->client().mediaPlayerEngineUpdated(m_player);
+ m_player->mediaEngineUpdated();
}
#if ENABLE(VIDEO_TRACK)
@@ -1662,7 +1662,7 @@
if (m_hasVideo)
m_player->sizeChanged();
- m_player->client().mediaPlayerEngineUpdated(m_player);
+ m_player->mediaEngineUpdated();
}
void MediaPlayerPrivateGStreamer::clearTracks()
@@ -2093,7 +2093,7 @@
m_missingPluginCallbacks.append(missingPluginCallback.copyRef());
GUniquePtr<char> detail(gst_missing_plugin_message_get_installer_detail(message));
GUniquePtr<char> description(gst_missing_plugin_message_get_description(message));
- m_player->client().requestInstallMissingPlugins(String::fromUTF8(detail.get()), String::fromUTF8(description.get()), missingPluginCallback.get());
+ m_player->requestInstallMissingPlugins(String::fromUTF8(detail.get()), String::fromUTF8(description.get()), missingPluginCallback.get());
}
}
#if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
@@ -2780,7 +2780,7 @@
m_isEndReached = true;
- if (!m_player->client().mediaPlayerIsLooping()) {
+ if (!m_player->isLooping()) {
m_isPaused = true;
changePipelineState(GST_STATE_READY);
m_didDownloadFinish = false;
@@ -2997,7 +2997,7 @@
void MediaPlayerPrivateGStreamer::acceleratedRenderingStateChanged()
{
- m_canRenderingBeAccelerated = m_player && m_player->client().mediaPlayerAcceleratedCompositingEnabled();
+ m_canRenderingBeAccelerated = m_player && m_player->acceleratedCompositingEnabled();
}
#if USE(TEXTURE_MAPPER_GL)
