Changeset 245985 in webkit

Timestamp:

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

Author:

Alan Coon

Message:

Revert r245953. rdar://problem/51314019

Location:

branches/safari-608.1.27-branch

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)

branches/safari-608.1.27-branch/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Revert r245953. rdar://problem/51314019
+
 2019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1.27-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Revert r245953. rdar://problem/51314019
+
 2019-05-31  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-608.1.27-branch/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()) {