<!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>[183077] 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/183077">183077</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 15:01:52 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Context menu doesn't account for selection semantics
https://bugs.webkit.org/show_bug.cgi?id=143958
<rdar://problem/19735706>
Reviewed by Tim Horton.
Before using the default word-only selection, check with the
lookup service to see if we can get a semantically appropriate
selection.
* page/EventHandler.cpp:
(WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup):
(WebCore::EventHandler::selectClosestWordFromHitTestResult):
* page/EventHandler.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183076 => 183077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-21 20:55:45 UTC (rev 183076)
+++ trunk/Source/WebCore/ChangeLog 2015-04-21 22:01:52 UTC (rev 183077)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-21 Brent Fulgham <bfulgham@apple.com>
+
+ Context menu doesn't account for selection semantics
+ https://bugs.webkit.org/show_bug.cgi?id=143958
+ <rdar://problem/19735706>
+
+ Reviewed by Tim Horton.
+
+ Before using the default word-only selection, check with the
+ lookup service to see if we can get a semantically appropriate
+ selection.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup):
+ (WebCore::EventHandler::selectClosestWordFromHitTestResult):
+ * page/EventHandler.h:
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup):
+
</ins><span class="cx"> 2015-04-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of an unneeded function from LoaderNSURLExtras.mm
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (183076 => 183077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2015-04-21 20:55:45 UTC (rev 183076)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2015-04-21 22:01:52 UTC (rev 183077)
</span><span class="lines">@@ -569,21 +569,31 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(MAC)
+VisibleSelection EventHandler::selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult&)
+{
+ return VisibleSelection();
+}
+#endif
+
</ins><span class="cx"> void EventHandler::selectClosestWordFromHitTestResult(const HitTestResult& result, AppendTrailingWhitespace appendTrailingWhitespace)
</span><span class="cx"> {
</span><span class="cx"> Node* targetNode = result.targetNode();
</span><span class="cx"> VisibleSelection newSelection;
</span><span class="cx">
</span><span class="cx"> if (targetNode && targetNode->renderer()) {
</span><del>- VisiblePosition pos(targetNode->renderer()->positionForPoint(result.localPoint(), nullptr));
- if (pos.isNotNull()) {
- newSelection = VisibleSelection(pos);
- newSelection.expandUsingGranularity(WordGranularity);
</del><ins>+ newSelection = selectClosestWordFromHitTestResultBasedOnLookup(result);
+ if (newSelection.isNone()) {
+ VisiblePosition pos(targetNode->renderer()->positionForPoint(result.localPoint(), nullptr));
+ if (pos.isNotNull()) {
+ newSelection = VisibleSelection(pos);
+ newSelection.expandUsingGranularity(WordGranularity);
+ }
+
+ if (appendTrailingWhitespace == ShouldAppendTrailingWhitespace && newSelection.isRange())
+ newSelection.appendTrailingWhitespace();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (appendTrailingWhitespace == ShouldAppendTrailingWhitespace && newSelection.isRange())
- newSelection.appendTrailingWhitespace();
-
</del><span class="cx"> updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), WordGranularity);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (183076 => 183077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h 2015-04-21 20:55:45 UTC (rev 183076)
+++ trunk/Source/WebCore/page/EventHandler.h 2015-04-21 22:01:52 UTC (rev 183077)
</span><span class="lines">@@ -325,6 +325,7 @@
</span><span class="cx"> bool eventActivatedView(const PlatformMouseEvent&) const;
</span><span class="cx"> bool updateSelectionForMouseDownDispatchingSelectStart(Node*, const VisibleSelection&, TextGranularity);
</span><span class="cx"> void selectClosestWordFromHitTestResult(const HitTestResult&, AppendTrailingWhitespace);
</span><ins>+ VisibleSelection selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult&);
</ins><span class="cx"> void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&);
</span><span class="cx"> void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (183076 => 183077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-04-21 20:55:45 UTC (rev 183076)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2015-04-21 22:01:52 UTC (rev 183077)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "Chrome.h"
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "DataTransfer.h"
</span><ins>+#include "DictionaryLookup.h"
</ins><span class="cx"> #include "DragController.h"
</span><span class="cx"> #include "EventNames.h"
</span><span class="cx"> #include "FocusController.h"
</span><span class="lines">@@ -45,6 +46,7 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx"> #include "PlatformEventFactoryMac.h"
</span><ins>+#include "Range.h"
</ins><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "RenderListBox.h"
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="lines">@@ -1007,4 +1009,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+VisibleSelection EventHandler::selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult& result)
+{
+ NSDictionary *options = nil;
+ if (RefPtr<Range> range = rangeForDictionaryLookupAtHitTestResult(result, &options))
+ return VisibleSelection(range.get());
+
+ return VisibleSelection();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>