Changeset 211541 in webkit

Timestamp:

Feb 1, 2017 5:12:53 PM (7 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible
​https://bugs.webkit.org/show_bug.cgi?id=167710
rdar://problem/30100286

Reviewed by Wenson Hsieh.
Source/WebCore:

Add a bit of logging to show when RLC decides to not composite a fixed element which
is out of bounds.

Test: fast/visual-viewport/ios/bottom-bar-with-keyboard.html

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresCompositingForPosition):

Source/WebKit2:

The unobscuredRectInContentCoordinates passed to -didUpdateVisibleRect:... could project outside
of the bounds of the document, which is OK when rubber-banding, but not when we're in a stable state,
because that can cause fixed elements to get pushed outside the doc. This happened when the keyboard
triggered bottom content insets on the scroll view.

LayoutTests:

• fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt: Added.
• fast/visual-viewport/ios/bottom-bar-with-keyboard.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt (added)
• LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-01  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible
+        https://bugs.webkit.org/show_bug.cgi?id=167710
+        rdar://problem/30100286
+
+        Reviewed by Wenson Hsieh.
+
+        * fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt: Added.
+        * fast/visual-viewport/ios/bottom-bar-with-keyboard.html: Added.
+
 2017-02-01  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-01  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible
+        https://bugs.webkit.org/show_bug.cgi?id=167710
+        rdar://problem/30100286
+
+        Reviewed by Wenson Hsieh.
+        
+        Add a bit of logging to show when RLC decides to not composite a fixed element which
+        is out of bounds.
+
+        Test: fast/visual-viewport/ios/bottom-bar-with-keyboard.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+
 2017-02-01  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2752 +2752 @@
         if (viewportConstrainedNotCompositedReason)
             *viewportConstrainedNotCompositedReason = RenderLayer::NotCompositedForBoundsOutOfView;
+        LOG_WITH_STREAM(Compositing, stream << "Layer " << &layer << " bounds " << layerBounds << " outside visible rect " << viewBounds);
         return false;
     }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-02-01  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible
+        https://bugs.webkit.org/show_bug.cgi?id=167710
+        rdar://problem/30100286
+
+        Reviewed by Wenson Hsieh.
+
+        The unobscuredRectInContentCoordinates passed to -didUpdateVisibleRect:... could project outside
+        of the bounds of the document, which is OK when rubber-banding, but not when we're in a stable state,
+        because that can cause fixed elements to get pushed outside the doc. This happened when the keyboard
+        triggered bottom content insets on the scroll view.
+
+        Fix by computing a rectangle which is the "allowed" bounds of fixed content, which is permitted
+        to extend outside the document bounds only when rubber-banding, and intersect unobscuredRectInContentCoordinates
+        with that rectangle.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _contentBoundsExtendedForRubberbandingWithScale:]):
+        (-[WKWebView _updateContentRectsWithState:]):
+
 2017-02-01  Enrica Casucci  <enrica@apple.com>
 

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

@@ -2088 +2088 @@
 }
 
+- (CGRect)_contentBoundsExtendedForRubberbandingWithScale:(CGFloat)scaleFactor
+{
+    CGPoint contentOffset = [_scrollView contentOffset];
+    CGPoint boundedOffset = contentOffsetBoundedInValidRange(_scrollView.get(), contentOffset);
+
+    CGFloat horiontalRubberbandAmountInContentCoordinates = (contentOffset.x - boundedOffset.x) / scaleFactor;
+    CGFloat verticalRubberbandAmountInContentCoordinates = (contentOffset.y - boundedOffset.y) / scaleFactor;
+
+    CGRect extendedBounds = [_contentView bounds];
+
+    if (horiontalRubberbandAmountInContentCoordinates < 0) {
+        extendedBounds.origin.x += horiontalRubberbandAmountInContentCoordinates;
+        extendedBounds.size.width -= horiontalRubberbandAmountInContentCoordinates;
+    } else if (horiontalRubberbandAmountInContentCoordinates > 0)
+        extendedBounds.size.width += horiontalRubberbandAmountInContentCoordinates;
+
+    if (verticalRubberbandAmountInContentCoordinates < 0) {
+        extendedBounds.origin.y += verticalRubberbandAmountInContentCoordinates;
+        extendedBounds.size.height -= verticalRubberbandAmountInContentCoordinates;
+    } else if (verticalRubberbandAmountInContentCoordinates > 0)
+        extendedBounds.size.height += verticalRubberbandAmountInContentCoordinates;
+
+    return extendedBounds;
+}
+
 - (void)_updateContentRectsWithState:(BOOL)inStableState
 {
@@ -2114 +2139 @@
         computedContentInsetUnadjustedForKeyboard.bottom -= _totalScrollViewBottomInsetAdjustmentForKeyboard;
 
+    CGFloat scaleFactor = contentZoomScale(self);
+
     CGRect unobscuredRect = UIEdgeInsetsInsetRect(fullViewRect, computedContentInsetUnadjustedForKeyboard);
     CGRect unobscuredRectInContentCoordinates = _frozenUnobscuredContentRect ? _frozenUnobscuredContentRect.value() : [self convertRect:unobscuredRect toView:_contentView.get()];
-
-    CGFloat scaleFactor = contentZoomScale(self);
+    unobscuredRectInContentCoordinates = CGRectIntersection(unobscuredRectInContentCoordinates, [self _contentBoundsExtendedForRubberbandingWithScale:scaleFactor]);
 
 #if ENABLE(CSS_SCROLL_SNAP) && ENABLE(ASYNC_SCROLLING)