Unreviewed build fixes after 2a5102d

* Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp: (WebCore::getDefaultCairoFontOptions): Deleted. There is an equivalent function with the same name in GdkCairoUtilities.cpp. * Source/WebKit/UIProcess/WebPasteboardProxy.messages.in: Mark message GetPasteboardChangeCount as needing a connection. * Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp: (WebKit::WebPlatformStrategies::changeCount): Adapt to older sendSync() that receives a reference to the return values container for IPC messages.
WebKit · Apr 6, 2023 · ed0f829 · ed0f829
1 parent 6395974
commit ed0f829
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
@@ -57,12 +57,6 @@ RecursiveLock& cairoFontLock()
 }
 #endif
 
-const cairo_font_options_t* getDefaultCairoFontOptions()
-{
-    static NeverDestroyed<cairo_font_options_t*> options = cairo_font_options_create();
-    return options;
-}
-
 void copyContextProperties(cairo_t* srcCr, cairo_t* dstCr)
 {
     cairo_set_antialias(dstCr, cairo_get_antialias(srcCr));

diff --git a/Source/WebKit/UIProcess/WebPasteboardProxy.messages.in b/Source/WebKit/UIProcess/WebPasteboardProxy.messages.in
@@ -72,7 +72,7 @@ messages -> WebPasteboardProxy NotRefCounted {
     ReadBuffer(String pasteboardName, String pasteboardType) -> (RefPtr<WebCore::SharedBuffer> buffer) Synchronous
     WriteToClipboard(String pasteboardName, WebCore::SelectionData pasteboardContent)
     ClearClipboard(String pasteboardName)
-    GetPasteboardChangeCount(String pasteboardName) -> (int64_t changeCount) Synchronous
+    GetPasteboardChangeCount(String pasteboardName) -> (int64_t changeCount) Synchronous WantsConnection
 #endif
 
 #if USE(LIBWPE)

diff --git a/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
@@ -333,8 +333,8 @@ void WebPlatformStrategies::clearClipboard(const String& pasteboardName)
 
 int64_t WebPlatformStrategies::changeCount(const String& pasteboardName)
 {
-    auto sendResult = WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(pasteboardName), 0);
-    auto [changeCount] = sendResult.takeReplyOr(0);
+    int64_t changeCount { 0 };
+    WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardChangeCount(pasteboardName), Messages::WebPasteboardProxy::GetPasteboardChangeCount::Reply(changeCount), 0);
     return changeCount;
 }