Changeset 268612 in webkit

Timestamp:

Oct 16, 2020 3:20:58 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GPU Process] Exchange RemoteImageBuffer and RemoteImageBufferProxy
​https://bugs.webkit.org/show_bug.cgi?id=217809

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2020-10-16
Reviewed by Simon Fraser.

The names of the GPU rendering classes have been confusing. RemoteImageBuffer
should be the real object in the GPU Process because it owns the backend.
And RemoteImageBufferProxy should be a proxy to this object in the Web
Process. So we are going to exchange the following classes:

-- RemoteImageBuffer <-> RemoteImageBufferProxy
-- RemoteRenderingBackend <-> RemoteRenderingBackendProxy
-- RemoteImageBufferMessageHandler <-> RemoteImageBufferMessageHandlerProxy

• CMakeLists.txt:
• DerivedSources-input.xcfilelist:
• DerivedSources.make:
• GPUProcess/GPUConnectionToWebProcess.cpp:

(WebKit::GPUConnectionToWebProcess::createRenderingBackend):
(WebKit::GPUConnectionToWebProcess::releaseRenderingBackend):

• GPUProcess/GPUConnectionToWebProcess.h:
• GPUProcess/graphics/PlatformRemoteImageBuffer.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/PlatformRemoteImageBuffer.h.
• GPUProcess/graphics/RemoteImageBuffer.h: Renamed from Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h.

(WebKit::RemoteImageBuffer::create):
(WebKit::RemoteImageBuffer::RemoteImageBuffer):
(WebKit::RemoteImageBuffer::~RemoteImageBuffer):
(WebKit::RemoteImageBuffer::apply):

• GPUProcess/graphics/RemoteImageBufferMessageHandler.cpp: Renamed from Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.cpp.

(WebKit::RemoteImageBufferMessageHandler::RemoteImageBufferMessageHandler):
(WebKit::RemoteImageBufferMessageHandler::createBackend):
(WebKit::RemoteImageBufferMessageHandler::commitFlushContext):

• GPUProcess/graphics/RemoteImageBufferMessageHandler.h: Renamed from Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.h.

(WebKit::RemoteImageBufferMessageHandler::backend):

• GPUProcess/graphics/RemoteRenderingBackend.cpp: Renamed from Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.cpp.

(WebKit::RemoteRenderingBackend::create):
(WebKit::RemoteRenderingBackend::RemoteRenderingBackend):
(WebKit::RemoteRenderingBackend::~RemoteRenderingBackend):
(WebKit::RemoteRenderingBackend::messageSenderConnection const):
(WebKit::RemoteRenderingBackend::messageSenderDestinationID const):
(WebKit::RemoteRenderingBackend::createImageBuffer):
(WebKit::RemoteRenderingBackend::releaseRemoteResource):
(WebKit::RemoteRenderingBackend::getImageData):
(WebKit::RemoteRenderingBackend::flushImageBufferDrawingContext):
(WebKit::RemoteRenderingBackend::flushImageBufferDrawingContextAndCommit):
(WebKit::RemoteRenderingBackend::gpuConnectionToWebProcess const):

• GPUProcess/graphics/RemoteRenderingBackend.h: Renamed from Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.h.

(WebKit::RemoteRenderingBackend::renderingBackendIdentifier const):

• GPUProcess/graphics/RemoteRenderingBackend.messages.in: Renamed from Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.messages.in.
• GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp:
• Sources.txt:
• WebKit.xcodeproj/project.pbxproj:
• WebProcess/GPU/graphics/PlatformRemoteImageBufferProxy.h: Renamed from Source/WebKit/GPUProcess/graphics/PlatformRemoteImageBufferProxy.h.
• WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.cpp: Removed.
• WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.cpp: Added.

(WebKit::RemoteImageBufferMessageHandlerProxy::RemoteImageBufferMessageHandlerProxy):
(WebKit::RemoteImageBufferMessageHandlerProxy::~RemoteImageBufferMessageHandlerProxy):
(WebKit::RemoteImageBufferMessageHandlerProxy::getImageData const):
(WebKit::RemoteImageBufferMessageHandlerProxy::waitForCreateImageBufferBackend):
(WebKit::RemoteImageBufferMessageHandlerProxy::waitForCommitImageBufferFlushContext):
(WebKit::RemoteImageBufferMessageHandlerProxy::flushDrawingContext):
(WebKit::RemoteImageBufferMessageHandlerProxy::flushDrawingContextAndWaitCommit):
(WebKit::RemoteImageBufferMessageHandlerProxy::commitFlushContext):

• WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.h.

(WebKit::RemoteImageBufferMessageHandlerProxy::remoteResourceIdentifier const):
(WebKit::RemoteImageBufferMessageHandlerProxy::isPendingFlush const):

• WebProcess/GPU/graphics/RemoteImageBufferProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteImageBuffer.h.

(WebKit::RemoteImageBufferProxy::create):
(WebKit::RemoteImageBufferProxy::~RemoteImageBufferProxy):
(WebKit::RemoteImageBufferProxy::RemoteImageBufferProxy):
(WebKit::RemoteImageBufferProxy::putImageData):

• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.cpp.

(WebKit::RemoteRenderingBackendProxy::create):
(WebKit::RemoteRenderingBackendProxy::RemoteRenderingBackendProxy):
(WebKit::RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy):
(WebKit::RemoteRenderingBackendProxy::messageSenderConnection const):
(WebKit::RemoteRenderingBackendProxy::messageSenderDestinationID const):
(WebKit::RemoteRenderingBackendProxy::waitForCreateImageBufferBackend):
(WebKit::RemoteRenderingBackendProxy::waitForCommitImageBufferFlushContext):
(WebKit::RemoteRenderingBackendProxy::createImageBuffer):
(WebKit::RemoteRenderingBackendProxy::releaseRemoteResource):
(WebKit::RemoteRenderingBackendProxy::createImageBufferBackend):
(WebKit::RemoteRenderingBackendProxy::commitImageBufferFlushContext):

• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.h.

(WebKit::RemoteRenderingBackendProxy::renderingBackendIdentifier const):

• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.messages.in.
• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::ensureRemoteRenderingBackendProxy const):
(WebKit::WebChromeClient::createImageBuffer const):
(WebKit::WebChromeClient::ensureRemoteRenderingBackend const): Deleted.

• WebProcess/WebCoreSupport/WebChromeClient.h:

Location:

trunk/Source/WebKit

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• DerivedSources-input.xcfilelist (modified) (2 diffs)
• DerivedSources.make (modified) (2 diffs)
• GPUProcess/GPUConnectionToWebProcess.cpp (modified) (3 diffs)
• GPUProcess/GPUConnectionToWebProcess.h (modified) (3 diffs)
• GPUProcess/graphics/PlatformRemoteImageBuffer.h (moved) (moved from trunk/Source/WebKit/WebProcess/GPU/graphics/PlatformRemoteImageBuffer.h)
• GPUProcess/graphics/RemoteImageBuffer.h (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h) (2 diffs)
• GPUProcess/graphics/RemoteImageBufferMessageHandler.cpp (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.cpp) (1 diff)
• GPUProcess/graphics/RemoteImageBufferMessageHandler.h (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.h) (3 diffs)
• GPUProcess/graphics/RemoteRenderingBackend.cpp (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.cpp) (9 diffs)
• GPUProcess/graphics/RemoteRenderingBackend.h (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.h) (4 diffs)
• GPUProcess/graphics/RemoteRenderingBackend.messages.in (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.messages.in) (1 diff)
• GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp (modified) (1 diff)
• Sources.txt (modified) (2 diffs)
• WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebProcess/GPU/graphics/PlatformRemoteImageBufferProxy.h (moved) (moved from trunk/Source/WebKit/GPUProcess/graphics/PlatformRemoteImageBufferProxy.h)
• WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.cpp (deleted)
• WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.cpp (added)
• WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.h (moved) (moved from trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.h) (3 diffs)
• WebProcess/GPU/graphics/RemoteImageBufferProxy.h (moved) (moved from trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBuffer.h) (8 diffs)
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (moved) (moved from trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.cpp) (8 diffs)
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h (moved) (moved from trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.h) (4 diffs)
• WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in (moved) (moved from trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.messages.in) (1 diff)
• WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (3 diffs)
• WebProcess/WebCoreSupport/WebChromeClient.h (modified) (3 diffs)

