Skip to content

Commit 7b5547b

Browse files
kkinnunen-applekkinnunen-apple
committed
GPUP: Identifier header files are not consistent
https://bugs.webkit.org/show_bug.cgi?id=298789 rdar://160483461 Reviewed by Mike Wyrzykowski. Move the few GPUP related interface identifier headers from Source/WebKit/WebProcess/GPU/graphics/ to Source/WebKit/GPUProcess/graphics/ The implementation and .messages.in references are mostly in Source/WebKit/WebProcess/GPU/graphics/ so that should be more consistent default place. Few identifiers lacked the Remote -prefix that is present in the types they identify, so add that prefix for consistency with the naming of the rest of the types in the system. * Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp: (WebKit::GPUConnectionToWebProcess::createRenderingBackend): (WebKit::GPUConnectionToWebProcess::releaseRenderingBackend): (WebKit::GPUConnectionToWebProcess::createGraphicsContextGL): (WebKit::GPUConnectionToWebProcess::releaseGraphicsContextGL): (WebKit::GPUConnectionToWebProcess::releaseGraphicsContextGLForTesting): (WebKit::GPUConnectionToWebProcess::remoteRenderingBackend): (WebKit::GPUConnectionToWebProcess::createGPU): * Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h: * Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in: * Source/WebKit/GPUProcess/graphics/RemoteDisplayListIdentifier.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListIdentifier.h. * Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorderIdentifier.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderIdentifier.h. * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp: (WebKit::RemoteGraphicsContextGL::create): (WebKit::RemoteGraphicsContextGL::RemoteGraphicsContextGL): * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h: * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLCocoa.cpp: (WebKit::RemoteGraphicsContextGL::create): (WebKit::RemoteGraphicsContextGLCocoa::RemoteGraphicsContextGLCocoa): * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLGBM.cpp: (WebKit::RemoteGraphicsContextGLGBM::RemoteGraphicsContextGLGBM): (WebKit::RemoteGraphicsContextGL::create): * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLIdentifier.h: Copied from Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextIdentifier.h. * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLWC.cpp: (WebKit::RemoteGraphicsContextGL::create): (WebKit::RemoteGraphicsContextGLWC::RemoteGraphicsContextGLWC): * Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextIdentifier.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextIdentifier.h. * Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp: (WebKit::RemoteRenderingBackend::create): (WebKit::RemoteRenderingBackend::RemoteRenderingBackend): * Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h: (WebKit::RemoteRenderingBackend::identifier): * Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendIdentifier.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RenderingBackendIdentifier.h. * Source/WebKit/GPUProcess/graphics/RemoteSerializedImageBufferIdentifier.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteSerializedImageBufferIdentifier.h. * Source/WebKit/Scripts/webkit/messages.py: (atomic_object_identifier): (serialized_identifiers): * Source/WebKit/Scripts/webkit/tests/GeneratedSerializers.cpp: (IPC::ArgumentCoder<Namespace::OtherClass>::decode): (IPC::ArgumentCoder<Namespace::ClassWithMemberPrecondition>::decode): (IPC::ArgumentCoder<SoftLinkedMember>::decode): * Source/WebKit/Scripts/webkit/tests/GeneratedWebKitSecureCoding.cpp: (WebKit::CoreIPCAVOutputContext::toID const): (WebKit::CoreIPCDDScannerResult::toID const): * Source/WebKit/Scripts/webkit/tests/MessageArgumentDescriptions.cpp: (IPC::serializedIdentifiers): * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Source/WebKit/WebProcess/GPU/GPUProcessConnection.cpp: (WebKit::GPUProcessConnection::createRenderingBackend): (WebKit::GPUProcessConnection::releaseRenderingBackend): (WebKit::GPUProcessConnection::createGraphicsContextGL): (WebKit::GPUProcessConnection::releaseGraphicsContextGL): (WebKit::GPUProcessConnection::createGPU): * Source/WebKit/WebProcess/GPU/GPUProcessConnection.h: * Source/WebKit/WebProcess/GPU/ShapeDetection/RemoteBarcodeDetectorProxy.cpp: (WebKit::ShapeDetection::RemoteBarcodeDetectorProxy::create): (WebKit::ShapeDetection::RemoteBarcodeDetectorProxy::RemoteBarcodeDetectorProxy): (WebKit::ShapeDetection::RemoteBarcodeDetectorProxy::getSupportedFormats): * Source/WebKit/WebProcess/GPU/ShapeDetection/RemoteBarcodeDetectorProxy.h: * Source/WebKit/WebProcess/GPU/ShapeDetection/RemoteFaceDetectorProxy.cpp: (WebKit::ShapeDetection::RemoteFaceDetectorProxy::create): (WebKit::ShapeDetection::RemoteFaceDetectorProxy::RemoteFaceDetectorProxy): * Source/WebKit/WebProcess/GPU/ShapeDetection/RemoteFaceDetectorProxy.h: * Source/WebKit/WebProcess/GPU/ShapeDetection/RemoteTextDetectorProxy.cpp: (WebKit::ShapeDetection::RemoteTextDetectorProxy::create): (WebKit::ShapeDetection::RemoteTextDetectorProxy::RemoteTextDetectorProxy): * Source/WebKit/WebProcess/GPU/ShapeDetection/RemoteTextDetectorProxy.h: * Source/WebKit/WebProcess/GPU/graphics/GraphicsContextGLIdentifier.h: Removed. * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp: (WebKit::RemoteGraphicsContextGLProxy::initializeIPC): * Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.h: * Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h: * Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp: (WebKit::RemoteRenderingBackendProxy::renderingBackendIdentifier const): (WebKit::RemoteRenderingBackendProxy::ensureBackendCreated): * Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h: * Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.cpp: (WebKit::RemoteGPUProxy::initializeIPC): * Source/WebKit/WebProcess/GPU/graphics/WebGPU/RemoteGPUProxy.h: * Source/WebKit/WebProcess/GPU/graphics/wc/WCPlatformLayerGCGL.h: Canonical link: https://commits.webkit.org/299941@main
1 parent cb57fd2 commit 7b5547b

