diff --git a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp index 4f6334fd41dd..3319c39ba8d5 100644 --- 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 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 index ee36b9c62cdf..8a625bafa93a 100644 --- 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 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 index 03187e7711cc..a58ae00cd7b3 100644 --- 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; }