[webkit-changes] [276304] trunk/Source/WebKit

Tue, 20 Apr 2021 07:52:44 -0700

Title: [276304] trunk/Source/WebKit
Revision
276304
Author
[email protected]
Date
2021-04-20 07:51:52 -0700 (Tue, 20 Apr 2021)

Log Message

Unreviewed, reverting r276271.

It did not fix the Canvas-Arcs subtest on the bots

Reverted changeset:

"MotionMark's Canvas-Arcs subtest is broken if the GPUProcess
is not yet running"
https://bugs.webkit.org/show_bug.cgi?id=224778
https://commits.webkit.org/r276271

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (276303 => 276304)


--- trunk/Source/WebKit/ChangeLog	2021-04-20 14:48:06 UTC (rev 276303)
+++ trunk/Source/WebKit/ChangeLog	2021-04-20 14:51:52 UTC (rev 276304)
@@ -1,3 +1,16 @@
+2021-04-20  Chris Dumez  <[email protected]>
+
+        Unreviewed, reverting r276271.
+
+        It did not fix the Canvas-Arcs subtest on the bots
+
+        Reverted changeset:
+
+        "MotionMark's Canvas-Arcs subtest is broken if the GPUProcess
+        is not yet running"
+        https://bugs.webkit.org/show_bug.cgi?id=224778
+        https://commits.webkit.org/r276271
+
 2021-04-19  Darin Adler  <[email protected]>
 
         Refactor sorted array mapping machinery in LocaleToScriptMapping.cpp for reuse elsewhere

Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp (276303 => 276304)


--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp	2021-04-20 14:48:06 UTC (rev 276303)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp	2021-04-20 14:51:52 UTC (rev 276304)
@@ -409,13 +409,12 @@
 }
 #endif
 
-void GPUConnectionToWebProcess::createRenderingBackend(RemoteRenderingBackendCreationParameters&& creationParameters, CompletionHandler<void()>&& completionHandler)
+void GPUConnectionToWebProcess::createRenderingBackend(RemoteRenderingBackendCreationParameters&& creationParameters)
 {
     auto addResult = m_remoteRenderingBackendMap.ensure(creationParameters.identifier, [&]() {
         return IPC::ScopedActiveMessageReceiveQueue { RemoteRenderingBackend::create(*this, WTFMove(creationParameters)) };
     });
     ASSERT_UNUSED(addResult, addResult.isNewEntry);
-    completionHandler();
 }
 
 void GPUConnectionToWebProcess::releaseRenderingBackend(RenderingBackendIdentifier renderingBackendIdentifier)

Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h (276303 => 276304)


--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h	2021-04-20 14:48:06 UTC (rev 276303)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h	2021-04-20 14:51:52 UTC (rev 276304)
@@ -163,7 +163,7 @@
     RemoteMediaRecorderManager& mediaRecorderManager();
 #endif
 
-    void createRenderingBackend(RemoteRenderingBackendCreationParameters&&, CompletionHandler<void()>&&);
+    void createRenderingBackend(RemoteRenderingBackendCreationParameters&&);
     void releaseRenderingBackend(RenderingBackendIdentifier);
 
 #if ENABLE(WEBGL)

Modified: trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in (276303 => 276304)


--- trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in	2021-04-20 14:48:06 UTC (rev 276303)
+++ trunk/Source/WebKit/GPUProcess/GPUConnectionToWebProcess.messages.in	2021-04-20 14:51:52 UTC (rev 276304)
@@ -23,7 +23,7 @@
 #if ENABLE(GPU_PROCESS)
 
 messages -> GPUConnectionToWebProcess WantsDispatchMessage {
-    void CreateRenderingBackend(struct WebKit::RemoteRenderingBackendCreationParameters creationParameters) -> () Synchronous
+    void CreateRenderingBackend(struct WebKit::RemoteRenderingBackendCreationParameters creationParameters)
     void ReleaseRenderingBackend(WebKit::RenderingBackendIdentifier renderingBackendIdentifier)
 #if ENABLE(WEBGL)
     void CreateGraphicsContextGL(struct WebCore::GraphicsContextGLAttributes attributes, WebKit::GraphicsContextGLIdentifier graphicsContextGLIdentifier, WebKit::RenderingBackendIdentifier renderingBackendIdentifier, IPC::StreamConnectionBuffer stream)

Modified: trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp (276303 => 276304)


--- trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp	2021-04-20 14:48:06 UTC (rev 276303)
+++ trunk/Source/WebKit/WebProcess/GPU/graphics/RemoteRenderingBackendProxy.cpp	2021-04-20 14:51:52 UTC (rev 276304)
@@ -75,9 +75,7 @@
         auto& gpuProcessConnection = WebProcess::singleton().ensureGPUProcessConnection();
         gpuProcessConnection.addClient(*this);
         gpuProcessConnection.messageReceiverMap().addMessageReceiver(Messages::RemoteRenderingBackendProxy::messageReceiverName(), renderingBackendIdentifier().toUInt64(), *this);
-        // FIXME: This message shouldn't need to be synchronous (https://bugs.webkit.org/show_bug.cgi?id=224781).
-        // However, we seem to get in a bad state when this message is asynchronous and the GPUProcess has just launched.
-        gpuProcessConnection.connection().sendSync(Messages::GPUConnectionToWebProcess::CreateRenderingBackend(m_parameters), Messages::GPUConnectionToWebProcess::CreateRenderingBackend::Reply(), 0);
+        gpuProcessConnection.connection().send(Messages::GPUConnectionToWebProcess::CreateRenderingBackend(m_parameters), 0, IPC::SendOption::DispatchMessageEvenWhenWaitingForSyncReply);
         m_gpuProcessConnection = makeWeakPtr(gpuProcessConnection);
     }
     return *m_gpuProcessConnection;

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to