38 files changed

+126
-126
lines changed

‎Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ Ref<RemoteImageDecoderAVFProxy> GPUConnectionToWebProcess::protectedImageDecoder
712712
}
713713
#endif
714714

715-
void GPUConnectionToWebProcess::createRenderingBackend(RenderingBackendIdentifier identifier, IPC::StreamServerConnection::Handle&& connectionHandle)
715+
void GPUConnectionToWebProcess::createRenderingBackend(RemoteRenderingBackendIdentifier identifier, IPC::StreamServerConnection::Handle&& connectionHandle)
716716
{
717717
IPC::StreamServerConnectionParameters params;
718718
#if ENABLE(IPC_TESTING_API)
@@ -730,15 +730,15 @@ void GPUConnectionToWebProcess::createRenderingBackend(RenderingBackendIdentifie
730730
}
731731
}
732732

733-
void GPUConnectionToWebProcess::releaseRenderingBackend(RenderingBackendIdentifier renderingBackendIdentifier)
733+
void GPUConnectionToWebProcess::releaseRenderingBackend(RemoteRenderingBackendIdentifier renderingBackendIdentifier)
734734
{
735735
bool found = m_remoteRenderingBackendMap.remove(renderingBackendIdentifier);
736736
ASSERT_UNUSED(found, found);
737737
m_gpuProcess->tryExitIfUnusedAndUnderMemoryPressure();
738738
}
739739

