Diff
Modified: trunk/Source/WebCore/ChangeLog (268069 => 268070)
--- trunk/Source/WebCore/ChangeLog 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebCore/ChangeLog 2020-10-06 20:37:53 UTC (rev 268070)
@@ -1,3 +1,25 @@
+2020-10-06 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Rename MediaPlayerPrivateRemoteIdentifier to MediaPlayerIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=217397
+
+ Reviewed by Tim Horton.
+
+ Move `MediaPlayerPrivateRemoteIdentifier` into WebCore, and rename it to `MediaPlayerIdentifier`, such that it
+ isn't necessarily limited to use for GPU Process code. This is preparation for introducing a display list
+ drawing item which will need to reference a remotely hosted `MediaPlayer`.
+
+ No change in behavior.
+
+ * Headers.cmake:
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::MediaPlayer::identifier const):
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerIdentifier.h: Renamed from Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h.
+ * platform/graphics/MediaPlayerPrivate.h:
+ (WebCore::MediaPlayerPrivateInterface::identifier const):
+
2020-10-06 Alex Christensen <achristen...@webkit.org>
Rename namespace Packed to namespace PackedColor
Modified: trunk/Source/WebCore/Headers.cmake (268069 => 268070)
--- trunk/Source/WebCore/Headers.cmake 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebCore/Headers.cmake 2020-10-06 20:37:53 UTC (rev 268070)
@@ -1187,6 +1187,7 @@
platform/graphics/MediaPlaybackTargetPicker.h
platform/graphics/MediaPlayer.h
platform/graphics/MediaPlayerEnums.h
+ platform/graphics/MediaPlayerIdentifier.h
platform/graphics/MediaPlayerPrivate.h
platform/graphics/MediaUsageInfo.h
platform/graphics/NativeImage.h
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (268069 => 268070)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2020-10-06 20:37:53 UTC (rev 268070)
@@ -5143,6 +5143,7 @@
F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */ = {isa = PBXBuildFile; fileRef = F3ABFE0B130E9DA000E7F7D1 /* InstrumentingAgents.h */; };
F3D461491161D53200CA0D09 /* JSErrorHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D461471161D53200CA0D09 /* JSErrorHandler.h */; };
F403E7872363B58C00044550 /* EnterKeyHint.h in Headers */ = {isa = PBXBuildFile; fileRef = F403E7852363B58C00044550 /* EnterKeyHint.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ F429261825264D4400007898 /* MediaPlayerIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = F429261725264D4400007898 /* MediaPlayerIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
F433E9031DBBDBA200EF0D14 /* StaticPasteboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F433E9021DBBDBA200EF0D14 /* StaticPasteboard.h */; settings = {ATTRIBUTES = (Private, ); }; };
F440E77A233D94D70063F9AB /* NavigatorClipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = F440E76F233D94D30063F9AB /* NavigatorClipboard.h */; };
F440E77B233D94D70063F9AB /* ClipboardItem.h in Headers */ = {isa = PBXBuildFile; fileRef = F440E770233D94D40063F9AB /* ClipboardItem.h */; };
@@ -16201,6 +16202,7 @@
F3D461471161D53200CA0D09 /* JSErrorHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSErrorHandler.h; sourceTree = "<group>"; };
F403E7852363B58C00044550 /* EnterKeyHint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnterKeyHint.h; sourceTree = "<group>"; };
F403E7862363B58C00044550 /* EnterKeyHint.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = EnterKeyHint.cpp; sourceTree = "<group>"; };
+ F429261725264D4400007898 /* MediaPlayerIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaPlayerIdentifier.h; sourceTree = "<group>"; };
F42CEB54214031EE002DCA72 /* FontAttributeChangesCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = FontAttributeChangesCocoa.mm; sourceTree = "<group>"; };
F433E9021DBBDBA200EF0D14 /* StaticPasteboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StaticPasteboard.h; sourceTree = "<group>"; };
F433E9041DBBDBC200EF0D14 /* StaticPasteboard.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = StaticPasteboard.cpp; sourceTree = "<group>"; };
@@ -26208,6 +26210,7 @@
E4B41E0C0CBF90BD00AF2ECE /* MediaPlayer.cpp */,
E4B41E0D0CBF90BD00AF2ECE /* MediaPlayer.h */,
CD5209E31B0BD8380077184E /* MediaPlayerEnums.h */,
+ F429261725264D4400007898 /* MediaPlayerIdentifier.h */,
079F5E4B0F3BEBEA005E0782 /* MediaPlayerPrivate.h */,
CD641EB11818F5ED00EE4C41 /* MediaSourcePrivate.h */,
CDDC1E7918A952F30027A9D4 /* MediaSourcePrivateClient.h */,
@@ -33046,6 +33049,7 @@
077B64131B94F12E003E9AD5 /* MediaPlaybackTargetPickerMock.h in Headers */,
E44613E40CD681A200FADA75 /* MediaPlayer.h in Headers */,
CD5209E41B0BD8380077184E /* MediaPlayerEnums.h in Headers */,
+ F429261825264D4400007898 /* MediaPlayerIdentifier.h in Headers */,
0725EFA9239AD79300A538A9 /* MediaPlayerPrivate.h in Headers */,
076F0D0E12B8192700C26AA4 /* MediaPlayerPrivateAVFoundation.h in Headers */,
DF9AFD7213FC31D80015FEB7 /* MediaPlayerPrivateAVFoundationObjC.h in Headers */,
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (268069 => 268070)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -1609,6 +1609,11 @@
m_private->audioOutputDeviceChanged();
}
+MediaPlayerIdentifier MediaPlayer::identifier() const
+{
+ return m_private->identifier();
+}
+
#if !RELEASE_LOG_DISABLED
const Logger& MediaPlayer::mediaPlayerLogger()
{
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (268069 => 268070)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -33,6 +33,7 @@
#include "LayoutRect.h"
#include "LegacyCDMSession.h"
#include "MediaPlayerEnums.h"
+#include "MediaPlayerIdentifier.h"
#include "NativeImage.h"
#include "PlatformLayer.h"
#include "PlatformMediaResourceLoader.h"
@@ -638,6 +639,8 @@
String audioOutputDeviceIdOverride() const;
void audioOutputDeviceChanged();
+ MediaPlayerIdentifier identifier() const;
+
private:
MediaPlayer(MediaPlayerClient&);
MediaPlayer(MediaPlayerClient&, MediaPlayerEnums::MediaEngineIdentifier);
Copied: trunk/Source/WebCore/platform/graphics/MediaPlayerIdentifier.h (from rev 268069, trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h) (0 => 268070)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerIdentifier.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerIdentifier.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <wtf/ObjectIdentifier.h>
+
+namespace WebCore {
+
+enum MediaPlayerIdentifierType { };
+using MediaPlayerIdentifier = ObjectIdentifier<MediaPlayerIdentifierType>;
+
+} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (268069 => 268070)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -28,6 +28,7 @@
#if ENABLE(VIDEO)
#include "MediaPlayer.h"
+#include "MediaPlayerIdentifier.h"
#include "PlatformTimeRanges.h"
namespace WebCore {
@@ -291,6 +292,8 @@
virtual void setPreferredDynamicRangeMode(DynamicRangeMode) { }
virtual void audioOutputDeviceChanged() { }
+
+ virtual MediaPlayerIdentifier identifier() const { return { }; }
};
}
Modified: trunk/Source/WebKit/ChangeLog (268069 => 268070)
--- trunk/Source/WebKit/ChangeLog 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/ChangeLog 2020-10-06 20:37:53 UTC (rev 268070)
@@ -1,3 +1,54 @@
+2020-10-06 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Rename MediaPlayerPrivateRemoteIdentifier to MediaPlayerIdentifier
+ https://bugs.webkit.org/show_bug.cgi?id=217397
+
+ Reviewed by Tim Horton.
+
+ Mass rename `MediaPlayerPrivateRemoteIdentifier` to `WebCore::MediaPlayerIdentifier`. See WebCore/ChangeLog for
+ more details.
+
+ * GPUProcess/media/RemoteLegacyCDMFactoryProxy.cpp:
+ (WebKit::RemoteLegacyCDMFactoryProxy::createCDM):
+ * GPUProcess/media/RemoteLegacyCDMFactoryProxy.h:
+ * GPUProcess/media/RemoteLegacyCDMFactoryProxy.messages.in:
+ * GPUProcess/media/RemoteLegacyCDMProxy.cpp:
+ (WebKit::RemoteLegacyCDMProxy::create):
+ (WebKit::RemoteLegacyCDMProxy::RemoteLegacyCDMProxy):
+ (WebKit::RemoteLegacyCDMProxy::setPlayerId):
+ * GPUProcess/media/RemoteLegacyCDMProxy.h:
+ * GPUProcess/media/RemoteLegacyCDMProxy.messages.in:
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp:
+ (WebKit::RemoteMediaPlayerManagerProxy::createMediaPlayer):
+ (WebKit::RemoteMediaPlayerManagerProxy::deleteMediaPlayer):
+ (WebKit::RemoteMediaPlayerManagerProxy::didReceivePlayerMessage):
+ (WebKit::RemoteMediaPlayerManagerProxy::didReceiveSyncPlayerMessage):
+ (WebKit::RemoteMediaPlayerManagerProxy::getProxy):
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.h:
+ * GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in:
+ * GPUProcess/media/RemoteMediaPlayerProxy.cpp:
+ (WebKit::RemoteMediaPlayerProxy::RemoteMediaPlayerProxy):
+ * GPUProcess/media/RemoteMediaPlayerProxy.h:
+ * Scripts/webkit/messages.py:
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
+ (WebKit::MediaPlayerPrivateRemote::MediaPlayerPrivateRemote):
+ (WebKit::MediaPlayerPrivateRemote::identifier const):
+ * WebProcess/GPU/media/MediaPlayerPrivateRemote.h:
+ * WebProcess/GPU/media/RemoteLegacyCDM.cpp:
+ (WebKit::RemoteLegacyCDM::setPlayerId):
+ * WebProcess/GPU/media/RemoteLegacyCDM.h:
+ * WebProcess/GPU/media/RemoteLegacyCDMFactory.cpp:
+ (WebKit::RemoteLegacyCDMFactory::createCDM):
+ * WebProcess/GPU/media/RemoteMediaPlayerManager.cpp:
+ (WebKit::RemoteMediaPlayerManager::createRemoteMediaPlayer):
+ (WebKit::RemoteMediaPlayerManager::deleteRemoteMediaPlayer):
+ (WebKit::RemoteMediaPlayerManager::findRemotePlayerId):
+ (WebKit::RemoteMediaPlayerManager::didReceivePlayerMessage):
+ * WebProcess/GPU/media/RemoteMediaPlayerManager.h:
+ * WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm:
+ (WebKit::MediaPlayerPrivateRemote::MediaPlayerPrivateRemote):
+
2020-10-06 Alex Christensen <achristen...@webkit.org>
Move ownership of DownloadClient from WebProcessPool to DownloadProxy
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.cpp (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -46,7 +46,7 @@
RemoteLegacyCDMFactoryProxy::~RemoteLegacyCDMFactoryProxy() = default;
-void RemoteLegacyCDMFactoryProxy::createCDM(const String& keySystem, Optional<MediaPlayerPrivateRemoteIdentifier>&& optionalPlayerId, CompletionHandler<void(RemoteLegacyCDMIdentifier&&)>&& completion)
+void RemoteLegacyCDMFactoryProxy::createCDM(const String& keySystem, Optional<MediaPlayerIdentifier>&& optionalPlayerId, CompletionHandler<void(RemoteLegacyCDMIdentifier&&)>&& completion)
{
auto privateCDM = LegacyCDM::create(keySystem);
if (!privateCDM) {
@@ -54,7 +54,7 @@
return;
}
- MediaPlayerPrivateRemoteIdentifier playerId;
+ MediaPlayerIdentifier playerId;
if (optionalPlayerId)
playerId = WTFMove(optionalPlayerId.value());
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.h (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -28,10 +28,10 @@
#if ENABLE(GPU_PROCESS) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
#include "Connection.h"
-#include "MediaPlayerPrivateRemoteIdentifier.h"
#include "MessageReceiver.h"
#include "RemoteLegacyCDMIdentifier.h"
#include "RemoteLegacyCDMSessionIdentifier.h"
+#include <WebCore/MediaPlayerIdentifier.h>
#include <wtf/UniqueRef.h>
#include <wtf/WeakPtr.h>
@@ -71,7 +71,7 @@
void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) final;
// Messages
- void createCDM(const String& keySystem, Optional<MediaPlayerPrivateRemoteIdentifier>&&, CompletionHandler<void(RemoteLegacyCDMIdentifier&&)>&&);
+ void createCDM(const String& keySystem, Optional<WebCore::MediaPlayerIdentifier>&&, CompletionHandler<void(RemoteLegacyCDMIdentifier&&)>&&);
void supportsKeySystem(const String& keySystem, Optional<String> mimeType, CompletionHandler<void(bool)>&&);
GPUConnectionToWebProcess& m_gpuConnectionToWebProcess;
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.messages.in (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.messages.in 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMFactoryProxy.messages.in 2020-10-06 20:37:53 UTC (rev 268070)
@@ -24,7 +24,7 @@
#if ENABLE(GPU_PROCESS) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
messages -> RemoteLegacyCDMFactoryProxy NotRefCounted {
- CreateCDM(String keySystem, Optional<WebKit::MediaPlayerPrivateRemoteIdentifier> playerId) -> (WebKit::RemoteLegacyCDMIdentifier id) Synchronous
+ CreateCDM(String keySystem, Optional<WebCore::MediaPlayerIdentifier> playerId) -> (WebKit::RemoteLegacyCDMIdentifier id) Synchronous
SupportsKeySystem(String keySystem, Optional<String> mimeType) -> (bool result) Synchronous
}
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.cpp (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -36,12 +36,12 @@
using namespace WebCore;
-std::unique_ptr<RemoteLegacyCDMProxy> RemoteLegacyCDMProxy::create(WeakPtr<RemoteLegacyCDMFactoryProxy> factory, MediaPlayerPrivateRemoteIdentifier&& playerId, std::unique_ptr<WebCore::LegacyCDM>&& cdm)
+std::unique_ptr<RemoteLegacyCDMProxy> RemoteLegacyCDMProxy::create(WeakPtr<RemoteLegacyCDMFactoryProxy> factory, MediaPlayerIdentifier&& playerId, std::unique_ptr<WebCore::LegacyCDM>&& cdm)
{
return std::unique_ptr<RemoteLegacyCDMProxy>(new RemoteLegacyCDMProxy(WTFMove(factory), WTFMove(playerId), WTFMove(cdm)));
}
-RemoteLegacyCDMProxy::RemoteLegacyCDMProxy(WeakPtr<RemoteLegacyCDMFactoryProxy>&& factory, MediaPlayerPrivateRemoteIdentifier&& playerId, std::unique_ptr<WebCore::LegacyCDM>&& cdm)
+RemoteLegacyCDMProxy::RemoteLegacyCDMProxy(WeakPtr<RemoteLegacyCDMFactoryProxy>&& factory, MediaPlayerIdentifier&& playerId, std::unique_ptr<WebCore::LegacyCDM>&& cdm)
: m_factory(WTFMove(factory))
, m_playerId(WTFMove(playerId))
, m_cdm(WTFMove(cdm))
@@ -74,7 +74,7 @@
callback(WTFMove(identifier));
}
-void RemoteLegacyCDMProxy::setPlayerId(Optional<MediaPlayerPrivateRemoteIdentifier>&& playerId)
+void RemoteLegacyCDMProxy::setPlayerId(Optional<MediaPlayerIdentifier>&& playerId)
{
if (!playerId)
m_playerId = { };
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.h (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -50,7 +50,7 @@
, public WebCore::LegacyCDMClient
, public CanMakeWeakPtr<RemoteLegacyCDMProxy> {
public:
- static std::unique_ptr<RemoteLegacyCDMProxy> create(WeakPtr<RemoteLegacyCDMFactoryProxy>, MediaPlayerPrivateRemoteIdentifier&&, std::unique_ptr<WebCore::LegacyCDM>&&);
+ static std::unique_ptr<RemoteLegacyCDMProxy> create(WeakPtr<RemoteLegacyCDMFactoryProxy>, WebCore::MediaPlayerIdentifier&&, std::unique_ptr<WebCore::LegacyCDM>&&);
~RemoteLegacyCDMProxy();
RemoteLegacyCDMFactoryProxy* factory() const { return m_factory.get(); }
@@ -57,7 +57,7 @@
private:
friend class RemoteLegacyCDMFactoryProxy;
- RemoteLegacyCDMProxy(WeakPtr<RemoteLegacyCDMFactoryProxy>&&, MediaPlayerPrivateRemoteIdentifier&&, std::unique_ptr<WebCore::LegacyCDM>&&);
+ RemoteLegacyCDMProxy(WeakPtr<RemoteLegacyCDMFactoryProxy>&&, WebCore::MediaPlayerIdentifier&&, std::unique_ptr<WebCore::LegacyCDM>&&);
// IPC::MessageReceiver
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
@@ -68,13 +68,13 @@
void supportsMIMEType(const String&, SupportsMIMETypeCallback&&);
using CreateSessionCallback = CompletionHandler<void(RemoteLegacyCDMSessionIdentifier&&)>;
void createSession(const String&, CreateSessionCallback&&);
- void setPlayerId(Optional<MediaPlayerPrivateRemoteIdentifier>&&);
+ void setPlayerId(Optional<WebCore::MediaPlayerIdentifier>&&);
// LegacyCDMClient
RefPtr<WebCore::MediaPlayer> cdmMediaPlayer(const WebCore::LegacyCDM*) const final;
WeakPtr<RemoteLegacyCDMFactoryProxy> m_factory;
- MediaPlayerPrivateRemoteIdentifier m_playerId;
+ WebCore::MediaPlayerIdentifier m_playerId;
std::unique_ptr<WebCore::LegacyCDM> m_cdm;
};
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.messages.in (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.messages.in 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteLegacyCDMProxy.messages.in 2020-10-06 20:37:53 UTC (rev 268070)
@@ -26,7 +26,7 @@
messages -> RemoteLegacyCDMProxy NotRefCounted {
SupportsMIMEType(String mimeType) -> (bool supports) Synchronous
CreateSession(String mediaKeysStorageDirectory) -> (WebKit::RemoteLegacyCDMSessionIdentifier id) Synchronous
- SetPlayerId(Optional<WebKit::MediaPlayerPrivateRemoteIdentifier> playerId)
+ SetPlayerId(Optional<WebCore::MediaPlayerIdentifier> playerId)
}
#endif
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -59,7 +59,7 @@
{
}
-void RemoteMediaPlayerManagerProxy::createMediaPlayer(MediaPlayerPrivateRemoteIdentifier id, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, RemoteMediaPlayerProxyConfiguration&& proxyConfiguration, CompletionHandler<void(RemoteMediaPlayerConfiguration&)>&& completionHandler)
+void RemoteMediaPlayerManagerProxy::createMediaPlayer(MediaPlayerIdentifier id, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, RemoteMediaPlayerProxyConfiguration&& proxyConfiguration, CompletionHandler<void(RemoteMediaPlayerConfiguration&)>&& completionHandler)
{
ASSERT(!m_proxies.contains(id));
@@ -72,7 +72,7 @@
completionHandler(playerConfiguration);
}
-void RemoteMediaPlayerManagerProxy::deleteMediaPlayer(MediaPlayerPrivateRemoteIdentifier id)
+void RemoteMediaPlayerManagerProxy::deleteMediaPlayer(MediaPlayerIdentifier id)
{
if (auto proxy = m_proxies.take(id))
proxy->invalidate();
@@ -194,17 +194,17 @@
void RemoteMediaPlayerManagerProxy::didReceivePlayerMessage(IPC::Connection& connection, IPC::Decoder& decoder)
{
- if (auto* player = m_proxies.get(makeObjectIdentifier<MediaPlayerPrivateRemoteIdentifierType>(decoder.destinationID())))
+ if (auto* player = m_proxies.get(makeObjectIdentifier<MediaPlayerIdentifierType>(decoder.destinationID())))
player->didReceiveMessage(connection, decoder);
}
void RemoteMediaPlayerManagerProxy::didReceiveSyncPlayerMessage(IPC::Connection& connection, IPC::Decoder& decoder, std::unique_ptr<IPC::Encoder>& encoder)
{
- if (auto* player = m_proxies.get(makeObjectIdentifier<MediaPlayerPrivateRemoteIdentifierType>(decoder.destinationID())))
+ if (auto* player = m_proxies.get(makeObjectIdentifier<MediaPlayerIdentifierType>(decoder.destinationID())))
player->didReceiveSyncMessage(connection, decoder, encoder);
}
-RemoteMediaPlayerProxy* RemoteMediaPlayerManagerProxy::getProxy(const MediaPlayerPrivateRemoteIdentifier& id)
+RemoteMediaPlayerProxy* RemoteMediaPlayerManagerProxy::getProxy(const MediaPlayerIdentifier& id)
{
auto results = m_proxies.find(id);
if (results != m_proxies.end())
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -28,11 +28,11 @@
#if ENABLE(GPU_PROCESS)
#include "Connection.h"
-#include "MediaPlayerPrivateRemoteIdentifier.h"
#include "MessageReceiver.h"
#include "SandboxExtension.h"
#include "TrackPrivateRemoteIdentifier.h"
#include <WebCore/MediaPlayer.h>
+#include <WebCore/MediaPlayerIdentifier.h>
#include <wtf/LoggerHelper.h>
namespace WebKit {
@@ -68,7 +68,7 @@
WTFLogChannel& logChannel() const final;
#endif
- RemoteMediaPlayerProxy* getProxy(const MediaPlayerPrivateRemoteIdentifier&);
+ RemoteMediaPlayerProxy* getProxy(const WebCore::MediaPlayerIdentifier&);
private:
// IPC::MessageReceiver
@@ -75,8 +75,8 @@
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
void didReceiveSyncMessage(IPC::Connection&, IPC::Decoder&, std::unique_ptr<IPC::Encoder>&) final;
- void createMediaPlayer(MediaPlayerPrivateRemoteIdentifier, WebCore::MediaPlayerEnums::MediaEngineIdentifier, RemoteMediaPlayerProxyConfiguration&&, CompletionHandler<void(RemoteMediaPlayerConfiguration&)>&&);
- void deleteMediaPlayer(MediaPlayerPrivateRemoteIdentifier);
+ void createMediaPlayer(WebCore::MediaPlayerIdentifier, WebCore::MediaPlayerEnums::MediaEngineIdentifier, RemoteMediaPlayerProxyConfiguration&&, CompletionHandler<void(RemoteMediaPlayerConfiguration&)>&&);
+ void deleteMediaPlayer(WebCore::MediaPlayerIdentifier);
// Media player factory
void getSupportedTypes(WebCore::MediaPlayerEnums::MediaEngineIdentifier, CompletionHandler<void(Vector<String>&&)>&&);
@@ -87,7 +87,7 @@
void clearMediaCacheForOrigins(WebCore::MediaPlayerEnums::MediaEngineIdentifier, const String&&, Vector<WebCore::SecurityOriginData>&&);
void supportsKeySystem(WebCore::MediaPlayerEnums::MediaEngineIdentifier, const String&&, const String&&, CompletionHandler<void(bool)>&&);
- HashMap<MediaPlayerPrivateRemoteIdentifier, std::unique_ptr<RemoteMediaPlayerProxy>> m_proxies;
+ HashMap<WebCore::MediaPlayerIdentifier, std::unique_ptr<RemoteMediaPlayerProxy>> m_proxies;
GPUConnectionToWebProcess& m_gpuConnectionToWebProcess;
#if !RELEASE_LOG_DISABLED
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerManagerProxy.messages.in 2020-10-06 20:37:53 UTC (rev 268070)
@@ -24,8 +24,8 @@
#if ENABLE(GPU_PROCESS)
messages -> RemoteMediaPlayerManagerProxy NotRefCounted {
- CreateMediaPlayer(WebKit::MediaPlayerPrivateRemoteIdentifier id, enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, struct WebKit::RemoteMediaPlayerProxyConfiguration proxyConfiguration) -> (struct WebKit::RemoteMediaPlayerConfiguration playerConfiguration) Async
- DeleteMediaPlayer(WebKit::MediaPlayerPrivateRemoteIdentifier id)
+ CreateMediaPlayer(WebCore::MediaPlayerIdentifier id, enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, struct WebKit::RemoteMediaPlayerProxyConfiguration proxyConfiguration) -> (struct WebKit::RemoteMediaPlayerConfiguration playerConfiguration) Async
+ DeleteMediaPlayer(WebCore::MediaPlayerIdentifier id)
GetSupportedTypes(enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier) -> (Vector<String> types) Synchronous
SupportsTypeAndCodecs(enum:uint8_t WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, struct WebCore::MediaEngineSupportParameters type) -> (enum:uint8_t WebCore::MediaPlayerEnums::SupportsType support) Synchronous
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -63,7 +63,7 @@
using namespace WebCore;
-RemoteMediaPlayerProxy::RemoteMediaPlayerProxy(RemoteMediaPlayerManagerProxy& manager, MediaPlayerPrivateRemoteIdentifier id, Ref<IPC::Connection>&& connection, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, RemoteMediaPlayerProxyConfiguration&& configuration)
+RemoteMediaPlayerProxy::RemoteMediaPlayerProxy(RemoteMediaPlayerManagerProxy& manager, MediaPlayerIdentifier id, Ref<IPC::Connection>&& connection, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, RemoteMediaPlayerProxyConfiguration&& configuration)
: m_id(id)
, m_webProcessConnection(WTFMove(connection))
, m_manager(manager)
Modified: trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h (268069 => 268070)
--- trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/GPUProcess/media/RemoteMediaPlayerProxy.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -28,7 +28,6 @@
#if ENABLE(GPU_PROCESS)
#include "Connection.h"
-#include "MediaPlayerPrivateRemoteIdentifier.h"
#include "MessageReceiver.h"
#include "RemoteLegacyCDMSessionIdentifier.h"
#include "RemoteMediaPlayerConfiguration.h"
@@ -40,6 +39,7 @@
#include <WebCore/Cookie.h>
#include <WebCore/InbandTextTrackPrivate.h>
#include <WebCore/MediaPlayer.h>
+#include <WebCore/MediaPlayerIdentifier.h>
#include <WebCore/PlatformMediaResourceLoader.h>
#include <wtf/LoggerHelper.h>
#include <wtf/RefPtr.h>
@@ -76,10 +76,10 @@
, private IPC::MessageReceiver {
WTF_MAKE_FAST_ALLOCATED;
public:
- RemoteMediaPlayerProxy(RemoteMediaPlayerManagerProxy&, MediaPlayerPrivateRemoteIdentifier, Ref<IPC::Connection>&&, WebCore::MediaPlayerEnums::MediaEngineIdentifier, RemoteMediaPlayerProxyConfiguration&&);
+ RemoteMediaPlayerProxy(RemoteMediaPlayerManagerProxy&, WebCore::MediaPlayerIdentifier, Ref<IPC::Connection>&&, WebCore::MediaPlayerEnums::MediaEngineIdentifier, RemoteMediaPlayerProxyConfiguration&&);
~RemoteMediaPlayerProxy();
- MediaPlayerPrivateRemoteIdentifier idendifier() const { return m_id; }
+ WebCore::MediaPlayerIdentifier idendifier() const { return m_id; }
void invalidate();
#if ENABLE(VIDEO_PRESENTATION_MODE)
@@ -276,7 +276,7 @@
HashMap<WebCore::VideoTrackPrivate*, Ref<RemoteVideoTrackProxy>> m_videoTracks;
HashMap<WebCore::InbandTextTrackPrivate*, Ref<RemoteTextTrackProxy>> m_textTracks;
- MediaPlayerPrivateRemoteIdentifier m_id;
+ WebCore::MediaPlayerIdentifier m_id;
RefPtr<SandboxExtension> m_sandboxExtension;
Ref<IPC::Connection> m_webProcessConnection;
RefPtr<WebCore::MediaPlayer> m_player;
Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (268069 => 268070)
--- trunk/Source/WebKit/Scripts/webkit/messages.py 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py 2020-10-06 20:37:53 UTC (rev 268070)
@@ -215,6 +215,7 @@
'WebCore::FrameIdentifier',
'WebCore::LibWebRTCSocketIdentifier',
'WebCore::PlaybackTargetClientContextIdentifier',
+ 'WebCore::MediaPlayerIdentifier',
'WebCore::MediaSessionIdentifier',
'WebCore::PageIdentifier',
'WebCore::PluginLoadClientPolicy',
@@ -244,7 +245,6 @@
'WebKit::LegacyCustomProtocolID',
'WebKit::LibWebRTCResolverIdentifier',
'WebKit::MDNSRegisterIdentifier',
- 'WebKit::MediaPlayerPrivateRemoteIdentifier',
'WebKit::MediaRecorderIdentifier',
'WebKit::PDFPluginIdentifier',
'WebKit::PlaybackSessionContextIdentifier',
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (268069 => 268070)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-10-06 20:37:53 UTC (rev 268070)
@@ -2164,7 +2164,6 @@
07923142239CBCB5009598E2 /* RemoteMediaPlayerManagerProxyMessagesReplies.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxyMessagesReplies.h; sourceTree = "<group>"; };
07923145239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteMediaPlayerManagerProxyMessageReceiver.cpp; sourceTree = "<group>"; };
07923146239CBCB7009598E2 /* RemoteMediaPlayerManagerProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteMediaPlayerManagerProxyMessages.h; sourceTree = "<group>"; };
- 0792314E239D5F53009598E2 /* MediaPlayerPrivateRemoteIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaPlayerPrivateRemoteIdentifier.h; sourceTree = "<group>"; };
0794B4AB24451BB90001B9C4 /* MediaUsageManagerCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MediaUsageManagerCocoa.mm; sourceTree = "<group>"; };
0794B4AC24451BB90001B9C4 /* MediaUsageManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaUsageManager.h; sourceTree = "<group>"; };
0794B4AE244524B00001B9C4 /* MediaUsageManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MediaUsageManager.cpp; sourceTree = "<group>"; };
@@ -5501,7 +5500,6 @@
07923131239B3B0C009598E2 /* MediaPlayerPrivateRemote.cpp */,
07923132239B3B0C009598E2 /* MediaPlayerPrivateRemote.h */,
07B1D04B23D38FCE00399A6E /* MediaPlayerPrivateRemote.messages.in */,
- 0792314E239D5F53009598E2 /* MediaPlayerPrivateRemoteIdentifier.h */,
9B5BEC30240102220070C6EF /* RemoteAudioBusData.h */,
9B5BEC29240101580070C6EF /* RemoteAudioDestinationProxy.cpp */,
9B5BEC28240101580070C6EF /* RemoteAudioDestinationProxy.h */,
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -91,7 +91,7 @@
#endif
#if !PLATFORM(COCOA)
-MediaPlayerPrivateRemote::MediaPlayerPrivateRemote(MediaPlayer* player, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, MediaPlayerPrivateRemoteIdentifier playerIdentifier, RemoteMediaPlayerManager& manager)
+MediaPlayerPrivateRemote::MediaPlayerPrivateRemote(MediaPlayer* player, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, MediaPlayerIdentifier playerIdentifier, RemoteMediaPlayerManager& manager)
: m_player(player)
#if !RELEASE_LOG_DISABLED
, m_logger(player->mediaPlayerLogger())
@@ -1156,6 +1156,11 @@
}
#endif
+MediaPlayerIdentifier MediaPlayerPrivateRemote::identifier() const
+{
+ return m_id;
+}
+
} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -69,12 +69,12 @@
#endif
{
public:
- static std::unique_ptr<MediaPlayerPrivateRemote> create(WebCore::MediaPlayer* player, WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, MediaPlayerPrivateRemoteIdentifier identifier, RemoteMediaPlayerManager& manager)
+ static std::unique_ptr<MediaPlayerPrivateRemote> create(WebCore::MediaPlayer* player, WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier, WebCore::MediaPlayerIdentifier identifier, RemoteMediaPlayerManager& manager)
{
return makeUnique<MediaPlayerPrivateRemote>(player, remoteEngineIdentifier, identifier, manager);
}
- MediaPlayerPrivateRemote(WebCore::MediaPlayer*, WebCore::MediaPlayerEnums::MediaEngineIdentifier, MediaPlayerPrivateRemoteIdentifier, RemoteMediaPlayerManager&);
+ MediaPlayerPrivateRemote(WebCore::MediaPlayer*, WebCore::MediaPlayerEnums::MediaEngineIdentifier, WebCore::MediaPlayerIdentifier, RemoteMediaPlayerManager&);
~MediaPlayerPrivateRemote();
void setConfiguration(RemoteMediaPlayerConfiguration&&, WebCore::SecurityOriginData&&);
@@ -83,7 +83,7 @@
void invalidate() { m_invalid = true; }
WebCore::MediaPlayerEnums::MediaEngineIdentifier remoteEngineIdentifier() const { return m_remoteEngineIdentifier; }
- MediaPlayerPrivateRemoteIdentifier itentifier() const { return m_id; }
+ WebCore::MediaPlayerIdentifier itentifier() const { return m_id; }
IPC::Connection& connection() const { return m_manager.gpuProcessConnection().connection(); }
void networkStateChanged(RemoteMediaPlayerState&&);
@@ -262,6 +262,8 @@
bool copyVideoTextureToPlatformTexture(WebCore::GraphicsContextGLOpenGL*, PlatformGLObject, GCGLenum, GCGLint, GCGLenum, GCGLenum, GCGLenum, bool, bool) final;
WebCore::NativeImagePtr nativeImageForCurrentTime() final;
+ WebCore::MediaPlayerIdentifier identifier() const final;
+
void setPreload(WebCore::MediaPlayer::Preload) final;
bool hasAvailableVideoFrame() const final;
@@ -368,7 +370,7 @@
RemoteMediaPlayerManager& m_manager;
WebCore::MediaPlayerEnums::MediaEngineIdentifier m_remoteEngineIdentifier;
- MediaPlayerPrivateRemoteIdentifier m_id;
+ WebCore::MediaPlayerIdentifier m_id;
RemoteMediaPlayerConfiguration m_configuration;
RemoteMediaPlayerState m_cachedState;
Deleted: trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemoteIdentifier.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2019 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.
- */
-
-#pragma once
-
-#if ENABLE(GPU_PROCESS)
-
-#include <wtf/ObjectIdentifier.h>
-
-namespace WebKit {
-
-enum MediaPlayerPrivateRemoteIdentifierType { };
-using MediaPlayerPrivateRemoteIdentifier = ObjectIdentifier<MediaPlayerPrivateRemoteIdentifierType>;
-
-} // namespace WebKit
-
-#endif
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDM.cpp (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDM.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDM.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -74,12 +74,12 @@
return RemoteLegacyCDMSession::create(m_factory, WTFMove(id));
}
-void RemoteLegacyCDM::setPlayerId(MediaPlayerPrivateRemoteIdentifier id)
+void RemoteLegacyCDM::setPlayerId(MediaPlayerIdentifier id)
{
if (!m_factory)
return;
- Optional<MediaPlayerPrivateRemoteIdentifier> optionalId;
+ Optional<MediaPlayerIdentifier> optionalId;
if (id)
optionalId = id;
m_factory->gpuProcessConnection().connection().send(Messages::RemoteLegacyCDMProxy::SetPlayerId(optionalId), m_identifier);
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDM.h (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDM.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDM.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -27,9 +27,9 @@
#if ENABLE(GPU_PROCESS) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
-#include "MediaPlayerPrivateRemoteIdentifier.h"
#include "RemoteLegacyCDMIdentifier.h"
#include <WebCore/LegacyCDMPrivate.h>
+#include <WebCore/MediaPlayerIdentifier.h>
#include <wtf/WeakPtr.h>
namespace WebCore {
@@ -51,7 +51,7 @@
bool supportsMIMEType(const String&) final;
std::unique_ptr<WebCore::LegacyCDMSession> createSession(WebCore::LegacyCDMSessionClient*) final;
- void setPlayerId(MediaPlayerPrivateRemoteIdentifier);
+ void setPlayerId(WebCore::MediaPlayerIdentifier);
private:
RemoteLegacyCDM(WeakPtr<RemoteLegacyCDMFactory>&&, RemoteLegacyCDMIdentifier&&);
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMFactory.cpp (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMFactory.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteLegacyCDMFactory.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -108,7 +108,7 @@
return nullptr;
}
- Optional<MediaPlayerPrivateRemoteIdentifier> playerId;
+ Optional<MediaPlayerIdentifier> playerId;
if (auto player = cdm->mediaPlayer())
playerId = gpuProcessConnection().mediaPlayerManager().findRemotePlayerId(player->playerPrivate());
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.cpp 2020-10-06 20:37:53 UTC (rev 268070)
@@ -165,7 +165,7 @@
auto documentSecurityOrigin = player->documentSecurityOrigin();
proxyConfiguration.documentSecurityOrigin = documentSecurityOrigin;
- auto identifier = MediaPlayerPrivateRemoteIdentifier::generate();
+ auto identifier = MediaPlayerIdentifier::generate();
RemoteMediaPlayerConfiguration playerConfiguration;
auto completionHandler = [this, weakThis = makeWeakPtr(this), identifier, documentSecurityOrigin = WTFMove(documentSecurityOrigin)](auto&& playerConfiguration) mutable {
if (!weakThis)
@@ -183,13 +183,13 @@
return remotePlayer;
}
-void RemoteMediaPlayerManager::deleteRemoteMediaPlayer(MediaPlayerPrivateRemoteIdentifier id)
+void RemoteMediaPlayerManager::deleteRemoteMediaPlayer(MediaPlayerIdentifier id)
{
m_players.take(id);
gpuProcessConnection().connection().send(Messages::RemoteMediaPlayerManagerProxy::DeleteMediaPlayer(id), 0);
}
-MediaPlayerPrivateRemoteIdentifier RemoteMediaPlayerManager::findRemotePlayerId(const MediaPlayerPrivateInterface* player)
+MediaPlayerIdentifier RemoteMediaPlayerManager::findRemotePlayerId(const MediaPlayerPrivateInterface* player)
{
for (auto pair : m_players) {
if (pair.value == player)
@@ -259,7 +259,7 @@
void RemoteMediaPlayerManager::didReceivePlayerMessage(IPC::Connection& connection, IPC::Decoder& decoder)
{
- if (const auto& player = m_players.get(makeObjectIdentifier<MediaPlayerPrivateRemoteIdentifierType>(decoder.destinationID())))
+ if (const auto& player = m_players.get(makeObjectIdentifier<MediaPlayerIdentifierType>(decoder.destinationID())))
player->didReceiveMessage(connection, decoder);
}
Modified: trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.h (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.h 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/RemoteMediaPlayerManager.h 2020-10-06 20:37:53 UTC (rev 268070)
@@ -28,7 +28,6 @@
#if ENABLE(GPU_PROCESS)
#include "GPUProcessConnection.h"
-#include "MediaPlayerPrivateRemoteIdentifier.h"
#include "MessageReceiver.h"
#include "RemoteMediaPlayerState.h"
#include "RemoteMediaResourceIdentifier.h"
@@ -36,6 +35,7 @@
#include "TrackPrivateRemoteIdentifier.h"
#include "WebProcessSupplement.h"
#include <WebCore/MediaPlayer.h>
+#include <WebCore/MediaPlayerIdentifier.h>
#include <wtf/HashMap.h>
namespace WebCore {
@@ -68,9 +68,9 @@
void didReceivePlayerMessage(IPC::Connection&, IPC::Decoder&);
- void deleteRemoteMediaPlayer(MediaPlayerPrivateRemoteIdentifier);
+ void deleteRemoteMediaPlayer(WebCore::MediaPlayerIdentifier);
- MediaPlayerPrivateRemoteIdentifier findRemotePlayerId(const WebCore::MediaPlayerPrivateInterface*);
+ WebCore::MediaPlayerIdentifier findRemotePlayerId(const WebCore::MediaPlayerPrivateInterface*);
private:
std::unique_ptr<WebCore::MediaPlayerPrivateInterface> createRemoteMediaPlayer(WebCore::MediaPlayer*, WebCore::MediaPlayerEnums::MediaEngineIdentifier);
@@ -88,7 +88,7 @@
RemoteMediaPlayerMIMETypeCache& typeCache(WebCore::MediaPlayerEnums::MediaEngineIdentifier);
- HashMap<MediaPlayerPrivateRemoteIdentifier, WeakPtr<MediaPlayerPrivateRemote>> m_players;
+ HashMap<WebCore::MediaPlayerIdentifier, WeakPtr<MediaPlayerPrivateRemote>> m_players;
WebProcess& m_process;
mutable GPUProcessConnection* m_gpuProcessConnection { nullptr };
};
Modified: trunk/Source/WebKit/WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm (268069 => 268070)
--- trunk/Source/WebKit/WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm 2020-10-06 20:29:23 UTC (rev 268069)
+++ trunk/Source/WebKit/WebProcess/GPU/media/cocoa/MediaPlayerPrivateRemoteCocoa.mm 2020-10-06 20:37:53 UTC (rev 268070)
@@ -34,7 +34,7 @@
namespace WebKit {
using namespace WebCore;
-MediaPlayerPrivateRemote::MediaPlayerPrivateRemote(MediaPlayer* player, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, MediaPlayerPrivateRemoteIdentifier playerIdentifier, RemoteMediaPlayerManager& manager)
+MediaPlayerPrivateRemote::MediaPlayerPrivateRemote(MediaPlayer* player, MediaPlayerEnums::MediaEngineIdentifier engineIdentifier, MediaPlayerIdentifier playerIdentifier, RemoteMediaPlayerManager& manager)
#if !RELEASE_LOG_DISABLED
: m_logger(player->mediaPlayerLogger())
, m_logIdentifier(player->mediaPlayerLogIdentifier())
