<!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>[188565] 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/188565">188565</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-08-17 19:02:36 -0700 (Mon, 17 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some functions on DictionaryLookup.h should just be generic functions elsewhere
https://bugs.webkit.org/show_bug.cgi?id=138567
Reviewed by Dean Jackson.
No new tests, just refactoring.
* dom/Range.cpp:
(WebCore::Range::contains):
* dom/Range.h:
Add a Range::contains(VisiblePosition).
It's simpler than the old thing from DictionaryLookup.mm, but does the same thing.
It's so simple that it doesn't necessarily need to exist, but it seems useful.
* editing/VisiblePosition.cpp:
(WebCore::makeRange):
nullptrs
* editing/mac/DictionaryLookup.h:
* editing/mac/DictionaryLookup.mm:
(WebCore::selectionContainsPosition):
(WebCore::rangeForDictionaryLookupAtHitTestResult):
(WebCore::isPositionInRange): Deleted.
(WebCore::shouldUseSelection): Deleted.
Move isPositionInRange to Range.
Rename shouldUseSelection to what it really means.
I didn't move selectionContainsPosition to VisibleSelection because it
only handles Range selections, not any of the ohers, and thus isn't
generic enough to put there.</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="#trunkSourceWebCoreeditingVisiblePositioncpp">trunk/Source/WebCore/editing/VisiblePosition.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookuph">trunk/Source/WebCore/editing/mac/DictionaryLookup.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookupmm">trunk/Source/WebCore/editing/mac/DictionaryLookup.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188564 => 188565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-18 01:42:40 UTC (rev 188564)
+++ trunk/Source/WebCore/ChangeLog 2015-08-18 02:02:36 UTC (rev 188565)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-08-17 Tim Horton <timothy_horton@apple.com>
+
+ Some functions on DictionaryLookup.h should just be generic functions elsewhere
+ https://bugs.webkit.org/show_bug.cgi?id=138567
+
+ Reviewed by Dean Jackson.
+
+ No new tests, just refactoring.
+
+ * dom/Range.cpp:
+ (WebCore::Range::contains):
+ * dom/Range.h:
+ Add a Range::contains(VisiblePosition).
+ It's simpler than the old thing from DictionaryLookup.mm, but does the same thing.
+ It's so simple that it doesn't necessarily need to exist, but it seems useful.
+
+ * editing/VisiblePosition.cpp:
+ (WebCore::makeRange):
+ nullptrs
+
+ * editing/mac/DictionaryLookup.h:
+ * editing/mac/DictionaryLookup.mm:
+ (WebCore::selectionContainsPosition):
+ (WebCore::rangeForDictionaryLookupAtHitTestResult):
+ (WebCore::isPositionInRange): Deleted.
+ (WebCore::shouldUseSelection): Deleted.
+ Move isPositionInRange to Range.
+ Rename shouldUseSelection to what it really means.
+ I didn't move selectionContainsPosition to VisibleSelection because it
+ only handles Range selections, not any of the ohers, and thus isn't
+ generic enough to put there.
+
</ins><span class="cx"> 2015-08-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win CMake] Allow WebKitLibraries directory to be set from the command line
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (188564 => 188565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2015-08-18 01:42:40 UTC (rev 188564)
+++ trunk/Source/WebCore/dom/Range.cpp 2015-08-18 02:02:36 UTC (rev 188565)
</span><span class="lines">@@ -1960,6 +1960,14 @@
</span><span class="cx"> return endToEnd >= 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Range::contains(const VisiblePosition& position) const
+{
+ RefPtr<Range> positionRange = makeRange(position, position);
+ if (!positionRange)
+ return false;
+ return contains(*positionRange);
+}
+
</ins><span class="cx"> bool areRangesEqual(const Range* a, const Range* b)
</span><span class="cx"> {
</span><span class="cx"> if (a == b)
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.h (188564 => 188565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.h 2015-08-18 01:42:40 UTC (rev 188564)
+++ trunk/Source/WebCore/dom/Range.h 2015-08-18 02:02:36 UTC (rev 188565)
</span><span class="lines">@@ -155,6 +155,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool contains(const Range&) const;
</span><ins>+ bool contains(const VisiblePosition&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit Range(Document&);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisiblePositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisiblePosition.cpp (188564 => 188565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisiblePosition.cpp 2015-08-18 01:42:40 UTC (rev 188564)
+++ trunk/Source/WebCore/editing/VisiblePosition.cpp 2015-08-18 02:02:36 UTC (rev 188565)
</span><span class="lines">@@ -670,12 +670,12 @@
</span><span class="cx"> PassRefPtr<Range> makeRange(const VisiblePosition &start, const VisiblePosition &end)
</span><span class="cx"> {
</span><span class="cx"> if (start.isNull() || end.isNull())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Position s = start.deepEquivalent().parentAnchoredEquivalent();
</span><span class="cx"> Position e = end.deepEquivalent().parentAnchoredEquivalent();
</span><span class="cx"> if (s.isNull() || e.isNull())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> return Range::create(s.containerNode()->document(), s.containerNode(), s.offsetInContainerNode(), e.containerNode(), e.offsetInContainerNode());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookuph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.h (188564 => 188565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-08-18 01:42:40 UTC (rev 188564)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.h 2015-08-18 02:02:36 UTC (rev 188565)
</span><span class="lines">@@ -37,14 +37,8 @@
</span><span class="cx">
</span><span class="cx"> class HitTestResult;
</span><span class="cx"> class Range;
</span><del>-class VisiblePosition;
</del><span class="cx"> class VisibleSelection;
</span><span class="cx">
</span><del>-// FIXME: Some of these functions should probably be in a more generic class.
-// https://bugs.webkit.org/show_bug.cgi?id=138567
-bool isPositionInRange(const VisiblePosition&, Range*);
-bool shouldUseSelection(const VisiblePosition&, const VisibleSelection&);
-
</del><span class="cx"> WEBCORE_EXPORT PassRefPtr<Range> rangeForDictionaryLookupForSelection(const VisibleSelection&, NSDictionary **options);
</span><span class="cx"> WEBCORE_EXPORT PassRefPtr<Range> rangeForDictionaryLookupAtHitTestResult(const HitTestResult&, NSDictionary **options);
</span><span class="cx"> WEBCORE_EXPORT NSString *dictionaryLookupForPDFSelection(PDFSelection *, NSDictionary **options);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (188564 => 188565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-08-18 01:42:40 UTC (rev 188564)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm 2015-08-18 02:02:36 UTC (rev 188565)
</span><span class="lines">@@ -49,25 +49,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-bool isPositionInRange(const VisiblePosition& position, Range* range)
</del><ins>+static bool selectionContainsPosition(const VisiblePosition& position, const VisibleSelection& selection)
</ins><span class="cx"> {
</span><del>- RefPtr<Range> positionRange = makeRange(position, position);
-
- ExceptionCode ec = 0;
- range->compareBoundaryPoints(Range::START_TO_START, positionRange.get(), ec);
- if (ec)
- return false;
-
- if (!range->isPointInRange(positionRange->startContainer(), positionRange->startOffset(), ec))
- return false;
- if (ec)
- return false;
-
- return true;
-}
-
-bool shouldUseSelection(const VisiblePosition& position, const VisibleSelection& selection)
-{
</del><span class="cx"> if (!selection.isRange())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -75,7 +58,7 @@
</span><span class="cx"> if (!selectedRange)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return isPositionInRange(position, selectedRange.get());
</del><ins>+ return selectedRange->contains(position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Range> rangeForDictionaryLookupForSelection(const VisibleSelection& selection, NSDictionary **options)
</span><span class="lines">@@ -127,8 +110,9 @@
</span><span class="cx"> if (position.isNull())
</span><span class="cx"> position = firstPositionInOrBeforeNode(node);
</span><span class="cx">
</span><ins>+ // If we hit the selection, use that instead of letting Lookup decide the range.
</ins><span class="cx"> VisibleSelection selection = frame->page()->focusController().focusedOrMainFrame().selection().selection();
</span><del>- if (shouldUseSelection(position, selection))
</del><ins>+ if (selectionContainsPosition(position, selection))
</ins><span class="cx"> return rangeForDictionaryLookupForSelection(selection, options);
</span><span class="cx">
</span><span class="cx"> VisibleSelection selectionAccountingForLineRules = VisibleSelection(position);
</span></span></pre>
</div>
</div>
</body>
</html>