<!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>[171501] branches/safari-600.1-branch/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/171501">171501</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-23 17:54:34 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171499">r171499</a>. <rdar://problem/17783423></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreeditingEditorcpp">branches/safari-600.1-branch/Source/WebCore/editing/Editor.cpp</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 (171500 => 171501)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-24 00:52:18 UTC (rev 171500)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-24 00:54:34 UTC (rev 171501)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-07-23 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171499. <rdar://problem/17783423>
+
+ 2014-07-23 Tim Horton <timothy_horton@apple.com>
+
+ REGRESSION (r171376): Sometimes we detect less than the whole phone number
+ https://bugs.webkit.org/show_bug.cgi?id=135220
+ <rdar://problem/17783423>
+
+ Reviewed by Brady Eidson.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::scanSelectionForTelephoneNumbers):
+ Use the visible selection's start and end instead of base and extent, because they'll
+ always be in the right order in the case of a directional selection (base can be *after* extent
+ if you select from right to left). This fixes the code that expands the selection.
+
+ Pass the *entire* expanded selection to DataDetectors, instead of using TextIterator.
+ This way, we will find each number only once, and will never get part of a phone number once
+ and then the whole phone number later.
+
</ins><span class="cx"> 2014-07-23 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171370
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/editing/Editor.cpp (171500 => 171501)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/editing/Editor.cpp 2014-07-24 00:52:18 UTC (rev 171500)
+++ branches/safari-600.1-branch/Source/WebCore/editing/Editor.cpp 2014-07-24 00:54:34 UTC (rev 171501)
</span><span class="lines">@@ -3373,72 +3373,36 @@
</span><span class="cx">
</span><span class="cx"> // Extend the range a few characters in each direction to detect incompletely selected phone numbers.
</span><span class="cx"> static const int charactersToExtend = 15;
</span><del>- Position base = frameSelection.selection().base();
- Position extent = frameSelection.selection().extent();
</del><ins>+ const VisibleSelection& visibleSelection = frameSelection.selection();
+ Position start = visibleSelection.start();
+ Position end = visibleSelection.end();
</ins><span class="cx"> for (int i = 0; i < charactersToExtend; ++i) {
</span><del>- base = base.previous(Character);
- extent = extent.next(Character);
</del><ins>+ if (directionOfEnclosingBlock(start) == LTR)
+ start = start.previous(Character);
+ else
+ start = start.next(Character);
+
+ if (directionOfEnclosingBlock(end) == LTR)
+ end = end.next(Character);
+ else
+ end = end.previous(Character);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameSelection extendedSelection;
</span><del>- extendedSelection.setBase(base);
- extendedSelection.setExtent(extent);
</del><ins>+ extendedSelection.setStart(start);
+ extendedSelection.setEnd(end);
</ins><span class="cx"> RefPtr<Range> extendedRange = extendedSelection.toNormalizedRange();
</span><span class="cx">
</span><del>- for (TextIterator textChunk(extendedRange.get()); !textChunk.atEnd(); textChunk.advance()) {
- Vector<RefPtr<Range>> markedChunkRanges;
- Vector<RefPtr<Range>> markedEdgeRanges;
</del><ins>+ scanRangeForTelephoneNumbers(*extendedRange, extendedRange->text(), markedRanges);
</ins><span class="cx">
</span><del>- // Scan the text iterator range.
- RefPtr<Range> range = textChunk.range();
- scanRangeForTelephoneNumbers(*range, textChunk.text(), markedChunkRanges);
-
- // If this text iterator range's end position is before the end of the full range,
- // then scan a window that is a bit before and a bit after this text iterator range.
- RefPtr<Range> edgeRange;
- if (range->endPosition() < extendedRange->endPosition()) {
- Position endPosition = range->endPosition();
- Position startPosition = endPosition;
- for (int i = 0; i < charactersToExtend; ++i) {
- startPosition = startPosition.previous(Character);
- endPosition = endPosition.next(Character);
- }
-
- edgeRange = Range::create(range->ownerDocument(), startPosition, endPosition);
- scanRangeForTelephoneNumbers(*edgeRange, plainText(edgeRange.get()), markedEdgeRanges);
- }
-
- // Add both of these sets of ranges to the full set of marked ranges, double checking to
- // make sure we don't end up with two equivalent ranges in the full set.
- for (auto& chunkRange : markedChunkRanges) {
- bool matchesEdgeRange = false;
- for (auto& edgeRange : markedEdgeRanges) {
- if (areRangesEqual(chunkRange.get(), edgeRange.get())) {
- matchesEdgeRange = true;
- break;
- }
- }
-
- if (!matchesEdgeRange)
- markedRanges.append(chunkRange);
- }
-
- for (auto& range : markedEdgeRanges)
- markedRanges.append(range);
-
- // If the edge range's end position is past the end position of the original range, we're done scanning.
- if (edgeRange && edgeRange->endPosition() >= extendedRange->endPosition())
- break;
- }
-
</del><span class="cx"> // Only consider ranges with a detected telephone number if they overlap with the actual selection range.
</span><del>- Vector<RefPtr<Range>> extendedMarkedRanges;
</del><ins>+ Vector<RefPtr<Range>> markedRangesIntersectingSelection;
</ins><span class="cx"> for (auto& range : markedRanges) {
</span><span class="cx"> if (rangesOverlap(range.get(), selectedRange.get()))
</span><del>- extendedMarkedRanges.append(range);
</del><ins>+ markedRangesIntersectingSelection.append(range);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- client()->selectedTelephoneNumberRangesChanged(extendedMarkedRanges);
</del><ins>+ client()->selectedTelephoneNumberRangesChanged(markedRangesIntersectingSelection);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Editor::scanRangeForTelephoneNumbers(Range& range, const StringView& stringView, Vector<RefPtr<Range>>& markedRanges)
</span><span class="lines">@@ -3471,6 +3435,7 @@
</span><span class="cx"> unsigned subrangeLength = relativeEndPosition - relativeStartPosition + 1;
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> subrange = TextIterator::subrange(&range, subrangeOffset, subrangeLength);
</span><ins>+
</ins><span class="cx"> markedRanges.append(subrange);
</span><span class="cx"> range.ownerDocument().markers().addMarker(subrange.get(), DocumentMarker::TelephoneNumber);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>