Title: [292065] trunk/Source/WebKit
- Revision
- 292065
- Author
- commit-qu...@webkit.org
- Date
- 2022-03-29 13:39:48 -0700 (Tue, 29 Mar 2022)
Log Message
Add Captive Portal alert to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=238326
Patch by C Lopez <clop...@apple.com> on 2022-03-29
Reviewed by Geoffrey Garen and Brent Fulgham
When WkWebView on iOS is initialized, we call `_presentCaptivePortalModeAlertIfNeeded` which checks whether an alert needs to be presented or not.
* UIProcess/API/ios/WKWebViewIOS.h:
* UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView _presentCaptivePortalModeAlertIfNeeded]):
(-[WKWebView didMoveToWindow]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (292064 => 292065)
--- trunk/Source/WebKit/ChangeLog 2022-03-29 20:24:48 UTC (rev 292064)
+++ trunk/Source/WebKit/ChangeLog 2022-03-29 20:39:48 UTC (rev 292065)
@@ -1,3 +1,17 @@
+2022-03-29 C Lopez <clop...@apple.com>
+
+ Add Captive Portal alert to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=238326
+
+ Reviewed by Geoffrey Garen and Brent Fulgham
+
+ When WkWebView on iOS is initialized, we call `_presentCaptivePortalModeAlertIfNeeded` which checks whether an alert needs to be presented or not.
+
+ * UIProcess/API/ios/WKWebViewIOS.h:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _presentCaptivePortalModeAlertIfNeeded]):
+ (-[WKWebView didMoveToWindow]):
+
2022-03-29 Don Olmstead <don.olmst...@sony.com>
[LibWPE] Guard libxkbcommon code with WPE_ENABLE_XKB
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.h (292064 => 292065)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.h 2022-03-29 20:24:48 UTC (rev 292064)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.h 2022-03-29 20:39:48 UTC (rev 292065)
@@ -25,6 +25,9 @@
#import "WKWebViewInternal.h"
#import "_WKTapHandlingResult.h"
+#if USE(APPLE_INTERNAL_SDK) && PLATFORM(IOS_FAMILY) && __has_include(<WebKitAdditions/WKWebViewAdditions.h>)
+#import <WebKitAdditions/WKWebViewAdditions.h>
+#endif
@class UIScrollEvent;
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (292064 => 292065)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2022-03-29 20:24:48 UTC (rev 292064)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2022-03-29 20:39:48 UTC (rev 292065)
@@ -1541,6 +1541,14 @@
return false;
}
+#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKWebViewAdditions.mm>)
+#import <WebKitAdditions/WKWebViewAdditions.mm>
+#else
+- (void)_presentCaptivePortalModeAlertIfNeeded
+{
+}
+#endif
+
- (void)didMoveToWindow
{
if (!_overridesInterfaceOrientation)
@@ -1547,6 +1555,7 @@
[self _dispatchSetDeviceOrientation:[self _deviceOrientation]];
_page->activityStateDidChange(WebCore::ActivityState::allFlags());
_page->webViewDidMoveToWindow();
+ [self _presentCaptivePortalModeAlertIfNeeded];
}
- (void)_setOpaqueInternal:(BOOL)opaque
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
