Diff
Modified: trunk/Source/WebKit/ChangeLog (254518 => 254519)
--- trunk/Source/WebKit/ChangeLog 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/ChangeLog 2020-01-14 19:05:22 UTC (rev 254519)
@@ -1,3 +1,78 @@
+2020-01-14 Eric Carlson <[email protected]>
+
+ Nake MediaPlayerPrivateRemoteProxy a message receiver
+ https://bugs.webkit.org/show_bug.cgi?id=206237
+ <rdar://problem/58569057>
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, no functional change.
+
+ Make MediaPlayerPrivateRemoteProxy a message receiver so we don't need a trampoline
+ for every method in the MediaPlayerPrivateRemoteManagerProxy.
+
+ * DerivedSources-input.xcfilelist:
+ * DerivedSources-output.xcfilelist:
+ * DerivedSources.make:
+ * GPUProcess/GPUConnectionToWebProcess.cpp:
+ (WebKit::GPUConnectionToWebProcess::didReceiveMessage):
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp:
+ (WebKit::RemoteMediaPlayerManagerProxy::didReceivePlayerMessage):
+ (WebKit::RemoteMediaPlayerManagerProxy::prepareForPlayback): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::load): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::cancelLoad): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::prepareToPlay): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::play): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::pause): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::seek): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::seekWithTolerance): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setVolume): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setMuted): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setPreload): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setPrivateBrowsingMode): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setPreservesPitch): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::prepareForRendering): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setSize): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setVisible): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setShouldMaintainAspectRatio): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setVideoFullscreenFrame): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setVideoFullscreenGravity): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::acceleratedRenderingStateChanged): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setShouldDisableSleep): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::setRate): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::audioTrackSetEnabled): Deleted.
+ (WebKit::RemoteMediaPlayerManagerProxy::videoTrackSetSelected): Deleted.
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.h:
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in:
+ * GPUProcess/media/RemoteMediaPlayerProxy.h:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/GPU/media/AudioTrackPrivateRemote.cpp:
+ (WebKit::AudioTrackPrivateRemote::setEnabled):
+ * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+ (WebKit::MediaPlayerPrivateRemote::prepareForPlayback):
+ (WebKit::MediaPlayerPrivateRemote::MediaPlayerPrivateRemote::load):
+ (WebKit::MediaPlayerPrivateRemote::cancelLoad):
+ (WebKit::MediaPlayerPrivateRemote::prepareToPlay):
+ (WebKit::MediaPlayerPrivateRemote::play):
+ (WebKit::MediaPlayerPrivateRemote::pause):
+ (WebKit::MediaPlayerPrivateRemote::setPreservesPitch):
+ (WebKit::MediaPlayerPrivateRemote::setVolumeDouble):
+ (WebKit::MediaPlayerPrivateRemote::setMuted):
+ (WebKit::MediaPlayerPrivateRemote::setPreload):
+ (WebKit::MediaPlayerPrivateRemote::setPrivateBrowsingMode):
+ (WebKit::MediaPlayerPrivateRemote::seek):
+ (WebKit::MediaPlayerPrivateRemote::seekWithTolerance):
+ (WebKit::MediaPlayerPrivateRemote::prepareForRendering):
+ (WebKit::MediaPlayerPrivateRemote::setSize):
+ (WebKit::MediaPlayerPrivateRemote::setVisible):
+ (WebKit::MediaPlayerPrivateRemote::setShouldMaintainAspectRatio):
+ (WebKit::MediaPlayerPrivateRemote::setVideoFullscreenFrame):
+ (WebKit::MediaPlayerPrivateRemote::setVideoFullscreenGravity):
+ (WebKit::MediaPlayerPrivateRemote::acceleratedRenderingStateChanged):
+ (WebKit::MediaPlayerPrivateRemote::setShouldDisableSleep):
+ * WebProcess/GPU/media/VideoTrackPrivateRemote.cpp:
+ (WebKit::VideoTrackPrivateRemote::setSelected):
+
2020-01-14 Don Olmstead <[email protected]>
Share TextChecker stub for ports without text checking
Modified: trunk/Source/WebKit/DerivedSources-input.xcfilelist (254518 => 254519)
--- trunk/Source/WebKit/DerivedSources-input.xcfilelist 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/DerivedSources-input.xcfilelist 2020-01-14 19:05:22 UTC (rev 254519)
@@ -17,6 +17,7 @@
$(PROJECT_DIR)/GPUProcess/GPUProcess.messages.in
$(PROJECT_DIR)/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in
$(PROJECT_DIR)/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in
+$(PROJECT_DIR)/GPUProcess/media/RemoteMediaPlayerProxy.messages.in
$(PROJECT_DIR)/GPUProcess/media/RemoteMediaResourceManager.messages.in
$(PROJECT_DIR)/GPUProcess/webrtc/LibWebRTCCodecsProxy.messages.in
$(PROJECT_DIR)/GPUProcess/webrtc/RemoteMediaRecorder.messages.in
Modified: trunk/Source/WebKit/DerivedSources-output.xcfilelist (254518 => 254519)
--- trunk/Source/WebKit/DerivedSources-output.xcfilelist 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/DerivedSources-output.xcfilelist 2020-01-14 19:05:22 UTC (rev 254519)
@@ -129,6 +129,9 @@
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaPlayerManagerProxyMessageReceiver.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaPlayerManagerProxyMessages.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaPlayerManagerProxyMessagesReplies.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaPlayerProxyMessageReceiver.cpp
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaPlayerProxyMessages.h
+$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaPlayerProxyMessagesReplies.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaRecorderManagerMessageReceiver.cpp
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaRecorderManagerMessages.h
$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2/RemoteMediaRecorderManagerMessagesReplies.h
Modified: trunk/Source/WebKit/DerivedSources.make (254518 => 254519)
--- trunk/Source/WebKit/DerivedSources.make 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/DerivedSources.make 2020-01-14 19:05:22 UTC (rev 254519)
@@ -143,6 +143,7 @@
RemoteLayerTreeDrawingAreaProxy \
RemoteMediaPlayerManager \
RemoteMediaPlayerManagerProxy \
+ RemoteMediaPlayerProxy \
RemoteMediaRecorder \
RemoteMediaRecorderManager \
RemoteMediaResourceManager \
Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (254518 => 254519)
--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp 2020-01-14 19:05:22 UTC (rev 254519)
@@ -39,6 +39,8 @@
#include "RemoteLayerTreeDrawingAreaProxyMessages.h"
#include "RemoteMediaPlayerManagerProxy.h"
#include "RemoteMediaPlayerManagerProxyMessages.h"
+#include "RemoteMediaPlayerProxy.h"
+#include "RemoteMediaPlayerProxyMessages.h"
#include "RemoteMediaRecorderManager.h"
#include "RemoteMediaRecorderManagerMessages.h"
#include "RemoteMediaRecorderMessages.h"
@@ -165,6 +167,9 @@
if (decoder.messageReceiverName() == Messages::RemoteMediaPlayerManagerProxy::messageReceiverName()) {
remoteMediaPlayerManagerProxy().didReceiveMessageFromWebProcess(connection, decoder);
return;
+ } else if (decoder.messageReceiverName() == Messages::RemoteMediaPlayerProxy::messageReceiverName()) {
+ remoteMediaPlayerManagerProxy().didReceivePlayerMessage(connection, decoder);
+ return;
} else if (decoder.messageReceiverName() == Messages::RemoteMediaResourceManager::messageReceiverName()) {
remoteMediaResourceManager().didReceiveMessage(connection, decoder);
return;
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp (254518 => 254519)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp 2020-01-14 19:05:22 UTC (rev 254519)
@@ -197,150 +197,12 @@
completionHandler(result);
}
-void RemoteMediaPlayerManagerProxy::prepareForPlayback(MediaPlayerPrivateRemoteIdentifier id, bool privateMode, WebCore::MediaPlayerEnums::Preload preload, bool preservesPitch, bool prepareForRendering)
+void RemoteMediaPlayerManagerProxy::didReceivePlayerMessage(IPC::Connection& connection, IPC::Decoder& decoder)
{
- if (auto player = m_proxies.get(id))
- player->prepareForPlayback(privateMode, preload, preservesPitch, prepareForRendering);
+ if (auto* player = m_proxies.get(makeObjectIdentifier<MediaPlayerPrivateRemoteIdentifierType>(decoder.destinationID())))
+ player->didReceiveMessage(connection, decoder);
}
-void RemoteMediaPlayerManagerProxy::load(MediaPlayerPrivateRemoteIdentifier id, URL&& url, Optional<SandboxExtension::Handle>&& sandboxExtension, WebCore::ContentType&& contentType, String&& keySystem, CompletionHandler<void(RemoteMediaPlayerConfiguration&&)>&& completionHandler)
-{
- if (auto player = m_proxies.get(id))
- player->load(WTFMove(url), WTFMove(sandboxExtension), WTFMove(contentType), WTFMove(keySystem), WTFMove(completionHandler));
-}
-
-void RemoteMediaPlayerManagerProxy::cancelLoad(MediaPlayerPrivateRemoteIdentifier id)
-{
- if (auto player = m_proxies.get(id))
- player->cancelLoad();
-}
-
-void RemoteMediaPlayerManagerProxy::prepareToPlay(MediaPlayerPrivateRemoteIdentifier id)
-{
- if (auto player = m_proxies.get(id))
- player->prepareToPlay();
-}
-
-void RemoteMediaPlayerManagerProxy::play(MediaPlayerPrivateRemoteIdentifier id)
-{
- if (auto player = m_proxies.get(id))
- player->play();
-}
-
-void RemoteMediaPlayerManagerProxy::pause(MediaPlayerPrivateRemoteIdentifier id)
-{
- if (auto player = m_proxies.get(id))
- player->pause();
-}
-
-void RemoteMediaPlayerManagerProxy::seek(MediaPlayerPrivateRemoteIdentifier id, MediaTime&& time)
-{
- if (auto player = m_proxies.get(id))
- player->seek(WTFMove(time));
-}
-
-void RemoteMediaPlayerManagerProxy::seekWithTolerance(MediaPlayerPrivateRemoteIdentifier id, MediaTime&& time, MediaTime&& negativeTolerance, MediaTime&& positiveTolerance)
-{
- if (auto player = m_proxies.get(id))
- player->seekWithTolerance(WTFMove(time), WTFMove(negativeTolerance), WTFMove(positiveTolerance));
-}
-
-void RemoteMediaPlayerManagerProxy::setVolume(MediaPlayerPrivateRemoteIdentifier id, double volume)
-{
- if (auto player = m_proxies.get(id))
- player->setVolume(volume);
-}
-
-void RemoteMediaPlayerManagerProxy::setMuted(MediaPlayerPrivateRemoteIdentifier id, bool muted)
-{
- if (auto player = m_proxies.get(id))
- player->setMuted(muted);
-}
-
-void RemoteMediaPlayerManagerProxy::setPreload(MediaPlayerPrivateRemoteIdentifier id, WebCore::MediaPlayerEnums::Preload preload)
-{
- if (auto player = m_proxies.get(id))
- player->setPreload(preload);
-}
-
-void RemoteMediaPlayerManagerProxy::setPrivateBrowsingMode(MediaPlayerPrivateRemoteIdentifier id, bool privateMode)
-{
- if (auto player = m_proxies.get(id))
- player->setPrivateBrowsingMode(privateMode);
-}
-
-void RemoteMediaPlayerManagerProxy::setPreservesPitch(MediaPlayerPrivateRemoteIdentifier id, bool preservesPitch)
-{
- if (auto player = m_proxies.get(id))
- player->setPreservesPitch(preservesPitch);
-}
-
-void RemoteMediaPlayerManagerProxy::prepareForRendering(MediaPlayerPrivateRemoteIdentifier id)
-{
- if (auto player = m_proxies.get(id))
- player->prepareForRendering();
-}
-
-void RemoteMediaPlayerManagerProxy::setSize(MediaPlayerPrivateRemoteIdentifier id, const WebCore::IntSize& size)
-{
- if (auto player = m_proxies.get(id))
- player->setSize(size);
-}
-
-void RemoteMediaPlayerManagerProxy::setVisible(MediaPlayerPrivateRemoteIdentifier id, bool visible)
-{
- if (auto player = m_proxies.get(id))
- player->setVisible(visible);
-}
-
-void RemoteMediaPlayerManagerProxy::setShouldMaintainAspectRatio(MediaPlayerPrivateRemoteIdentifier id, bool maintainRatio)
-{
- if (auto player = m_proxies.get(id))
- player->setShouldMaintainAspectRatio(maintainRatio);
-}
-
-void RemoteMediaPlayerManagerProxy::setVideoFullscreenFrame(MediaPlayerPrivateRemoteIdentifier id, WebCore::FloatRect rect)
-{
- if (auto player = m_proxies.get(id))
- player->setVideoFullscreenFrame(rect);
-}
-
-void RemoteMediaPlayerManagerProxy::setVideoFullscreenGravity(MediaPlayerPrivateRemoteIdentifier id, WebCore::MediaPlayerEnums::VideoGravity gravity)
-{
- if (auto player = m_proxies.get(id))
- player->setVideoFullscreenGravity(gravity);
-}
-
-void RemoteMediaPlayerManagerProxy::acceleratedRenderingStateChanged(MediaPlayerPrivateRemoteIdentifier id, bool renderingCanBeAccelerated)
-{
- if (auto player = m_proxies.get(id))
- player->acceleratedRenderingStateChanged(renderingCanBeAccelerated);
-}
-
-void RemoteMediaPlayerManagerProxy::setShouldDisableSleep(MediaPlayerPrivateRemoteIdentifier id, bool disable)
-{
- if (auto player = m_proxies.get(id))
- player->setShouldDisableSleep(disable);
-}
-
-void RemoteMediaPlayerManagerProxy::setRate(MediaPlayerPrivateRemoteIdentifier id, double rate)
-{
- if (auto player = m_proxies.get(id))
- player->setRate(rate);
-}
-
-void RemoteMediaPlayerManagerProxy::audioTrackSetEnabled(MediaPlayerPrivateRemoteIdentifier playerID, TrackPrivateRemoteIdentifier trackID, bool enabled)
-{
- if (auto player = m_proxies.get(playerID))
- player->audioTrackSetEnabled(trackID, enabled);
-}
-
-void RemoteMediaPlayerManagerProxy::videoTrackSetSelected(MediaPlayerPrivateRemoteIdentifier playerID, TrackPrivateRemoteIdentifier trackID, bool selected)
-{
- if (auto player = m_proxies.get(playerID))
- player->videoTrackSetSelected(trackID, selected);
-}
-
#if !RELEASE_LOG_DISABLED
const Logger& RemoteMediaPlayerManagerProxy::logger() const
{
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h (254518 => 254519)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h 2020-01-14 19:05:22 UTC (rev 254519)
@@ -38,7 +38,6 @@
namespace WebKit {
class GPUConnectionToWebProcess;
-class RemoteMediaResourceManager;
class RemoteMediaPlayerProxy;
struct RemoteMediaPlayerConfiguration;
struct RemoteMediaPlayerProxyConfiguration;
@@ -59,6 +58,7 @@
void didReceiveMessageFromWebProcess(IPC::Connection& connection, IPC::Decoder& decoder) { didReceiveMessage(connection, decoder); }
void didReceiveSyncMessageFromWebProcess(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& encoder) { didReceiveSyncMessage(connection, decoder, encoder); }
+ void didReceivePlayerMessage(IPC::Connection&, IPC::Decoder&);
#if !RELEASE_LOG_DISABLED
const Logger& logger() const final;
@@ -84,37 +84,6 @@
void clearMediaCacheForOrigins(WebCore::MediaPlayerEnums::MediaEngineIdentifier, const String&&, Vector<WebCore::SecurityOriginData>&&);
void supportsKeySystem(WebCore::MediaPlayerEnums::MediaEngineIdentifier, const String&&, const String&&, CompletionHandler<void(bool)>&&);
- void load(MediaPlayerPrivateRemoteIdentifier, URL&&, Optional<SandboxExtension::Handle>&&, WebCore::ContentType&&, String&&, CompletionHandler<void(RemoteMediaPlayerConfiguration&&)>&&);
- void prepareForPlayback(MediaPlayerPrivateRemoteIdentifier, bool privateMode, WebCore::MediaPlayerEnums::Preload, bool preservesPitch, bool prepareForRendering);
- void cancelLoad(MediaPlayerPrivateRemoteIdentifier);
- void prepareToPlay(MediaPlayerPrivateRemoteIdentifier);
-
- void play(MediaPlayerPrivateRemoteIdentifier);
- void pause(MediaPlayerPrivateRemoteIdentifier);
-
- void seek(MediaPlayerPrivateRemoteIdentifier, MediaTime&&);
- void seekWithTolerance(MediaPlayerPrivateRemoteIdentifier, MediaTime&&, MediaTime&& negativeTolerance, MediaTime&& positiveTolerance);
-
- void setVolume(MediaPlayerPrivateRemoteIdentifier, double);
- void setMuted(MediaPlayerPrivateRemoteIdentifier, bool);
-
- void setPreload(MediaPlayerPrivateRemoteIdentifier, WebCore::MediaPlayerEnums::Preload);
- void setPrivateBrowsingMode(MediaPlayerPrivateRemoteIdentifier, bool);
- void setPreservesPitch(MediaPlayerPrivateRemoteIdentifier, bool);
-
- void prepareForRendering(MediaPlayerPrivateRemoteIdentifier);
- void setSize(MediaPlayerPrivateRemoteIdentifier, const WebCore::IntSize&);
- void setVisible(MediaPlayerPrivateRemoteIdentifier, bool);
- void setShouldMaintainAspectRatio(MediaPlayerPrivateRemoteIdentifier, bool);
- void setVideoFullscreenFrame(MediaPlayerPrivateRemoteIdentifier, WebCore::FloatRect);
- void setVideoFullscreenGravity(MediaPlayerPrivateRemoteIdentifier, WebCore::MediaPlayerEnums::VideoGravity);
- void acceleratedRenderingStateChanged(MediaPlayerPrivateRemoteIdentifier, bool);
- void setShouldDisableSleep(MediaPlayerPrivateRemoteIdentifier, bool);
- void setRate(MediaPlayerPrivateRemoteIdentifier, double);
-
- void audioTrackSetEnabled(MediaPlayerPrivateRemoteIdentifier, TrackPrivateRemoteIdentifier, bool);
- void videoTrackSetSelected(MediaPlayerPrivateRemoteIdentifier, TrackPrivateRemoteIdentifier, bool);
-
HashMap<MediaPlayerPrivateRemoteIdentifier, std::unique_ptr<RemoteMediaPlayerProxy>> m_proxies;
GPUConnectionToWebProcess& m_gpuConnectionToWebProcess;
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in (254518 => 254519)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in 2020-01-14 19:05:22 UTC (rev 254519)
@@ -34,39 +34,6 @@
ClearMediaCache(enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, String path, WallTime modifiedSince)
ClearMediaCacheForOrigins(enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, String path, Vector<WebCore::SecurityOriginData> origins)
SupportsKeySystem(enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, String keySystem, String mimeType) -> (bool supports) Synchronous
-
- PrepareForPlayback(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool privateMode, enum:uint8_t WebCore::MediaPlayerEnums::Preload preload, bool preservesPitch, bool prepareForRendering)
-
- Load(WebKit::MediaPlayerPrivateRemoteIdentifier id, URL url, Optional<WebKit::SandboxExtension::Handle> sandboxExtension, WebCore::ContentType contentType, String keySystem) -> (struct WebKit::RemoteMediaPlayerConfiguration playerConfiguration) Async
- CancelLoad(WebKit::MediaPlayerPrivateRemoteIdentifier id)
-
- PrepareToPlay(WebKit::MediaPlayerPrivateRemoteIdentifier id)
-
- Play(WebKit::MediaPlayerPrivateRemoteIdentifier id)
- Pause(WebKit::MediaPlayerPrivateRemoteIdentifier id)
-
- SetVolume(WebKit::MediaPlayerPrivateRemoteIdentifier id, double volume)
- SetMuted(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool muted)
-
- Seek(WebKit::MediaPlayerPrivateRemoteIdentifier id, MediaTime time)
- SeekWithTolerance(WebKit::MediaPlayerPrivateRemoteIdentifier id, MediaTime time, MediaTime negativeTolerance, MediaTime positiveTolerance)
-
- SetPreload(WebKit::MediaPlayerPrivateRemoteIdentifier id, enum:uint8_t WebCore::MediaPlayerEnums::Preload preload)
- SetPrivateBrowsingMode(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool privateMode)
- SetPreservesPitch(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool preservesPitch)
-
- PrepareForRendering(WebKit::MediaPlayerPrivateRemoteIdentifier id)
- SetSize(WebKit::MediaPlayerPrivateRemoteIdentifier id, WebCore::IntSize size)
- SetVisible(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool visible)
- SetShouldMaintainAspectRatio(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool maintainAspectRatio)
- SetVideoFullscreenFrame(WebKit::MediaPlayerPrivateRemoteIdentifier id, WebCore::FloatRect rect)
- SetVideoFullscreenGravity(WebKit::MediaPlayerPrivateRemoteIdentifier id, enum:uint8_t WebCore::MediaPlayerEnums::VideoGravity gravity)
- AcceleratedRenderingStateChanged(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool canBeAccelerated)
- SetShouldDisableSleep(WebKit::MediaPlayerPrivateRemoteIdentifier id, bool disable)
- SetRate(WebKit::MediaPlayerPrivateRemoteIdentifier id, double rate)
-
- AudioTrackSetEnabled(WebKit::MediaPlayerPrivateRemoteIdentifier playerID, WebKit::TrackPrivateRemoteIdentifier trackID, bool enabled)
- VideoTrackSetSelected(WebKit::MediaPlayerPrivateRemoteIdentifier playerID, WebKit::TrackPrivateRemoteIdentifier trackID, bool enabled)
}
#endif
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h (254518 => 254519)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2020-01-14 19:05:22 UTC (rev 254519)
@@ -29,11 +29,13 @@
#include "Connection.h"
#include "MediaPlayerPrivateRemoteIdentifier.h"
+#include "MessageReceiver.h"
#include "RemoteMediaPlayerConfiguration.h"
#include "RemoteMediaPlayerProxyConfiguration.h"
#include "RemoteMediaPlayerState.h"
#include "RemoteMediaResourceIdentifier.h"
#include "SandboxExtension.h"
+#include "TrackPrivateRemoteIdentifier.h"
#include <WebCore/Cookie.h>
#include <WebCore/MediaPlayer.h>
#include <WebCore/PlatformMediaResourceLoader.h>
@@ -45,6 +47,7 @@
namespace WebCore {
class AudioTrackPrivate;
+class VideoTrackPrivate;
}
namespace WebKit {
@@ -55,7 +58,8 @@
class RemoteMediaPlayerProxy final
: public CanMakeWeakPtr<RemoteMediaPlayerProxy>
- , public WebCore::MediaPlayerClient {
+ , public WebCore::MediaPlayerClient
+ , private IPC::MessageReceiver {
WTF_MAKE_FAST_ALLOCATED;
public:
RemoteMediaPlayerProxy(RemoteMediaPlayerManagerProxy&, MediaPlayerPrivateRemoteIdentifier, Ref<IPC::Connection>&&, WebCore::MediaPlayerEnums::MediaEngineIdentifier, RemoteMediaPlayerProxyConfiguration&&);
@@ -64,6 +68,8 @@
MediaPlayerPrivateRemoteIdentifier idendifier() const { return m_id; }
void invalidate();
+ void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
+
void getConfiguration(RemoteMediaPlayerConfiguration&);
void prepareForPlayback(bool privateMode, WebCore::MediaPlayerEnums::Preload, bool preservesPitch, bool prepareForRendering);
@@ -197,8 +203,8 @@
const void* mediaPlayerLogIdentifier() { return reinterpret_cast<const void*>(m_configuration.logIdentifier); }
#endif
- HashMap<AudioTrackPrivate*, Ref<RemoteAudioTrackProxy>> m_audioTracks;
- HashMap<VideoTrackPrivate*, Ref<RemoteVideoTrackProxy>> m_videoTracks;
+ HashMap<WebCore::AudioTrackPrivate*, Ref<RemoteAudioTrackProxy>> m_audioTracks;
+ HashMap<WebCore::VideoTrackPrivate*, Ref<RemoteVideoTrackProxy>> m_videoTracks;
MediaPlayerPrivateRemoteIdentifier m_id;
RefPtr<SandboxExtension> m_sandboxExtension;
Ref<IPC::Connection> m_webProcessConnection;
Added: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in (0 => 254519)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in (rev 0)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.messages.in 2020-01-14 19:05:22 UTC (rev 254519)
@@ -0,0 +1,61 @@
+# Copyright (C) 2020 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+#if ENABLE(VIDEO)
+
+messages -> RemoteMediaPlayerProxy NotRefCounted {
+ PrepareForPlayback(bool privateMode, enum:uint8_t WebCore::MediaPlayerEnums::Preload preload, bool preservesPitch, bool prepareForRendering)
+
+ Load(URL url, Optional<WebKit::SandboxExtension::Handle> sandboxExtension, WebCore::ContentType contentType, String keySystem) -> (struct WebKit::RemoteMediaPlayerConfiguration playerConfiguration) Async
+ CancelLoad()
+
+ PrepareToPlay()
+
+ Play()
+ Pause()
+
+ SetVolume(double volume)
+ SetMuted(bool muted)
+
+ Seek(MediaTime time)
+ SeekWithTolerance(MediaTime time, MediaTime negativeTolerance, MediaTime positiveTolerance)
+
+ SetPreload(enum:uint8_t WebCore::MediaPlayerEnums::Preload preload)
+ SetPrivateBrowsingMode(bool privateMode)
+ SetPreservesPitch(bool preservesPitch)
+
+ PrepareForRendering()
+ SetSize(WebCore::IntSize size)
+ SetVisible(bool visible)
+ SetShouldMaintainAspectRatio(bool maintainAspectRatio)
+ SetVideoFullscreenFrame(WebCore::FloatRect rect)
+ SetVideoFullscreenGravity(enum:uint8_t WebCore::MediaPlayerEnums::VideoGravity gravity)
+ AcceleratedRenderingStateChanged(bool canBeAccelerated)
+ SetShouldDisableSleep(bool disable)
+ SetRate(double rate)
+
+ AudioTrackSetEnabled(WebKit::TrackPrivateRemoteIdentifier trackID, bool enabled)
+ VideoTrackSetSelected(WebKit::TrackPrivateRemoteIdentifier trackID, bool enabled)
+}
+
+#endif
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (254518 => 254519)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-01-14 19:05:22 UTC (rev 254519)
@@ -85,6 +85,9 @@
00B9661618E24CBA00CE1F88 /* APIFindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661518E24CBA00CE1F88 /* APIFindClient.h */; };
00B9661A18E25AE100CE1F88 /* FindClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 00B9661818E25AE100CE1F88 /* FindClient.h */; };
0701789E23BE9CFC005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0701789B23BAE261005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp */; };
+ 071BC58F23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 071BC58C23CE1EA900680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp */; };
+ 071BC59023CE1EAA00680D7C /* RemoteMediaPlayerProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 071BC58D23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessages.h */; };
+ 071BC59123CE1EAA00680D7C /* RemoteMediaPlayerProxyMessagesReplies.h in Headers */ = {isa = PBXBuildFile; fileRef = 071BC58E23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessagesReplies.h */; };
07297F9F1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297F9D1C17BBEA003F0735 /* UserMediaPermissionCheckProxy.h */; };
07297F9F1C17BBEA015F0735 /* DeviceIdHashSaltStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297F9D1C17BBEA223F0735 /* DeviceIdHashSaltStorage.h */; };
07297FA31C186ADB003F0735 /* WKUserMediaPermissionCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 07297FA11C186ADB003F0735 /* WKUserMediaPermissionCheck.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -2062,6 +2065,10 @@
071BC58323CC2BD500680D7C /* VideoTrackPrivateRemote.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VideoTrackPrivateRemote.cpp; sourceTree = "<group>"; };
071BC58423CC2C0900680D7C /* RemoteVideoTrackProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteVideoTrackProxy.cpp; sourceTree = "<group>"; };
071BC58523CC2C0900680D7C /* RemoteVideoTrackProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteVideoTrackProxy.h; sourceTree = "<group>"; };
+ 071BC58B23CDFE7500680D7C /* RemoteMediaPlayerProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteMediaPlayerProxy.messages.in; sourceTree = "<group>"; };
+ 071BC58C23CE1EA900680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteMediaPlayerProxyMessageReceiver.cpp; path = RemoteMediaPlayerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
+ 071BC58D23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteMediaPlayerProxyMessages.h; path = RemoteMediaPlayerProxyMessages.h; sourceTree = "<group>"; };
+ 071BC58E23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteMediaPlayerProxyMessagesReplies.h; path = RemoteMediaPlayerProxyMessagesReplies.h; sourceTree = "<group>"; };
0725EFAB239AE38400A538A9 /* RemoteMediaPlayerManagerProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = RemoteMediaPlayerManagerProxy.messages.in; sourceTree = "<group>"; };
0725EFAC239AE38500A538A9 /* RemoteMediaPlayerManagerProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxy.h; sourceTree = "<group>"; };
0725EFAD239B024500A538A9 /* RemoteMediaPlayerManagerProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManagerProxy.cpp; sourceTree = "<group>"; };
@@ -5210,6 +5217,7 @@
0725EFAB239AE38400A538A9 /* RemoteMediaPlayerManagerProxy.messages.in */,
07BAF35723A2CC190044257E /* RemoteMediaPlayerProxy.cpp */,
07BAF35623A2CC170044257E /* RemoteMediaPlayerProxy.h */,
+ 071BC58B23CDFE7500680D7C /* RemoteMediaPlayerProxy.messages.in */,
07B3B47523AD890400BA5B12 /* RemoteMediaPlayerProxyConfiguration.h */,
1D32F89923A8468000B1EA6A /* RemoteMediaResource.cpp */,
1D32F89823A8465A00B1EA6A /* RemoteMediaResource.h */,
@@ -9434,6 +9442,9 @@
07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */,
07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */,
07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */,
+ 071BC58C23CE1EA900680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp */,
+ 071BC58D23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessages.h */,
+ 071BC58E23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessagesReplies.h */,
1D4D736B23A9DF5500717A25 /* RemoteMediaResourceManagerMessageReceiver.cpp */,
1D4D736C23A9DF6000717A25 /* RemoteMediaResourceManagerMessages.h */,
1D4D737523A9EB6800717A25 /* RemoteMediaResourceManagerMessagesReplies.h */,
@@ -10332,6 +10343,8 @@
0792314A239CBCB8009598E2 /* RemoteMediaPlayerManagerMessagesReplies.h in Headers */,
0792314C239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessages.h in Headers */,
07923148239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h in Headers */,
+ 071BC59023CE1EAA00680D7C /* RemoteMediaPlayerProxyMessages.h in Headers */,
+ 071BC59123CE1EAA00680D7C /* RemoteMediaPlayerProxyMessagesReplies.h in Headers */,
1D4D737123A9E56200717A25 /* RemoteMediaResourceManagerMessages.h in Headers */,
1D4D737623A9ED1800717A25 /* RemoteMediaResourceManagerMessagesReplies.h in Headers */,
E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */,
@@ -12008,6 +12021,7 @@
07923149239CBCB8009598E2 /* RemoteMediaPlayerManagerMessageReceiver.cpp in Sources */,
0792314B239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp in Sources */,
0701789E23BE9CFC005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp in Sources */,
+ 071BC58F23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp in Sources */,
1D4D737023A9E54700717A25 /* RemoteMediaResourceManagerMessageReceiver.cpp in Sources */,
1AC1338518590C4600F3EC05 /* RemoteObjectRegistryMessageReceiver.cpp in Sources */,
0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */,
Modified: trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.cpp (254518 => 254519)
--- trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.cpp 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/WebProcess/GPU/media/AudioTrackPrivateRemote.cpp 2020-01-14 19:05:22 UTC (rev 254519)
@@ -30,7 +30,7 @@
#if ENABLE(GPU_PROCESS)
#include "MediaPlayerPrivateRemote.h"
-#include "RemoteMediaPlayerManagerProxyMessages.h"
+#include "RemoteMediaPlayerProxyMessages.h"
#include "TrackPrivateRemoteConfiguration.h"
namespace WebKit {
@@ -45,7 +45,7 @@
void AudioTrackPrivateRemote::setEnabled(bool enabled)
{
if (enabled != this->enabled())
- m_player.connection().send(Messages::RemoteMediaPlayerManagerProxy::AudioTrackSetEnabled(m_player.itentifier(), m_idendifier, enabled), 0);
+ m_player.connection().send(Messages::RemoteMediaPlayerProxy::AudioTrackSetEnabled(m_idendifier, enabled), m_player.itentifier());
AudioTrackPrivate::setEnabled(enabled);
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (254518 => 254519)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2020-01-14 19:05:22 UTC (rev 254519)
@@ -31,6 +31,7 @@
#include "AudioTrackPrivateRemote.h"
#include "Logging.h"
#include "RemoteMediaPlayerManagerProxyMessages.h"
+#include "RemoteMediaPlayerProxyMessages.h"
#include "SandboxExtension.h"
#include "VideoTrackPrivateRemote.h"
#include "WebCoreArgumentCoders.h"
@@ -88,7 +89,7 @@
void MediaPlayerPrivateRemote::prepareForPlayback(bool privateMode, MediaPlayer::Preload preload, bool preservesPitch, bool prepare)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::PrepareForPlayback(m_id, privateMode, preload, preservesPitch, prepare), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::PrepareForPlayback(privateMode, preload, preservesPitch, prepare), m_id);
}
void MediaPlayerPrivateRemote::MediaPlayerPrivateRemote::load(const URL& url, const ContentType& contentType, const String& keySystem)
@@ -118,57 +119,57 @@
sandboxExtensionHandle = WTFMove(handle);
}
- connection().sendWithAsyncReply(Messages::RemoteMediaPlayerManagerProxy::Load(m_id, url, sandboxExtensionHandle, contentType, keySystem), [weakThis = makeWeakPtr(*this)](auto&& configuration) {
+ connection().sendWithAsyncReply(Messages::RemoteMediaPlayerProxy::Load(url, sandboxExtensionHandle, contentType, keySystem), [weakThis = makeWeakPtr(*this)](auto&& configuration) {
if (weakThis)
weakThis->m_configuration = configuration;
- });
+ }, m_id);
}
void MediaPlayerPrivateRemote::cancelLoad()
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::CancelLoad(m_id), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::CancelLoad(), m_id);
}
void MediaPlayerPrivateRemote::prepareToPlay()
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::PrepareToPlay(m_id), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::PrepareToPlay(), m_id);
}
void MediaPlayerPrivateRemote::play()
{
m_cachedState.paused = false;
- connection().send(Messages::RemoteMediaPlayerManagerProxy::Play(m_id), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::Play(), m_id);
}
void MediaPlayerPrivateRemote::pause()
{
m_cachedState.paused = true;
- connection().send(Messages::RemoteMediaPlayerManagerProxy::Pause(m_id), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::Pause(), m_id);
}
void MediaPlayerPrivateRemote::setPreservesPitch(bool preservesPitch)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetPreservesPitch(m_id, preservesPitch), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetPreservesPitch(preservesPitch), m_id);
}
void MediaPlayerPrivateRemote::setVolumeDouble(double volume)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetVolume(m_id, volume), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetVolume(volume), m_id);
}
void MediaPlayerPrivateRemote::setMuted(bool muted)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetMuted(m_id, muted), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetMuted(muted), m_id);
}
void MediaPlayerPrivateRemote::setPreload(MediaPlayer::Preload preload)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetPreload(m_id, preload), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetPreload(preload), m_id);
}
void MediaPlayerPrivateRemote::setPrivateBrowsingMode(bool privateMode)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetPrivateBrowsingMode(m_id, privateMode), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetPrivateBrowsingMode(privateMode), m_id);
}
MediaTime MediaPlayerPrivateRemote::currentMediaTime() const
@@ -179,13 +180,13 @@
void MediaPlayerPrivateRemote::seek(const MediaTime& time)
{
m_seeking = true;
- connection().send(Messages::RemoteMediaPlayerManagerProxy::Seek(m_id, time), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::Seek(time), m_id);
}
void MediaPlayerPrivateRemote::seekWithTolerance(const MediaTime& time, const MediaTime& negativeTolerance, const MediaTime& positiveTolerance)
{
m_seeking = true;
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SeekWithTolerance(m_id, time, negativeTolerance, positiveTolerance), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SeekWithTolerance(time, negativeTolerance, positiveTolerance), m_id);
}
bool MediaPlayerPrivateRemote::didLoadingProgress() const
@@ -342,42 +343,42 @@
void MediaPlayerPrivateRemote::prepareForRendering()
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::PrepareForRendering(m_id), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::PrepareForRendering(), m_id);
}
void MediaPlayerPrivateRemote::setSize(const WebCore::IntSize& size)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetSize(m_id, size), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetSize(size), m_id);
}
void MediaPlayerPrivateRemote::setVisible(bool visible)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetVisible(m_id, visible), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetVisible(visible), m_id);
}
void MediaPlayerPrivateRemote::setShouldMaintainAspectRatio(bool maintainRatio)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetShouldMaintainAspectRatio(m_id, maintainRatio), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetShouldMaintainAspectRatio(maintainRatio), m_id);
}
void MediaPlayerPrivateRemote::setVideoFullscreenFrame(WebCore::FloatRect rect)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetVideoFullscreenFrame(m_id, rect), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetVideoFullscreenFrame(rect), m_id);
}
void MediaPlayerPrivateRemote::setVideoFullscreenGravity(WebCore::MediaPlayerEnums::VideoGravity gravity)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetVideoFullscreenGravity(m_id, gravity), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetVideoFullscreenGravity(gravity), m_id);
}
void MediaPlayerPrivateRemote::acceleratedRenderingStateChanged()
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::AcceleratedRenderingStateChanged(m_id, m_player->supportsAcceleratedRendering()), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::AcceleratedRenderingStateChanged(m_player->supportsAcceleratedRendering()), m_id);
}
void MediaPlayerPrivateRemote::setShouldDisableSleep(bool disable)
{
- connection().send(Messages::RemoteMediaPlayerManagerProxy::SetShouldDisableSleep(m_id, disable), 0);
+ connection().send(Messages::RemoteMediaPlayerProxy::SetShouldDisableSleep(disable), m_id);
}
FloatSize MediaPlayerPrivateRemote::naturalSize() const
Modified: trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.cpp (254518 => 254519)
--- trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.cpp 2020-01-14 18:37:41 UTC (rev 254518)
+++ trunk/Source/WebKit/WebProcess/GPU/media/VideoTrackPrivateRemote.cpp 2020-01-14 19:05:22 UTC (rev 254519)
@@ -30,7 +30,7 @@
#if ENABLE(GPU_PROCESS)
#include "MediaPlayerPrivateRemote.h"
-#include "RemoteMediaPlayerManagerProxyMessages.h"
+#include "RemoteMediaPlayerProxyMessages.h"
namespace WebKit {
@@ -44,7 +44,7 @@
void VideoTrackPrivateRemote::setSelected(bool selected)
{
if (selected != this->selected())
- m_player.connection().send(Messages::RemoteMediaPlayerManagerProxy::VideoTrackSetSelected(m_player.itentifier(), m_idendifier, selected), 0);
+ m_player.connection().send(Messages::RemoteMediaPlayerProxy::VideoTrackSetSelected(m_idendifier, selected), m_player.itentifier());
VideoTrackPrivate::setSelected(selected);
}