trunk/Source/WebKit/CMakeLists.txt

@@ -124 +124 @@
     GPUProcess/GPUProcess
 
-    GPUProcess/graphics/RemoteRenderingBackendProxy
+    GPUProcess/graphics/RemoteRenderingBackend
 
     GPUProcess/media/RemoteAudioDestinationManager
@@ -216 +216 @@
     WebProcess/GPU/GPUProcessConnection
 
-    WebProcess/GPU/graphics/RemoteRenderingBackend
+    WebProcess/GPU/graphics/RemoteRenderingBackendProxy
 
     WebProcess/GPU/media/MediaPlayerPrivateRemote

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-16  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [GPU Process] Exchange RemoteImageBuffer and RemoteImageBufferProxy
+        https://bugs.webkit.org/show_bug.cgi?id=217809
+
+        Reviewed by Simon Fraser.
+
+        The names of the GPU rendering classes have been confusing. RemoteImageBuffer
+        should be the real object in the GPU Process because it owns the backend.
+        And RemoteImageBufferProxy should be a proxy to this object in the Web
+        Process. So we are going to exchange the following classes:
+
+        -- RemoteImageBuffer <-> RemoteImageBufferProxy
+        -- RemoteRenderingBackend <-> RemoteRenderingBackendProxy
+        -- RemoteImageBufferMessageHandler <-> RemoteImageBufferMessageHandlerProxy
+
+        * CMakeLists.txt:
+        * DerivedSources-input.xcfilelist:
+        * DerivedSources.make:
+        * GPUProcess/GPUConnectionToWebProcess.cpp:
+        (WebKit::GPUConnectionToWebProcess::createRenderingBackend):
+        (WebKit::GPUConnectionToWebProcess::releaseRenderingBackend):
+        * GPUProcess/GPUConnectionToWebProcess.h:
+        * GPUProcess/graphics/PlatformRemoteImageBuffer.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/PlatformRemoteImageBuffer.h.
+        * GPUProcess/graphics/RemoteImageBuffer.h: Renamed from Source/WebKit/GPUProcess/graphics/RemoteImageBufferProxy.h.
+        (WebKit::RemoteImageBuffer::create):
+        (WebKit::RemoteImageBuffer::RemoteImageBuffer):
+        (WebKit::RemoteImageBuffer::~RemoteImageBuffer):
+        (WebKit::RemoteImageBuffer::apply):
+        * GPUProcess/graphics/RemoteImageBufferMessageHandler.cpp: Renamed from Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.cpp.
+        (WebKit::RemoteImageBufferMessageHandler::RemoteImageBufferMessageHandler):
+        (WebKit::RemoteImageBufferMessageHandler::createBackend):
+        (WebKit::RemoteImageBufferMessageHandler::commitFlushContext):
+        * GPUProcess/graphics/RemoteImageBufferMessageHandler.h: Renamed from Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.h.
+        (WebKit::RemoteImageBufferMessageHandler::backend):
+        * GPUProcess/graphics/RemoteRenderingBackend.cpp: Renamed from Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.cpp.
+        (WebKit::RemoteRenderingBackend::create):
+        (WebKit::RemoteRenderingBackend::RemoteRenderingBackend):
+        (WebKit::RemoteRenderingBackend::~RemoteRenderingBackend):
+        (WebKit::RemoteRenderingBackend::messageSenderConnection const):
+        (WebKit::RemoteRenderingBackend::messageSenderDestinationID const):
+        (WebKit::RemoteRenderingBackend::createImageBuffer):
+        (WebKit::RemoteRenderingBackend::releaseRemoteResource):
+        (WebKit::RemoteRenderingBackend::getImageData):
+        (WebKit::RemoteRenderingBackend::flushImageBufferDrawingContext):
+        (WebKit::RemoteRenderingBackend::flushImageBufferDrawingContextAndCommit):
+        (WebKit::RemoteRenderingBackend::gpuConnectionToWebProcess const):
+        * GPUProcess/graphics/RemoteRenderingBackend.h: Renamed from Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.h.
+        (WebKit::RemoteRenderingBackend::renderingBackendIdentifier const):
+        * GPUProcess/graphics/RemoteRenderingBackend.messages.in: Renamed from Source/WebKit/GPUProcess/graphics/RemoteRenderingBackendProxy.messages.in.
+        * GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp:
+        * Sources.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/GPU/graphics/PlatformRemoteImageBufferProxy.h: Renamed from Source/WebKit/GPUProcess/graphics/PlatformRemoteImageBufferProxy.h.
+        * WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.cpp: Removed.
+        * WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.cpp: Added.
+        (WebKit::RemoteImageBufferMessageHandlerProxy::RemoteImageBufferMessageHandlerProxy):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::~RemoteImageBufferMessageHandlerProxy):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::getImageData const):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::waitForCreateImageBufferBackend):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::waitForCommitImageBufferFlushContext):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::flushDrawingContext):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::flushDrawingContextAndWaitCommit):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::commitFlushContext):
+        * WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.h.
+        (WebKit::RemoteImageBufferMessageHandlerProxy::remoteResourceIdentifier const):
+        (WebKit::RemoteImageBufferMessageHandlerProxy::isPendingFlush const):
+        * WebProcess/GPU/graphics/RemoteImageBufferProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteImageBuffer.h.
+        (WebKit::RemoteImageBufferProxy::create):
+        (WebKit::RemoteImageBufferProxy::~RemoteImageBufferProxy):
+        (WebKit::RemoteImageBufferProxy::RemoteImageBufferProxy):
+        (WebKit::RemoteImageBufferProxy::putImageData):
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.cpp.
+        (WebKit::RemoteRenderingBackendProxy::create):
+        (WebKit::RemoteRenderingBackendProxy::RemoteRenderingBackendProxy):
+        (WebKit::RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy):
+        (WebKit::RemoteRenderingBackendProxy::messageSenderConnection const):
+        (WebKit::RemoteRenderingBackendProxy::messageSenderDestinationID const):
+        (WebKit::RemoteRenderingBackendProxy::waitForCreateImageBufferBackend):
+        (WebKit::RemoteRenderingBackendProxy::waitForCommitImageBufferFlushContext):
+        (WebKit::RemoteRenderingBackendProxy::createImageBuffer):
+        (WebKit::RemoteRenderingBackendProxy::releaseRemoteResource):
+        (WebKit::RemoteRenderingBackendProxy::createImageBufferBackend):
+        (WebKit::RemoteRenderingBackendProxy::commitImageBufferFlushContext):
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.h.
+        (WebKit::RemoteRenderingBackendProxy::renderingBackendIdentifier const):
+        * WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in: Renamed from Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackend.messages.in.
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::ensureRemoteRenderingBackendProxy const):
+        (WebKit::WebChromeClient::createImageBuffer const):
+        (WebKit::WebChromeClient::ensureRemoteRenderingBackend const): Deleted.
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+
 2020-10-16  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebKit/DerivedSources-input.xcfilelist

@@ -21 +21 @@
 $(PROJECT_DIR)/GPUProcess/GPUConnectionToWebProcess.messages.in
 $(PROJECT_DIR)/GPUProcess/GPUProcess.messages.in
-$(PROJECT_DIR)/GPUProcess/graphics/RemoteRenderingBackendProxy.messages.in
+$(PROJECT_DIR)/GPUProcess/graphics/RemoteRenderingBackend.messages.in
 $(PROJECT_DIR)/GPUProcess/mac/com.apple.WebKit.GPUProcess.sb.in
 $(PROJECT_DIR)/GPUProcess/media/RemoteAudioDestinationManager.messages.in
@@ -128 +128 @@
 $(PROJECT_DIR)/WebProcess/FullScreen/WebFullScreenManager.messages.in
 $(PROJECT_DIR)/WebProcess/GPU/GPUProcessConnection.messages.in
-$(PROJECT_DIR)/WebProcess/GPU/graphics/RemoteRenderingBackend.messages.in
+$(PROJECT_DIR)/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in
 $(PROJECT_DIR)/WebProcess/GPU/media/MediaPlayerPrivateRemote.messages.in
 $(PROJECT_DIR)/WebProcess/GPU/media/RemoteAudioDestinationProxy.messages.in

trunk/Source/WebKit/DerivedSources.make

