Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): fix mac compilation after roll to 01-11 (#4972)

Browse source
This commit is contained in:
Yury Semikhatsky 2021-01-11 11:30:54 -08:00 committed by GitHub
parent 62c52e8628
commit 56f012043b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/webkit/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1418 1419
Changed: yurys@chromium.org Mon 11 Jan 2021 10:56:28 AM PST Changed: yurys@chromium.org Mon 11 Jan 2021 11:30:13 AM PST

8
browser_patches/webkit/patches/bootstrap.diff
View file

@ -10485,7 +10485,7 @@ index 30dc2b97782825f23184b42301c50acf60617216..b79d979521e8510b42c28e8e8c7d8590
bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1; bool webViewRunBeforeUnloadConfirmPanelWithMessageInitiatedByFrameCompletionHandler : 1;
bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1; bool webViewRequestGeolocationPermissionForFrameDecisionHandler : 1;
diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm diff --git a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
index 1b9edbf4d98b8e50900b5a36a93647487be358db..b2185cf53222b4cca18425490a161d6caa3645dc 100644 index 1b9edbf4d98b8e50900b5a36a93647487be358db..db7fed31883ec19cd73e151286c4888c0868fd7a 100644
--- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm --- a/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
+++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm +++ b/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm
@@ -104,6 +104,7 @@ void UIDelegate::setDelegate(id <WKUIDelegate> delegate) @@ -104,6 +104,7 @@ void UIDelegate::setDelegate(id <WKUIDelegate> delegate)
@ -10501,12 +10501,12 @@ index 1b9edbf4d98b8e50900b5a36a93647487be358db..b2185cf53222b4cca18425490a161d6c
} }
+void UIDelegate::UIClient::handleJavaScriptDialog(WebKit::WebPageProxy&, bool accept, const WTF::String& value) { +void UIDelegate::UIClient::handleJavaScriptDialog(WebKit::WebPageProxy&, bool accept, const WTF::String& value) {
+ if (!m_uiDelegate.m_delegateMethods.webViewHandleJavaScriptDialogValue) + if (!m_uiDelegate->m_delegateMethods.webViewHandleJavaScriptDialogValue)
+ return; + return;
+ auto delegate = m_uiDelegate.m_delegate.get(); + auto delegate = m_uiDelegate->m_delegate.get();
+ if (!delegate) + if (!delegate)
+ return; + return;
+ [delegate webView:m_uiDelegate.m_webView handleJavaScriptDialog:accept value:value]; + [delegate webView:m_uiDelegate->m_webView handleJavaScriptDialog:accept value:value];
+} +}
+ +
void UIDelegate::UIClient::requestStorageAccessConfirm(WebPageProxy& webPageProxy, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler<void(bool)>&& completionHandler) void UIDelegate::UIClient::requestStorageAccessConfirm(WebPageProxy& webPageProxy, WebFrameProxy*, const WebCore::RegistrableDomain& requestingDomain, const WebCore::RegistrableDomain& currentDomain, CompletionHandler<void(bool)>&& completionHandler)