Apply patch. rdar://problem/100252324

Fix build on branch after 5192197. Canonical link: https://commits.webkit.org/252432.1011@safari-7614.4.6.0-branch
WebKit · Dec 22, 2022 · 7c4a28f · 7c4a28f
1 parent 078f717
commit 7c4a28f
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp b/Source/WebKit/WebProcess/GPU/graphics/RemoteGraphicsContextGLProxy.cpp
@@ -317,17 +317,18 @@ void RemoteGraphicsContextGLProxy::readnPixelsSharedMemory(GCGLint x, GCGLint y,
             markContextLost();
             return;
         }
-        auto handle = buffer->createHandle(SharedMemory::Protection::ReadWrite);
-        if (!handle || handle->isNull()) {
+        SharedMemory::Handle handle;
+        buffer->createHandle(handle, SharedMemory::Protection::ReadWrite);
+        if (handle.isNull()) {
             markContextLost();
             return;
         }
-        memcpy(buffer->data(), data.data(), data.size());
-        auto sendResult = sendSync(Messages::RemoteGraphicsContextGL::ReadnPixels2(x, y, width, height, format, type, WTFMove(*handle)));
+        memcpy(buffer->data(), data.data, data.bufSize);
+        bool success = false;
+        auto sendResult = sendSync(Messages::RemoteGraphicsContextGL::ReadnPixels2(x, y, width, height, format, type, WTFMove(handle)), Messages::RemoteGraphicsContextGL::ReadnPixels2::Reply(success));
         if (sendResult) {
-            auto [success] = sendResult.takeReply();
             if (success)
-                memcpy(data.data(), buffer->data(), data.size());
+                memcpy(data.data, buffer->data(), data.bufSize);
         } else
             markContextLost();
     }