Title: [254462] trunk/Source/WebKit
Revision
254462
Author
[email protected]
Date
2020-01-13 15:37:02 -0800 (Mon, 13 Jan 2020)

Log Message

Propogate UIEdgeInsets from WKWebView to WKSafeBrowsingWarning on iOS
https://bugs.webkit.org/show_bug.cgi?id=206201
<rdar://problem/57135847>

Reviewed by Tim Horton.

Manually verified this fixes the radar.

* UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView _computedObscuredInsetForSafeBrowsingWarning]):
(-[WKWebView safeAreaInsetsDidChange]):
(-[WKWebView _setObscuredInsets:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (254461 => 254462)


--- trunk/Source/WebKit/ChangeLog	2020-01-13 23:35:24 UTC (rev 254461)
+++ trunk/Source/WebKit/ChangeLog	2020-01-13 23:37:02 UTC (rev 254462)
@@ -1,3 +1,18 @@
+2020-01-13  Alex Christensen  <[email protected]>
+
+        Propogate UIEdgeInsets from WKWebView to WKSafeBrowsingWarning on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=206201
+        <rdar://problem/57135847>
+
+        Reviewed by Tim Horton.
+
+        Manually verified this fixes the radar.
+
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView _computedObscuredInsetForSafeBrowsingWarning]):
+        (-[WKWebView safeAreaInsetsDidChange]):
+        (-[WKWebView _setObscuredInsets:]):
+
 2020-01-13  Eric Carlson  <[email protected]>
 
         Expose audio tracks for media files in the GPUProcess

Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (254461 => 254462)


--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm	2020-01-13 23:35:24 UTC (rev 254461)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm	2020-01-13 23:37:02 UTC (rev 254462)
@@ -563,6 +563,18 @@
     return _obscuredInsetEdgesAffectedBySafeArea;
 }
 
+- (UIEdgeInsets)_computedObscuredInsetForSafeBrowsingWarning
+{
+    if (_haveSetObscuredInsets)
+        return _obscuredInsets;
+
+#if PLATFORM(IOS)
+    return UIEdgeInsetsAdd(UIEdgeInsetsZero, self._scrollViewSystemContentInset, self._effectiveObscuredInsetEdgesAffectedBySafeArea);
+#else
+    return UIEdgeInsetsZero;
+#endif
+}
+
 - (UIEdgeInsets)_computedObscuredInset
 {
     if (!linkedOnOrAfter(WebKit::SDKVersion::FirstWhereScrollViewContentInsetsAreNotObscuringInsets)) {
@@ -1784,6 +1796,7 @@
     [super safeAreaInsetsDidChange];
 
     [self _scheduleVisibleContentRectUpdate];
+    [_safeBrowsingWarning setContentInset:[self _computedObscuredInsetForSafeBrowsingWarning]];
 }
 #endif
 
@@ -2428,6 +2441,7 @@
     _obscuredInsets = obscuredInsets;
 
     [self _scheduleVisibleContentRectUpdate];
+    [_safeBrowsingWarning setContentInset:[self _computedObscuredInsetForSafeBrowsingWarning]];
 }
 
 - (UIRectEdge)_obscuredInsetEdgesAffectedBySafeArea
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to