Changeset 171509 in webkit

Timestamp:

Jul 23, 2014 10:17:43 PM (10 years ago)

Author:

Simon Fraser

Message:

[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:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/WKContentView.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-23  Simon Fraser  <simon.fraser@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-23  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -207 +207 @@
     _rootContentView = adoptNS([[UIView alloc] init]);
     [_rootContentView layer].masksToBounds = NO;
-    
+    [_rootContentView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
+
     _fixedClippingView = adoptNS([[UIView alloc] init]);
     [_fixedClippingView layer].masksToBounds = YES;
@@ -314 +315 @@
         if (!_inspectorIndicationView) {
             _inspectorIndicationView = adoptNS([[WKInspectorIndicationView alloc] initWithFrame:[self bounds]]);
+            [_inspectorIndicationView setAutoresizingMask:UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight];
             [self insertSubview:_inspectorIndicationView.get() aboveSubview:_rootContentView.get()];
         }
@@ -444 +446 @@
 
     BOOL boundsChanged = !CGRectEqualToRect(oldBounds, contentBounds);
-    if (boundsChanged) {
+    if (boundsChanged)
         [self setBounds:contentBounds];
-        [_rootContentView setFrame:contentBounds];
-        [_inspectorIndicationView setFrame:contentBounds];
-    }
 
     [_webView _didCommitLayerTree:layerTreeTransaction];