Diff
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h (295675 => 295676)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2022-06-20 18:47:37 UTC (rev 295676)
@@ -110,7 +110,7 @@
RemoteMediaPlayerProxy(RemoteMediaPlayerManagerProxy&, WebCore::MediaPlayerIdentifier, Ref<IPC::Connection>&&, WebCore::MediaPlayerEnums::MediaEngineIdentifier, RemoteMediaPlayerProxyConfiguration&&, RemoteVideoFrameObjectHeap&, const WebCore::ProcessIdentity&);
~RemoteMediaPlayerProxy();
- WebCore::MediaPlayerIdentifier idendifier() const { return m_id; }
+ WebCore::MediaPlayerIdentifier identifier() const { return m_id; }
void invalidate();
#if ENABLE(VIDEO_PRESENTATION_MODE)
Modified: trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.cpp (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.cpp 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.cpp 2022-06-20 18:47:37 UTC (rev 295676)
@@ -36,10 +36,10 @@
namespace WebKit {
-AudioTrackPrivateRemote::AudioTrackPrivateRemote(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier idendifier, AudioTrackPrivateRemoteConfiguration&& configuration)
+AudioTrackPrivateRemote::AudioTrackPrivateRemote(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier identifier, AudioTrackPrivateRemoteConfiguration&& configuration)
: m_gpuProcessConnection(gpuProcessConnection)
, m_playerIdentifier(playerIdentifier)
- , m_idendifier(idendifier)
+ , m_identifier(identifier)
{
updateConfiguration(WTFMove(configuration));
}
@@ -50,7 +50,7 @@
return;
if (enabled != this->enabled())
- m_gpuProcessConnection->connection().send(Messages::RemoteMediaPlayerProxy::AudioTrackSetEnabled(m_idendifier, enabled), m_playerIdentifier);
+ m_gpuProcessConnection->connection().send(Messages::RemoteMediaPlayerProxy::AudioTrackSetEnabled(m_identifier, enabled), m_playerIdentifier);
AudioTrackPrivate::setEnabled(enabled);
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.h (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.h 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.h 2022-06-20 18:47:37 UTC (rev 295676)
@@ -41,9 +41,9 @@
class AudioTrackPrivateRemote final : public WebCore::AudioTrackPrivate {
WTF_MAKE_NONCOPYABLE(AudioTrackPrivateRemote)
public:
- static Ref<AudioTrackPrivateRemote> create(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier idendifier, AudioTrackPrivateRemoteConfiguration&& configuration)
+ static Ref<AudioTrackPrivateRemote> create(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier identifier, AudioTrackPrivateRemoteConfiguration&& configuration)
{
- return adoptRef(*new AudioTrackPrivateRemote(gpuProcessConnection, playerIdentifier, idendifier, WTFMove(configuration)));
+ return adoptRef(*new AudioTrackPrivateRemote(gpuProcessConnection, playerIdentifier, identifier, WTFMove(configuration)));
}
AtomString id() const final { return m_id; }
@@ -69,7 +69,7 @@
MediaTime m_startTimeVariance { MediaTime::zeroTime() };
WebCore::MediaPlayerIdentifier m_playerIdentifier;
- TrackPrivateRemoteIdentifier m_idendifier;
+ TrackPrivateRemoteIdentifier m_identifier;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2022-06-20 18:47:37 UTC (rev 295676)
@@ -1506,11 +1506,6 @@
}
#endif
-MediaPlayerIdentifier MediaPlayerPrivateRemote::identifier() const
-{
- return m_id;
-}
-
} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h 2022-06-20 18:47:37 UTC (rev 295676)
@@ -93,7 +93,7 @@
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier() const { return m_remoteEngineIdentifier; }
- WebCore::MediaPlayerIdentifier itentifier() const { return m_id; }
+ WebCore::MediaPlayerIdentifier identifier() const final { return m_id; }
IPC::Connection& connection() const { return m_manager.gpuProcessConnection().connection(); }
WebCore::MediaPlayer* player() const { return m_player.get(); }
@@ -305,8 +305,6 @@
bool shouldGetNativeImageForCanvasDrawing() const final { return false; }
#endif
- WebCore::MediaPlayerIdentifier identifier() const final;
-
void setPreload(WebCore::MediaPlayer::Preload) final;
bool hasAvailableVideoFrame() const final;
Modified: trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.cpp (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.cpp 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.cpp 2022-06-20 18:47:37 UTC (rev 295676)
@@ -37,11 +37,11 @@
namespace WebKit {
using namespace WebCore;
-TextTrackPrivateRemote::TextTrackPrivateRemote(GPUProcessConnection& gpuProcessConnection, MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier idendifier, TextTrackPrivateRemoteConfiguration&& configuration)
+TextTrackPrivateRemote::TextTrackPrivateRemote(GPUProcessConnection& gpuProcessConnection, MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier identifier, TextTrackPrivateRemoteConfiguration&& configuration)
: WebCore::InbandTextTrackPrivate(configuration.cueFormat)
, m_gpuProcessConnection(gpuProcessConnection)
, m_playerIdentifier(playerIdentifier)
- , m_identifier(idendifier)
+ , m_identifier(identifier)
{
updateConfiguration(WTFMove(configuration));
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.h (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.h 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/TextTrackPrivateRemote.h 2022-06-20 18:47:37 UTC (rev 295676)
@@ -48,9 +48,9 @@
WTF_MAKE_NONCOPYABLE(TextTrackPrivateRemote)
public:
- static Ref<TextTrackPrivateRemote> create(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier idendifier, TextTrackPrivateRemoteConfiguration&& configuration)
+ static Ref<TextTrackPrivateRemote> create(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier identifier, TextTrackPrivateRemoteConfiguration&& configuration)
{
- return adoptRef(*new TextTrackPrivateRemote(gpuProcessConnection, playerIdentifier, idendifier, WTFMove(configuration)));
+ return adoptRef(*new TextTrackPrivateRemote(gpuProcessConnection, playerIdentifier, identifier, WTFMove(configuration)));
}
void addDataCue(MediaTime&& start, MediaTime&& end, IPC::DataReference&&);
Modified: trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.cpp (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.cpp 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.cpp 2022-06-20 18:47:37 UTC (rev 295676)
@@ -36,10 +36,10 @@
namespace WebKit {
-VideoTrackPrivateRemote::VideoTrackPrivateRemote(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier idendifier, VideoTrackPrivateRemoteConfiguration&& configuration)
+VideoTrackPrivateRemote::VideoTrackPrivateRemote(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier identifier, VideoTrackPrivateRemoteConfiguration&& configuration)
: m_gpuProcessConnection(gpuProcessConnection)
, m_playerIdentifier(playerIdentifier)
- , m_idendifier(idendifier)
+ , m_identifier(identifier)
{
updateConfiguration(WTFMove(configuration));
}
@@ -50,7 +50,7 @@
return;
if (selected != this->selected())
- m_gpuProcessConnection->connection().send(Messages::RemoteMediaPlayerProxy::VideoTrackSetSelected(m_idendifier, selected), m_playerIdentifier);
+ m_gpuProcessConnection->connection().send(Messages::RemoteMediaPlayerProxy::VideoTrackSetSelected(m_identifier, selected), m_playerIdentifier);
VideoTrackPrivate::setSelected(selected);
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.h (295675 => 295676)
--- trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.h 2022-06-20 14:45:19 UTC (rev 295675)
+++ trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.h 2022-06-20 18:47:37 UTC (rev 295676)
@@ -42,9 +42,9 @@
: public WebCore::VideoTrackPrivate {
WTF_MAKE_NONCOPYABLE(VideoTrackPrivateRemote)
public:
- static Ref<VideoTrackPrivateRemote> create(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier idendifier, VideoTrackPrivateRemoteConfiguration&& configuration)
+ static Ref<VideoTrackPrivateRemote> create(GPUProcessConnection& gpuProcessConnection, WebCore::MediaPlayerIdentifier playerIdentifier, TrackPrivateRemoteIdentifier identifier, VideoTrackPrivateRemoteConfiguration&& configuration)
{
- return adoptRef(*new VideoTrackPrivateRemote(gpuProcessConnection, playerIdentifier, idendifier, WTFMove(configuration)));
+ return adoptRef(*new VideoTrackPrivateRemote(gpuProcessConnection, playerIdentifier, identifier, WTFMove(configuration)));
}
void updateConfiguration(VideoTrackPrivateRemoteConfiguration&&);
@@ -70,7 +70,7 @@
AtomString m_language;
int m_trackIndex { -1 };
MediaTime m_startTimeVariance { MediaTime::zeroTime() };
- TrackPrivateRemoteIdentifier m_idendifier;
+ TrackPrivateRemoteIdentifier m_identifier;
};
} // namespace WebKit