Title: [171539] branches/safari-600.1-branch/Source/WebKit2
- Revision
- 171539
- Author
- lforsch...@apple.com
- Date
- 2014-07-24 15:42:40 -0700 (Thu, 24 Jul 2014)
Log Message
Merged r171509. <rdar://problem/17790792>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171538 => 171539)
--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-24 22:40:50 UTC (rev 171538)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-24 22:42:40 UTC (rev 171539)
@@ -1,5 +1,31 @@
2014-07-24 Lucas Forschler <lforsch...@apple.com>
+ Merge r171509
+
+ 2014-07-23 Simon Fraser <simon.fra...@apple.com>
+
+ [iOS WK2] Some help.apple.com pages not scrollable
+ https://bugs.webkit.org/show_bug.cgi?id=135228
+ <rdar://problem/17790792>
+
+ Reviewed by Benjamin Poulain.
+
+ On pages which size their document to the device size, the WKContentView size
+ never changes after it's created. In this situation, we never set a bounds
+ on the _rootContentView, so it remains zero-sized which breaks hit testing
+ on all enclosed UIScrollViews for overflow:scroll.
+
+ Fix by making the _rootContentView and the _inspectorIndicationView use autosizing
+ so they are always the size of their parent view, and remove the explicit setting
+ of their bounds.
+
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView initWithFrame:context:configuration:webView:]):
+ (-[WKContentView setShowingInspectorIndication:]):
+ (-[WKContentView _didCommitLayerTree:]):
+
+2014-07-24 Lucas Forschler <lforsch...@apple.com>
+
Merge r171507
2014-07-23 Benjamin Poulain <bpoul...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (171538 => 171539)
--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-07-24 22:40:50 UTC (rev 171538)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-07-24 22:42:40 UTC (rev 171539)
@@ -206,7 +206,8 @@
_rootContentView = adoptNS([[UIView alloc] init]);
[_rootContentView layer].masksToBounds = NO;
-
+ [_rootContentView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+
_fixedClippingView = adoptNS([[UIView alloc] init]);
[_fixedClippingView layer].masksToBounds = YES;
[_fixedClippingView layer].anchorPoint = CGPointZero;
@@ -313,6 +314,7 @@
if (show) {
if (!_inspectorIndicationView) {
_inspectorIndicationView = adoptNS([[WKInspectorIndicationView alloc] initWithFrame:[self bounds]]);
+ [_inspectorIndicationView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
[self insertSubview:_inspectorIndicationView.get() aboveSubview:_rootContentView.get()];
}
} else {
@@ -443,11 +445,8 @@
CGRect oldBounds = [self bounds];
BOOL boundsChanged = !CGRectEqualToRect(oldBounds, contentBounds);
- if (boundsChanged) {
+ if (boundsChanged)
[self setBounds:contentBounds];
- [_rootContentView setFrame:contentBounds];
- [_inspectorIndicationView setFrame:contentBounds];
- }
[_webView _didCommitLayerTree:layerTreeTransaction];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
