<!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>[175662] branches/safari-600.3-branch/Source/WebKit2</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/175662">175662</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-11-05 20:52:02 -0800 (Wed, 05 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175517">r175517</a>. <rdar://problems/18861406></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6003branchSourceWebKit2ChangeLog">branches/safari-600.3-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari6003branchSourceWebKit2WebProcessWebPagemacWebPageMacmm">branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6003branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175661 => 175662)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-11-06 04:24:18 UTC (rev 175661)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog        2014-11-06 04:52:02 UTC (rev 175662)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-11-05 Dana Burkart <dburkart@apple.com>
+
+ Merge r175517. <rdar://problem/18861406>
+
+ 2014-11-04 Tim Horton <timothy_horton@apple.com>
+
+ Dictionary lookup panel pops up at random when clicking on selected text
+ https://bugs.webkit.org/show_bug.cgi?id=138353
+ <rdar://problem/18861406>
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::rangeForDictionaryLookupForSelection):
+ (WebKit::rangeForDictionaryLookupAtHitTestResult):
+ Factor rangeForDictionaryLookupForSelection out of performDictionaryLookupForSelection.
+
+ Make use of rangeForDictionaryLookupForSelection in rangeForDictionaryLookupAtHitTestResult,
+ returning the selection-based range if the hit test intersects the selected text.
+ Previously, we were just going forward with performDictionaryLookupForSelection,
+ which would actually *do* the lookup, even if we just wanted to retrieve the range.
+
+ Make rangeForDictionaryLookup* static.
+
+ (WebKit::WebPage::performDictionaryLookupForSelection):
+ Make use of rangeForDictionaryLookupForSelection.
+
+
</ins><span class="cx"> 2014-11-03 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Implement action menus for editable text with spelling suggestions
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (175661 => 175662)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-11-06 04:24:18 UTC (rev 175661)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-11-06 04:52:02 UTC (rev 175662)
</span><span class="lines">@@ -644,8 +644,6 @@
</span><span class="cx"> void dummy(bool&);
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&);
-
</del><span class="cx"> bool isSpeaking();
</span><span class="cx"> void speak(const String&);
</span><span class="cx"> void stopSpeaking();
</span><span class="lines">@@ -964,9 +962,9 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
</span><del>- void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range&, NSDictionary *options);
- PassRefPtr<WebCore::Range> rangeForDictionaryLookupAtHitTestResult(const WebCore::HitTestResult&, NSDictionary **);
</del><span class="cx"> void performDictionaryLookupOfCurrentSelection();
</span><ins>+ void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&);
+ void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range&, NSDictionary *options);
</ins><span class="cx">
</span><span class="cx"> void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& windowFrameInUnflippedScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6003branchSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175661 => 175662)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm        2014-11-06 04:24:18 UTC (rev 175661)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm        2014-11-06 04:52:02 UTC (rev 175662)
</span><span class="lines">@@ -517,8 +517,33 @@
</span><span class="cx"> return makeRange(start, end);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::rangeForDictionaryLookupAtHitTestResult(const WebCore::HitTestResult& hitTestResult, NSDictionary **options)
</del><ins>+static PassRefPtr<Range> rangeForDictionaryLookupForSelection(const VisibleSelection& selection, NSDictionary **options)
</ins><span class="cx"> {
</span><ins>+ RefPtr<Range> selectedRange = selection.toNormalizedRange();
+ if (!selectedRange)
+ return nullptr;
+
+ VisiblePosition selectionStart = selection.visibleStart();
+ VisiblePosition selectionEnd = selection.visibleEnd();
+
+ // As context, we are going to use the surrounding paragraphs of text.
+ VisiblePosition paragraphStart = startOfParagraph(selectionStart);
+ VisiblePosition paragraphEnd = endOfParagraph(selectionEnd);
+
+ int lengthToSelectionStart = TextIterator::rangeLength(makeRange(paragraphStart, selectionStart).get());
+ int lengthToSelectionEnd = TextIterator::rangeLength(makeRange(paragraphStart, selectionEnd).get());
+ NSRange rangeToPass = NSMakeRange(lengthToSelectionStart, lengthToSelectionEnd - lengthToSelectionStart);
+
+ String fullPlainTextString = plainText(makeRange(paragraphStart, paragraphEnd).get());
+
+ // Since we already have the range we want, we just need to grab the returned options.
+ WKExtractWordDefinitionTokenRangeFromContextualString(fullPlainTextString, rangeToPass, options);
+
+ return selectedRange.release();
+}
+
+static PassRefPtr<Range> rangeForDictionaryLookupAtHitTestResult(const HitTestResult& hitTestResult, NSDictionary **options)
+{
</ins><span class="cx"> Node* node = hitTestResult.innerNonSharedNode();
</span><span class="cx"> if (!node)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -539,11 +564,9 @@
</span><span class="cx"> if (position.isNull())
</span><span class="cx"> position = firstPositionInOrBeforeNode(node);
</span><span class="cx">
</span><del>- VisibleSelection selection = m_page->focusController().focusedOrMainFrame().selection().selection();
- if (shouldUseSelection(position, selection)) {
- performDictionaryLookupForSelection(frame, selection);
- return nullptr;
- }
</del><ins>+ VisibleSelection selection = frame->page()->focusController().focusedOrMainFrame().selection().selection();
+ if (shouldUseSelection(position, selection))
+ return rangeForDictionaryLookupForSelection(frame->selection().selection(), options);
</ins><span class="cx">
</span><span class="cx"> // As context, we are going to use 250 characters of text before and after the point.
</span><span class="cx"> RefPtr<Range> fullCharacterRange = rangeExpandedAroundPositionByCharacters(position, 250);
</span><span class="lines">@@ -581,28 +604,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::performDictionaryLookupForSelection(Frame* frame, const VisibleSelection& selection)
</span><span class="cx"> {
</span><del>- RefPtr<Range> selectedRange = selection.toNormalizedRange();
- if (!selectedRange)
- return;
-
</del><span class="cx"> NSDictionary *options = nil;
</span><del>-
- VisiblePosition selectionStart = selection.visibleStart();
- VisiblePosition selectionEnd = selection.visibleEnd();
-
- // As context, we are going to use the surrounding paragraphs of text.
- VisiblePosition paragraphStart = startOfParagraph(selectionStart);
- VisiblePosition paragraphEnd = endOfParagraph(selectionEnd);
-
- int lengthToSelectionStart = TextIterator::rangeLength(makeRange(paragraphStart, selectionStart).get());
- int lengthToSelectionEnd = TextIterator::rangeLength(makeRange(paragraphStart, selectionEnd).get());
- NSRange rangeToPass = NSMakeRange(lengthToSelectionStart, lengthToSelectionEnd - lengthToSelectionStart);
-
- String fullPlainTextString = plainText(makeRange(paragraphStart, paragraphEnd).get());
-
- // Since we already have the range we want, we just need to grab the returned options.
- WKExtractWordDefinitionTokenRangeFromContextualString(fullPlainTextString, rangeToPass, &options);
-
</del><ins>+ RefPtr<Range> selectedRange = rangeForDictionaryLookupForSelection(selection, &options);
</ins><span class="cx"> performDictionaryLookupForRange(frame, *selectedRange, options);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>