<!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>[166027] 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/166027">166027</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-03-20 17:07:34 -0700 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WebKit2] typing and deleting text lags behind the caret movement on google.com.
https://bugs.webkit.org/show_bug.cgi?id=130544
<rdar://problem/16380296>
Reviewed by Tim Horton.
On iOS the selection is drawn in the UIProcess. If the WebProcess is
processing multiple requests within the same runloop, the caret could be
updated in the UIProcess before the WebProcess has had a chance to paint.
This change synchronizes the selection drawing with the tile update.
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _didCommitLayerTree:WebKit::]):
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _selectionChanged]):
(-[WKContentView _updateChangedSelection]):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didChangeSelection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionh">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166026 => 166027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-21 00:04:44 UTC (rev 166026)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-21 00:07:34 UTC (rev 166027)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-20 Enrica Casucci <enrica@apple.com>
+
+ [iOS WebKit2] typing and deleting text lags behind the caret movement on google.com.
+ https://bugs.webkit.org/show_bug.cgi?id=130544
+ <rdar://problem/16380296>
+
+ Reviewed by Tim Horton.
+
+ On iOS the selection is drawn in the UIProcess. If the WebProcess is
+ processing multiple requests within the same runloop, the caret could be
+ updated in the UIProcess before the WebProcess has had a chance to paint.
+ This change synchronizes the selection drawing with the tile update.
+
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _didCommitLayerTree:WebKit::]):
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _selectionChanged]):
+ (-[WKContentView _updateChangedSelection]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didChangeSelection):
+
</ins><span class="cx"> 2014-03-20 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Generalize WebInspector check in maybeInitializeSandboxExtensionHandle().
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (166026 => 166027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-03-21 00:04:44 UTC (rev 166026)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-03-21 00:07:34 UTC (rev 166027)
</span><span class="lines">@@ -294,6 +294,7 @@
</span><span class="cx"> [_rootContentView setFrame:CGRectMake(0, 0, contentsSize.width, contentsSize.height)];
</span><span class="cx">
</span><span class="cx"> [_webView _didCommitLayerTree:layerTreeTransaction];
</span><ins>+ [self _updateChangedSelection];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_setAcceleratedCompositingRootView:(UIView *)rootView
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (166026 => 166027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-03-21 00:04:44 UTC (rev 166026)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2014-03-21 00:07:34 UTC (rev 166027)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> BOOL _showingTextStyleOptions;
</span><span class="cx"> BOOL _hasValidPositionInformation;
</span><span class="cx"> BOOL _isTapHighlightIDValid;
</span><ins>+ BOOL _selectionNeedsUpdate;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -129,6 +130,7 @@
</span><span class="cx"> - (void)_startAssistingNode:(const WebKit::AssistedNodeInformation&)information;
</span><span class="cx"> - (void)_stopAssistingNode;
</span><span class="cx"> - (void)_selectionChanged;
</span><ins>+- (void)_updateChangedSelection;
</ins><span class="cx"> - (BOOL)_interpretKeyEvent:(WebIOSEvent *)theEvent isCharEvent:(BOOL)isCharEvent;
</span><span class="cx"> - (void)_positionInformationDidChange:(const WebKit::InteractionInformationAtPosition&)info;
</span><span class="cx"> - (void)_attemptClickAtLocation:(CGPoint)location;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (166026 => 166027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-03-21 00:04:44 UTC (rev 166026)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-03-21 00:07:34 UTC (rev 166027)
</span><span class="lines">@@ -1918,6 +1918,14 @@
</span><span class="cx">
</span><span class="cx"> - (void)_selectionChanged
</span><span class="cx"> {
</span><ins>+ _selectionNeedsUpdate = YES;
+}
+
+- (void)_updateChangedSelection
+{
+ if (!_selectionNeedsUpdate)
+ return;
+
</ins><span class="cx"> // FIXME: We need to figure out what to do if the selection is changed by Javascript.
</span><span class="cx"> if (_textSelectionAssistant) {
</span><span class="cx"> _markedText = (_page->editorState().hasComposition) ? _page->editorState().markedText : String();
</span><span class="lines">@@ -1925,6 +1933,7 @@
</span><span class="cx"> [_textSelectionAssistant selectionChanged];
</span><span class="cx"> } else
</span><span class="cx"> [_webSelectionAssistant selectionChanged];
</span><ins>+ _selectionNeedsUpdate = NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - Implementation of UIWebTouchEventsGestureRecognizerDelegate.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (166026 => 166027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-21 00:04:44 UTC (rev 166026)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-21 00:07:34 UTC (rev 166027)
</span><span class="lines">@@ -4097,6 +4097,9 @@
</span><span class="cx"> void WebPage::didChangeSelection()
</span><span class="cx"> {
</span><span class="cx"> send(Messages::WebPageProxy::EditorStateChanged(editorState()));
</span><ins>+#if PLATFORM(IOS)
+ m_drawingArea->scheduleCompositingLayerFlush();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::setMinimumLayoutSize(const IntSize& minimumLayoutSize)
</span></span></pre>
</div>
</div>
</body>
</html>