<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[235741] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/235741">235741</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2018-09-06 09:56:13 -0700 (Thu, 06 Sep 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessPageClienth">trunk/Source/WebKit/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeiosRemoteScrollingCoordinatorProxyIOSmm">trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxyh">trunk/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebPageProxymessagesin">trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosPageClientImplIOSh">trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosPageClientImplIOSmm">trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebCoreSupportiosWebChromeClientIOSmm">trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,52 @@
</span><ins>+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):
+
</ins><span class="cx"> 2018-09-06  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebKit/Platform/IPC/mac/ConnectionMac.mm:222: _dispatch_bug_kevent_vanished
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/PageClient.h (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -358,10 +358,10 @@
</span><span class="cx">     virtual void disableDoubleTapGesturesDuringTapIfNecessary(uint64_t requestID) = 0;
</span><span class="cx">     virtual double minimumZoomScale() const = 0;
</span><span class="cx">     virtual WebCore::FloatRect documentRect() const = 0;
</span><del>-    virtual void overflowScrollViewWillStartPanGesture() = 0;
-    virtual void overflowScrollViewDidScroll() = 0;
-    virtual void overflowScrollWillStartScroll() = 0;
-    virtual void overflowScrollDidEndScroll() = 0;
</del><ins>+    virtual void scrollingNodeScrollViewWillStartPanGesture() = 0;
+    virtual void scrollingNodeScrollViewDidScroll() = 0;
+    virtual void scrollingNodeScrollWillStartScroll() = 0;
+    virtual void scrollingNodeScrollDidEndScroll() = 0;
</ins><span class="cx">     virtual Vector<String> mimeTypesWithCustomContentProviders() = 0;
</span><span class="cx"> 
</span><span class="cx">     virtual void showInspectorHighlight(const WebCore::Highlight&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-    m_webPageProxy.overflowScrollViewDidScroll();
</del><ins>+    m_webPageProxy.scrollingNodeScrollViewDidScroll();
</ins><span class="cx"> #endif
</span><span class="cx">     m_webPageProxy.send(Messages::RemoteScrollingCoordinator::ScrollPositionChangedForNode(scrolledNodeID, newScrollPosition, scrollingLayerPositionAction == ScrollingLayerPositionAction::Sync));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeiosRemoteScrollingCoordinatorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -101,17 +101,17 @@
</span><span class="cx"> 
</span><span class="cx"> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture()
</span><span class="cx"> {
</span><del>-    m_webPageProxy.overflowScrollViewWillStartPanGesture();
</del><ins>+    m_webPageProxy.scrollingNodeScrollViewWillStartPanGesture();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll()
</span><span class="cx"> {
</span><del>-    m_webPageProxy.overflowScrollWillStartScroll();
</del><ins>+    m_webPageProxy.scrollingNodeScrollWillStartScroll();
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll()
</span><span class="cx"> {
</span><del>-    m_webPageProxy.overflowScrollDidEndScroll();
</del><ins>+    m_webPageProxy.scrollingNodeScrollDidEndScroll();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -556,10 +556,10 @@
</span><span class="cx"> 
</span><span class="cx">     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;
</span><span class="cx"> 
</span><del>-    void overflowScrollViewWillStartPanGesture();
-    void overflowScrollViewDidScroll();
-    void overflowScrollWillStartScroll();
-    void overflowScrollDidEndScroll();
</del><ins>+    void scrollingNodeScrollViewWillStartPanGesture();
+    void scrollingNodeScrollViewDidScroll();
+    void scrollingNodeScrollWillStartScroll();
+    void scrollingNodeScrollDidEndScroll();
</ins><span class="cx"> 
</span><span class="cx">     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);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -405,8 +405,8 @@
</span><span class="cx"> 
</span><span class="cx">     StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, bool changingActivityState, WebKit::UserData userData)
</span><span class="cx">     StopAssistingNode()
</span><del>-    OverflowScrollWillStartScroll()
-    OverflowScrollDidEndScroll()
</del><ins>+    ScrollingNodeScrollWillStartScroll()
+    ScrollingNodeScrollDidEndScroll()
</ins><span class="cx">     ShowInspectorHighlight(struct WebCore::Highlight highlight)
</span><span class="cx">     HideInspectorHighlight()
</span><span class="cx">     AssistedNodeInformationCallback(struct WebKit::AssistedNodeInformation information, WebKit::CallbackID callbackID)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -159,10 +159,10 @@
</span><span class="cx">     void enableInspectorNodeSearch() override;
</span><span class="cx">     void disableInspectorNodeSearch() override;
</span><span class="cx"> 
</span><del>-    void overflowScrollViewWillStartPanGesture() override;
-    void overflowScrollViewDidScroll() override;
-    void overflowScrollWillStartScroll() override;
-    void overflowScrollDidEndScroll() override;
</del><ins>+    void scrollingNodeScrollViewWillStartPanGesture() override;
+    void scrollingNodeScrollViewDidScroll() override;
+    void scrollingNodeScrollWillStartScroll() override;
+    void scrollingNodeScrollDidEndScroll() override;
</ins><span class="cx"> 
</span><span class="cx">     // Auxiliary Client Creation
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -657,24 +657,24 @@
</span><span class="cx">     [m_webView _didFinishLoadingDataForCustomContentProviderWithSuggestedFilename:suggestedFilename data:data.get()];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageClientImpl::overflowScrollViewWillStartPanGesture()
</del><ins>+void PageClientImpl::scrollingNodeScrollViewWillStartPanGesture()
</ins><span class="cx"> {
</span><span class="cx">     [m_contentView scrollViewWillStartPanOrPinchGesture];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageClientImpl::overflowScrollViewDidScroll()
</del><ins>+void PageClientImpl::scrollingNodeScrollViewDidScroll()
</ins><span class="cx"> {
</span><span class="cx">     [m_contentView _didScroll];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageClientImpl::overflowScrollWillStartScroll()
</del><ins>+void PageClientImpl::scrollingNodeScrollWillStartScroll()
</ins><span class="cx"> {
</span><del>-    [m_contentView _overflowScrollingWillBegin];
</del><ins>+    [m_contentView _scrollingNodeScrollingWillBegin];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void PageClientImpl::overflowScrollDidEndScroll()
</del><ins>+void PageClientImpl::scrollingNodeScrollDidEndScroll()
</ins><span class="cx"> {
</span><del>-    [m_contentView _overflowScrollingDidEnd];
</del><ins>+    [m_contentView _scrollingNodeScrollingDidEnd];
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Vector<String> PageClientImpl::mimeTypesWithCustomContentProviders()
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -337,8 +337,8 @@
</span><span class="cx"> - (void)_willStartScrollingOrZooming;
</span><span class="cx"> - (void)_didScroll;
</span><span class="cx"> - (void)_didEndScrollingOrZooming;
</span><del>-- (void)_overflowScrollingWillBegin;
-- (void)_overflowScrollingDidEnd;
</del><ins>+- (void)_scrollingNodeScrollingWillBegin;
+- (void)_scrollingNodeScrollingDidEnd;
</ins><span class="cx"> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect routeSharingPolicy:(WebCore::RouteSharingPolicy)policy routingContextUID:(NSString *)contextUID;
</span><span class="cx"> - (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
</span><span class="cx"> - (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)shareData completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1269,13 +1269,13 @@
</span><span class="cx">     [self _cancelInteraction];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_overflowScrollingWillBegin
</del><ins>+- (void)_scrollingNodeScrollingWillBegin
</ins><span class="cx"> {
</span><span class="cx">     [_webSelectionAssistant willStartScrollingOverflow];
</span><span class="cx">     [_textSelectionAssistant willStartScrollingOverflow];    
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_overflowScrollingDidEnd
</del><ins>+- (void)_scrollingNodeScrollingDidEnd
</ins><span class="cx"> {
</span><span class="cx">     // If scrolling ends before we've received a selection update,
</span><span class="cx">     // we postpone showing the selection until the update is received.
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -285,24 +285,24 @@
</span><span class="cx">     return layoutViewportRect;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::overflowScrollViewWillStartPanGesture()
</del><ins>+void WebPageProxy::scrollingNodeScrollViewWillStartPanGesture()
</ins><span class="cx"> {
</span><del>-    m_pageClient.overflowScrollViewWillStartPanGesture();
</del><ins>+    m_pageClient.scrollingNodeScrollViewWillStartPanGesture();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::overflowScrollViewDidScroll()
</del><ins>+void WebPageProxy::scrollingNodeScrollViewDidScroll()
</ins><span class="cx"> {
</span><del>-    m_pageClient.overflowScrollViewDidScroll();
</del><ins>+    m_pageClient.scrollingNodeScrollViewDidScroll();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::overflowScrollWillStartScroll()
</del><ins>+void WebPageProxy::scrollingNodeScrollWillStartScroll()
</ins><span class="cx"> {
</span><del>-    m_pageClient.overflowScrollWillStartScroll();
</del><ins>+    m_pageClient.scrollingNodeScrollWillStartScroll();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void WebPageProxy::overflowScrollDidEndScroll()
</del><ins>+void WebPageProxy::scrollingNodeScrollDidEndScroll()
</ins><span class="cx"> {
</span><del>-    m_pageClient.overflowScrollDidEndScroll();
</del><ins>+    m_pageClient.scrollingNodeScrollDidEndScroll();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 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)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebCoreSupportiosWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (235740 => 235741)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -96,12 +96,12 @@
</span><span class="cx"> 
</span><span class="cx"> void WebChromeClient::didStartOverflowScroll()
</span><span class="cx"> {
</span><del>-    m_page.send(Messages::WebPageProxy::OverflowScrollWillStartScroll());
</del><ins>+    m_page.send(Messages::WebPageProxy::ScrollingNodeScrollWillStartScroll());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebChromeClient::didEndOverflowScroll()
</span><span class="cx"> {
</span><del>-    m_page.send(Messages::WebPageProxy::OverflowScrollDidEndScroll());
</del><ins>+    m_page.send(Messages::WebPageProxy::ScrollingNodeScrollDidEndScroll());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool WebChromeClient::hasStablePageScaleFactor() const
</span></span></pre>
</div>
</div>

</body>
</html>