Changeset 213643 in webkit

Timestamp:

Mar 9, 2017 8:26:41 AM (7 years ago)

Author:

timothy_horton@apple.com

Message:

WKWebView should automatically respect insets from the view controller hierarchy
​https://bugs.webkit.org/show_bug.cgi?id=169398
<rdar://problem/30617593>

Reviewed by Dean Jackson.

• Platform/spi/ios/UIKitSPI.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _initializeWithConfiguration:]):
(-[WKWebView _computedContentInset]):
(activeMinimumLayoutSize):
(-[WKWebView _frameOrBoundsChanged]):
Factor insets from above us in the view controller hierarchy into our
content insets (and layout size) automatically.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/spi/ios/UIKitSPI.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-03-09  Tim Horton  <timothy_horton@apple.com>
+
+        WKWebView should automatically respect insets from the view controller hierarchy
+        https://bugs.webkit.org/show_bug.cgi?id=169398
+        <rdar://problem/30617593>
+
+        Reviewed by Dean Jackson.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+        (-[WKWebView _computedContentInset]):
+        (activeMinimumLayoutSize):
+        (-[WKWebView _frameOrBoundsChanged]):
+        Factor insets from above us in the view controller hierarchy into our
+        content insets (and layout size) automatically.
+
 2017-03-09  Tomas Popela  <tpopela@redhat.com>
 

trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h

@@ -874 +874 @@
 @end
 
+@interface UIView ()
+- (void)safeAreaInsetsDidChange;
+@end
+
+@interface UIScrollView ()
+@property (nonatomic, setter=_setEdgesScrollingContentIntoSafeArea:) UIRectEdge _edgesScrollingContentIntoSafeArea;
+@property (nonatomic, readonly) UIEdgeInsets _systemContentInset;
+@end
+
 WTF_EXTERN_C_BEGIN
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -507 +507 @@
     [_scrollView setBouncesZoom:YES];
 
+    if ([_scrollView respondsToSelector:@selector(_setEdgesScrollingContentIntoSafeArea:)])
+        [_scrollView _setEdgesScrollingContentIntoSafeArea:UIRectEdgeAll];
+
     [self addSubview:_scrollView.get()];
 
@@ -1342 +1345 @@
         return _obscuredInsets;
 
-    return [_scrollView contentInset];
+    UIEdgeInsets insets = [_scrollView contentInset];
+
+    if ([_scrollView respondsToSelector:@selector(_systemContentInset)]) {
+        UIEdgeInsets systemInsets = [_scrollView _systemContentInset];
+        insets.top += systemInsets.top;
+        insets.bottom += systemInsets.bottom;
+        insets.left += systemInsets.left;
+        insets.right += systemInsets.right;
+    }
+
+    return insets;
 }
 
@@ -2192 +2205 @@
 }
 
+static WebCore::FloatSize activeMinimumLayoutSize(WKWebView *webView, const CGRect& bounds)
+{
+    if (webView->_overridesMinimumLayoutSize)
+        return WebCore::FloatSize(webView->_minimumLayoutSizeOverride);
+
+    if ([webView->_scrollView respondsToSelector:@selector(_systemContentInset)]) {
+        UIEdgeInsets systemContentInset = [webView->_scrollView _systemContentInset];
+        return WebCore::FloatSize(UIEdgeInsetsInsetRect(CGRectMake(0, 0, bounds.size.width, bounds.size.height), systemContentInset).size);
+    }
+
+    return WebCore::FloatSize(bounds.size);
+}
+
 - (void)_frameOrBoundsChanged
 {
@@ -2199 +2225 @@
     if (_dynamicViewportUpdateMode == DynamicViewportUpdateMode::NotResizing) {
         if (!_overridesMinimumLayoutSize)
-            _page->setViewportConfigurationMinimumLayoutSize(WebCore::FloatSize(bounds.size));
+            _page->setViewportConfigurationMinimumLayoutSize(activeMinimumLayoutSize(self, self.bounds));
         if (!_overridesMaximumUnobscuredSize)
             _page->setMaximumUnobscuredSize(WebCore::FloatSize(bounds.size));
@@ -2233 +2259 @@
     CGPoint boundedOffset = contentOffsetBoundedInValidRange(_scrollView.get(), contentOffset);
     return !pointsEqualInDevicePixels(contentOffset, boundedOffset, deviceScaleFactor);
+}
+
+- (void)safeAreaInsetsDidChange
+{
+    if ([super respondsToSelector:@selector(safeAreaInsetsDidChange)])
+        [super safeAreaInsetsDidChange];
+
+    [self _scheduleVisibleContentRectUpdate];
 }
 
@@ -3655 +3689 @@
 
 #if PLATFORM(IOS)
-static WebCore::FloatSize activeMinimumLayoutSize(WKWebView *webView, const CGRect& bounds)
-{
-    return WebCore::FloatSize(webView->_overridesMinimumLayoutSize ? webView->_minimumLayoutSizeOverride : bounds.size);
-}
-
 static WebCore::FloatSize activeMaximumUnobscuredSize(WKWebView *webView, const CGRect& bounds)
 {