Diff
Modified: trunk/Source/WebKit/ChangeLog (235740 => 235741)
--- trunk/Source/WebKit/ChangeLog 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/ChangeLog 2018-09-06 16:56:13 UTC (rev 235741)
@@ -1,3 +1,52 @@
+2018-09-06 Frederic Wang <[email protected]>
+
+ 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 <[email protected]>
WebKit/Platform/IPC/mac/ConnectionMac.mm:222: _dispatch_bug_kevent_vanished
Modified: trunk/Source/WebKit/UIProcess/PageClient.h (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/PageClient.h 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/PageClient.h 2018-09-06 16:56:13 UTC (rev 235741)
@@ -358,10 +358,10 @@
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;
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 2018-09-06 16:56:13 UTC (rev 235741)
@@ -171,7 +171,7 @@
return;
#if PLATFORM(IOS)
- m_webPageProxy.overflowScrollViewDidScroll();
+ m_webPageProxy.scrollingNodeScrollViewDidScroll();
#endif
m_webPageProxy.send(Messages::RemoteScrollingCoordinator::ScrollPositionChangedForNode(scrolledNodeID, newScrollPosition, scrollingLayerPositionAction == ScrollingLayerPositionAction::Sync));
}
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm 2018-09-06 16:56:13 UTC (rev 235741)
@@ -101,17 +101,17 @@
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)
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h 2018-09-06 16:56:13 UTC (rev 235741)
@@ -556,10 +556,10 @@
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);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in 2018-09-06 16:56:13 UTC (rev 235741)
@@ -405,8 +405,8 @@
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)
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h 2018-09-06 16:56:13 UTC (rev 235741)
@@ -159,10 +159,10 @@
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)
Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm 2018-09-06 16:56:13 UTC (rev 235741)
@@ -657,24 +657,24 @@
[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()
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2018-09-06 16:56:13 UTC (rev 235741)
@@ -337,8 +337,8 @@
- (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;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-09-06 16:56:13 UTC (rev 235741)
@@ -1269,13 +1269,13 @@
[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.
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (235740 => 235741)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2018-09-06 16:56:13 UTC (rev 235741)
@@ -285,24 +285,24 @@
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)
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (235740 => 235741)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2018-09-06 16:41:32 UTC (rev 235740)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2018-09-06 16:56:13 UTC (rev 235741)
@@ -96,12 +96,12 @@
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