@@ -170 +170 @@
         WebProcess/Databases/IndexedDB/WebIDBConnectionToServer \
         WebProcess/GPU/GPUProcessConnection \
-        WebProcess/GPU/graphics/RemoteRenderingBackend \
+        WebProcess/GPU/graphics/RemoteRenderingBackendProxy \
         WebProcess/GPU/webrtc/LibWebRTCCodecs \
         WebProcess/GPU/webrtc/SampleBufferDisplayLayer \
@@ -223 +223 @@
         PluginProcess/PluginProcess \
         GPUProcess/GPUConnectionToWebProcess \
-        GPUProcess/graphics/RemoteRenderingBackendProxy \
+        GPUProcess/graphics/RemoteRenderingBackend \
         GPUProcess/webrtc/LibWebRTCCodecsProxy \
         GPUProcess/webrtc/RemoteSampleBufferDisplayLayerManager \

trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp

@@ -48 +48 @@
 #include "RemoteMediaResourceManager.h"
 #include "RemoteMediaResourceManagerMessages.h"
+#include "RemoteRenderingBackend.h"
 #include "RemoteSampleBufferDisplayLayerManager.h"
 #include "RemoteSampleBufferDisplayLayerManagerMessages.h"
@@ -278 +279 @@
 void GPUConnectionToWebProcess::createRenderingBackend(RenderingBackendIdentifier renderingBackendIdentifier)
 {
-    auto addResult = m_remoteRenderingBackendProxyMap.ensure(renderingBackendIdentifier, [&]() {
-        return RemoteRenderingBackendProxy::create(*this, renderingBackendIdentifier);
+    auto addResult = m_remoteRenderingBackendMap.ensure(renderingBackendIdentifier, [&]() {
+        return RemoteRenderingBackend::create(*this, renderingBackendIdentifier);
     });
     ASSERT_UNUSED(addResult, addResult.isNewEntry);
@@ -286 +287 @@
 void GPUConnectionToWebProcess::releaseRenderingBackend(RenderingBackendIdentifier renderingBackendIdentifier)
 {
-    bool found = m_remoteRenderingBackendProxyMap.remove(renderingBackendIdentifier);
+    bool found = m_remoteRenderingBackendMap.remove(renderingBackendIdentifier);
     ASSERT_UNUSED(found, found);
 }

trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h

@@ -32 +32 @@
 #include "MessageReceiverMap.h"
 #include "RemoteAudioSessionIdentifier.h"
-#include "RemoteRenderingBackendProxy.h"
 #include "RenderingBackendIdentifier.h"
 #include <WebCore/LibWebRTCEnumTraits.h>
@@ -55 +54 @@
 class RemoteMediaResourceManager;
 class RemoteMediaSessionHelperProxy;
+class RemoteRenderingBackend;
 class RemoteSampleBufferDisplayLayerManager;
 class UserMediaCaptureManagerProxy;
@@ -179 +179 @@
 #endif
 
-    using RemoteRenderingBackendProxyMap = HashMap<RenderingBackendIdentifier, std::unique_ptr<RemoteRenderingBackendProxy>>;
-    RemoteRenderingBackendProxyMap m_remoteRenderingBackendProxyMap;
+    using RemoteRenderingBackendMap = HashMap<RenderingBackendIdentifier, std::unique_ptr<RemoteRenderingBackend>>;
+    RemoteRenderingBackendMap m_remoteRenderingBackendMap;
 
 #if ENABLE(ENCRYPTED_MEDIA)

trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBuffer.h

@@ -36 +36 @@
 
 template<typename BackendType>
-class RemoteImageBufferProxy : public WebCore::ConcreteImageBuffer<BackendType>, public RemoteImageBufferMessageHandlerProxy, public WebCore::DisplayList::Replayer::Delegate {
+class RemoteImageBuffer : public WebCore::ConcreteImageBuffer<BackendType>, public RemoteImageBufferMessageHandler, public WebCore::DisplayList::Replayer::Delegate {
     using BaseConcreteImageBuffer = WebCore::ConcreteImageBuffer<BackendType>;
     using BaseConcreteImageBuffer::context;
@@ -42 +42 @@
 
 public:
-    static auto create(const WebCore::FloatSize& size, float resolutionScale, WebCore::ColorSpace colorSpace, RemoteRenderingBackendProxy& remoteRenderingBackendProxy, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
+    static auto create(const WebCore::FloatSize& size, float resolutionScale, WebCore::ColorSpace colorSpace, RemoteRenderingBackend& remoteRenderingBackend, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
     {
-        return BaseConcreteImageBuffer::template create<RemoteImageBufferProxy>(size, resolutionScale, colorSpace, nullptr, remoteRenderingBackendProxy, remoteResourceIdentifier);
+        return BaseConcreteImageBuffer::template create<RemoteImageBuffer>(size, resolutionScale, colorSpace, nullptr, remoteRenderingBackend, remoteResourceIdentifier);
     }
 
-    RemoteImageBufferProxy(std::unique_ptr<BackendType>&& backend, RemoteRenderingBackendProxy& remoteRenderingBackendProxy, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
+    RemoteImageBuffer(std::unique_ptr<BackendType>&& backend, RemoteRenderingBackend& remoteRenderingBackend, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
         : BaseConcreteImageBuffer(WTFMove(backend))
-        , RemoteImageBufferMessageHandlerProxy(remoteRenderingBackendProxy, remoteResourceIdentifier)
+        , RemoteImageBufferMessageHandler(remoteRenderingBackend, remoteResourceIdentifier)
     {
         createBackend(m_backend->logicalSize(), m_backend->backendSize(), m_backend->resolutionScale(), m_backend->colorSpace(), m_backend->createImageBufferBackendHandle());
     }
 
-    ~RemoteImageBufferProxy()
+    ~RemoteImageBuffer()
     {
         // Unwind the context's state stack before destruction, since calls to restore may not have

trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandler.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "RemoteImageBufferMessageHandlerProxy.h"
+#include "RemoteImageBufferMessageHandler.h"
 
 #if ENABLE(GPU_PROCESS)
 
-#include "RemoteRenderingBackendMessages.h"
-#include "RemoteRenderingBackendProxy.h"
+#include "RemoteRenderingBackend.h"
+#include "RemoteRenderingBackendProxyMessages.h"
 
 namespace WebKit {
 using namespace WebCore;
 
-RemoteImageBufferMessageHandlerProxy::RemoteImageBufferMessageHandlerProxy(RemoteRenderingBackendProxy& remoteRenderingBackendProxy, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
-    : m_remoteRenderingBackendProxy(remoteRenderingBackendProxy)
+RemoteImageBufferMessageHandler::RemoteImageBufferMessageHandler(RemoteRenderingBackend& remoteRenderingBackend, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
+    : m_remoteRenderingBackend(remoteRenderingBackend)
     , m_remoteResourceIdentifier(remoteResourceIdentifier)
 {
 }
 
-void RemoteImageBufferMessageHandlerProxy::createBackend(const FloatSize& logicalSize, const IntSize& backendSize, float resolutionScale, ColorSpace colorSpace, ImageBufferBackendHandle handle)
+void RemoteImageBufferMessageHandler::createBackend(const FloatSize& logicalSize, const IntSize& backendSize, float resolutionScale, ColorSpace colorSpace, ImageBufferBackendHandle handle)
 {
-    m_remoteRenderingBackendProxy.send(Messages::RemoteRenderingBackend::CreateImageBufferBackend(logicalSize, backendSize, resolutionScale, colorSpace, WTFMove(handle), m_remoteResourceIdentifier), m_remoteRenderingBackendProxy.renderingBackendIdentifier());
+    m_remoteRenderingBackend.send(Messages::RemoteRenderingBackendProxy::CreateImageBufferBackend(logicalSize, backendSize, resolutionScale, colorSpace, WTFMove(handle), m_remoteResourceIdentifier), m_remoteRenderingBackend.renderingBackendIdentifier());
 }
 
-void RemoteImageBufferMessageHandlerProxy::commitFlushContext(ImageBufferFlushIdentifier flushIdentifier)
+void RemoteImageBufferMessageHandler::commitFlushContext(ImageBufferFlushIdentifier flushIdentifier)
 {
-    m_remoteRenderingBackendProxy.send(Messages::RemoteRenderingBackend::CommitImageBufferFlushContext(flushIdentifier, m_remoteResourceIdentifier), m_remoteRenderingBackendProxy.renderingBackendIdentifier());
+    m_remoteRenderingBackend.send(Messages::RemoteRenderingBackendProxy::CommitImageBufferFlushContext(flushIdentifier, m_remoteResourceIdentifier), m_remoteRenderingBackend.renderingBackendIdentifier());
 }
 

trunk/Source/WebKit/GPUProcess/graphics/RemoteImageBufferMessageHandler.h

@@ -42 +42 @@
 namespace WebKit {
 
-class RemoteRenderingBackendProxy;
+class RemoteRenderingBackend;
 
-class RemoteImageBufferMessageHandlerProxy {
+class RemoteImageBufferMessageHandler {
 public:
-    virtual ~RemoteImageBufferMessageHandlerProxy() = default;
+    virtual ~RemoteImageBufferMessageHandler() = default;
 
-    // Messages to be received. See RemoteRenderingBackendProxy.messages.in.
+    // Messages to be received. See RemoteRenderingBackend.messages.in.
     virtual void flushDrawingContext(const WebCore::DisplayList::DisplayList&) = 0;
     virtual void flushDrawingContextAndCommit(const WebCore::DisplayList::DisplayList&, ImageBufferFlushIdentifier) = 0;
@@ -54 +54 @@
 
 protected:
-    RemoteImageBufferMessageHandlerProxy(RemoteRenderingBackendProxy&, WebCore::RemoteResourceIdentifier);
+    RemoteImageBufferMessageHandler(RemoteRenderingBackend&, WebCore::RemoteResourceIdentifier);
 
     // Messages to be sent. See RemoteRenderingBackend.messages.in.
@@ -60 +60 @@
     void commitFlushContext(ImageBufferFlushIdentifier);
 
-    RemoteRenderingBackendProxy& backend() { return m_remoteRenderingBackendProxy; }
+    RemoteRenderingBackend& backend() { return m_remoteRenderingBackend; }
 
 private:
-    RemoteRenderingBackendProxy& m_remoteRenderingBackendProxy;
+    RemoteRenderingBackend& m_remoteRenderingBackend;
     WebCore::RemoteResourceIdentifier m_remoteResourceIdentifier;
 };

trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "RemoteRenderingBackendProxy.h"
+#include "RemoteRenderingBackend.h"
 
 #if ENABLE(GPU_PROCESS)
 
 #include "GPUConnectionToWebProcess.h"
-#include "PlatformRemoteImageBufferProxy.h"
-#include "RemoteRenderingBackendProxyMessages.h"
+#include "PlatformRemoteImageBuffer.h"
+#include "RemoteRenderingBackendMessages.h"
 
 namespace WebKit {
 using namespace WebCore;
 
-std::unique_ptr<RemoteRenderingBackendProxy> RemoteRenderingBackendProxy::create(GPUConnectionToWebProcess& gpuConnectionToWebProcess, RenderingBackendIdentifier renderingBackendIdentifier)
+std::unique_ptr<RemoteRenderingBackend> RemoteRenderingBackend::create(GPUConnectionToWebProcess& gpuConnectionToWebProcess, RenderingBackendIdentifier renderingBackendIdentifier)
 {
-    return std::unique_ptr<RemoteRenderingBackendProxy>(new RemoteRenderingBackendProxy(gpuConnectionToWebProcess, renderingBackendIdentifier));
+    return std::unique_ptr<RemoteRenderingBackend>(new RemoteRenderingBackend(gpuConnectionToWebProcess, renderingBackendIdentifier));
 }
 
-RemoteRenderingBackendProxy::RemoteRenderingBackendProxy(GPUConnectionToWebProcess& gpuConnectionToWebProcess, RenderingBackendIdentifier renderingBackendIdentifier)
+RemoteRenderingBackend::RemoteRenderingBackend(GPUConnectionToWebProcess& gpuConnectionToWebProcess, RenderingBackendIdentifier renderingBackendIdentifier)
     : m_gpuConnectionToWebProcess(makeWeakPtr(gpuConnectionToWebProcess))
     , m_renderingBackendIdentifier(renderingBackendIdentifier)
 {
     if (auto* gpuConnectionToWebProcess = m_gpuConnectionToWebProcess.get())
-        gpuConnectionToWebProcess->messageReceiverMap().addMessageReceiver(Messages::RemoteRenderingBackendProxy::messageReceiverName(), renderingBackendIdentifier.toUInt64(), *this);
+        gpuConnectionToWebProcess->messageReceiverMap().addMessageReceiver(Messages::RemoteRenderingBackend::messageReceiverName(), renderingBackendIdentifier.toUInt64(), *this);
 }
 
-RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy()
+RemoteRenderingBackend::~RemoteRenderingBackend()
 {
     if (auto* gpuConnectionToWebProcess = m_gpuConnectionToWebProcess.get())
-        gpuConnectionToWebProcess->messageReceiverMap().removeMessageReceiver(Messages::RemoteRenderingBackendProxy::messageReceiverName(), m_renderingBackendIdentifier.toUInt64());
+        gpuConnectionToWebProcess->messageReceiverMap().removeMessageReceiver(Messages::RemoteRenderingBackend::messageReceiverName(), m_renderingBackendIdentifier.toUInt64());
 }
 
-IPC::Connection* RemoteRenderingBackendProxy::messageSenderConnection() const
+IPC::Connection* RemoteRenderingBackend::messageSenderConnection() const
 {
     if (auto* gpuConnectionToWebProcess = m_gpuConnectionToWebProcess.get())
@@ -62 +62 @@
 }
 
-uint64_t RemoteRenderingBackendProxy::messageSenderDestinationID() const
+uint64_t RemoteRenderingBackend::messageSenderDestinationID() const
 {
     return m_renderingBackendIdentifier.toUInt64();
 }
 
-void RemoteRenderingBackendProxy::createImageBuffer(const FloatSize& logicalSize, RenderingMode renderingMode, float resolutionScale, ColorSpace colorSpace, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackend::createImageBuffer(const FloatSize& logicalSize, RenderingMode renderingMode, float resolutionScale, ColorSpace colorSpace, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
 {
     auto* gpuConnectionToWebProcess = m_gpuConnectionToWebProcess.get();
@@ -79 +79 @@
 
     if (renderingMode == RenderingMode::RemoteAccelerated) {
-        if (auto imageBuffer = AcceleratedRemoteImageBufferProxy::create(logicalSize, resolutionScale, colorSpace, *this, remoteResourceIdentifier)) {
+        if (auto imageBuffer = AcceleratedRemoteImageBuffer::create(logicalSize, resolutionScale, colorSpace, *this, remoteResourceIdentifier)) {
             m_imageBufferMessageHandlerMap.add(remoteResourceIdentifier, WTFMove(imageBuffer));
             return;
@@ -86 +86 @@
 
     if (renderingMode == RenderingMode::RemoteAccelerated || renderingMode == RenderingMode::RemoteUnaccelerated) {
-        if (auto imageBuffer = UnacceleratedRemoteImageBufferProxy::create(logicalSize, resolutionScale, colorSpace, *this, remoteResourceIdentifier)) {
+        if (auto imageBuffer = UnacceleratedRemoteImageBuffer::create(logicalSize, resolutionScale, colorSpace, *this, remoteResourceIdentifier)) {
             m_imageBufferMessageHandlerMap.add(remoteResourceIdentifier, WTFMove(imageBuffer));
             return;
@@ -95 +95 @@
 }
 
-void RemoteRenderingBackendProxy::releaseRemoteResource(RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackend::releaseRemoteResource(RemoteResourceIdentifier remoteResourceIdentifier)
 {
     // CreateImageBuffer message should have been received before this one.
@@ -102 +102 @@
 }
 
-void RemoteRenderingBackendProxy::getImageData(WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, RemoteResourceIdentifier remoteResourceIdentifier, CompletionHandler<void(IPC::ImageDataReference&&)>&& completionHandler)
+void RemoteRenderingBackend::getImageData(WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, RemoteResourceIdentifier remoteResourceIdentifier, CompletionHandler<void(IPC::ImageDataReference&&)>&& completionHandler)
 {
     if (auto imageBuffer = m_imageBufferMessageHandlerMap.get(remoteResourceIdentifier)) {
@@ -110 +110 @@
 }
 
-void RemoteRenderingBackendProxy::flushImageBufferDrawingContext(const WebCore::DisplayList::DisplayList& displayList, RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackend::flushImageBufferDrawingContext(const WebCore::DisplayList::DisplayList& displayList, RemoteResourceIdentifier remoteResourceIdentifier)
 {
     if (auto imageBuffer = m_imageBufferMessageHandlerMap.get(remoteResourceIdentifier))
@@ -116 +116 @@
 }
 
-void RemoteRenderingBackendProxy::flushImageBufferDrawingContextAndCommit(const WebCore::DisplayList::DisplayList& displayList, ImageBufferFlushIdentifier flushIdentifier, RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackend::flushImageBufferDrawingContextAndCommit(const WebCore::DisplayList::DisplayList& displayList, ImageBufferFlushIdentifier flushIdentifier, RemoteResourceIdentifier remoteResourceIdentifier)
 {
     if (auto imageBuffer = m_imageBufferMessageHandlerMap.get(remoteResourceIdentifier))
@@ -122 +122 @@
 }
 
-GPUConnectionToWebProcess* RemoteRenderingBackendProxy::gpuConnectionToWebProcess() const
+GPUConnectionToWebProcess* RemoteRenderingBackend::gpuConnectionToWebProcess() const
 {
     return m_gpuConnectionToWebProcess.get();

trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.h

@@ -33 +33 @@
 #include "MessageReceiver.h"
 #include "MessageSender.h"
-#include "RemoteImageBufferMessageHandlerProxy.h"
+#include "RemoteImageBufferMessageHandler.h"
 #include "RenderingBackendIdentifier.h"
 #include <WebCore/ColorSpace.h>
@@ -53 +53 @@
 class GPUConnectionToWebProcess;
 
-class RemoteRenderingBackendProxy
+class RemoteRenderingBackend
     : public IPC::MessageSender
     , private IPC::MessageReceiver {
 public:
-    static std::unique_ptr<RemoteRenderingBackendProxy> create(GPUConnectionToWebProcess&, RenderingBackendIdentifier);
-    virtual ~RemoteRenderingBackendProxy();
+    static std::unique_ptr<RemoteRenderingBackend> create(GPUConnectionToWebProcess&, RenderingBackendIdentifier);
+    virtual ~RemoteRenderingBackend();
 
     RenderingBackendIdentifier renderingBackendIdentifier() const { return m_renderingBackendIdentifier; }
@@ -64 +64 @@
 
 private:
-    RemoteRenderingBackendProxy(GPUConnectionToWebProcess&, RenderingBackendIdentifier);
+    RemoteRenderingBackend(GPUConnectionToWebProcess&, RenderingBackendIdentifier);
 
     // IPC::MessageSender.
@@ -81 +81 @@
     void getImageData(WebCore::AlphaPremultiplication outputFormat, WebCore::IntRect srcRect, WebCore::RemoteResourceIdentifier, CompletionHandler<void(IPC::ImageDataReference&&)>&&);
 
-    using ImageBufferMessageHandlerMap = HashMap<WebCore::RemoteResourceIdentifier, std::unique_ptr<RemoteImageBufferMessageHandlerProxy>>;
+    using ImageBufferMessageHandlerMap = HashMap<WebCore::RemoteResourceIdentifier, std::unique_ptr<RemoteImageBufferMessageHandler>>;
     ImageBufferMessageHandlerMap m_imageBufferMessageHandlerMap;
     WeakPtr<GPUConnectionToWebProcess> m_gpuConnectionToWebProcess;

trunk/Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.messages.in

@@ -23 +23 @@
 #if ENABLE(GPU_PROCESS)
 
-messages -> RemoteRenderingBackendProxy NotRefCounted {
+messages -> RemoteRenderingBackend NotRefCounted {
     void CreateImageBuffer(WebCore::FloatSize logicalSize, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
     void FlushImageBufferDrawingContext(WebCore::DisplayList::DisplayList displayList, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)

trunk/Source/WebKit/GPUProcess/media/RemoteCDMInstanceSessionProxy.cpp

@@ -33 +33 @@
 #include "RemoteCDMInstanceSessionMessages.h"
 #include "SharedBufferCopy.h"
+#include "WebCoreArgumentCoders.h"
 
 namespace WebKit {

trunk/Source/WebKit/Sources.txt

@@ -25 +25 @@
 GPUProcess/GPUConnectionToWebProcess.cpp
 GPUProcess/GPUProcessCreationParameters.cpp
-GPUProcess/graphics/RemoteImageBufferMessageHandlerProxy.cpp
-GPUProcess/graphics/RemoteRenderingBackendProxy.cpp
+GPUProcess/graphics/RemoteImageBufferMessageHandler.cpp
+GPUProcess/graphics/RemoteRenderingBackend.cpp
 GPUProcess/media/RemoteAudioSessionProxy.cpp
 GPUProcess/media/RemoteAudioSessionProxyManager.cpp
@@ -558 +558 @@
 WebProcess/GPU/GPUProcessConnection.cpp
 WebProcess/GPU/graphics/ImageBufferShareableBitmapBackend.cpp
-WebProcess/GPU/graphics/RemoteImageBufferMessageHandler.cpp
-WebProcess/GPU/graphics/RemoteRenderingBackend.cpp
+WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.cpp
+WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp
 WebProcess/GPU/media/AudioTrackPrivateRemote.cpp
 WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -3907 +3907 @@
                 53CFBBC72224D1B000266546 /* TextCheckerCompletion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextCheckerCompletion.h; sourceTree = "<group>"; };
                 53F3CAA5206C443E0086490E /* NetworkActivityTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkActivityTracker.cpp; sourceTree = "<group>"; };
-                5506409D2407160900AAE045 /* RemoteRenderingBackend.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteRenderingBackend.cpp; sourceTree = "<group>"; };
-                5506409E2407160900AAE045 /* RemoteRenderingBackend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteRenderingBackend.h; sourceTree = "<group>"; };
+                5506409D2407160900AAE045 /* RemoteRenderingBackendProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteRenderingBackendProxy.cpp; sourceTree = "<group>"; };
+                5506409E2407160900AAE045 /* RemoteRenderingBackendProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteRenderingBackendProxy.h; sourceTree = "<group>"; };
                 5506409F2407196A00AAE045 /* RenderingBackendIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RenderingBackendIdentifier.h; sourceTree = "<group>"; };
-                550640A0240719E100AAE045 /* RemoteRenderingBackend.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RemoteRenderingBackend.messages.in; sourceTree = "<group>"; };
-                550640A224071A6100AAE045 /* RemoteRenderingBackendProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteRenderingBackendProxy.cpp; sourceTree = "<group>"; };
-                550640A324071A6100AAE045 /* RemoteRenderingBackendProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteRenderingBackendProxy.h; sourceTree = "<group>"; };
-                550640A424071C2100AAE045 /* RemoteRenderingBackendProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RemoteRenderingBackendProxy.messages.in; sourceTree = "<group>"; };
-                55AD09422408A02E00DE4D2F /* RemoteImageBufferProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBufferProxy.h; sourceTree = "<group>"; };
-                55AD09432408A0E600DE4D2F /* PlatformRemoteImageBufferProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformRemoteImageBufferProxy.h; sourceTree = "<group>"; };
+                550640A0240719E100AAE045 /* RemoteRenderingBackendProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RemoteRenderingBackendProxy.messages.in; sourceTree = "<group>"; };
+                550640A224071A6100AAE045 /* RemoteRenderingBackend.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteRenderingBackend.cpp; sourceTree = "<group>"; };
+                550640A324071A6100AAE045 /* RemoteRenderingBackend.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteRenderingBackend.h; sourceTree = "<group>"; };
+                550640A424071C2100AAE045 /* RemoteRenderingBackend.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RemoteRenderingBackend.messages.in; sourceTree = "<group>"; };
+                55AD09422408A02E00DE4D2F /* RemoteImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBuffer.h; sourceTree = "<group>"; };
+                55AD09432408A0E600DE4D2F /* PlatformRemoteImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformRemoteImageBuffer.h; sourceTree = "<group>"; };
                 55AD09442408ABB300DE4D2F /* ImageBufferFlushIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImageBufferFlushIdentifier.h; sourceTree = "<group>"; };
                 570AB8F220AE3BD700B8BE87 /* SecKeyProxyStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SecKeyProxyStore.h; sourceTree = "<group>"; };
@@ -4226 +4226 @@
                 71A676A522C62318007D6295 /* WKTouchActionGestureRecognizer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKTouchActionGestureRecognizer.mm; path = ios/WKTouchActionGestureRecognizer.mm; sourceTree = "<group>"; };
                 71FB810A2260627A00323677 /* WebsiteSimulatedMouseEventsDispatchPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteSimulatedMouseEventsDispatchPolicy.h; sourceTree = "<group>"; };
-                7227800B2408BD7D007D376B /* PlatformRemoteImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformRemoteImageBuffer.h; sourceTree = "<group>"; };
-                7227800C24097A02007D376B /* RemoteImageBufferMessageHandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteImageBufferMessageHandler.cpp; sourceTree = "<group>"; };
-                7227800D24097A02007D376B /* RemoteImageBufferMessageHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBufferMessageHandler.h; sourceTree = "<group>"; };
-                722780112409906E007D376B /* RemoteImageBufferMessageHandlerProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteImageBufferMessageHandlerProxy.cpp; sourceTree = "<group>"; };
-                722780122409906E007D376B /* RemoteImageBufferMessageHandlerProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBufferMessageHandlerProxy.h; sourceTree = "<group>"; };
+                7227800B2408BD7D007D376B /* PlatformRemoteImageBufferProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PlatformRemoteImageBufferProxy.h; sourceTree = "<group>"; };
+                7227800C24097A02007D376B /* RemoteImageBufferMessageHandlerProxy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteImageBufferMessageHandlerProxy.cpp; sourceTree = "<group>"; };
+                7227800D24097A02007D376B /* RemoteImageBufferMessageHandlerProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBufferMessageHandlerProxy.h; sourceTree = "<group>"; };
+                722780112409906E007D376B /* RemoteImageBufferMessageHandler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteImageBufferMessageHandler.cpp; sourceTree = "<group>"; };
+                722780122409906E007D376B /* RemoteImageBufferMessageHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBufferMessageHandler.h; sourceTree = "<group>"; };
                 727A7F342407857D004D2931 /* ImageBufferShareableIOSurfaceBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ImageBufferShareableIOSurfaceBackend.cpp; sourceTree = "<group>"; };
                 727A7F352407857F004D2931 /* ImageBufferShareableIOSurfaceBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageBufferShareableIOSurfaceBackend.h; sourceTree = "<group>"; };
@@ -4237 +4237 @@
                 727A7F38240788F0004D2931 /* PlatformImageBufferShareableBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformImageBufferShareableBackend.h; sourceTree = "<group>"; };
                 727A7F39240788F1004D2931 /* ImageBufferBackendHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageBufferBackendHandle.h; sourceTree = "<group>"; };
-                727A7F492408AEE6004D2931 /* RemoteImageBuffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBuffer.h; sourceTree = "<group>"; };
+                727A7F492408AEE6004D2931 /* RemoteImageBufferProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteImageBufferProxy.h; sourceTree = "<group>"; };
                 728E86EF1795188C0087879E /* WebColorPickerMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebColorPickerMac.h; sourceTree = "<group>"; };
                 728E86F01795188C0087879E /* WebColorPickerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebColorPickerMac.mm; sourceTree = "<group>"; };
@@ -8142 +8142 @@
                                 727A7F36240788F0004D2931 /* ImageBufferShareableBitmapBackend.h */,
                                 727A7F38240788F0004D2931 /* PlatformImageBufferShareableBackend.h */,
-                                7227800B2408BD7D007D376B /* PlatformRemoteImageBuffer.h */,
-                                727A7F492408AEE6004D2931 /* RemoteImageBuffer.h */,
-                                7227800C24097A02007D376B /* RemoteImageBufferMessageHandler.cpp */,
-                                7227800D24097A02007D376B /* RemoteImageBufferMessageHandler.h */,
-                                5506409D2407160900AAE045 /* RemoteRenderingBackend.cpp */,
-                                5506409E2407160900AAE045 /* RemoteRenderingBackend.h */,
-                                550640A0240719E100AAE045 /* RemoteRenderingBackend.messages.in */,
+                                7227800B2408BD7D007D376B /* PlatformRemoteImageBufferProxy.h */,
+                                7227800C24097A02007D376B /* RemoteImageBufferMessageHandlerProxy.cpp */,
+                                7227800D24097A02007D376B /* RemoteImageBufferMessageHandlerProxy.h */,
+                                727A7F492408AEE6004D2931 /* RemoteImageBufferProxy.h */,
+                                5506409D2407160900AAE045 /* RemoteRenderingBackendProxy.cpp */,
+                                5506409E2407160900AAE045 /* RemoteRenderingBackendProxy.h */,
+                                550640A0240719E100AAE045 /* RemoteRenderingBackendProxy.messages.in */,
                                 5506409F2407196A00AAE045 /* RenderingBackendIdentifier.h */,
                         );
@@ -8157 +8157 @@
                         isa = PBXGroup;
                         children = (
-                                55AD09432408A0E600DE4D2F /* PlatformRemoteImageBufferProxy.h */,
-                                722780112409906E007D376B /* RemoteImageBufferMessageHandlerProxy.cpp */,
-                                722780122409906E007D376B /* RemoteImageBufferMessageHandlerProxy.h */,
-                                55AD09422408A02E00DE4D2F /* RemoteImageBufferProxy.h */,
-                                550640A224071A6100AAE045 /* RemoteRenderingBackendProxy.cpp */,
-                                550640A324071A6100AAE045 /* RemoteRenderingBackendProxy.h */,
-                                550640A424071C2100AAE045 /* RemoteRenderingBackendProxy.messages.in */,
+                                55AD09432408A0E600DE4D2F /* PlatformRemoteImageBuffer.h */,
+                                55AD09422408A02E00DE4D2F /* RemoteImageBuffer.h */,
+                                722780112409906E007D376B /* RemoteImageBufferMessageHandler.cpp */,
+                                722780122409906E007D376B /* RemoteImageBufferMessageHandler.h */,
+                                550640A224071A6100AAE045 /* RemoteRenderingBackend.cpp */,
+                                550640A324071A6100AAE045 /* RemoteRenderingBackend.h */,
+                                550640A424071C2100AAE045 /* RemoteRenderingBackend.messages.in */,
                         );
                         path = graphics;

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferMessageHandlerProxy.h

@@ -43 +43 @@
 namespace WebKit {
 
-class RemoteRenderingBackend;
+class RemoteRenderingBackendProxy;
 
-class RemoteImageBufferMessageHandler {
+class RemoteImageBufferMessageHandlerProxy {
 public:
-    virtual ~RemoteImageBufferMessageHandler();
+    virtual ~RemoteImageBufferMessageHandlerProxy();
 
     WebCore::RemoteResourceIdentifier remoteResourceIdentifier() const { return m_remoteResourceIdentifier; }
@@ -57 +57 @@
 
 protected:
-    RemoteImageBufferMessageHandler(const WebCore::FloatSize&, WebCore::RenderingMode, float resolutionScale, WebCore::ColorSpace, RemoteRenderingBackend&);
+    RemoteImageBufferMessageHandlerProxy(const WebCore::FloatSize&, WebCore::RenderingMode, float resolutionScale, WebCore::ColorSpace, RemoteRenderingBackendProxy&);
 
     virtual bool isBackendCreated() const = 0;
@@ -72 +72 @@
 
 private:
-    WeakPtr<RemoteRenderingBackend> m_remoteRenderingBackend;
+    WeakPtr<RemoteRenderingBackendProxy> m_remoteRenderingBackendProxy;
     WebCore::RemoteResourceIdentifier m_remoteResourceIdentifier { WebCore::RemoteResourceIdentifier::generate() };
 

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteImageBufferProxy.h

@@ -28 +28 @@
 #if ENABLE(GPU_PROCESS)
 
-#include "RemoteImageBufferMessageHandler.h"
+#include "RemoteImageBufferMessageHandlerProxy.h"
 #include <WebCore/DisplayListImageBuffer.h>
 #include <WebCore/DisplayListItems.h>
@@ -38 +38 @@
 
 template<typename BackendType>
-class RemoteImageBuffer : public WebCore::DisplayList::ImageBuffer<BackendType>, public RemoteImageBufferMessageHandler {
+class RemoteImageBufferProxy : public WebCore::DisplayList::ImageBuffer<BackendType>, public RemoteImageBufferMessageHandlerProxy {
     using BaseDisplayListImageBuffer = WebCore::DisplayList::ImageBuffer<BackendType>;
     using BaseDisplayListImageBuffer::m_backend;
@@ -44 +44 @@
 
 public:
-    static std::unique_ptr<RemoteImageBuffer> create(const WebCore::FloatSize& size, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, RemoteRenderingBackend& remoteRenderingBackend)
+    static std::unique_ptr<RemoteImageBufferProxy> create(const WebCore::FloatSize& size, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, RemoteRenderingBackendProxy& remoteRenderingBackendProxy)
     {
         if (BackendType::calculateBackendSize(size, resolutionScale).isEmpty())
             return nullptr;
 
-        return std::unique_ptr<RemoteImageBuffer>(new RemoteImageBuffer(size, renderingMode, resolutionScale, colorSpace, remoteRenderingBackend));
+        return std::unique_ptr<RemoteImageBufferProxy>(new RemoteImageBufferProxy(size, renderingMode, resolutionScale, colorSpace, remoteRenderingBackendProxy));
     }
 
-    ~RemoteImageBuffer()
+    ~RemoteImageBufferProxy()
     {
         flushDrawingContext();
@@ -58 +58 @@
 
 protected:
-    RemoteImageBuffer(const WebCore::FloatSize& size, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, RemoteRenderingBackend& remoteRenderingBackend)
+    RemoteImageBufferProxy(const WebCore::FloatSize& size, WebCore::RenderingMode renderingMode, float resolutionScale, WebCore::ColorSpace colorSpace, RemoteRenderingBackendProxy& remoteRenderingBackendProxy)
         : BaseDisplayListImageBuffer(size)
-        , RemoteImageBufferMessageHandler(size, renderingMode, resolutionScale, colorSpace, remoteRenderingBackend)
+        , RemoteImageBufferMessageHandlerProxy(size, renderingMode, resolutionScale, colorSpace, remoteRenderingBackendProxy)
     {
     }
@@ -75 +75 @@
     {
         if (!m_backend)
-            const_cast<RemoteImageBuffer&>(*this).RemoteImageBufferMessageHandler::waitForCreateImageBufferBackend();
+            const_cast<RemoteImageBufferProxy&>(*this).RemoteImageBufferMessageHandlerProxy::waitForCreateImageBufferBackend();
         return m_backend.get();
     }
@@ -81 +81 @@
     RefPtr<WebCore::ImageData> getImageData(WebCore::AlphaPremultiplication outputFormat, const WebCore::IntRect& srcRect) const override
     {
-        auto& displayList = const_cast<RemoteImageBuffer*>(this)->m_drawingContext.displayList();
-        const_cast<RemoteImageBuffer*>(this)->RemoteImageBufferMessageHandler::flushDrawingContext(displayList);
-        auto result = const_cast<RemoteImageBuffer*>(this)->RemoteImageBufferMessageHandler::getImageData(outputFormat, srcRect);
+        auto& displayList = const_cast<RemoteImageBufferProxy*>(this)->m_drawingContext.displayList();
+        const_cast<RemoteImageBufferProxy*>(this)->RemoteImageBufferMessageHandlerProxy::flushDrawingContext(displayList);
+        auto result = const_cast<RemoteImageBufferProxy*>(this)->RemoteImageBufferMessageHandlerProxy::getImageData(outputFormat, srcRect);
         // getImageData is synchronous, which means we've already received the CommitImageBufferFlushContext message.
         return result;
@@ -106 +106 @@
         auto& displayList = m_drawingContext.displayList();
         if (displayList.itemCount())
-            RemoteImageBufferMessageHandler::flushDrawingContextAndWaitCommit(displayList);
+            RemoteImageBufferMessageHandlerProxy::flushDrawingContextAndWaitCommit(displayList);
     }
     
@@ -114 +114 @@
         auto& displayList = m_drawingContext.displayList();
         if (displayList.itemCount() >= DisplayListBatchSize)
-            RemoteImageBufferMessageHandler::flushDrawingContext(displayList);
+            RemoteImageBufferMessageHandlerProxy::flushDrawingContext(displayList);
     }
 };

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "RemoteRenderingBackend.h"
+#include "RemoteRenderingBackendProxy.h"
 
 #if ENABLE(GPU_PROCESS)
@@ -31 +31 @@
 #include "GPUConnectionToWebProcess.h"
 #include "GPUProcessConnection.h"
-#include "PlatformRemoteImageBuffer.h"
+#include "PlatformRemoteImageBufferProxy.h"
 #include "RemoteRenderingBackendMessages.h"
 #include "RemoteRenderingBackendProxyMessages.h"
@@ -40 +40 @@
 using namespace WebCore;
 
-std::unique_ptr<RemoteRenderingBackend> RemoteRenderingBackend::create()
+std::unique_ptr<RemoteRenderingBackendProxy> RemoteRenderingBackendProxy::create()
 {
-    return std::unique_ptr<RemoteRenderingBackend>(new RemoteRenderingBackend());
+    return std::unique_ptr<RemoteRenderingBackendProxy>(new RemoteRenderingBackendProxy());
 }
 
-RemoteRenderingBackend::RemoteRenderingBackend()
+RemoteRenderingBackendProxy::RemoteRenderingBackendProxy()
 {
     // Register itself as a MessageReceiver in the GPUProcessConnection.
     IPC::MessageReceiverMap& messageReceiverMap = WebProcess::singleton().ensureGPUProcessConnection().messageReceiverMap();
-    messageReceiverMap.addMessageReceiver(Messages::RemoteRenderingBackend::messageReceiverName(), m_renderingBackendIdentifier.toUInt64(), *this);
+    messageReceiverMap.addMessageReceiver(Messages::RemoteRenderingBackendProxy::messageReceiverName(), m_renderingBackendIdentifier.toUInt64(), *this);
 
-    // Create the RemoteRenderingBackendProxy.
+    // Create the RemoteRenderingBackend
     send(Messages::GPUConnectionToWebProcess::CreateRenderingBackend(m_renderingBackendIdentifier), 0);
 }
 
-RemoteRenderingBackend::~RemoteRenderingBackend()
+RemoteRenderingBackendProxy::~RemoteRenderingBackendProxy()
 {
     // Un-register itself as a MessageReceiver.
@@ -61 +61 @@
     messageReceiverMap.removeMessageReceiver(*this);
 
-    // Release the RemoteRenderingBackendProxy.
+    // Release the RemoteRenderingBackend.
     send(Messages::GPUConnectionToWebProcess::ReleaseRenderingBackend(m_renderingBackendIdentifier), 0);
 }
 
-IPC::Connection* RemoteRenderingBackend::messageSenderConnection() const
+IPC::Connection* RemoteRenderingBackendProxy::messageSenderConnection() const
 {
     return &WebProcess::singleton().ensureGPUProcessConnection().connection();
 }
 
-uint64_t RemoteRenderingBackend::messageSenderDestinationID() const
+uint64_t RemoteRenderingBackendProxy::messageSenderDestinationID() const
 {
     return m_renderingBackendIdentifier.toUInt64();
 }
 
-bool RemoteRenderingBackend::waitForCreateImageBufferBackend()
+bool RemoteRenderingBackendProxy::waitForCreateImageBufferBackend()
 {
     Ref<IPC::Connection> connection = WebProcess::singleton().ensureGPUProcessConnection().connection();
-    return connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackend::CreateImageBufferBackend>(m_renderingBackendIdentifier, 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
+    return connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackendProxy::CreateImageBufferBackend>(m_renderingBackendIdentifier, 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
 }
 
-bool RemoteRenderingBackend::waitForCommitImageBufferFlushContext()
+bool RemoteRenderingBackendProxy::waitForCommitImageBufferFlushContext()
 {
     Ref<IPC::Connection> connection = WebProcess::singleton().ensureGPUProcessConnection().connection();
-    return connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackend::CommitImageBufferFlushContext>(m_renderingBackendIdentifier, 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
+    return connection->waitForAndDispatchImmediately<Messages::RemoteRenderingBackendProxy::CommitImageBufferFlushContext>(m_renderingBackendIdentifier, 1_s, IPC::WaitForOption::InterruptWaitingIfSyncMessageArrives);
 }
 
-std::unique_ptr<ImageBuffer> RemoteRenderingBackend::createImageBuffer(const FloatSize& size, ShouldAccelerate shouldAccelerate, float resolutionScale, ColorSpace colorSpace)
+std::unique_ptr<ImageBuffer> RemoteRenderingBackendProxy::createImageBuffer(const FloatSize& size, ShouldAccelerate shouldAccelerate, float resolutionScale, ColorSpace colorSpace)
 {
     if (shouldAccelerate == ShouldAccelerate::Yes) {
-        if (auto imageBuffer = AcceleratedRemoteImageBuffer::create(size, RenderingMode::RemoteAccelerated, resolutionScale, colorSpace, *this)) {
+        if (auto imageBuffer = AcceleratedRemoteImageBufferProxy::create(size, RenderingMode::RemoteAccelerated, resolutionScale, colorSpace, *this)) {
             m_imageBufferMessageHandlerMap.add(imageBuffer->remoteResourceIdentifier(), imageBuffer.get());
             return imageBuffer;
@@ -96 +96 @@
     }
 
-    if (auto imageBuffer = UnacceleratedRemoteImageBuffer::create(size, RenderingMode::RemoteUnaccelerated, resolutionScale, colorSpace, *this)) {
+    if (auto imageBuffer = UnacceleratedRemoteImageBufferProxy::create(size, RenderingMode::RemoteUnaccelerated, resolutionScale, colorSpace, *this)) {
         m_imageBufferMessageHandlerMap.add(imageBuffer->remoteResourceIdentifier(), imageBuffer.get());
         return imageBuffer;
@@ -104 +104 @@
 }
 
-void RemoteRenderingBackend::releaseRemoteResource(RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackendProxy::releaseRemoteResource(RemoteResourceIdentifier remoteResourceIdentifier)
 {
     // CreateImageBuffer message should have been received before this one.
@@ -111 +111 @@
 }
 
-void RemoteRenderingBackend::createImageBufferBackend(const FloatSize& logicalSize, const IntSize& backendSize, float resolutionScale, ColorSpace colorSpace, ImageBufferBackendHandle handle, RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackendProxy::createImageBufferBackend(const FloatSize& logicalSize, const IntSize& backendSize, float resolutionScale, ColorSpace colorSpace, ImageBufferBackendHandle handle, RemoteResourceIdentifier remoteResourceIdentifier)
 {
     if (auto imageBuffer = m_imageBufferMessageHandlerMap.get(remoteResourceIdentifier))
@@ -117 +117 @@
 }
 
-void RemoteRenderingBackend::commitImageBufferFlushContext(ImageBufferFlushIdentifier flushIdentifier, RemoteResourceIdentifier remoteResourceIdentifier)
+void RemoteRenderingBackendProxy::commitImageBufferFlushContext(ImageBufferFlushIdentifier flushIdentifier, RemoteResourceIdentifier remoteResourceIdentifier)
 {
     if (auto imageBuffer = m_imageBufferMessageHandlerMap.get(remoteResourceIdentifier))

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.h

@@ -32 +32 @@
 #include "MessageReceiver.h"
 #include "MessageSender.h"
-#include "RemoteImageBufferMessageHandler.h"
+#include "RemoteImageBufferMessageHandlerProxy.h"
 #include "RenderingBackendIdentifier.h"
 #include <WebCore/ColorSpace.h>
@@ -44 +44 @@
 namespace WebKit {
 
-class RemoteRenderingBackend
+class RemoteRenderingBackendProxy
     : public IPC::MessageSender
     , private IPC::MessageReceiver
-    , public CanMakeWeakPtr<RemoteRenderingBackend> {
+    , public CanMakeWeakPtr<RemoteRenderingBackendProxy> {
 public:
-    static std::unique_ptr<RemoteRenderingBackend> create();
+    static std::unique_ptr<RemoteRenderingBackendProxy> create();
 
-    ~RemoteRenderingBackend();
+    ~RemoteRenderingBackendProxy();
 
     RenderingBackendIdentifier renderingBackendIdentifier() const { return m_renderingBackendIdentifier; }
@@ -69 +69 @@
 
 private:
-    RemoteRenderingBackend();
+    RemoteRenderingBackendProxy();
 
     // Messages to be received.
@@ -75 +75 @@
     void commitImageBufferFlushContext(ImageBufferFlushIdentifier, WebCore::RemoteResourceIdentifier);
 
-    using ImageBufferMessageHandlerMap = HashMap<WebCore::RemoteResourceIdentifier, RemoteImageBufferMessageHandler*>;
+    using ImageBufferMessageHandlerMap = HashMap<WebCore::RemoteResourceIdentifier, RemoteImageBufferMessageHandlerProxy*>;
     ImageBufferMessageHandlerMap m_imageBufferMessageHandlerMap;
     RenderingBackendIdentifier m_renderingBackendIdentifier { RenderingBackendIdentifier::generate() };

trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.messages.in

@@ -23 +23 @@
 #if ENABLE(GPU_PROCESS)
 
-messages -> RemoteRenderingBackend NotRefCounted {
+messages -> RemoteRenderingBackendProxy NotRefCounted {
     void CreateImageBufferBackend(WebCore::FloatSize logicalSize, WebCore::IntSize backendSize, float resolutionScale, WebCore::ColorSpace colorSpace, WebKit::ImageBufferBackendHandle handle, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)
     void CommitImageBufferFlushContext(WebKit::ImageBufferFlushIdentifier flushIdentifier, WebCore::RemoteResourceIdentifier remoteResourceIdentifier)

trunk/Source/WebKit/WebProcess/GPU/webrtc/LibWebRTCCodecs.cpp

@@ -32 +32 @@
 #include "GPUProcessConnection.h"
 #include "LibWebRTCCodecsProxyMessages.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebProcess.h"
 #include <WebCore/LibWebRTCMacros.h>

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -40 +40 @@
 #include "NetworkProcessConnection.h"
 #include "PageBanner.h"
-#include "RemoteRenderingBackend.h"
+#include "RemoteRenderingBackendProxy.h"
 #include "UserData.h"
 #include "WebColorChooser.h"
@@ -895 +895 @@
 #if ENABLE(GPU_PROCESS)
 
-RemoteRenderingBackend& WebChromeClient::ensureRemoteRenderingBackend() const
-{
-    if (!m_remoteRenderingBackend)
-        m_remoteRenderingBackend = RemoteRenderingBackend::create();
-    return *m_remoteRenderingBackend;
+RemoteRenderingBackendProxy& WebChromeClient::ensureRemoteRenderingBackendProxy() const
+{
+    if (!m_remoteRenderingBackendProxy)
+        m_remoteRenderingBackendProxy = RemoteRenderingBackendProxy::create();
+    return *m_remoteRenderingBackendProxy;
 }
 
@@ -907 +907 @@
         return nullptr;
 
-    return ensureRemoteRenderingBackend().createImageBuffer(size, shouldAccelerate, resolutionScale, colorSpace);
+    return ensureRemoteRenderingBackendProxy().createImageBuffer(size, shouldAccelerate, resolutionScale, colorSpace);
 }
 

trunk/Source/WebKit/WebProcess/WebCoreSupport/WebChromeClient.h

@@ -38 +38 @@
 namespace WebKit {
 
-class RemoteRenderingBackend;
+class RemoteRenderingBackendProxy;
 class WebFrame;
 class WebPage;
@@ -243 +243 @@
 
 #if ENABLE(GPU_PROCESS)
-    RemoteRenderingBackend& ensureRemoteRenderingBackend() const;
+    RemoteRenderingBackendProxy& ensureRemoteRenderingBackendProxy() const;
     std::unique_ptr<WebCore::ImageBuffer> createImageBuffer(const WebCore::FloatSize&, WebCore::ShouldAccelerate, WebCore::ShouldUseDisplayList, WebCore::RenderingPurpose, float resolutionScale, WebCore::ColorSpace) const final;
 #endif
@@ -406 +406 @@
     mutable bool m_cachedMainFrameHasVerticalScrollbar { false };
 #if ENABLE(GPU_PROCESS)
-    mutable std::unique_ptr<RemoteRenderingBackend> m_remoteRenderingBackend;
+    mutable std::unique_ptr<RemoteRenderingBackendProxy> m_remoteRenderingBackendProxy;
 #endif
     WebPage& m_page;