Use more generic names than "overflow" for functions that can be used for subframes
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Sep 2018 16:56:13 +0000 (16:56 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Sep 2018 16:56:13 +0000 (16:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179125

Patch by Frederic Wang <fwang@igalia.com> on 2018-09-06
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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235741 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/WebKit/ChangeLog
Source/WebKit/UIProcess/PageClient.h
Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
Source/WebKit/UIProcess/WebPageProxy.h
Source/WebKit/UIProcess/WebPageProxy.messages.in
Source/WebKit/UIProcess/ios/PageClientImplIOS.h
Source/WebKit/UIProcess/ios/PageClientImplIOS.mm
Source/WebKit/UIProcess/ios/WKContentViewInteraction.h
Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm
Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm
Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm

index b2eeed8..5bb49f0 100644 (file)
@@ -1,3 +1,52 @@
+2018-09-06  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-06  Chris Dumez  <cdumez@apple.com>
 
         WebKit/Platform/IPC/mac/ConnectionMac.mm:222: _dispatch_bug_kevent_vanished
index bb09d1d..c2afc7a 100644 (file)
@@ -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;
index 8fa85ca..e549a54 100644 (file)
@@ -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));
 }
index 46f84d7..c16a68d 100644 (file)
@@ -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)
index 452814b..3dd6dca 100644 (file)
@@ -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);
 
index 008dae7..0f9277b 100644 (file)
@@ -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)
index a814b3d..e4eaf48 100644 (file)
@@ -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)
index fac3529..d1cb445 100644 (file)
@@ -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()
index cb975c8..4cf49cc 100644 (file)
@@ -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;
index 58b4c22..938d4a9 100644 (file)
@@ -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.
index a40e902..9b1bbd7 100644 (file)
@@ -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)
index dc391bd..6033f1a 100644 (file)
@@ -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