Diff
Modified: branches/safari-608.1.24.40-branch/LayoutTests/ChangeLog (245590 => 245591)
--- branches/safari-608.1.24.40-branch/LayoutTests/ChangeLog 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/LayoutTests/ChangeLog 2019-05-21 19:54:55 UTC (rev 245591)
@@ -1,3 +1,7 @@
+2019-05-21 Kocsen Chung <[email protected]>
+
+ Revert r245465. rdar://problem/50252398
+
2019-05-20 Kocsen Chung <[email protected]>
Cherry-pick r245465. rdar://problem/50252398
Modified: branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/body-overflow-hidden-frame-expected.html (245590 => 245591)
--- branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/body-overflow-hidden-frame-expected.html 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/body-overflow-hidden-frame-expected.html 2019-05-21 19:54:55 UTC (rev 245591)
@@ -11,7 +11,7 @@
<html>
<style>
body { overflow: hidden }
- .scroll-content { width: 500px; height: 5000px; border: 2px solid green; transform:translateZ(0) }
+ .scroll-content { width: 500px; height: 5000px; border: 2px solid green; }
</style>
<body>
<div class='scroll-content'>
Modified: branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/body-overflow-hidden-frame.html (245590 => 245591)
--- branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/body-overflow-hidden-frame.html 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/body-overflow-hidden-frame.html 2019-05-21 19:54:55 UTC (rev 245591)
@@ -32,7 +32,7 @@
<html>
<style>
body { overflow: hidden }
- .scroll-content { width: 500px; height: 5000px; border: 2px solid green; transform:translateZ(0) }
+ .scroll-content { width: 500px; height: 5000px; border: 2px solid green; }
</style>
<body>
<div class='scroll-content'>
Deleted: branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/frame-scrolling-no-expected.html (245590 => 245591)
--- branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/frame-scrolling-no-expected.html 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/frame-scrolling-no-expected.html 2019-05-21 19:54:55 UTC (rev 245591)
@@ -1,24 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true internal:AsyncFrameScrollingEnabled=true ] -->
-<html>
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<style>
-body { overflow: hidden }
-.scroll-content { width: 500px; height: 5000px; border: 2px solid green; }
-</style>
-<body>
-<iframe scrolling="no" srcdoc="
- <html>
- <style>
- .scroll-content { width: 500px; height: 5000px; border: 2px solid green; transform:translateZ(0) }
- </style>
- <body>
- <div class='scroll-content'>
- This document shouldn't be scrollable.
- </div>
- </body>
- </html>
-" width=500 height=500>
-</iframe>
-</body>
-</html>
Deleted: branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/frame-scrolling-no.html (245590 => 245591)
--- branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/frame-scrolling-no.html 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/LayoutTests/fast/scrolling/ios/frame-scrolling-no.html 2019-05-21 19:54:55 UTC (rev 245591)
@@ -1,45 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true internal:AsyncFrameScrollingEnabled=true ] -->
-<html>
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<script src=""
-<style>
-body { overflow: hidden }
-.scroll-content { width: 500px; height: 5000px; border: 2px solid green; }
-</style>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-function waitPromise(delay)
-{
- return new Promise(resolve => setTimeout(resolve, delay));
-}
-
-async function runTest() {
- if (!window.testRunner)
- return;
-
- await touchAndDragFromPointToPoint(150, 300, 150, 150);
- await liftUpAtPoint(150, 150);
- await waitPromise(50);
-
- testRunner.notifyDone();
-}
-</script>
-<body _onload_="runTest()">
-<iframe scrolling="no" srcdoc="
- <html>
- <style>
- .scroll-content { width: 500px; height: 5000px; border: 2px solid green; transform:translateZ(0) }
- </style>
- <body>
- <div class='scroll-content'>
- This document shouldn't be scrollable.
- </div>
- </body>
- </html>
-" width=500 height=500>
-</iframe>
-</body>
-</html>
Modified: branches/safari-608.1.24.40-branch/Source/WebKit/ChangeLog (245590 => 245591)
--- branches/safari-608.1.24.40-branch/Source/WebKit/ChangeLog 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/Source/WebKit/ChangeLog 2019-05-21 19:54:55 UTC (rev 245591)
@@ -1,3 +1,7 @@
+2019-05-21 Kocsen Chung <[email protected]>
+
+ Revert r245465. rdar://problem/50252398
+
2019-05-20 Kocsen Chung <[email protected]>
Cherry-pick r245465. rdar://problem/50252398
Modified: branches/safari-608.1.24.40-branch/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h (245590 => 245591)
--- branches/safari-608.1.24.40-branch/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.h 2019-05-21 19:54:55 UTC (rev 245591)
@@ -33,7 +33,6 @@
#include <WebCore/ScrollingTreeScrollingNodeDelegate.h>
OBJC_CLASS CALayer;
-OBJC_CLASS UIScrollView;
OBJC_CLASS WKScrollingNodeScrollViewDelegate;
namespace WebCore {
@@ -72,8 +71,6 @@
#endif
private:
- UIScrollView *scrollView() const;
-
RetainPtr<CALayer> m_scrollLayer;
RetainPtr<CALayer> m_scrolledContentsLayer;
RetainPtr<WKScrollingNodeScrollViewDelegate> m_scrollViewDelegate;
Modified: branches/safari-608.1.24.40-branch/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm (245590 => 245591)
--- branches/safari-608.1.24.40-branch/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm 2019-05-21 19:25:01 UTC (rev 245590)
+++ branches/safari-608.1.24.40-branch/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm 2019-05-21 19:54:55 UTC (rev 245591)
@@ -230,7 +230,9 @@
|| scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollPosition)
|| scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollOrigin)) {
BEGIN_BLOCK_OBJC_EXCEPTIONS
- UIScrollView *scrollView = this->scrollView();
+ UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate];
+ ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
+
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollContainerLayer)) {
if (!m_scrollViewDelegate)
m_scrollViewDelegate = adoptNS([[WKScrollingNodeScrollViewDelegate alloc] initWithScrollingTreeNodeDelegate:this]);
@@ -266,18 +268,21 @@
// FIXME: If only one axis snaps in 2D scrolling, the other axis will decelerate fast as well. Is this what we want?
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::HorizontalSnapOffsets) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::VerticalSnapOffsets)) {
BEGIN_BLOCK_OBJC_EXCEPTIONS
- scrollView().decelerationRate = scrollingNode().horizontalSnapOffsets().size() || scrollingNode().verticalSnapOffsets().size() ? UIScrollViewDecelerationRateFast : UIScrollViewDecelerationRateNormal;
+ UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate];
+ ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
+
+ scrollView.decelerationRate = scrollingNode().horizontalSnapOffsets().size() || scrollingNode().verticalSnapOffsets().size() ? UIScrollViewDecelerationRateFast : UIScrollViewDecelerationRateNormal;
+#endif
END_BLOCK_OBJC_EXCEPTIONS
}
-#endif
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollableAreaParams)) {
BEGIN_BLOCK_OBJC_EXCEPTIONS
- UIScrollView *scrollView = this->scrollView();
+ UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate];
+ ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
[scrollView setShowsHorizontalScrollIndicator:!scrollingNode().horizontalScrollbarHiddenByStyle()];
[scrollView setShowsVerticalScrollIndicator:!scrollingNode().verticalScrollbarHiddenByStyle()];
- [scrollView setScrollEnabled:scrollingNode().canHaveScrollbars()];
END_BLOCK_OBJC_EXCEPTIONS
}
@@ -293,7 +298,9 @@
auto scrollPosition = scrollingNode().currentScrollPosition();
BEGIN_BLOCK_OBJC_EXCEPTIONS
- [scrollView() setContentOffset:scrollPosition];
+ UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate];
+ ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
+ [scrollView setContentOffset:scrollPosition];
END_BLOCK_OBJC_EXCEPTIONS
}
@@ -328,13 +335,6 @@
scrollingTree().currentSnapPointIndicesDidChange(scrollingNode().scrollingNodeID(), horizontal, vertical);
}
-UIScrollView *ScrollingTreeScrollingNodeDelegateIOS::scrollView() const
-{
- UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate];
- ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
- return scrollView;
-}
-
#if ENABLE(POINTER_EVENTS)
OptionSet<TouchAction> ScrollingTreeScrollingNodeDelegateIOS::activeTouchActionsForGestureRecognizer(UIGestureRecognizer* gestureRecognizer) const
{
