<!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>[186400] releases/WebKitGTK/webkit-2.8/Source/WebCore</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/186400">186400</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-06 22:37:38 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/185287">r185287</a> - Typing is slow in Gmail on iPads
https://bugs.webkit.org/show_bug.cgi?id=145686
Reviewed by Enrica Casucci.
The bug was caused by nextCandidate and nextVisuallyDistinctCandidate traversing through each character
in a text node without a renderer. Skip any node that doesn't have a renderer in both of those functions
and corresponding previous* functions.
It's fine to skip unrendered nodes in PositionIterator because only other clients of PositionIterator
are Position::upstream and Position::downstream and they don't care about un-rendered nodes either.
* dom/PositionIterator.cpp:
(WebCore::PositionIterator::increment):
(WebCore::PositionIterator::decrement):
* editing/htmlediting.cpp:
(WebCore::nextVisuallyDistinctCandidate):
(WebCore::previousVisuallyDistinctCandidate):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoredomPositionIteratorcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/PositionIterator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreeditinghtmleditingcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/htmlediting.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186399 => 186400)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 05:04:36 UTC (rev 186399)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 05:37:38 UTC (rev 186400)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-06 Ryosuke Niwa <rniwa@webkit.org>
+
+ Typing is slow in Gmail on iPads
+ https://bugs.webkit.org/show_bug.cgi?id=145686
+
+ Reviewed by Enrica Casucci.
+
+ The bug was caused by nextCandidate and nextVisuallyDistinctCandidate traversing through each character
+ in a text node without a renderer. Skip any node that doesn't have a renderer in both of those functions
+ and corresponding previous* functions.
+
+ It's fine to skip unrendered nodes in PositionIterator because only other clients of PositionIterator
+ are Position::upstream and Position::downstream and they don't care about un-rendered nodes either.
+
+ * dom/PositionIterator.cpp:
+ (WebCore::PositionIterator::increment):
+ (WebCore::PositionIterator::decrement):
+ * editing/htmlediting.cpp:
+ (WebCore::nextVisuallyDistinctCandidate):
+ (WebCore::previousVisuallyDistinctCandidate):
+
</ins><span class="cx"> 2015-06-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r176212): Broke app switching on iCloud.com
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoredomPositionIteratorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/PositionIterator.cpp (186399 => 186400)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/PositionIterator.cpp 2015-07-07 05:04:36 UTC (rev 186399)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/dom/PositionIterator.cpp 2015-07-07 05:37:38 UTC (rev 186400)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!m_anchorNode->hasChildNodes() && m_offsetInAnchor < lastOffsetForEditing(m_anchorNode))
</del><ins>+ if (m_anchorNode->renderer() && !m_anchorNode->hasChildNodes() && m_offsetInAnchor < lastOffsetForEditing(m_anchorNode))
</ins><span class="cx"> m_offsetInAnchor = Position::uncheckedNextOffset(m_anchorNode, m_offsetInAnchor);
</span><span class="cx"> else {
</span><span class="cx"> m_nodeAfterPositionInAnchor = m_anchorNode;
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> m_anchorNode = m_anchorNode->lastChild();
</span><span class="cx"> m_offsetInAnchor = m_anchorNode->hasChildNodes()? 0: lastOffsetForEditing(m_anchorNode);
</span><span class="cx"> } else {
</span><del>- if (m_offsetInAnchor)
</del><ins>+ if (m_offsetInAnchor && m_anchorNode->renderer())
</ins><span class="cx"> m_offsetInAnchor = Position::uncheckedPreviousOffset(m_anchorNode, m_offsetInAnchor);
</span><span class="cx"> else {
</span><span class="cx"> m_nodeAfterPositionInAnchor = m_anchorNode;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/htmlediting.cpp (186399 => 186400)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/htmlediting.cpp 2015-07-07 05:04:36 UTC (rev 186399)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/htmlediting.cpp 2015-07-07 05:37:38 UTC (rev 186400)
</span><span class="lines">@@ -215,12 +215,17 @@
</span><span class="cx">
</span><span class="cx"> Position nextVisuallyDistinctCandidate(const Position& position)
</span><span class="cx"> {
</span><ins>+ // FIXME: Use PositionIterator instead.
</ins><span class="cx"> Position p = position;
</span><span class="cx"> Position downstreamStart = p.downstream();
</span><span class="cx"> while (!p.atEndOfTree()) {
</span><span class="cx"> p = p.next(Character);
</span><span class="cx"> if (p.isCandidate() && p.downstream() != downstreamStart)
</span><span class="cx"> return p;
</span><ins>+ if (auto* node = p.containerNode()) {
+ if (!node->renderer())
+ p = lastPositionInOrAfterNode(node);
+ }
</ins><span class="cx"> }
</span><span class="cx"> return Position();
</span><span class="cx"> }
</span><span class="lines">@@ -238,12 +243,17 @@
</span><span class="cx">
</span><span class="cx"> Position previousVisuallyDistinctCandidate(const Position& position)
</span><span class="cx"> {
</span><ins>+ // FIXME: Use PositionIterator instead.
</ins><span class="cx"> Position p = position;
</span><span class="cx"> Position downstreamStart = p.downstream();
</span><span class="cx"> while (!p.atStartOfTree()) {
</span><span class="cx"> p = p.previous(Character);
</span><span class="cx"> if (p.isCandidate() && p.downstream() != downstreamStart)
</span><span class="cx"> return p;
</span><ins>+ if (auto* node = p.containerNode()) {
+ if (!node->renderer())
+ p = firstPositionInOrBeforeNode(node);
+ }
</ins><span class="cx"> }
</span><span class="cx"> return Position();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>