Changeset 245984 in webkit

Timestamp:

May 31, 2019, 2:11:32 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard-expected.txt (deleted)
• LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-keyboard.html (deleted)
• LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1-expected.txt (deleted)
• LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-1.html (deleted)
• LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2-expected.txt (deleted)
• LayoutTests/fast/scrolling/ios/body-overflow-hidden-height-100-percent-zoomed-2.html (deleted)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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>
 

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

@@ -1989 +1989 @@
     [_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()) {