Attachment 373198 Details for Bug 198217 – Restore iOS 12 behavior; for EWS only

[patch] Restore iOS 12 behavior; for EWS only

bug-198217-20190630145638.patch (text/plain), 5.33 KB, created by Wenson Hsieh on 2019-06-30 14:56:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-06-30 14:56:38 PDT

Size: 5.33 KB

patch

obsolete

>Subversion Revision: 246947
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5e5bacdb18fb9788f8cfb0c2a6a97f5efd1a8c54..bc3a58c4996c48716a3c2a0e638c0f72068b00ed 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-30  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        iOS: REGRESSION(async scroll): Caret doesn't scroll when scrolling textarea
>+        https://bugs.webkit.org/show_bug.cgi?id=198217
>+        <rdar://problem/51097296>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Patch for EWS only.
>+
>+        * page/scrolling/ScrollingTreeScrollingNode.cpp:
>+        (WebCore::ScrollingTreeScrollingNode::wasScrolledByDelegatedScrolling):
>+        * page/scrolling/ScrollingTreeScrollingNode.h:
>+
> 2019-06-28  Zalan Bujtas  <zalan@apple.com>
> 
>         [Text autosizing][iPadOS] bing.com is hard to read even with boosted text because of the line height
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8ead54ff6f4abefb58a286e19b91931d0abf45a2..d82b45fc347c1e3b0929e7f9f6bf162bb39ed107 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-30  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        iOS: REGRESSION(async scroll): Caret doesn't scroll when scrolling textarea
>+        https://bugs.webkit.org/show_bug.cgi?id=198217
>+        <rdar://problem/51097296>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Patch for EWS only.
>+
>+        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
>+        (WebKit::ScrollingTreeScrollingNodeDelegateIOS::scrollViewDidScroll):
>+
> 2019-06-28  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed build fix attempt after r246928.
>diff --git a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp
>index 51b356a941f713a314fc0182ffdc4c4a60333194..44d6e8c667b66be9db33ba0f822764e10ee6f74e 100644
>--- a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp
>@@ -194,10 +194,10 @@ void ScrollingTreeScrollingNode::applyLayerPositions()
>     repositionRelatedLayers();
> }
> 
>-void ScrollingTreeScrollingNode::wasScrolledByDelegatedScrolling(const FloatPoint& position, Optional<FloatRect> overrideLayoutViewport)
>+void ScrollingTreeScrollingNode::wasScrolledByDelegatedScrolling(const FloatPoint& position, Optional<FloatRect> overrideLayoutViewport, ScrollingLayerPositionAction scrollingLayerPositionAction)
> {
>     bool scrollPositionChanged = !scrollPositionAndLayoutViewportMatch(position, overrideLayoutViewport);
>-    if (!scrollPositionChanged)
>+    if (!scrollPositionChanged && scrollingLayerPositionAction != ScrollingLayerPositionAction::Set)
>         return;
> 
>     m_currentScrollPosition = adjustedScrollPosition(position, ScrollPositionClamp::None);
>@@ -206,7 +206,7 @@ void ScrollingTreeScrollingNode::wasScrolledByDelegatedScrolling(const FloatPoin
>     repositionRelatedLayers();
> 
>     scrollingTree().notifyRelatedNodesAfterScrollPositionChange(*this);
>-    scrollingTree().scrollingTreeNodeDidScroll(*this);
>+    scrollingTree().scrollingTreeNodeDidScroll(*this, scrollingLayerPositionAction);
>     scrollingTree().didScrollByDelegatedScrolling();
> }
> 
>diff --git a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h
>index b22ffa79225a929cb069a6730f1bed7918d32409..7e5e45ca3297eec0dbf1ed67797eac9e37e58ba0 100644
>--- a/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h
>@@ -63,7 +63,7 @@ public:
>     void scrollTo(const FloatPoint&, ScrollType = ScrollType::User, ScrollPositionClamp = ScrollPositionClamp::ToContentEdges);
>     void scrollBy(const FloatSize&, ScrollPositionClamp = ScrollPositionClamp::ToContentEdges);
> 
>-    void wasScrolledByDelegatedScrolling(const FloatPoint& position, Optional<FloatRect> overrideLayoutViewport = { });
>+    void wasScrolledByDelegatedScrolling(const FloatPoint& position, Optional<FloatRect> overrideLayoutViewport = { }, ScrollingLayerPositionAction = ScrollingLayerPositionAction::Sync);
>     
>     const FloatSize& scrollableAreaSize() const { return m_scrollableAreaSize; }
>     const FloatSize& totalContentsSize() const { return m_totalContentsSize; }
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>index 5ea0382d4c7e4514ca87fa81460f2a4a471c0d85..1e55e4ef94f3ade6d07dfb787bc1b56aa8fd4e26 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>@@ -327,7 +327,7 @@ void ScrollingTreeScrollingNodeDelegateIOS::scrollViewDidScroll(const FloatPoint
>         return;
> 
>     auto scrollPosition = ScrollableArea::scrollPositionFromOffset(scrollOffset, toFloatSize(scrollOrigin()));
>-    scrollingNode().wasScrolledByDelegatedScrolling(scrollPosition);
>+    scrollingNode().wasScrolledByDelegatedScrolling(scrollPosition, { }, inUserInteraction ? ScrollingLayerPositionAction::Sync : ScrollingLayerPositionAction::Set);
> }
> 
> void ScrollingTreeScrollingNodeDelegateIOS::currentSnapPointIndicesDidChange(unsigned horizontal, unsigned vertical) const

Actions: View | Formatted Diff | Diff

Attachments on bug 198217: 373198 | 373232 | 373235