Diff
Modified: trunk/LayoutTests/ChangeLog (245983 => 245984)
--- trunk/LayoutTests/ChangeLog 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/ChangeLog 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,3 +1,17 @@
+2019-05-31 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r245953.
+ https://bugs.webkit.org/show_bug.cgi?id=198436
+
+ Broke quip (Requested by rniwa on #webkit).
+
+ Reverted changeset:
+
+ "iOS: Main frame should be scrollable when pinch zoomed or
+ software keyboard is up"
+ https://bugs.webkit.org/show_bug.cgi?id=198244
+ https://trac.webkit.org/changeset/245953
+
2019-05-31 Simon Fraser <simon.fra...@apple.com>
Move code that sets compositing paint phases into a single function
Deleted: trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt (245983 => 245984)
--- trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,4 +0,0 @@
-This document shouldn't be scrollable normally but should be scrollable when the software keyboard is shown.
-To manually test, tap on the text field below to bring up the docked software keyboard.
-The document should become scrollable.
-PASS - the document did scroll
Deleted: trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html (245983 => 245984)
--- trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,50 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true internal:AsyncOverflowScrollingEnabled=true internal:AsyncFrameScrollingEnabled=true ] -->
-<html>
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
-<script src=""
-<script src=""
-<style>
-html, body { width: 100%; height: 100%; margin: 0px; padding: 0px; }
-body { overflow: hidden; }
-#content { width: 100%; height: 100%; box-sizing: border-box; padding: 20px; background: #ccc; }
-</style>
-<script>
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-async function runTest() {
- if (!window.testRunner)
- return;
-
- await UIHelper.setHardwareKeyboardAttached(false);
-
- // FIXME: <rdar://problem/51289800> Scrolling down by touch gestures does not work immediately after software keyboard is brought up for the first time
- await UIHelper.activateElementAndWaitForInputSession(document.querySelector('input'));
- document.activeElement.blur();
- await UIHelper.waitForKeyboardToHide();
-
- await UIHelper.activateElementAndWaitForInputSession(document.querySelector('input'));
-
- const result = document.getElementById('result');
- const y = result.getBoundingClientRect().top + 10;
-
- await touchAndDragFromPointToPoint(200, y + 100, 200, y + 10);
- await liftUpAtPoint(200, y + 10);
- await UIHelper.delayFor(100);
-
- result.textContent = document.documentElement.scrollTop >= 50 ? 'PASS - the document did scroll' : 'FAIL - the document did not scroll';
-
- testRunner.notifyDone();
-}
-
-</script>
-<body _onload_="runTest()"><div id="content">
-This document shouldn't be scrollable normally but should be scrollable when the software keyboard is shown.<br>
-To manually test, tap on the text field below to bring up the docked software keyboard.<br>
-The document should become scrollable.<br>
-<div id="result"><input placeholder="Click here"></div>
-</div></body>
-</html>
Deleted: trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt (245983 => 245984)
--- trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,5 +0,0 @@
-This document shouldn't be scrollable normally but should be scrollable when pinch zoomed.
-To manually test, pinch zoom on the page. The document should become scrollable.
-PASS - the document did scroll with zooming
-PASS - the document scrolled back to the top
-
Deleted: trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html (245983 => 245984)
--- trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,48 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true internal:AsyncOverflowScrollingEnabled=true internal:AsyncFrameScrollingEnabled=true ] -->
-<html>
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<script src=""
-<script src=""
-<style>
-html, body { width: 100%; height: 100%; margin: 0px; padding: 0px; }
-body { overflow: hidden; }
-#content { width: 100%; height: 100%; box-sizing: border-box; padding: 20px; background: #ccc; }
-</style>
-<script>
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-async function runTest() {
- if (!window.testRunner)
- return;
-
- let result = '';
- const log = (text) => result += text + '\n';
-
- await UIHelper.zoomToScale(1.5);
-
- log(visualViewport.pageTop > 50 ? 'PASS - the document did scroll with zooming' : `FAIL - the document did not scroll with zooming: ${visualViewport.pageTop}`);
-
- await touchAndDragFromPointToPoint(200, 100, 200, 200);
- await liftUpAtPoint(200, 200);
- await UIHelper.delayFor(200);
-
- log(visualViewport.pageTop <= 0 ? 'PASS - the document scrolled back to the top' : `FAIL - the document did not scroll back to the top: ${visualViewport.pageTop}`);
-
- document.getElementById('log').textContent = result;
-
- testRunner.notifyDone();
-}
-
-</script>
-<body _onload_="runTest()">
-<div id="content">
-This document shouldn't be scrollable normally but should be scrollable when pinch zoomed.<br>
-To manually test, pinch zoom on the page. The document should become scrollable.
-</div>
-<pre id="log"></pre>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt (245983 => 245984)
--- trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,5 +0,0 @@
-This document shouldn't be scrollable normally but should be scrollable when pinch zoomed.
-To manually test, pinch zoom on the page. The document should become scrollable.
-PASS - the document did scroll with zooming
-PASS - the document scrolled back to the top
-
Deleted: trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html (245983 => 245984)
--- trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,53 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true internal:AsyncOverflowScrollingEnabled=true internal:AsyncFrameScrollingEnabled=true ] -->
-<html>
-<head>
-<script src=""
-<script src=""
-<style>
-html, body { width: 100%; height: 100%; margin: 0px; padding: 0px; }
-body { overflow: hidden; }
-#content { width: 100%; height: 100%; box-sizing: border-box; padding: 20px; background: #ccc; }
-</style>
-<script>
-if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
-}
-
-async function runTest() {
- if (!window.testRunner)
- return;
-
- let result = '';
- const log = (text) => result += text + '\n';
-
- const initialScale = await UIHelper.zoomScale();
- await UIHelper.zoomToScale(initialScale * 1.5);
- const finalScale = await UIHelper.zoomScale();
-
- log(visualViewport.pageTop > 100 ? 'PASS - the document did scroll with zooming' : `FAIL - the document did not scroll with zooming: ${visualViewport.pageTop}`);
-
- const x = visualViewport.pageLeft;
- const y = visualViewport.pageTop;
-
- await touchAndDragFromPointToPoint(x + 100, y + 100, x + 100, y + 200);
- await liftUpAtPoint(x + 100, y + 200);
- await UIHelper.delayFor(200);
-
- const expectedY = y - 80 * finalScale;
- log(visualViewport.pageTop < expectedY ? 'PASS - the document scrolled back to the top' : `FAIL - the document did not scroll back to the top: expected ${visualViewport.pageTop} < ${expectedY}`);
-
- document.getElementById('log').textContent = result;
-
- testRunner.notifyDone();
-}
-
-</script>
-<body _onload_="runTest()">
-<div id="content">
-This document shouldn't be scrollable normally but should be scrollable when pinch zoomed.<br>
-To manually test, pinch zoom on the page. The document should become scrollable.
-</div>
-<pre id="log"></pre>
-</body>
-</html>
Modified: trunk/Source/WebKit/ChangeLog (245983 => 245984)
--- trunk/Source/WebKit/ChangeLog 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/Source/WebKit/ChangeLog 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1,3 +1,17 @@
+2019-05-31 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r245953.
+ https://bugs.webkit.org/show_bug.cgi?id=198436
+
+ Broke quip (Requested by rniwa on #webkit).
+
+ Reverted changeset:
+
+ "iOS: Main frame should be scrollable when pinch zoomed or
+ software keyboard is up"
+ https://bugs.webkit.org/show_bug.cgi?id=198244
+ https://trac.webkit.org/changeset/245953
+
2019-05-31 Tim Horton <timothy_hor...@apple.com>
Optionally respect device management restrictions when loading from the network
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (245983 => 245984)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-05-31 20:56:40 UTC (rev 245983)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-05-31 21:11:32 UTC (rev 245984)
@@ -1988,9 +1988,7 @@
[_scrollView setMaximumZoomScale:layerTreeTransaction.maximumScaleFactor()];
[_scrollView setZoomEnabled:layerTreeTransaction.allowsUserScaling()];
#if ENABLE(ASYNC_SCROLLING)
- bool hasDockedInputView = !CGRectIsEmpty(_inputViewBounds);
- bool isZoomed = layerTreeTransaction.pageScaleFactor() > layerTreeTransaction.initialScaleFactor();
- [_scrollView setScrollEnabled:_page->scrollingCoordinatorProxy()->hasScrollableMainFrame() || hasDockedInputView || isZoomed];
+ [_scrollView setScrollEnabled:_page->scrollingCoordinatorProxy()->hasScrollableMainFrame()];
#endif
if (!layerTreeTransaction.scaleWasSetByUIProcess() && ![_scrollView isZooming] && ![_scrollView isZoomBouncing] && ![_scrollView _isAnimatingZoom] && [_scrollView zoomScale] != layerTreeTransaction.pageScaleFactor()) {
LOG_WITH_STREAM(VisibleRects, stream << " updating scroll view with pageScaleFactor " << layerTreeTransaction.pageScaleFactor());