740740
#if ENABLE(WEBGL)
741-
void GPUConnectionToWebProcess::createGraphicsContextGL(GraphicsContextGLIdentifier identifier, WebCore::GraphicsContextGLAttributes attributes, RenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnection::Handle&& connectionHandle)
741+
void GPUConnectionToWebProcess::createGraphicsContextGL(RemoteGraphicsContextGLIdentifier identifier, WebCore::GraphicsContextGLAttributes attributes, RemoteRenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnection::Handle&& connectionHandle)
742742
{
743743
MESSAGE_CHECK(!isLockdownModeEnabled());
744744

@@ -760,7 +760,7 @@ void GPUConnectionToWebProcess::createGraphicsContextGL(GraphicsContextGLIdentif
760760
ASSERT_UNUSED(addResult, addResult.isNewEntry);
761761
}
762762

763-
void GPUConnectionToWebProcess::releaseGraphicsContextGL(GraphicsContextGLIdentifier identifier)
763+
void GPUConnectionToWebProcess::releaseGraphicsContextGL(RemoteGraphicsContextGLIdentifier identifier)
764764
{
765765
MESSAGE_CHECK(!isLockdownModeEnabled());
766766

@@ -769,13 +769,13 @@ void GPUConnectionToWebProcess::releaseGraphicsContextGL(GraphicsContextGLIdenti
769769
m_gpuProcess->tryExitIfUnusedAndUnderMemoryPressure();
770770
}
771771

772-
void GPUConnectionToWebProcess::releaseGraphicsContextGLForTesting(GraphicsContextGLIdentifier identifier)
772+
void GPUConnectionToWebProcess::releaseGraphicsContextGLForTesting(RemoteGraphicsContextGLIdentifier identifier)
773773
{
774774
releaseGraphicsContextGL(identifier);
775775
}
776776
#endif
777777

778-
RemoteRenderingBackend* GPUConnectionToWebProcess::remoteRenderingBackend(RenderingBackendIdentifier renderingBackendIdentifier)
778+
RemoteRenderingBackend* GPUConnectionToWebProcess::remoteRenderingBackend(RemoteRenderingBackendIdentifier renderingBackendIdentifier)
779779
{
780780
auto it = m_remoteRenderingBackendMap.find(renderingBackendIdentifier);
781781
if (it == m_remoteRenderingBackendMap.end())
@@ -803,7 +803,7 @@ void GPUConnectionToWebProcess::performWithMediaPlayerOnMainThread(MediaPlayerId
803803
}
804804
#endif
805805

806-
void GPUConnectionToWebProcess::createGPU(WebGPUIdentifier identifier, RenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnection::Handle&& connectionHandle)
806+
void GPUConnectionToWebProcess::createGPU(WebGPUIdentifier identifier, RemoteRenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnection::Handle&& connectionHandle)
807807
{
808808
MESSAGE_CHECK(m_sharedPreferencesForWebProcess.webGPUEnabled);
809809

‎Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "RemoteAudioSessionIdentifier.h"
3535
#include "RemoteGPU.h"
3636
#include "RemoteRemoteCommandListenerIdentifier.h"
37-
#include "RenderingBackendIdentifier.h"
37+
#include "RemoteRenderingBackendIdentifier.h"
3838
#include "ScopedActiveMessageReceiveQueue.h"
3939
#include "SharedPreferencesForWebProcess.h"
4040
#include "WebGPUIdentifier.h"
@@ -56,7 +56,7 @@
5656
#endif
5757

5858
#if ENABLE(WEBGL)
59-
#include "GraphicsContextGLIdentifier.h"
59+
#include "RemoteGraphicsContextGLIdentifier.h"
6060
#include <WebCore/GraphicsContextGLAttributes.h>
6161
#endif
6262

@@ -235,15 +235,15 @@ class GPUConnectionToWebProcess
235235
void lowMemoryHandler(WTF::Critical, WTF::Synchronous);
236236

237237
#if ENABLE(WEBGL)
238-
void releaseGraphicsContextGLForTesting(GraphicsContextGLIdentifier);
238+
void releaseGraphicsContextGLForTesting(RemoteGraphicsContextGLIdentifier);
239239
#endif
240240

241241
static uint64_t objectCountForTesting() { return gObjectCountForTesting; }
242242

243-
using RemoteRenderingBackendMap = HashMap<RenderingBackendIdentifier, IPC::ScopedActiveMessageReceiveQueue<RemoteRenderingBackend>>;
243+
using RemoteRenderingBackendMap = HashMap<RemoteRenderingBackendIdentifier, IPC::ScopedActiveMessageReceiveQueue<RemoteRenderingBackend>>;
244244
const RemoteRenderingBackendMap& remoteRenderingBackendMap() const { return m_remoteRenderingBackendMap; }
245245

246-
RemoteRenderingBackend* remoteRenderingBackend(RenderingBackendIdentifier);
246+
RemoteRenderingBackend* remoteRenderingBackend(RemoteRenderingBackendIdentifier);
247247

248248
#if HAVE(AUDIT_TOKEN)
249249
const HashMap<WebCore::PageIdentifier, CoreIPCAuditToken>& presentingApplicationAuditTokens() const { return m_presentingApplicationAuditTokens; }
@@ -293,15 +293,15 @@ class GPUConnectionToWebProcess
293293
Ref<RemoteAudioMediaStreamTrackRendererInternalUnitManager> protectedAudioMediaStreamTrackRendererInternalUnitManager();
294294
#endif
295295

296-
void createRenderingBackend(RenderingBackendIdentifier, IPC::StreamServerConnection::Handle&&);
297-
void releaseRenderingBackend(RenderingBackendIdentifier);
296+
void createRenderingBackend(RemoteRenderingBackendIdentifier, IPC::StreamServerConnection::Handle&&);
297+
void releaseRenderingBackend(RemoteRenderingBackendIdentifier);
298298

299299
#if ENABLE(WEBGL)
300-
void createGraphicsContextGL(GraphicsContextGLIdentifier, WebCore::GraphicsContextGLAttributes, RenderingBackendIdentifier, IPC::StreamServerConnection::Handle&&);
301-
void releaseGraphicsContextGL(GraphicsContextGLIdentifier);
300+
void createGraphicsContextGL(RemoteGraphicsContextGLIdentifier, WebCore::GraphicsContextGLAttributes, RemoteRenderingBackendIdentifier, IPC::StreamServerConnection::Handle&&);
301+
void releaseGraphicsContextGL(RemoteGraphicsContextGLIdentifier);
302302
#endif
303303

304-
void createGPU(WebGPUIdentifier, RenderingBackendIdentifier, IPC::StreamServerConnection::Handle&&);
304+
void createGPU(WebGPUIdentifier, RemoteRenderingBackendIdentifier, IPC::StreamServerConnection::Handle&&);
305305
void releaseGPU(WebGPUIdentifier);
306306

307307
void clearNowPlayingInfo();
@@ -406,7 +406,7 @@ class GPUConnectionToWebProcess
406406

407407
RemoteRenderingBackendMap m_remoteRenderingBackendMap;
408408
#if ENABLE(WEBGL)
409-
using RemoteGraphicsContextGLMap = HashMap<GraphicsContextGLIdentifier, IPC::ScopedActiveMessageReceiveQueue<RemoteGraphicsContextGL>>;
409+
using RemoteGraphicsContextGLMap = HashMap<RemoteGraphicsContextGLIdentifier, IPC::ScopedActiveMessageReceiveQueue<RemoteGraphicsContextGL>>;
410410
RemoteGraphicsContextGLMap m_remoteGraphicsContextGLMap;
411411
#endif
412412
using RemoteGPUMap = HashMap<WebGPUIdentifier, IPC::ScopedActiveMessageReceiveQueue<RemoteGPU>>;

‎Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
DispatchedTo=GPU
2929
]
3030
messages -> GPUConnectionToWebProcess WantsDispatchMessage {
31-
void CreateRenderingBackend(WebKit::RenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnectionHandle connectionHandle) AllowedWhenWaitingForSyncReply
32-
void ReleaseRenderingBackend(WebKit::RenderingBackendIdentifier renderingBackendIdentifier) AllowedWhenWaitingForSyncReply
31+
void CreateRenderingBackend(WebKit::RemoteRenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnectionHandle connectionHandle) AllowedWhenWaitingForSyncReply
32+
void ReleaseRenderingBackend(WebKit::RemoteRenderingBackendIdentifier renderingBackendIdentifier) AllowedWhenWaitingForSyncReply
3333
#if ENABLE(WEBGL)
34-
[EnabledBy=WebGLEnabled && UseGPUProcessForWebGLEnabled] void CreateGraphicsContextGL(WebKit::GraphicsContextGLIdentifier identifier, struct WebCore::GraphicsContextGLAttributes attributes, WebKit::RenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnectionHandle serverConnection) AllowedWhenWaitingForSyncReply
35-
[EnabledBy=WebGLEnabled && UseGPUProcessForWebGLEnabled] void ReleaseGraphicsContextGL(WebKit::GraphicsContextGLIdentifier identifier) AllowedWhenWaitingForSyncReply
34+
[EnabledBy=WebGLEnabled && UseGPUProcessForWebGLEnabled] void CreateGraphicsContextGL(WebKit::RemoteGraphicsContextGLIdentifier identifier, struct WebCore::GraphicsContextGLAttributes attributes, WebKit::RemoteRenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnectionHandle serverConnection) AllowedWhenWaitingForSyncReply
35+
[EnabledBy=WebGLEnabled && UseGPUProcessForWebGLEnabled] void ReleaseGraphicsContextGL(WebKit::RemoteGraphicsContextGLIdentifier identifier) AllowedWhenWaitingForSyncReply
3636
#endif
37-
[EnabledBy=WebGPUEnabled] void CreateGPU(WebKit::WebGPUIdentifier identifier, WebKit::RenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnectionHandle serverConnection) AllowedWhenWaitingForSyncReply
37+
[EnabledBy=WebGPUEnabled] void CreateGPU(WebKit::WebGPUIdentifier identifier, WebKit::RemoteRenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamServerConnectionHandle serverConnection) AllowedWhenWaitingForSyncReply
3838
[EnabledBy=WebGPUEnabled] void ReleaseGPU(WebKit::WebGPUIdentifier identifier) AllowedWhenWaitingForSyncReply
3939
void ClearNowPlayingInfo()
4040
void SetNowPlayingInfo(struct WebCore::NowPlayingInfo nowPlayingInfo)

‎Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListIdentifier.h‎ renamed to ‎Source/WebKit/GPUProcess/graphics/RemoteDisplayListIdentifier.h‎

File renamed without changes.

‎Source/WebKit/WebProcess/GPU/graphics/RemoteDisplayListRecorderIdentifier.h‎ renamed to ‎Source/WebKit/GPUProcess/graphics/RemoteDisplayListRecorderIdentifier.h‎

File renamed without changes.

‎Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ IPC::StreamConnectionWorkQueue& remoteGraphicsContextGLStreamWorkQueueSingleton(
7272
}
7373

7474
#if !PLATFORM(COCOA) && !USE(GRAPHICS_LAYER_WC) && !USE(GBM)
75-
Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebProcess& gpuConnectionToWebProcess, GraphicsContextGLAttributes&& attributes, GraphicsContextGLIdentifier graphicsContextGLIdentifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
75+
Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebProcess& gpuConnectionToWebProcess, GraphicsContextGLAttributes&& attributes, RemoteGraphicsContextGLIdentifier graphicsContextGLIdentifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
7676
{
7777
ASSERT_NOT_REACHED();
7878
auto instance = adoptRef(*new RemoteGraphicsContextGL(gpuConnectionToWebProcess, graphicsContextGLIdentifier, renderingBackend, WTFMove(streamConnection)));
@@ -81,7 +81,7 @@ Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebP
8181
}
8282
#endif
8383

84-
RemoteGraphicsContextGL::RemoteGraphicsContextGL(GPUConnectionToWebProcess& gpuConnectionToWebProcess, GraphicsContextGLIdentifier identifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
84+
RemoteGraphicsContextGL::RemoteGraphicsContextGL(GPUConnectionToWebProcess& gpuConnectionToWebProcess, RemoteGraphicsContextGLIdentifier identifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
8585
: m_gpuConnectionToWebProcess(gpuConnectionToWebProcess)
8686
, m_workQueue(remoteGraphicsContextGLStreamWorkQueueSingleton())
8787
, m_connection(WTFMove(streamConnection))

‎Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGL.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "Connection.h"
3131
#include "GPUConnectionToWebProcess.h"
3232
#include "GPUProcess.h"
33-
#include "GraphicsContextGLIdentifier.h"
33+
#include "RemoteGraphicsContextGLIdentifier.h"
3434
#include "RemoteRenderingBackend.h"
3535
#include "RemoteSharedResourceCache.h"
3636
#include "ScopedWebGLRenderingResourcesRequest.h"
@@ -87,14 +87,14 @@ IPC::StreamConnectionWorkQueue& remoteGraphicsContextGLStreamWorkQueueSingleton(
8787
// The implementation is largely generated by running Tools/Scripts/generate-gpup-webgl.
8888
class RemoteGraphicsContextGL : private WebCore::GraphicsContextGL::Client, public IPC::StreamServerConnection::Client {
8989
public:
90-
static Ref<RemoteGraphicsContextGL> create(GPUConnectionToWebProcess&, WebCore::GraphicsContextGLAttributes&&, GraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
90+
static Ref<RemoteGraphicsContextGL> create(GPUConnectionToWebProcess&, WebCore::GraphicsContextGLAttributes&&, RemoteGraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
9191
~RemoteGraphicsContextGL() override;
9292
void stopListeningForIPC(Ref<RemoteGraphicsContextGL>&& refFromConnection);
9393

9494
std::optional<SharedPreferencesForWebProcess> sharedPreferencesForWebProcess() const { return m_sharedPreferencesForWebProcess; }
9595

9696
protected:
97-
RemoteGraphicsContextGL(GPUConnectionToWebProcess&, GraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
97+
RemoteGraphicsContextGL(GPUConnectionToWebProcess&, RemoteGraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
9898
void initialize(WebCore::GraphicsContextGLAttributes&&);
9999
IPC::StreamConnectionWorkQueue& workQueue() const { return m_workQueue; }
100100

@@ -177,7 +177,7 @@ class RemoteGraphicsContextGL : private WebCore::GraphicsContextGL::Client, publ
177177
const Ref<IPC::StreamConnectionWorkQueue> m_workQueue;
178178
const Ref<IPC::StreamServerConnection> m_connection;
179179
RefPtr<GCGLContext> m_context WTF_GUARDED_BY_CAPABILITY(workQueue());
180-
const GraphicsContextGLIdentifier m_identifier;
180+
const RemoteGraphicsContextGLIdentifier m_identifier;
181181
const Ref<RemoteRenderingBackend> m_renderingBackend;
182182
const Ref<RemoteSharedResourceCache> m_sharedResourceCache;
183183
#if ENABLE(VIDEO)

‎Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLCocoa.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class RemoteGraphicsContextGLCocoa final : public RemoteGraphicsContextGL {
8282
WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RemoteGraphicsContextGLCocoa);
8383

8484
public:
85-
RemoteGraphicsContextGLCocoa(GPUConnectionToWebProcess&, GraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
85+
RemoteGraphicsContextGLCocoa(GPUConnectionToWebProcess&, RemoteGraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
8686
~RemoteGraphicsContextGLCocoa() final = default;
8787

8888
// RemoteGraphicsContextGL overrides.
@@ -95,14 +95,14 @@ WTF_MAKE_TZONE_ALLOCATED_IMPL(RemoteGraphicsContextGLCocoa);
9595

9696
}
9797

98-
Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebProcess& gpuConnectionToWebProcess, WebCore::GraphicsContextGLAttributes&& attributes, GraphicsContextGLIdentifier graphicsContextGLIdentifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
98+
Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebProcess& gpuConnectionToWebProcess, WebCore::GraphicsContextGLAttributes&& attributes, RemoteGraphicsContextGLIdentifier graphicsContextGLIdentifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
9999
{
100100
auto instance = adoptRef(*new RemoteGraphicsContextGLCocoa(gpuConnectionToWebProcess, graphicsContextGLIdentifier, renderingBackend, WTFMove(streamConnection)));
101101
instance->initialize(WTFMove(attributes));
102102
return instance;
103103
}
104104

105-
RemoteGraphicsContextGLCocoa::RemoteGraphicsContextGLCocoa(GPUConnectionToWebProcess& gpuConnectionToWebProcess, GraphicsContextGLIdentifier graphicsContextGLIdentifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
105+
RemoteGraphicsContextGLCocoa::RemoteGraphicsContextGLCocoa(GPUConnectionToWebProcess& gpuConnectionToWebProcess, RemoteGraphicsContextGLIdentifier graphicsContextGLIdentifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
106106
: RemoteGraphicsContextGL(gpuConnectionToWebProcess, graphicsContextGLIdentifier, renderingBackend, WTFMove(streamConnection))
107107
{
108108
}

‎Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLGBM.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class RemoteGraphicsContextGLGBM final : public RemoteGraphicsContextGL {
3939
WTF_OVERRIDE_DELETE_FOR_CHECKED_PTR(RemoteGraphicsContextGLGBM);
4040

4141
public:
42-
RemoteGraphicsContextGLGBM(GPUConnectionToWebProcess&, GraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
42+
RemoteGraphicsContextGLGBM(GPUConnectionToWebProcess&, RemoteGraphicsContextGLIdentifier, RemoteRenderingBackend&, Ref<IPC::StreamServerConnection>&&);
4343

4444
private:
4545
void platformWorkQueueInitialize(WebCore::GraphicsContextGLAttributes&&) final;
@@ -48,7 +48,7 @@ class RemoteGraphicsContextGLGBM final : public RemoteGraphicsContextGL {
4848

4949
WTF_MAKE_TZONE_ALLOCATED_IMPL(RemoteGraphicsContextGLGBM);
5050

51-
RemoteGraphicsContextGLGBM::RemoteGraphicsContextGLGBM(GPUConnectionToWebProcess& connection, GraphicsContextGLIdentifier identifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
51+
RemoteGraphicsContextGLGBM::RemoteGraphicsContextGLGBM(GPUConnectionToWebProcess& connection, RemoteGraphicsContextGLIdentifier identifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
5252
: RemoteGraphicsContextGL(connection, identifier, renderingBackend, WTFMove(streamConnection))
5353
{ }
5454

@@ -78,7 +78,7 @@ void RemoteGraphicsContextGLGBM::prepareForDisplay(CompletionHandler<void(uint64
7878
completionHandler(buffer->id(), buffer->takeAttributes(), WTFMove(fenceFD));
7979
}
8080

81-
Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebProcess& connection, WebCore::GraphicsContextGLAttributes&& attributes, GraphicsContextGLIdentifier identifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
81+
Ref<RemoteGraphicsContextGL> RemoteGraphicsContextGL::create(GPUConnectionToWebProcess& connection, WebCore::GraphicsContextGLAttributes&& attributes, RemoteGraphicsContextGLIdentifier identifier, RemoteRenderingBackend& renderingBackend, Ref<IPC::StreamServerConnection>&& streamConnection)
8282
{
8383
auto instance = adoptRef(*new RemoteGraphicsContextGLGBM(connection, identifier, renderingBackend, WTFMove(streamConnection)));
8484
instance->initialize(WTFMove(attributes));

‎Source/WebKit/WebProcess/GPU/graphics/GraphicsContextGLIdentifier.h‎ renamed to ‎Source/WebKit/GPUProcess/graphics/RemoteGraphicsContextGLIdentifier.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
namespace WebKit {
3333

34-
struct GraphicsContextGLIdentifierType;
35-
using GraphicsContextGLIdentifier = AtomicObjectIdentifier<GraphicsContextGLIdentifierType>;
34+
struct RemoteGraphicsContextGLIdentifierType;
35+
using RemoteGraphicsContextGLIdentifier = AtomicObjectIdentifier<RemoteGraphicsContextGLIdentifierType>;
3636

3737
} // namespace WebKit
3838

0 commit comments

Comments
 (0)