Attachment 349032 Details for Bug 179125 – Patch for landing

[patch] Patch for landing

0001-Bug-179125-Use-more-generic-names-than-overflow-for-.patch (text/plain), 16.02 KB, created by Frédéric Wang (:fredw) on 2018-09-06 09:18:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang (:fredw)

Created: 2018-09-06 09:18:10 PDT

Size: 16.02 KB

patch

obsolete

>From 18590a17720baa8908880cc56ddc3e96326573a7 Mon Sep 17 00:00:00 2001
>From: Frederic Wang <fwang@igalia.com>
>Date: Wed, 9 May 2018 14:28:04 +0200
>Subject: [PATCH xserver] Bug 179125 - Use more generic names than "overflow"
> for functions that can be used for subframes
>
>---
> Source/WebKit/ChangeLog                       | 49 +++++++++++++++++++
> Source/WebKit/UIProcess/PageClient.h          |  8 +--
> .../RemoteScrollingCoordinatorProxy.cpp       |  2 +-
> .../ios/RemoteScrollingCoordinatorProxyIOS.mm |  6 +--
> Source/WebKit/UIProcess/WebPageProxy.h        |  8 +--
> .../WebKit/UIProcess/WebPageProxy.messages.in |  4 +-
> .../WebKit/UIProcess/ios/PageClientImplIOS.h  |  8 +--
> .../WebKit/UIProcess/ios/PageClientImplIOS.mm | 12 ++---
> .../UIProcess/ios/WKContentViewInteraction.h  |  4 +-
> .../UIProcess/ios/WKContentViewInteraction.mm |  4 +-
> .../WebKit/UIProcess/ios/WebPageProxyIOS.mm   | 16 +++---
> .../WebCoreSupport/ios/WebChromeClientIOS.mm  |  4 +-
> 12 files changed, 87 insertions(+), 38 deletions(-)
>
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 266104c9dd0..81dee616def 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,52 @@
>+2017-11-03  Frederic Wang  <fwang@igalia.com>
>+
>+        Use more generic names than "overflow" for functions that can be used for subframes
>+        https://bugs.webkit.org/show_bug.cgi?id=179125
>+
>+        Reviewed by Simon Fraser..
>+
>+        Some functions will be used by subframes when iframe scrolling is implemented on iOS (see
>+        bug 149264). Currently they are only used for "overflow" nodes. This patch renames them to
>+        use a more generic "scrolling node" name.
>+
>+        * UIProcess/PageClient.h:
>+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
>+        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll):
>+        * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
>+        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture):
>+        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll):
>+        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll):
>+        * UIProcess/WebPageProxy.h:
>+        * UIProcess/WebPageProxy.messages.in:
>+        * UIProcess/ios/PageClientImplIOS.h:
>+        * UIProcess/ios/PageClientImplIOS.mm:
>+        (WebKit::PageClientImpl::scrollingNodeScrollViewWillStartPanGesture):
>+        (WebKit::PageClientImpl::scrollingNodeScrollViewDidScroll):
>+        (WebKit::PageClientImpl::scrollingNodeScrollWillStartScroll):
>+        (WebKit::PageClientImpl::scrollingNodeScrollDidEndScroll):
>+        (WebKit::PageClientImpl::overflowScrollViewWillStartPanGesture): Deleted.
>+        (WebKit::PageClientImpl::overflowScrollViewDidScroll): Deleted.
>+        (WebKit::PageClientImpl::overflowScrollWillStartScroll): Deleted.
>+        (WebKit::PageClientImpl::overflowScrollDidEndScroll): Deleted.
>+        * UIProcess/ios/WKContentViewInteraction.h:
>+        * UIProcess/ios/WKContentViewInteraction.mm:
>+        (-[WKContentView _scrollingNodeScrollingWillBegin]):
>+        (-[WKContentView _scrollingNodeScrollingDidEnd]):
>+        (-[WKContentView _overflowScrollingWillBegin]): Deleted.
>+        (-[WKContentView _overflowScrollingDidEnd]): Deleted.
>+        * UIProcess/ios/WebPageProxyIOS.mm:
>+        (WebKit::WebPageProxy::scrollingNodeScrollViewWillStartPanGesture):
>+        (WebKit::WebPageProxy::scrollingNodeScrollViewDidScroll):
>+        (WebKit::WebPageProxy::scrollingNodeScrollWillStartScroll):
>+        (WebKit::WebPageProxy::scrollingNodeScrollDidEndScroll):
>+        (WebKit::WebPageProxy::overflowScrollViewWillStartPanGesture): Deleted.
>+        (WebKit::WebPageProxy::overflowScrollViewDidScroll): Deleted.
>+        (WebKit::WebPageProxy::overflowScrollWillStartScroll): Deleted.
>+        (WebKit::WebPageProxy::overflowScrollDidEndScroll): Deleted.
>+        * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
>+        (WebKit::WebChromeClient::didStartOverflowScroll):
>+        (WebKit::WebChromeClient::didEndOverflowScroll):
>+
> 2018-09-04  Frederic Wang  <fwang@igalia.com>
> 
>         Add basic support for ScrollIntoViewOptions
>diff --git a/Source/WebKit/UIProcess/PageClient.h b/Source/WebKit/UIProcess/PageClient.h
>index bb09d1d6e52..c2afc7a4526 100644
>--- a/Source/WebKit/UIProcess/PageClient.h
>+++ b/Source/WebKit/UIProcess/PageClient.h
>@@ -358,10 +358,10 @@ public:
>     virtual void disableDoubleTapGesturesDuringTapIfNecessary(uint64_t requestID) = 0;
>     virtual double minimumZoomScale() const = 0;
>     virtual WebCore::FloatRect documentRect() const = 0;
>-    virtual void overflowScrollViewWillStartPanGesture() = 0;
>-    virtual void overflowScrollViewDidScroll() = 0;
>-    virtual void overflowScrollWillStartScroll() = 0;
>-    virtual void overflowScrollDidEndScroll() = 0;
>+    virtual void scrollingNodeScrollViewWillStartPanGesture() = 0;
>+    virtual void scrollingNodeScrollViewDidScroll() = 0;
>+    virtual void scrollingNodeScrollWillStartScroll() = 0;
>+    virtual void scrollingNodeScrollDidEndScroll() = 0;
>     virtual Vector<String> mimeTypesWithCustomContentProviders() = 0;
> 
>     virtual void showInspectorHighlight(const WebCore::Highlight&) = 0;
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>index 8fa85ca58ae..e549a549fad 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>@@ -171,7 +171,7 @@ void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll(ScrollingNodeID
>         return;
> 
> #if PLATFORM(IOS)
>-    m_webPageProxy.overflowScrollViewDidScroll();
>+    m_webPageProxy.scrollingNodeScrollViewDidScroll();
> #endif
>     m_webPageProxy.send(Messages::RemoteScrollingCoordinator::ScrollPositionChangedForNode(scrolledNodeID, newScrollPosition, scrollingLayerPositionAction == ScrollingLayerPositionAction::Sync));
> }
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>index 46f84d79c9b..c16a68dbd00 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>@@ -101,17 +101,17 @@ FloatRect RemoteScrollingCoordinatorProxy::customFixedPositionRect() const
> 
> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture()
> {
>-    m_webPageProxy.overflowScrollViewWillStartPanGesture();
>+    m_webPageProxy.scrollingNodeScrollViewWillStartPanGesture();
> }
> 
> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll()
> {
>-    m_webPageProxy.overflowScrollWillStartScroll();
>+    m_webPageProxy.scrollingNodeScrollWillStartScroll();
> }
>     
> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll()
> {
>-    m_webPageProxy.overflowScrollDidEndScroll();
>+    m_webPageProxy.scrollingNodeScrollDidEndScroll();
> }
> 
> #if ENABLE(CSS_SCROLL_SNAP)
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
>index 452814bc25f..3dd6dcabdd8 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.h
>+++ b/Source/WebKit/UIProcess/WebPageProxy.h
>@@ -556,10 +556,10 @@ public:
> 
>     WebCore::FloatRect computeCustomFixedPositionRect(const WebCore::FloatRect& unobscuredContentRect, const WebCore::FloatRect& unobscuredContentRectRespectingInputViewBounds, const WebCore::FloatRect& currentCustomFixedPositionRect, double displayedContentScale, WebCore::FrameView::LayoutViewportConstraint = WebCore::FrameView::LayoutViewportConstraint::Unconstrained, bool visualViewportEnabled = false) const;
> 
>-    void overflowScrollViewWillStartPanGesture();
>-    void overflowScrollViewDidScroll();
>-    void overflowScrollWillStartScroll();
>-    void overflowScrollDidEndScroll();
>+    void scrollingNodeScrollViewWillStartPanGesture();
>+    void scrollingNodeScrollViewDidScroll();
>+    void scrollingNodeScrollWillStartScroll();
>+    void scrollingNodeScrollDidEndScroll();
> 
>     void dynamicViewportSizeUpdate(const WebCore::FloatSize& viewLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& unobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation, DynamicViewportSizeUpdateID);
> 
>diff --git a/Source/WebKit/UIProcess/WebPageProxy.messages.in b/Source/WebKit/UIProcess/WebPageProxy.messages.in
>index 008dae74646..0f9277bb502 100644
>--- a/Source/WebKit/UIProcess/WebPageProxy.messages.in
>+++ b/Source/WebKit/UIProcess/WebPageProxy.messages.in
>@@ -405,8 +405,8 @@ messages -> WebPageProxy {
> 
>     StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, WebKit::UserData userData)
>     StopAssistingNode()
>-    OverflowScrollWillStartScroll()
>-    OverflowScrollDidEndScroll()
>+    ScrollingNodeScrollWillStartScroll()
>+    ScrollingNodeScrollDidEndScroll()
>     ShowInspectorHighlight(struct WebCore::Highlight highlight)
>     HideInspectorHighlight()
>     AssistedNodeInformationCallback(struct WebKit::AssistedNodeInformation information, WebKit::CallbackID callbackID)
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>index a814b3dd732..e4eaf48557d 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.h
>@@ -159,10 +159,10 @@ private:
>     void enableInspectorNodeSearch() override;
>     void disableInspectorNodeSearch() override;
> 
>-    void overflowScrollViewWillStartPanGesture() override;
>-    void overflowScrollViewDidScroll() override;
>-    void overflowScrollWillStartScroll() override;
>-    void overflowScrollDidEndScroll() override;
>+    void scrollingNodeScrollViewWillStartPanGesture() override;
>+    void scrollingNodeScrollViewDidScroll() override;
>+    void scrollingNodeScrollWillStartScroll() override;
>+    void scrollingNodeScrollDidEndScroll() override;
> 
>     // Auxiliary Client Creation
> #if ENABLE(FULLSCREEN_API)
>diff --git a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>index fac352902eb..d1cb445adaf 100644
>--- a/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
>@@ -657,24 +657,24 @@ void PageClientImpl::didFinishLoadingDataForCustomContentProvider(const String&
>     [m_webView _didFinishLoadingDataForCustomContentProviderWithSuggestedFilename:suggestedFilename data:data.get()];
> }
> 
>-void PageClientImpl::overflowScrollViewWillStartPanGesture()
>+void PageClientImpl::scrollingNodeScrollViewWillStartPanGesture()
> {
>     [m_contentView scrollViewWillStartPanOrPinchGesture];
> }
> 
>-void PageClientImpl::overflowScrollViewDidScroll()
>+void PageClientImpl::scrollingNodeScrollViewDidScroll()
> {
>     [m_contentView _didScroll];
> }
> 
>-void PageClientImpl::overflowScrollWillStartScroll()
>+void PageClientImpl::scrollingNodeScrollWillStartScroll()
> {
>-    [m_contentView _overflowScrollingWillBegin];
>+    [m_contentView _scrollingNodeScrollingWillBegin];
> }
> 
>-void PageClientImpl::overflowScrollDidEndScroll()
>+void PageClientImpl::scrollingNodeScrollDidEndScroll()
> {
>-    [m_contentView _overflowScrollingDidEnd];
>+    [m_contentView _scrollingNodeScrollingDidEnd];
> }
> 
> Vector<String> PageClientImpl::mimeTypesWithCustomContentProviders()
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>index cb975c84eea..4cf49cc3c2e 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
>@@ -337,8 +337,8 @@ FOR_EACH_WKCONTENTVIEW_ACTION(DECLARE_WKCONTENTVIEW_ACTION_FOR_WEB_VIEW)
> - (void)_willStartScrollingOrZooming;
> - (void)_didScroll;
> - (void)_didEndScrollingOrZooming;
>-- (void)_overflowScrollingWillBegin;
>-- (void)_overflowScrollingDidEnd;
>+- (void)_scrollingNodeScrollingWillBegin;
>+- (void)_scrollingNodeScrollingDidEnd;
> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect routeSharingPolicy:(WebCore::RouteSharingPolicy)policy routingContextUID:(NSString *)contextUID;
> - (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
> - (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)shareData completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
>diff --git a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>index 58b4c22591d..938d4a9df48 100644
>--- a/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>+++ b/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
>@@ -1269,13 +1269,13 @@ static NSValue *nsSizeForTapHighlightBorderRadius(WebCore::IntSize borderRadius,
>     [self _cancelInteraction];
> }
> 
>-- (void)_overflowScrollingWillBegin
>+- (void)_scrollingNodeScrollingWillBegin
> {
>     [_webSelectionAssistant willStartScrollingOverflow];
>     [_textSelectionAssistant willStartScrollingOverflow];    
> }
> 
>-- (void)_overflowScrollingDidEnd
>+- (void)_scrollingNodeScrollingDidEnd
> {
>     // If scrolling ends before we've received a selection update,
>     // we postpone showing the selection until the update is received.
>diff --git a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>index a40e9022a4c..9b1bbd7b5b1 100644
>--- a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
>@@ -285,24 +285,24 @@ WebCore::FloatRect WebPageProxy::computeCustomFixedPositionRect(const FloatRect&
>     return layoutViewportRect;
> }
> 
>-void WebPageProxy::overflowScrollViewWillStartPanGesture()
>+void WebPageProxy::scrollingNodeScrollViewWillStartPanGesture()
> {
>-    m_pageClient.overflowScrollViewWillStartPanGesture();
>+    m_pageClient.scrollingNodeScrollViewWillStartPanGesture();
> }
> 
>-void WebPageProxy::overflowScrollViewDidScroll()
>+void WebPageProxy::scrollingNodeScrollViewDidScroll()
> {
>-    m_pageClient.overflowScrollViewDidScroll();
>+    m_pageClient.scrollingNodeScrollViewDidScroll();
> }
> 
>-void WebPageProxy::overflowScrollWillStartScroll()
>+void WebPageProxy::scrollingNodeScrollWillStartScroll()
> {
>-    m_pageClient.overflowScrollWillStartScroll();
>+    m_pageClient.scrollingNodeScrollWillStartScroll();
> }
> 
>-void WebPageProxy::overflowScrollDidEndScroll()
>+void WebPageProxy::scrollingNodeScrollDidEndScroll()
> {
>-    m_pageClient.overflowScrollDidEndScroll();
>+    m_pageClient.scrollingNodeScrollDidEndScroll();
> }
> 
> void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& viewLayoutSize, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates, const WebCore::FloatBoxExtent& unobscuredSafeAreaInsets, double targetScale, int32_t deviceOrientation, DynamicViewportSizeUpdateID dynamicViewportSizeUpdateID)
>diff --git a/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm b/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm
>index dc391bd0ae7..6033f1aaf2e 100644
>--- a/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm
>+++ b/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm
>@@ -96,12 +96,12 @@ void WebChromeClient::didLayout(LayoutType type)
> 
> void WebChromeClient::didStartOverflowScroll()
> {
>-    m_page.send(Messages::WebPageProxy::OverflowScrollWillStartScroll());
>+    m_page.send(Messages::WebPageProxy::ScrollingNodeScrollWillStartScroll());
> }
> 
> void WebChromeClient::didEndOverflowScroll()
> {
>-    m_page.send(Messages::WebPageProxy::OverflowScrollDidEndScroll());
>+    m_page.send(Messages::WebPageProxy::ScrollingNodeScrollDidEndScroll());
> }
> 
> bool WebChromeClient::hasStablePageScaleFactor() const
>-- 
>2.18.0
>

Actions: View | Formatted Diff | Diff

Attachments on bug 179125: 325586 | 325892 | 340075 | 348914 | 349032