<!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>[185013] trunk/Source/WebKit2</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/185013">185013</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2015-05-29 16:02:56 -0700 (Fri, 29 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Cursor hidden in text area once it scrolls.
https://bugs.webkit.org/show_bug.cgi?id=145451
rdar://problem/20356413
Reviewed by Simon Fraser.
This patch fixes both the touch scrolling inside the
overflow area as well as the programmatic scroll that
occurs when inserting a new line. The first issue is fixed by
implementing the chrome client methods didLayout,
didStartOverflowScroll and didEndOverflowScroll. The second
required changing the implementation of notifyRevealedSelectionByScrollingFrame.
We not only need to notify the client to redraw the selection,
but we also need to recompute the editorState, because scrolling
might have occurred.
I've removed the NotifyRevealedSelection message that was not needed
any longer, since EditorStateChanged will do exactly what we want.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::editorStateChanged):
(WebKit::WebPageProxy::notifyRevealedSelection): Deleted.
* WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
(WebKit::WebChromeClient::notifyRevealedSelectionByScrollingFrame):
(WebKit::WebChromeClient::didLayout):
(WebKit::WebChromeClient::didStartOverflowScroll):
(WebKit::WebChromeClient::didEndOverflowScroll):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxymessagesin">trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185012 => 185013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-29 23:02:36 UTC (rev 185012)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-29 23:02:56 UTC (rev 185013)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-05-29 Enrica Casucci <enrica@apple.com>
+
+ [iOS] Cursor hidden in text area once it scrolls.
+ https://bugs.webkit.org/show_bug.cgi?id=145451
+ rdar://problem/20356413
+
+ Reviewed by Simon Fraser.
+
+ This patch fixes both the touch scrolling inside the
+ overflow area as well as the programmatic scroll that
+ occurs when inserting a new line. The first issue is fixed by
+ implementing the chrome client methods didLayout,
+ didStartOverflowScroll and didEndOverflowScroll. The second
+ required changing the implementation of notifyRevealedSelectionByScrollingFrame.
+ We not only need to notify the client to redraw the selection,
+ but we also need to recompute the editorState, because scrolling
+ might have occurred.
+ I've removed the NotifyRevealedSelection message that was not needed
+ any longer, since EditorStateChanged will do exactly what we want.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::editorStateChanged):
+ (WebKit::WebPageProxy::notifyRevealedSelection): Deleted.
+ * WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm:
+ (WebKit::WebChromeClient::notifyRevealedSelectionByScrollingFrame):
+ (WebKit::WebChromeClient::didLayout):
+ (WebKit::WebChromeClient::didStartOverflowScroll):
+ (WebKit::WebChromeClient::didEndOverflowScroll):
+
</ins><span class="cx"> 2015-05-29 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Update WebContent process sandbox profile for AWD logging
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (185012 => 185013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-29 23:02:36 UTC (rev 185012)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-29 23:02:56 UTC (rev 185013)
</span><span class="lines">@@ -1390,8 +1390,6 @@
</span><span class="cx">
</span><span class="cx"> void enableInspectorNodeSearch();
</span><span class="cx"> void disableInspectorNodeSearch();
</span><del>-
- void notifyRevealedSelection();
</del><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> void clearLoadDependentCallbacks();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (185012 => 185013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-05-29 23:02:36 UTC (rev 185012)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2015-05-29 23:02:56 UTC (rev 185013)
</span><span class="lines">@@ -369,8 +369,8 @@
</span><span class="cx">
</span><span class="cx"> StartAssistingNode(struct WebKit::AssistedNodeInformation information, bool userIsInteracting, bool blurPreviousNode, WebKit::UserData userData)
</span><span class="cx"> StopAssistingNode()
</span><del>- NotifyRevealedSelection()
-
</del><ins>+ OverflowScrollWillStartScroll()
+ OverflowScrollDidEndScroll()
</ins><span class="cx"> ShowInspectorHighlight(struct WebCore::Highlight highlight)
</span><span class="cx"> HideInspectorHighlight()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (185012 => 185013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-05-29 23:02:36 UTC (rev 185012)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-05-29 23:02:56 UTC (rev 185013)
</span><span class="lines">@@ -608,11 +608,6 @@
</span><span class="cx"> m_process->send(Messages::WebPage::ApplicationDidBecomeActive(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::notifyRevealedSelection()
-{
- m_pageClient.selectionDidChange();
-}
-
</del><span class="cx"> void WebPageProxy::extendSelection(WebCore::TextGranularity granularity)
</span><span class="cx"> {
</span><span class="cx"> m_process->send(Messages::WebPage::ExtendSelection(static_cast<uint32_t>(granularity)), m_pageID);
</span><span class="lines">@@ -924,7 +919,7 @@
</span><span class="cx">
</span><span class="cx"> // We always need to notify the client on iOS to make sure the selection is redrawn,
</span><span class="cx"> // even during composition to support phrase boundary gesture.
</span><del>- notifyRevealedSelection();
</del><ins>+ m_pageClient.selectionDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportiosWebChromeClientIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm (185012 => 185013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2015-05-29 23:02:36 UTC (rev 185012)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/ios/WebChromeClientIOS.mm 2015-05-29 23:02:56 UTC (rev 185013)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::notifyRevealedSelectionByScrollingFrame(WebCore::Frame*)
</span><span class="cx"> {
</span><del>- m_page->send(Messages::WebPageProxy::NotifyRevealedSelection());
</del><ins>+ m_page->didChangeSelection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::isStopping()
</span><span class="lines">@@ -85,19 +85,20 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebChromeClient::didLayout(LayoutType)
</del><ins>+void WebChromeClient::didLayout(LayoutType type)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ if (type == Scroll)
+ m_page->didChangeSelection();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didStartOverflowScroll()
</span><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ m_page->send(Messages::WebPageProxy::OverflowScrollWillStartScroll());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebChromeClient::didEndOverflowScroll()
</span><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ m_page->send(Messages::WebPageProxy::OverflowScrollDidEndScroll());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::hasStablePageScaleFactor() const
</span></span></pre>
</div>
</div>
</body>
</html>