Changeset 235741 in webkit


Ignore:
Timestamp:
Sep 6, 2018 9:56:13 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Use more generic names than "overflow" for functions that can be used for subframes
​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):

Location:
trunk/Source/WebKit
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r235739 r235741  
     12018-09-06  Frederic Wang  <fwang@igalia.com>
     2
     3        Use more generic names than "overflow" for functions that can be used for subframes
     4        https://bugs.webkit.org/show_bug.cgi?id=179125
     5
     6        Reviewed by Simon Fraser..
     7
     8        Some functions will be used by subframes when iframe scrolling is implemented on iOS (see
     9        bug 149264). Currently they are only used for "overflow" nodes. This patch renames them to
     10        use a more generic "scrolling node" name.
     11
     12        * UIProcess/PageClient.h:
     13        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
     14        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidScroll):
     15        * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
     16        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture):
     17        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll):
     18        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll):
     19        * UIProcess/WebPageProxy.h:
     20        * UIProcess/WebPageProxy.messages.in:
     21        * UIProcess/ios/PageClientImplIOS.h:
     22        * UIProcess/ios/PageClientImplIOS.mm:
     23        (WebKit::PageClientImpl::scrollingNodeScrollViewWillStartPanGesture):
     24        (WebKit::PageClientImpl::scrollingNodeScrollViewDidScroll):
     25        (WebKit::PageClientImpl::scrollingNodeScrollWillStartScroll):
     26        (WebKit::PageClientImpl::scrollingNodeScrollDidEndScroll):
     27        (WebKit::PageClientImpl::overflowScrollViewWillStartPanGesture): Deleted.
     28        (WebKit::PageClientImpl::overflowScrollViewDidScroll): Deleted.
     29        (WebKit::PageClientImpl::overflowScrollWillStartScroll): Deleted.
     30        (WebKit::PageClientImpl::overflowScrollDidEndScroll): Deleted.
     31        * UIProcess/ios/WKContentViewInteraction.h:
     32        * UIProcess/ios/WKContentViewInteraction.mm:
     33        (-[WKContentView _scrollingNodeScrollingWillBegin]):
     34        (-[WKContentView _scrollingNodeScrollingDidEnd]):
     35        (-[WKContentView _overflowScrollingWillBegin]): Deleted.
     36        (-[WKContentView _overflowScrollingDidEnd]): Deleted.
     37        * UIProcess/ios/WebPageProxyIOS.mm:
     38        (WebKit::WebPageProxy::scrollingNodeScrollViewWillStartPanGesture):
     39        (WebKit::WebPageProxy::scrollingNodeScrollViewDidScroll):
     40        (WebKit::WebPageProxy::scrollingNodeScrollWillStartScroll):
     41        (WebKit::WebPageProxy::scrollingNodeScrollDidEndScroll):
     42        (WebKit::WebPageProxy::overflowScrollViewWillStartPanGesture): Deleted.
     43        (WebKit::WebPageProxy::overflowScrollViewDidScroll): Deleted.
     44        (WebKit::WebPageProxy::overflowScrollWillStartScroll): Deleted.
     45        (WebKit::WebPageProxy::overflowScrollDidEndScroll): Deleted.
     46        * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
     47        (WebKit::WebChromeClient::didStartOverflowScroll):
     48        (WebKit::WebChromeClient::didEndOverflowScroll):
     49
    1502018-09-06  Chris Dumez  <cdumez@apple.com>
    251

  • trunk/Source/WebKit/UIProcess/PageClient.h

    r235489 r235741  
    359359    virtual double minimumZoomScale() const = 0;
    360360    virtual WebCore::FloatRect documentRect() const = 0;
    361     virtual void overflowScrollViewWillStartPanGesture() = 0;
    362     virtual void overflowScrollViewDidScroll() = 0;
    363     virtual void overflowScrollWillStartScroll() = 0;
    364     virtual void overflowScrollDidEndScroll() = 0;
     361    virtual void scrollingNodeScrollViewWillStartPanGesture() = 0;
     362    virtual void scrollingNodeScrollViewDidScroll() = 0;
     363    virtual void scrollingNodeScrollWillStartScroll() = 0;
     364    virtual void scrollingNodeScrollDidEndScroll() = 0;
    365365    virtual Vector<String> mimeTypesWithCustomContentProviders() = 0;
    366366

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp

    r235265 r235741  
    172172
    173173#if PLATFORM(IOS)
    174     m_webPageProxy.overflowScrollViewDidScroll();
     174    m_webPageProxy.scrollingNodeScrollViewDidScroll();
    175175#endif
    176176    m_webPageProxy.send(Messages::RemoteScrollingCoordinator::ScrollPositionChangedForNode(scrolledNodeID, newScrollPosition, scrollingLayerPositionAction == ScrollingLayerPositionAction::Sync));

  • trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm

    r235265 r235741  
    102102void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture()
    103103{
    104     m_webPageProxy.overflowScrollViewWillStartPanGesture();
     104    m_webPageProxy.scrollingNodeScrollViewWillStartPanGesture();
    105105}
    106106
    107107void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll()
    108108{
    109     m_webPageProxy.overflowScrollWillStartScroll();
     109    m_webPageProxy.scrollingNodeScrollWillStartScroll();
    110110}
    111111   
    112112void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll()
    113113{
    114     m_webPageProxy.overflowScrollDidEndScroll();
     114    m_webPageProxy.scrollingNodeScrollDidEndScroll();
    115115}
    116116

  • trunk/Source/WebKit/UIProcess/WebPageProxy.h

    r235559 r235741  
    557557    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;
    558558
    559     void overflowScrollViewWillStartPanGesture();
    560     void overflowScrollViewDidScroll();
    561     void overflowScrollWillStartScroll();
    562     void overflowScrollDidEndScroll();
     559    void scrollingNodeScrollViewWillStartPanGesture();
     560    void scrollingNodeScrollViewDidScroll();
     561    void scrollingNodeScrollWillStartScroll();
     562    void scrollingNodeScrollDidEndScroll();
    563563
    564564    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);

  • trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in

    r235489 r235741  
    406406    StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, WebKit::UserData userData)
    407407    StopAssistingNode()
    408     OverflowScrollWillStartScroll()
    409     OverflowScrollDidEndScroll()
     408    ScrollingNodeScrollWillStartScroll()
     409    ScrollingNodeScrollDidEndScroll()
    410410    ShowInspectorHighlight(struct WebCore::Highlight highlight)
    411411    HideInspectorHighlight()

  • trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

    r235489 r235741  
    160160    void disableInspectorNodeSearch() override;
    161161
    162     void overflowScrollViewWillStartPanGesture() override;
    163     void overflowScrollViewDidScroll() override;
    164     void overflowScrollWillStartScroll() override;
    165     void overflowScrollDidEndScroll() override;
     162    void scrollingNodeScrollViewWillStartPanGesture() override;
     163    void scrollingNodeScrollViewDidScroll() override;
     164    void scrollingNodeScrollWillStartScroll() override;
     165    void scrollingNodeScrollDidEndScroll() override;
    166166
    167167    // Auxiliary Client Creation

  • trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

    r235556 r235741  
    658658}
    659659
    660 void PageClientImpl::overflowScrollViewWillStartPanGesture()
     660void PageClientImpl::scrollingNodeScrollViewWillStartPanGesture()
    661661{
    662662    [m_contentView scrollViewWillStartPanOrPinchGesture];
    663663}
    664664
    665 void PageClientImpl::overflowScrollViewDidScroll()
     665void PageClientImpl::scrollingNodeScrollViewDidScroll()
    666666{
    667667    [m_contentView _didScroll];
    668668}
    669669
    670 void PageClientImpl::overflowScrollWillStartScroll()
    671 {
    672     [m_contentView _overflowScrollingWillBegin];
    673 }
    674 
    675 void PageClientImpl::overflowScrollDidEndScroll()
    676 {
    677     [m_contentView _overflowScrollingDidEnd];
     670void PageClientImpl::scrollingNodeScrollWillStartScroll()
     671{
     672    [m_contentView _scrollingNodeScrollingWillBegin];
     673}
     674
     675void PageClientImpl::scrollingNodeScrollDidEndScroll()
     676{
     677    [m_contentView _scrollingNodeScrollingDidEnd];
    678678}
    679679

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

    r235556 r235741  
    338338- (void)_didScroll;
    339339- (void)_didEndScrollingOrZooming;
    340 - (void)_overflowScrollingWillBegin;
    341 - (void)_overflowScrollingDidEnd;
     340- (void)_scrollingNodeScrollingWillBegin;
     341- (void)_scrollingNodeScrollingDidEnd;
    342342- (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect routeSharingPolicy:(WebCore::RouteSharingPolicy)policy routingContextUID:(NSString *)contextUID;
    343343- (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;

  • trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

    r235556 r235741  
    12701270}
    12711271
    1272 - (void)_overflowScrollingWillBegin
     1272- (void)_scrollingNodeScrollingWillBegin
    12731273{
    12741274    [_webSelectionAssistant willStartScrollingOverflow];
    … …  
    12761276}
    12771277
    1278 - (void)_overflowScrollingDidEnd
     1278- (void)_scrollingNodeScrollingDidEnd
    12791279{
    12801280    // If scrolling ends before we've received a selection update,

  • trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm

    r235398 r235741  
    286286}
    287287
    288 void WebPageProxy::overflowScrollViewWillStartPanGesture()
    289 {
    290     m_pageClient.overflowScrollViewWillStartPanGesture();
    291 }
    292 
    293 void WebPageProxy::overflowScrollViewDidScroll()
    294 {
    295     m_pageClient.overflowScrollViewDidScroll();
    296 }
    297 
    298 void WebPageProxy::overflowScrollWillStartScroll()
    299 {
    300     m_pageClient.overflowScrollWillStartScroll();
    301 }
    302 
    303 void WebPageProxy::overflowScrollDidEndScroll()
    304 {
    305     m_pageClient.overflowScrollDidEndScroll();
     288void WebPageProxy::scrollingNodeScrollViewWillStartPanGesture()
     289{
     290    m_pageClient.scrollingNodeScrollViewWillStartPanGesture();
     291}
     292
     293void WebPageProxy::scrollingNodeScrollViewDidScroll()
     294{
     295    m_pageClient.scrollingNodeScrollViewDidScroll();
     296}
     297
     298void WebPageProxy::scrollingNodeScrollWillStartScroll()
     299{
     300    m_pageClient.scrollingNodeScrollWillStartScroll();
     301}
     302
     303void WebPageProxy::scrollingNodeScrollDidEndScroll()
     304{
     305    m_pageClient.scrollingNodeScrollDidEndScroll();
    306306}
    307307

  • trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm

    r235205 r235741  
    9797void WebChromeClient::didStartOverflowScroll()
    9898{
    99     m_page.send(Messages::WebPageProxy::OverflowScrollWillStartScroll());
     99    m_page.send(Messages::WebPageProxy::ScrollingNodeScrollWillStartScroll());
    100100}
    101101
    102102void WebChromeClient::didEndOverflowScroll()
    103103{
    104     m_page.send(Messages::WebPageProxy::OverflowScrollDidEndScroll());
     104    m_page.send(Messages::WebPageProxy::ScrollingNodeScrollDidEndScroll());
    105105}
    106106
Note: See TracChangeset for help on using the changeset viewer.