<!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>[171467] branches/safari-600.1-branch/Source</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/171467">171467</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-23 01:42:20 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171370">r171370</a>. <rdar://problem/16721055></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreloaderEmptyClientsh">branches/safari-600.1-branch/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepageEditorClienth">branches/safari-600.1-branch/Source/WebCore/page/EditorClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">branches/safari-600.1-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebCorepagescrollingScrollingTreeh">branches/safari-600.1-branch/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacChangeLog">branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKitmacWebCoreSupportWebEditorClienth">branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessPageClienth">branches/safari-600.1-branch/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessScrollingRemoteScrollingTreeh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosPageClientImplIOSh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosPageClientImplIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosRemoteScrollingCoordinatorProxyIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWebPageProxyIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebCoreSupportWebEditorClienth">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebProcessWebCoreSupportiosWebEditorClientIOSmm">branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171370
+
+ 2014-07-22 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION (WebKit2): Selection inside accelerated overflow:scroll doesn't track scrolling.
+ https://bugs.webkit.org/show_bug.cgi?id=135180
+ <rdar://problem/16721055>
+
+ Reviewed by Simon Fraser.
+
+ AsyncScrollingCoordinator will force a selection update on iOS
+ when scrolling terminates in an overflow scroll.
+
+ * loader/EmptyClients.h:
+ * page/EditorClient.h:
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
+ * page/scrolling/ScrollingTree.h:
+ (WebCore::ScrollingTree::scrollingTreeNodeWillStartScroll):
+ (WebCore::ScrollingTree::scrollingTreeNodeDidEndScroll):
+
+2014-07-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171355
</span><span class="cx">
</span><span class="cx"> 2014-07-21 Sam Weinig <sam@webkit.org>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/loader/EmptyClients.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/loader/EmptyClients.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebCore/loader/EmptyClients.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -471,6 +471,7 @@
</span><span class="cx"> virtual bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*) override { return false; }
</span><span class="cx"> virtual void textWillBeDeletedInTextField(Element*) override { }
</span><span class="cx"> virtual void textDidChangeInTextArea(Element*) override { }
</span><ins>+ virtual void overflowScrollPositionChanged() override { }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() override { }
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepageEditorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/EditorClient.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/EditorClient.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebCore/page/EditorClient.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -119,6 +119,7 @@
</span><span class="cx"> virtual bool doTextFieldCommandFromEvent(Element*, KeyboardEvent*) = 0;
</span><span class="cx"> virtual void textWillBeDeletedInTextField(Element*) = 0;
</span><span class="cx"> virtual void textDidChangeInTextArea(Element*) = 0;
</span><ins>+ virtual void overflowScrollPositionChanged() = 0;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() = 0;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> #include "AsyncScrollingCoordinator.h"
</span><span class="cx">
</span><ins>+#include "EditorClient.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "GraphicsLayer.h"
</span><span class="lines">@@ -308,6 +309,8 @@
</span><span class="cx"> scrollableArea->setIsUserScroll(scrollingLayerPositionAction == SyncScrollingLayerPosition);
</span><span class="cx"> scrollableArea->scrollToOffsetWithoutAnimation(scrollPosition);
</span><span class="cx"> scrollableArea->setIsUserScroll(false);
</span><ins>+ if (scrollingLayerPositionAction == SetScrollingLayerPosition)
+ m_page->editorClient()->overflowScrollPositionChanged();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/page/scrolling/ScrollingTree.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/page/scrolling/ScrollingTree.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebCore/page/scrolling/ScrollingTree.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -93,6 +93,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual FloatRect fixedPositionRect() = 0;
</span><span class="cx"> virtual void scrollingTreeNodeWillStartPanGesture() { }
</span><ins>+ virtual void scrollingTreeNodeWillStartScroll() { }
+ virtual void scrollingTreeNodeDidEndScroll() { }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isPointInNonFastScrollableRegion(IntPoint);
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit/mac/ChangeLog 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171370
+
+ 2014-07-22 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION (WebKit2): Selection inside accelerated overflow:scroll doesn't track scrolling.
+ https://bugs.webkit.org/show_bug.cgi?id=135180
+ <rdar://problem/16721055>
+
+ Reviewed by Simon Fraser.
+
+ * WebCoreSupport/WebEditorClient.h:
+
+2014-07-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171345
</span><span class="cx">
</span><span class="cx"> 2014-07-22 Jeremy Jones <jeremyj@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx"> virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) override;
</span><span class="cx"> virtual void textWillBeDeletedInTextField(WebCore::Element*) override;
</span><span class="cx"> virtual void textDidChangeInTextArea(WebCore::Element*) override;
</span><ins>+ virtual void overflowScrollPositionChanged() override { };
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual void startDelayingAndCoalescingContentChangeNotifications() override;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -1,5 +1,58 @@
</span><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171370
+
+ 2014-07-22 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION (WebKit2): Selection inside accelerated overflow:scroll doesn't track scrolling.
+ https://bugs.webkit.org/show_bug.cgi?id=135180
+ <rdar://problem/16721055>
+
+ Reviewed by Simon Fraser.
+
+ Adds notifications to the WKContentView to know when scrolling starts and ends
+ in an overflow scroll. When scrolling starts, we hide the selection and we restore
+ it when scrolling ends, though not before the selection information in the editor
+ state has been updated.
+ It also adds a new method to the EditorClient class to force the
+ selection update when scrolling is completed.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/Scrolling/RemoteScrollingTree.cpp:
+ (WebKit::RemoteScrollingTree::scrollingTreeNodeWillStartScroll):
+ (WebKit::RemoteScrollingTree::scrollingTreeNodeDidEndScroll):
+ * UIProcess/Scrolling/RemoteScrollingTree.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (-[WKOverflowScrollViewDelegate scrollViewWillBeginDragging:]):
+ (-[WKOverflowScrollViewDelegate scrollViewDidEndDragging:willDecelerate:]):
+ (-[WKOverflowScrollViewDelegate scrollViewDidEndDecelerating:]):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::overflowScrollWillStart):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::overflowScrollDidEnd):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::overflowScrollWillStartScroll):
+ (WebKit::PageClientImpl::overflowScrollDidEndScroll):
+ * UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm:
+ (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll):
+ (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _overflowScrollingWillBegin]):
+ (-[WKContentView _overflowScrollingDidEnd]):
+ (-[WKContentView _updateChangedSelection]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::overflowScrollWillStartScroll):
+ (WebKit::WebPageProxy::overflowScrollDidEndScroll):
+ * WebProcess/WebCoreSupport/WebEditorClient.h:
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ * WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm:
+ (WebKit::WebEditorClient::updateSelection):
+
+2014-07-23 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r171368
</span><span class="cx">
</span><span class="cx"> 2014-07-22 Benjamin Poulain <bpoulain@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/PageClient.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/PageClient.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/PageClient.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -273,6 +273,8 @@
</span><span class="cx"> virtual WebCore::FloatSize contentsSize() const = 0;
</span><span class="cx"> virtual void overflowScrollViewWillStartPanGesture() = 0;
</span><span class="cx"> virtual void overflowScrollViewDidScroll() = 0;
</span><ins>+ virtual void overflowScrollWillStartScroll() = 0;
+ virtual void overflowScrollDidEndScroll() = 0;
</ins><span class="cx"> virtual void didFinishDrawingPagesToPDF(const IPC::DataReference&) = 0;
</span><span class="cx"> virtual Vector<String> mimeTypesWithCustomContentProviders() = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -75,6 +75,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> WebCore::FloatRect customFixedPositionRect() const;
</span><span class="cx"> void scrollingTreeNodeWillStartPanGesture();
</span><ins>+ void scrollingTreeNodeWillStartScroll();
+ void scrollingTreeNodeDidEndScroll();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -87,6 +87,17 @@
</span><span class="cx"> {
</span><span class="cx"> m_scrollingCoordinatorProxy.scrollingTreeNodeWillStartPanGesture();
</span><span class="cx"> }
</span><ins>+
+void RemoteScrollingTree::scrollingTreeNodeWillStartScroll()
+{
+ m_scrollingCoordinatorProxy.scrollingTreeNodeWillStartScroll();
+}
+
+void RemoteScrollingTree::scrollingTreeNodeDidEndScroll()
+{
+ m_scrollingCoordinatorProxy.scrollingTreeNodeDidEndScroll();
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void RemoteScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessScrollingRemoteScrollingTreeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -59,6 +59,8 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> virtual WebCore::FloatRect fixedPositionRect() override;
</span><span class="cx"> virtual void scrollingTreeNodeWillStartPanGesture() override;
</span><ins>+ virtual void scrollingTreeNodeWillStartScroll() override;
+ virtual void scrollingTreeNodeDidEndScroll() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::ScrollingTreeNode> createScrollingTreeNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID) override;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> static PassRefPtr<ScrollingTreeOverflowScrollingNodeIOS> create(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
</span><span class="cx"> virtual ~ScrollingTreeOverflowScrollingNodeIOS();
</span><span class="cx">
</span><ins>+ void overflowScrollWillStart();
+ void overflowScrollDidEnd();
</ins><span class="cx"> void overflowScrollViewWillStartPanGesture();
</span><span class="cx"> void scrollViewDidScroll(const WebCore::FloatPoint&, bool inUserInteration);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> if (scrollView.panGestureRecognizer.state == UIGestureRecognizerStateBegan)
</span><span class="cx"> _scrollingTreeNode->overflowScrollViewWillStartPanGesture();
</span><ins>+ _scrollingTreeNode->overflowScrollWillStart();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)willDecelerate
</span><span class="lines">@@ -77,6 +78,7 @@
</span><span class="cx"> if (_inUserInteraction && !willDecelerate) {
</span><span class="cx"> _inUserInteraction = NO;
</span><span class="cx"> _scrollingTreeNode->scrollViewDidScroll(scrollView.contentOffset, _inUserInteraction);
</span><ins>+ _scrollingTreeNode->overflowScrollDidEnd();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -85,6 +87,7 @@
</span><span class="cx"> if (_inUserInteraction) {
</span><span class="cx"> _inUserInteraction = NO;
</span><span class="cx"> _scrollingTreeNode->scrollViewDidScroll(scrollView.contentOffset, _inUserInteraction);
</span><ins>+ _scrollingTreeNode->overflowScrollDidEnd();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -232,6 +235,16 @@
</span><span class="cx"> child->updateLayersAfterAncestorChange(*this, fixedPositionRect, scrollDelta);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollingTreeOverflowScrollingNodeIOS::overflowScrollWillStart()
+{
+ scrollingTree().scrollingTreeNodeWillStartScroll();
+}
+
+void ScrollingTreeOverflowScrollingNodeIOS::overflowScrollDidEnd()
+{
+ scrollingTree().scrollingTreeNodeDidEndScroll();
+}
+
</ins><span class="cx"> void ScrollingTreeOverflowScrollingNodeIOS::overflowScrollViewWillStartPanGesture()
</span><span class="cx"> {
</span><span class="cx"> scrollingTree().scrollingTreeNodeWillStartPanGesture();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -390,6 +390,8 @@
</span><span class="cx"> WebCore::FloatRect computeCustomFixedPositionRect(const WebCore::FloatRect& unobscuredContentRect, double displayedContentScale, UnobscuredRectConstraint = UnobscuredRectConstraint::Unconstrained) const;
</span><span class="cx"> void overflowScrollViewWillStartPanGesture();
</span><span class="cx"> void overflowScrollViewDidScroll();
</span><ins>+ void overflowScrollWillStartScroll();
+ void overflowScrollDidEndScroll();
</ins><span class="cx">
</span><span class="cx"> void dynamicViewportSizeUpdate(const WebCore::FloatSize& minimumLayoutSize, const WebCore::FloatSize& minimumLayoutSizeForMinimalUI, const WebCore::FloatSize& maximumUnobscuredSize, const WebCore::FloatRect& targetExposedContentRect, const WebCore::FloatRect& targetUnobscuredRect, const WebCore::FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation);
</span><span class="cx"> void synchronizeDynamicViewportUpdate();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -147,6 +147,9 @@
</span><span class="cx"> virtual void zoomToRect(WebCore::FloatRect, double minimumScale, double maximumScale) override;
</span><span class="cx"> virtual void overflowScrollViewWillStartPanGesture() override;
</span><span class="cx"> virtual void overflowScrollViewDidScroll() override;
</span><ins>+ virtual void overflowScrollWillStartScroll() override;
+ virtual void overflowScrollDidEndScroll() override;
+
</ins><span class="cx"> virtual void didFinishDrawingPagesToPDF(const IPC::DataReference&) override;
</span><span class="cx">
</span><span class="cx"> // Auxiliary Client Creation
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -645,6 +645,16 @@
</span><span class="cx"> [m_contentView _didScroll];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::overflowScrollWillStartScroll()
+{
+ [m_contentView _overflowScrollingWillBegin];
+}
+
+void PageClientImpl::overflowScrollDidEndScroll()
+{
+ [m_contentView _overflowScrollingDidEnd];
+}
+
</ins><span class="cx"> void PageClientImpl::didFinishDrawingPagesToPDF(const IPC::DataReference& pdfData)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(kCFAllocatorDefault, pdfData.data(), pdfData.size()));
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosRemoteScrollingCoordinatorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -103,6 +103,16 @@
</span><span class="cx"> m_webPageProxy.overflowScrollViewWillStartPanGesture();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartScroll()
+{
+ m_webPageProxy.overflowScrollWillStartScroll();
+}
+
+void RemoteScrollingCoordinatorProxy::scrollingTreeNodeDidEndScroll()
+{
+ m_webPageProxy.overflowScrollDidEndScroll();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -137,6 +137,7 @@
</span><span class="cx"> BOOL _potentialTapInProgress;
</span><span class="cx"> BOOL _hasTapHighlightForPotentialTap;
</span><span class="cx"> BOOL _selectionNeedsUpdate;
</span><ins>+ BOOL _shouldRestoreSelection;
</ins><span class="cx"> BOOL _usingGestureForSelection;
</span><span class="cx"> BOOL _inspectorNodeSearchEnabled;
</span><span class="cx"> BOOL _didAccessoryTabInitiateFocus;
</span><span class="lines">@@ -174,6 +175,8 @@
</span><span class="cx"> - (void)_willStartScrollingOrZooming;
</span><span class="cx"> - (void)_didScroll;
</span><span class="cx"> - (void)_didEndScrollingOrZooming;
</span><ins>+- (void)_overflowScrollingWillBegin;
+- (void)_overflowScrollingDidEnd;
</ins><span class="cx"> - (void)_didUpdateBlockSelectionWithTouch:(WebKit::SelectionTouch)touch withFlags:(WebKit::SelectionFlags)flags growThreshold:(CGFloat)growThreshold shrinkThreshold:(CGFloat)shrinkThreshold;
</span><span class="cx"> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const WebCore::IntRect&)elementRect;
</span><span class="cx"> - (void)_showRunOpenPanel:(WebKit::WebOpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -654,6 +654,25 @@
</span><span class="cx"> [self _cancelInteraction];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_overflowScrollingWillBegin
+{
+ [_webSelectionAssistant willStartScrollingOverflow];
+ [_textSelectionAssistant willStartScrollingOverflow];
+}
+
+- (void)_overflowScrollingDidEnd
+{
+ // If scrolling ends before we've received a selection update,
+ // we postpone showing the selection until the update is received.
+ if (!_selectionNeedsUpdate) {
+ _shouldRestoreSelection = YES;
+ return;
+ }
+ [self _updateChangedSelection];
+ [_webSelectionAssistant didEndScrollingOverflow];
+ [_textSelectionAssistant didEndScrollingOverflow];
+}
+
</ins><span class="cx"> - (BOOL)_requiresKeyboardWhenFirstResponder
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We should add the logic to handle keyboard visibility during focus redirects.
</span><span class="lines">@@ -2609,6 +2628,11 @@
</span><span class="cx"> } else if (!_page->editorState().isContentEditable)
</span><span class="cx"> [_webSelectionAssistant selectionChanged];
</span><span class="cx"> _selectionNeedsUpdate = NO;
</span><ins>+ if (_shouldRestoreSelection) {
+ [_webSelectionAssistant didEndScrollingOverflow];
+ [_textSelectionAssistant didEndScrollingOverflow];
+ _shouldRestoreSelection = NO;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_showPlaybackTargetPicker:(BOOL)hasVideo fromRect:(const IntRect&)elementRect
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -251,6 +251,16 @@
</span><span class="cx"> m_pageClient.overflowScrollViewDidScroll();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::overflowScrollWillStartScroll()
+{
+ m_pageClient.overflowScrollWillStartScroll();
+}
+
+void WebPageProxy::overflowScrollDidEndScroll()
+{
+ m_pageClient.overflowScrollDidEndScroll();
+}
+
</ins><span class="cx"> void WebPageProxy::dynamicViewportSizeUpdate(const FloatSize& minimumLayoutSize, const WebCore::FloatSize& minimumLayoutSizeForMinimalUI, const WebCore::FloatSize& maximumUnobscuredSize, const FloatRect& targetExposedContentRect, const FloatRect& targetUnobscuredRect, const FloatRect& targetUnobscuredRectInScrollViewCoordinates, double targetScale, int32_t deviceOrientation)
</span><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -339,6 +339,13 @@
</span><span class="cx"> m_page->injectedBundleFormClient().textDidChangeInTextArea(m_page, toHTMLTextAreaElement(element), webFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(IOS)
+void WebEditorClient::overflowScrollPositionChanged()
+{
+ notImplemented();
+}
+#endif
+
</ins><span class="cx"> static bool getActionTypeForKeyEvent(KeyboardEvent* event, WKInputFieldActionType& type)
</span><span class="cx"> {
</span><span class="cx"> String key = event->keyIdentifier();
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*) override;
</span><span class="cx"> virtual void textWillBeDeletedInTextField(WebCore::Element*) override;
</span><span class="cx"> virtual void textDidChangeInTextArea(WebCore::Element*) override;
</span><ins>+ virtual void overflowScrollPositionChanged() override;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> virtual NSString *userVisibleString(NSURL *) override;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebProcessWebCoreSupportiosWebEditorClientIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm (171466 => 171467)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm 2014-07-23 08:36:44 UTC (rev 171466)
+++ branches/safari-600.1-branch/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebEditorClientIOS.mm 2014-07-23 08:42:20 UTC (rev 171467)
</span><span class="lines">@@ -134,6 +134,11 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebEditorClient::overflowScrollPositionChanged()
+{
+ m_page->didChangeSelection();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>