<!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>[169750] 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/169750">169750</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 10:52:18 -0700 (Tue, 10 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Send more context about text selection to telephone number scanner
<rdar://problem/16874385> and https://bugs.webkit.org/show_bug.cgi?id=133684
Reviewed by Enrica Casucci.
* dom/Range.cpp:
(WebCore::rangesOverlap):Add a utility to check if two ranges overlap.
* dom/Range.h:
* editing/Editor.cpp:
(WebCore::Editor::scanSelectionForTelephoneNumbers): Create a range that is wider than the
actual selection to search for phone numbers that are not completely selected yet.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoredomRangeh">trunk/Source/WebCore/dom/Range.h</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 (169749 => 169750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-10 17:42:51 UTC (rev 169749)
+++ trunk/Source/WebCore/ChangeLog 2014-06-10 17:52:18 UTC (rev 169750)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-10 Brady Eidson <beidson@apple.com>
+
+ Send more context about text selection to telephone number scanner
+ <rdar://problem/16874385> and https://bugs.webkit.org/show_bug.cgi?id=133684
+
+ Reviewed by Enrica Casucci.
+
+ * dom/Range.cpp:
+ (WebCore::rangesOverlap):Add a utility to check if two ranges overlap.
+ * dom/Range.h:
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::scanSelectionForTelephoneNumbers): Create a range that is wider than the
+ actual selection to search for phone numbers that are not completely selected yet.
+
</ins><span class="cx"> 2014-06-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [iOS] Another unreviewed build fix after r169746.
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (169749 => 169750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2014-06-10 17:42:51 UTC (rev 169749)
+++ trunk/Source/WebCore/dom/Range.cpp 2014-06-10 17:52:18 UTC (rev 169750)
</span><span class="lines">@@ -1976,6 +1976,35 @@
</span><span class="cx"> return a->startPosition() == b->startPosition() && a->endPosition() == b->endPosition();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool rangesOverlap(const Range* a, const Range* b)
+{
+ if (!a || !b)
+ return false;
+
+ if (a == b)
+ return true;
+
+ if (a->commonAncestorContainer(ASSERT_NO_EXCEPTION)->ownerDocument() != b->commonAncestorContainer(ASSERT_NO_EXCEPTION)->ownerDocument())
+ return false;
+
+ short startToStart = a->compareBoundaryPoints(Range::START_TO_START, b, ASSERT_NO_EXCEPTION);
+ short endToEnd = a->compareBoundaryPoints(Range::END_TO_END, b, ASSERT_NO_EXCEPTION);
+
+ // First range contains the second range.
+ if (startToStart <= 0 && endToEnd >= 0)
+ return true;
+
+ // End of first range is inside second range.
+ if (a->compareBoundaryPoints(Range::END_TO_START, b, ASSERT_NO_EXCEPTION) >= 0 && endToEnd <= 0)
+ return true;
+
+ // Start of first range is inside second range.
+ if (startToStart >= 0 && a->compareBoundaryPoints(Range::START_TO_END, b, ASSERT_NO_EXCEPTION) <= 0)
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> PassRefPtr<Range> rangeOfContents(Node& node)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Range> range = Range::create(node.document());
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (169749 => 169750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2014-06-10 17:42:51 UTC (rev 169749)
+++ trunk/Source/WebCore/dom/Range.h 2014-06-10 17:52:18 UTC (rev 169750)
</span><span class="lines">@@ -189,6 +189,7 @@
</span><span class="cx"> PassRefPtr<Range> rangeOfContents(Node&);
</span><span class="cx">
</span><span class="cx"> bool areRangesEqual(const Range*, const Range*);
</span><ins>+bool rangesOverlap(const Range*, const Range*);
</ins><span class="cx">
</span><span class="cx"> } // namespace
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (169749 => 169750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-06-10 17:42:51 UTC (rev 169749)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-06-10 17:52:18 UTC (rev 169750)
</span><span class="lines">@@ -3364,23 +3364,45 @@
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<Range>> markedRanges;
</span><span class="cx">
</span><del>- RefPtr<Range> selectedRange = m_frame.selection().toNormalizedRange();
- if (!selectedRange || (selectedRange->startContainer() == selectedRange->endContainer() && selectedRange->startOffset() == selectedRange->endOffset())) {
</del><ins>+ FrameSelection& frameSelection = m_frame.selection();
+ if (!frameSelection.isRange()) {
</ins><span class="cx"> client()->selectedTelephoneNumberRangesChanged(markedRanges);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Extend the range a few characters in each direction to detect incompletely selected phone numbers.
+ static const int charactersToExtend = 15;
+ Position base = frameSelection.selection().base();
+ Position extent = frameSelection.selection().extent();
+ for (int i = 0; i < charactersToExtend; ++i) {
+ base = base.previous(Character);
+ extent = extent.next(Character);
+ }
+
+ FrameSelection extendedSelection;
+ extendedSelection.setBase(base);
+ extendedSelection.setExtent(extent);
+ RefPtr<Range> extendedRange = extendedSelection.toNormalizedRange();
+
</ins><span class="cx"> // FIXME: This won't work if a phone number spans multiple chunks of text from the perspective of the TextIterator
</span><span class="cx"> // (By a style change, image, line break, etc.)
</span><span class="cx"> // One idea to handle this would be a model like text search that uses a rotating window.
</span><del>- for (TextIterator textChunk(selectedRange.get()); !textChunk.atEnd(); textChunk.advance()) {
</del><ins>+ for (TextIterator textChunk(extendedRange.get()); !textChunk.atEnd(); textChunk.advance()) {
</ins><span class="cx"> // TextIterator is supposed to never returns a Range that spans multiple Nodes.
</span><span class="cx"> ASSERT(textChunk.range()->startContainer() == textChunk.range()->endContainer());
</span><span class="cx">
</span><span class="cx"> scanRangeForTelephoneNumbers(*textChunk.range(), textChunk.text(), markedRanges);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- client()->selectedTelephoneNumberRangesChanged(markedRanges);
</del><ins>+ // Only consider ranges with a detected telephone number if they overlap with the actual selection range.
+ Vector<RefPtr<Range>> extendedMarkedRanges;
+ RefPtr<Range> selectedRange = frameSelection.toNormalizedRange();
+ for (auto& range : markedRanges) {
+ if (rangesOverlap(range.get(), selectedRange.get()))
+ extendedMarkedRanges.append(range);
+ }
+
+ client()->selectedTelephoneNumberRangesChanged(extendedMarkedRanges);
</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></pre>
</div>
</div>
</body>
</html>