Changeset 215468 in webkit

Timestamp:

Apr 18, 2017 10:14:58 AM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Force scroll view insets to be respected regardless of rubber-banding state
​https://bugs.webkit.org/show_bug.cgi?id=170937
<rdar://problem/31412788>

Reviewed by Simon Fraser.

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

(-[WKWebView _initializeWithConfiguration:]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-04-18  Timothy Horton  <timothy_horton@apple.com>
+
+        Force scroll view insets to be respected regardless of rubber-banding state
+        https://bugs.webkit.org/show_bug.cgi?id=170937
+        <rdar://problem/31412788>
+
+        Reviewed by Simon Fraser.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _initializeWithConfiguration:]):
+
 2017-04-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -306 +306 @@
 #endif
 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+typedef NS_ENUM(NSInteger, UIScrollViewContentInsetAdjustmentBehavior) {
+    UIScrollViewContentInsetAdjustmentAutomatic = 0,
+    UIScrollViewContentInsetAdjustmentAlways = 3,
+};
+#endif
+
 @interface UIScrollView ()
 - (void)_stopScrollingAndZoomingAnimations;
@@ -318 +325 @@
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
 @property (nonatomic, readonly) UIEdgeInsets _systemContentInset;
+@property (nonatomic, setter=_setContentInsetAdjustmentBehavior:, getter=_contentInsetAdjustmentBehavior) UIScrollViewContentInsetAdjustmentBehavior contentInsetAdjustmentBehavior;
 #endif
 @end

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

@@ -505 +505 @@
     [_scrollView setInternalDelegate:self];
     [_scrollView setBouncesZoom:YES];
+    
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+    if ([_scrollView _contentInsetAdjustmentBehavior] == UIScrollViewContentInsetAdjustmentAutomatic)
+        [_scrollView _setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentAlways];
+#endif
 
     [self addSubview:_scrollView.get()];