<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211541] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211541">211541</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 17:12:53 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastvisualviewportiosbottombarwithkeyboardexpectedtxt">trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastvisualviewportiosbottombarwithkeyboardhtml">trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211540 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-01 23:49:41 UTC (rev 211540)
+++ trunk/LayoutTests/ChangeLog 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2017-02-01 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking compositing/repaint/fixed-background-scroll.html as flaky on macOS WK1.
</span></span></pre></div>
<a id="trunkLayoutTestsfastvisualviewportiosbottombarwithkeyboardexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt (0 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard-expected.txt 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Layout viewport: {"top":0,"right":320,"bottom":548,"left":0,"width":320,"height":548}
+Visual viewport: {"top":375,"right":220,"bottom":548,"left":0,"width":220,"height":173}
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastvisualviewportiosbottombarwithkeyboardhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard.html (0 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard.html (rev 0)
+++ trunk/LayoutTests/fast/visual-viewport/ios/bottom-bar-with-keyboard.html 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true ] -->
+
+<html>
+<head>
+ <meta name="viewport" content="initial-scale=1.0">
+ <style>
+ body {
+ height: 100%;
+ }
+ .fixed {
+ position: fixed;
+ background-color: silver;
+ bottom: 0;
+ padding: 10px;
+ }
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ function getFocusInputUIScript(x, y)
+ {
+ return `(function() {
+ uiController.didEndZoomingCallback = function() {
+ uiController.uiScriptComplete();
+ }
+
+ uiController.singleTapAtPoint(${x}, ${y}, function() {});
+ })();`;
+ }
+
+ function runTest()
+ {
+ if (!window.testRunner || !testRunner.runUIScript)
+ return;
+
+ var rect = document.getElementById('input').getBoundingClientRect();
+ // singleTapAtPoint takes document coordinates, so add scrollTop to clientRect.top.
+ testRunner.runUIScript(getFocusInputUIScript(rect.left, rect.top + document.scrollingElement.scrollTop), function() {
+ var output = 'Layout viewport: ' + JSON.stringify(internals.layoutViewportRect()) + '\nVisual viewport: ' + JSON.stringify(internals.visualViewportRect()) + '\n';
+ document.getElementById('results').innerText = output;
+
+ testRunner.notifyDone();
+ });
+ }
+
+ window.addEventListener('load', runTest, false);
+ </script>
+</head>
+<body>
+<pre id="results"></pre>
+<div class="fixed">
+ <input id="input" type="text">
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211540 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-01 23:49:41 UTC (rev 211540)
+++ trunk/Source/WebCore/ChangeLog 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-02-01 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Update CARingBuffer class
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (211540 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-01 23:49:41 UTC (rev 211540)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -2751,6 +2751,7 @@
</span><span class="cx"> if (!viewBounds.intersects(enclosingIntRect(absoluteBounds))) {
</span><span class="cx"> if (viewportConstrainedNotCompositedReason)
</span><span class="cx"> *viewportConstrainedNotCompositedReason = RenderLayer::NotCompositedForBoundsOutOfView;
</span><ins>+ LOG_WITH_STREAM(Compositing, stream << "Layer " << &layer << " bounds " << layerBounds << " outside visible rect " << viewBounds);
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211540 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-01 23:49:41 UTC (rev 211540)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+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:]):
+
</ins><span class="cx"> 2017-02-01 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> WebProcess crashes in int WTF::__throw_bad_variant_access<int> when expanding/shrinking a block selection.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (211540 => 211541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-01 23:49:41 UTC (rev 211540)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2017-02-02 01:12:53 UTC (rev 211541)
</span><span class="lines">@@ -2087,6 +2087,31 @@
</span><span class="cx"> || (contentSize.height + contentInset.top + contentInset.bottom) > boundsSize.height;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (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;
+}
+
</ins><span class="cx"> - (void)_updateContentRectsWithState:(BOOL)inStableState
</span><span class="cx"> {
</span><span class="cx"> if (![self usesStandardContentView]) {
</span><span class="lines">@@ -2113,11 +2138,12 @@
</span><span class="cx"> if (!_haveSetObscuredInsets)
</span><span class="cx"> computedContentInsetUnadjustedForKeyboard.bottom -= _totalScrollViewBottomInsetAdjustmentForKeyboard;
</span><span class="cx">
</span><ins>+ CGFloat scaleFactor = contentZoomScale(self);
+
</ins><span class="cx"> CGRect unobscuredRect = UIEdgeInsetsInsetRect(fullViewRect, computedContentInsetUnadjustedForKeyboard);
</span><span class="cx"> CGRect unobscuredRectInContentCoordinates = _frozenUnobscuredContentRect ? _frozenUnobscuredContentRect.value() : [self convertRect:unobscuredRect toView:_contentView.get()];
</span><ins>+ unobscuredRectInContentCoordinates = CGRectIntersection(unobscuredRectInContentCoordinates, [self _contentBoundsExtendedForRubberbandingWithScale:scaleFactor]);
</ins><span class="cx">
</span><del>- CGFloat scaleFactor = contentZoomScale(self);
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) && ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> if (inStableState) {
</span><span class="cx"> WebKit::RemoteScrollingCoordinatorProxy* coordinator = _page->scrollingCoordinatorProxy();
</span></span></pre>
</div>
</div>
</body>
</html>