Modified: trunk/Source/WebKit/ChangeLog (290083 => 290084)
--- trunk/Source/WebKit/ChangeLog 2022-02-17 23:29:34 UTC (rev 290083)
+++ trunk/Source/WebKit/ChangeLog 2022-02-17 23:39:21 UTC (rev 290084)
@@ -1,3 +1,18 @@
+2022-02-17 Diego Pino Garcia <[email protected]>
+
+ [macOS] Non-unified build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=236752
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::requestTextRecognition):
+ (WebKit::WebViewImpl::showSafeBrowsingWarning):
+ (WebKit::toWKRectEdge):
+ (WebKit::toRectEdges):
+ * UIProcess/mac/WKSharingServicePickerDelegate.h:
+
2022-02-17 Per Arne Vollan <[email protected]>
[macOS][WP] Add required syscall to sandbox
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm (290083 => 290084)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm 2022-02-17 23:29:34 UTC (rev 290083)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKWebAuthenticationPanel.mm 2022-02-17 23:39:21 UTC (rev 290084)
@@ -55,6 +55,7 @@
#import <WebCore/PublicKeyCredentialRequestOptions.h>
#import <WebCore/WebAuthenticationConstants.h>
#import <WebCore/WebAuthenticationUtils.h>
+#import <WebCore/WebCoreObjCExtras.h>
#import <objc/runtime.h>
#import <pal/crypto/CryptoDigest.h>
#import <wtf/BlockPtr.h>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm (290083 => 290084)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2022-02-17 23:29:34 UTC (rev 290083)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm 2022-02-17 23:39:21 UTC (rev 290084)
@@ -203,7 +203,7 @@
return request;
}
-void WebViewImpl::requestTextRecognition(const URL& imageURL, const ShareableBitmap::Handle& imageData, const String& identifier, CompletionHandler<void(TextRecognitionResult&&)>&& completion)
+void WebViewImpl::requestTextRecognition(const URL& imageURL, const ShareableBitmap::Handle& imageData, const String& identifier, CompletionHandler<void(WebCore::TextRecognitionResult&&)>&& completion)
{
if (!isLiveTextAvailableAndEnabled()) {
completion({ });
@@ -1770,7 +1770,7 @@
WebCore::DiagnosticLoggingClient::ValueDictionary showedWarningDictionary;
showedWarningDictionary.set("source"_s, String("service"));
- m_page->logDiagnosticMessageWithValueDictionary("SafeBrowsing.ShowedWarning"_s, "Safari"_s, showedWarningDictionary, ShouldSample::No);
+ m_page->logDiagnosticMessageWithValueDictionary("SafeBrowsing.ShowedWarning"_s, "Safari"_s, showedWarningDictionary, WebCore::ShouldSample::No);
m_safeBrowsingWarning = adoptNS([[WKSafeBrowsingWarning alloc] initWithFrame:[m_view bounds] safeBrowsingWarning:warning completionHandler:[weakThis = WeakPtr { *this }, completionHandler = WTFMove(completionHandler)] (auto&& result) mutable {
completionHandler(WTFMove(result));
@@ -1796,12 +1796,12 @@
else
dictionary.set("action"_s, String("redirect to url"));
- weakThis->m_page->logDiagnosticMessageWithValueDictionary("SafeBrowsing.PerformedAction"_s, "Safari"_s, dictionary, ShouldSample::No);
+ weakThis->m_page->logDiagnosticMessageWithValueDictionary("SafeBrowsing.PerformedAction"_s, "Safari"_s, dictionary, WebCore::ShouldSample::No);
return;
}
dictionary.set("action"_s, String("go back"));
- weakThis->m_page->logDiagnosticMessageWithValueDictionary("SafeBrowsing.PerformedAction"_s, "Safari"_s, dictionary, ShouldSample::No);
+ weakThis->m_page->logDiagnosticMessageWithValueDictionary("SafeBrowsing.PerformedAction"_s, "Safari"_s, dictionary, WebCore::ShouldSample::No);
if (!navigatesFrame && weakThis->m_safeBrowsingWarning && !forMainFrameNavigation) {
weakThis->m_page->goBack();
@@ -5516,7 +5516,7 @@
mouseMovedInternal(event);
}
-static _WKRectEdge toWKRectEdge(RectEdges<bool> edges)
+static _WKRectEdge toWKRectEdge(WebCore::RectEdges<bool> edges)
{
_WKRectEdge result = _WKRectEdgeNone;
@@ -5535,7 +5535,7 @@
return result;
}
-static RectEdges<bool> toRectEdges(_WKRectEdge edges)
+static WebCore::RectEdges<bool> toRectEdges(_WKRectEdge edges)
{
return {
edges & _WKRectEdgeTop,
Modified: trunk/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h (290083 => 290084)
--- trunk/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h 2022-02-17 23:29:34 UTC (rev 290083)
+++ trunk/Source/WebKit/UIProcess/mac/WKSharingServicePickerDelegate.h 2022-02-17 23:39:21 UTC (rev 290084)
@@ -26,6 +26,7 @@
#if ENABLE(SERVICE_CONTROLS)
#import <wtf/RetainPtr.h>
+#import <wtf/text/WTFString.h>
namespace WebKit {
class WebContextMenuProxyMac;
