Attachment 371083 Details for Bug 198436 – ROLLOUT of r245953

[patch] ROLLOUT of r245953

bug-198436-20190531140925.patch (text/plain), 11.91 KB, created by WebKit Commit Bot on 2019-05-31 14:09:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-05-31 14:09:26 PDT

Size: 11.91 KB

patch

obsolete

>Subversion Revision: 245983
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 979a98b561a21c7cb48785f990d53161b332627a..061a1e7f51111fc391b21febaaa7e73aa59f8cc0 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-31  Commit Queue  <commit-queue@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_horton@apple.com>
> 
>         Optionally respect device management restrictions when loading from the network
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index fa3f1e2db5f65ac4ac81e2235958f7d53427439d..d873d1481a70bad53222e6ee98f9e8476924740e 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -1988,9 +1988,7 @@ static inline bool areEssentiallyEqualAsFloat(float a, float b)
>     [_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());
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index a4e87bcdf1d0a2545464a5a2565e8d20a442f271..658d99a5d52be798f7c207b0e5b527b5db6fcf26 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-31  Commit Queue  <commit-queue@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.fraser@apple.com>
> 
>         Move code that sets compositing paint phases into a single function
>diff --git a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt b/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt
>deleted file mode 100644
>index 0fa6179283c1978dc0a8a4f974b05d4106afb754..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt
>+++ /dev/null
>@@ -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
>diff --git a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html b/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html
>deleted file mode 100644
>index e2faf8a0af7e6619371246bb98743bbc8e9ae38b..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html
>+++ /dev/null
>@@ -1,50 +0,0 @@
>-<!DOCTYPE html> 
>-<html>
>-<head>
>-<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
>-<script src="../../../resources/ui-helper.js"></script>
>-<script src="../../../resources/basic-gestures.js"></script>
>-<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>
>diff --git a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt b/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt
>deleted file mode 100644
>index 6e72a6a7f1c0c7ca3ec5ca1c63ee7a0f7b6381ab..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt
>+++ /dev/null
>@@ -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
>-
>diff --git a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html b/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html
>deleted file mode 100644
>index 8882a732bc64ed4b72a72ebffb95efc971a6ff68..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html
>+++ /dev/null
>@@ -1,48 +0,0 @@
>-<!DOCTYPE html> 
>-<html>
>-<head>
>-<meta name="viewport" content="width=device-width, initial-scale=1">
>-<script src="../../../resources/ui-helper.js"></script>
>-<script src="../../../resources/basic-gestures.js"></script>
>-<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>
>diff --git a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt b/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt
>deleted file mode 100644
>index 6e72a6a7f1c0c7ca3ec5ca1c63ee7a0f7b6381ab..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt
>+++ /dev/null
>@@ -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
>-
>diff --git a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html b/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html
>deleted file mode 100644
>index 32ec59e55abf311fff0e968afd64dcde6a1489ba..0000000000000000000000000000000000000000
>--- a/LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html
>+++ /dev/null
>@@ -1,53 +0,0 @@
>-<!DOCTYPE html> 
>-<html>
>-<head>
>-<script src="../../../resources/ui-helper.js"></script>
>-<script src="../../../resources/basic-gestures.js"></script>
>-<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>

Actions: View | Formatted Diff | Diff

Attachments on bug 198436: 371083