<!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>[171376] trunk/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/171376">171376</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 17:36:13 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/171016">r171016</a>): Reproducible infinite spin selecting phone number
https://bugs.webkit.org/show_bug.cgi?id=135183
<rdar://problem/17727342>
Reviewed by Ryosuke Niwa.
* editing/Editor.cpp:
(WebCore::Editor::scanRangeForTelephoneNumbers):
Make use of TextIterator::subrange, which knows how to make a subrange from character positions,
instead of assuming that our character positions translate directly to positions in the incoming range.
Make use of DocumentMarkerController::addMarker, which takes a range and applies the marker to
all text nodes inside the range as appropriate.
Fix naming of the shadowed 'length' local.
Fix a typo in the comment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171375 => 171376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-23 00:35:27 UTC (rev 171375)
+++ trunk/Source/WebCore/ChangeLog 2014-07-23 00:36:13 UTC (rev 171376)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-22 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r171016): Reproducible infinite spin selecting phone number
+ https://bugs.webkit.org/show_bug.cgi?id=135183
+ <rdar://problem/17727342>
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::scanRangeForTelephoneNumbers):
+ Make use of TextIterator::subrange, which knows how to make a subrange from character positions,
+ instead of assuming that our character positions translate directly to positions in the incoming range.
+ Make use of DocumentMarkerController::addMarker, which takes a range and applies the marker to
+ all text nodes inside the range as appropriate.
+ Fix naming of the shadowed 'length' local.
+ Fix a typo in the comment.
+
</ins><span class="cx"> 2014-07-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] [OSX] Don't transcode WOFF on platforms that support it natively
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (171375 => 171376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-07-23 00:35:27 UTC (rev 171375)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-07-23 00:36:13 UTC (rev 171376)
</span><span class="lines">@@ -3460,23 +3460,20 @@
</span><span class="cx">
</span><span class="cx"> while (scannerPosition < length && TelephoneNumberDetector::find(&characters[scannerPosition], length - scannerPosition, &relativeStartPosition, &relativeEndPosition)) {
</span><span class="cx"> // The convention in the Data Detectors framework is that the end position is the first character NOT in the phone number
</span><del>- // (that is, the length of the range is relativeEndPosition - relativeStartPosition). So substract 1 to get the same
</del><ins>+ // (that is, the length of the range is relativeEndPosition - relativeStartPosition). So subtract 1 to get the same
</ins><span class="cx"> // convention as the old WebCore phone number parser (so that the rest of the code is still valid if we want to go back
</span><span class="cx"> // to the old parser).
</span><span class="cx"> --relativeEndPosition;
</span><span class="cx">
</span><span class="cx"> ASSERT(scannerPosition + relativeEndPosition < length);
</span><span class="cx">
</span><del>- // It doesn't make sense to add the document marker to a match that's not in a text node.
- if (!startNode->isTextNode())
- continue;
</del><ins>+ unsigned subrangeOffset = scannerPosition + relativeStartPosition;
+ unsigned subrangeLength = relativeEndPosition - relativeStartPosition + 1;
</ins><span class="cx">
</span><del>- unsigned startOffset = range.startOffset() + scannerPosition + relativeStartPosition;
- unsigned length = relativeEndPosition - relativeStartPosition + 1;
</del><ins>+ RefPtr<Range> subrange = TextIterator::subrange(&range, subrangeOffset, subrangeLength);
+ markedRanges.append(subrange);
+ range.ownerDocument().markers().addMarker(subrange.get(), DocumentMarker::TelephoneNumber);
</ins><span class="cx">
</span><del>- markedRanges.append(Range::create(range.ownerDocument(), startNode, startOffset, startNode, startOffset + length));
- range.ownerDocument().markers().addMarkerToNode(startNode, startOffset, length, DocumentMarker::TelephoneNumber);
-
</del><span class="cx"> scannerPosition += relativeEndPosition + 1;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>