Title: [221273] branches/safari-604-branch/Source/WebKit
- Revision
- 221273
- Author
- [email protected]
- Date
- 2017-08-28 14:48:52 -0700 (Mon, 28 Aug 2017)
Log Message
Cherry-pick r221161. rdar://problem/34113784
Modified Paths
Diff
Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (221272 => 221273)
--- branches/safari-604-branch/Source/WebKit/ChangeLog 2017-08-28 21:48:49 UTC (rev 221272)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog 2017-08-28 21:48:52 UTC (rev 221273)
@@ -1,5 +1,22 @@
2017-08-28 Jason Marcell <[email protected]>
+ Cherry-pick r221161. rdar://problem/34113784
+
+ 2017-08-24 Tim Horton <[email protected]>
+
+ Overflow scroll views are inset to avoid safe areas even if the parent view is not
+ https://bugs.webkit.org/show_bug.cgi?id=175949
+ <rdar://problem/34063057>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ios/RemoteLayerTreeHostIOS.mm:
+ (WebKit::RemoteLayerTreeHost::createLayer):
+ Disable automatic content inset adjustment to avoid safe areas on
+ all of WKWebView's child UIScrollViews.
+
+2017-08-28 Jason Marcell <[email protected]>
+
Cherry-pick r221153. rdar://problem/34113728
2017-08-24 Tim Horton <[email protected]>
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/ios/RemoteLayerTreeHostIOS.mm (221272 => 221273)
--- branches/safari-604-branch/Source/WebKit/UIProcess/ios/RemoteLayerTreeHostIOS.mm 2017-08-28 21:48:49 UTC (rev 221272)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/ios/RemoteLayerTreeHostIOS.mm 2017-08-28 21:48:52 UTC (rev 221273)
@@ -221,9 +221,13 @@
view = adoptNS([[WKShapeView alloc] init]);
break;
case PlatformCALayer::LayerTypeScrollingLayer:
- if (!m_isDebugLayerTreeHost)
- view = adoptNS([[UIScrollView alloc] init]);
- else // The debug indicator parents views under layers, which can cause crashes with UIScrollView.
+ if (!m_isDebugLayerTreeHost) {
+ auto scrollView = adoptNS([[UIScrollView alloc] init]);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+ [scrollView setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentNever];
+#endif
+ view = scrollView;
+ } else // The debug indicator parents views under layers, which can cause crashes with UIScrollView.
view = adoptNS([[UIView alloc] init]);
break;
default:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
