<!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>[183138] trunk</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/183138">183138</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-04-22 15:10:29 -0700 (Wed, 22 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
&lt;rdar://problem/19735706&gt;

Reviewed by Tim Horton.

Source/WebCore:

Before using the default word-only selection for context menus, check with the
lookup service to see if we can get a semantically appropriate selection.

* editing/EditingBehavior.h:
(WebCore::EditingBehavior::shouldSelectBasedOnDictionaryLookup): Added, so that we can
behavior correctly when using non-Mac editing behavior.
* editing/mac/DictionaryLookup.mm:
(WebCore::rangeForDictionaryLookupAtHitTestResult): Modified to honor standard WebKit
behavior when hit testing at end-of-line/end-of-paragraph, etc.
* page/EventHandler.cpp:
(WebCore::EventHandler::shouldAppendTrailingWhitespace): New helper function to share code.
(WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup): Added.
(WebCore::EventHandler::selectClosestContextualWordFromMouseEvent): Added.
(WebCore::EventHandler::selectClosestContextualWordOrLinkFromMouseEvent): Renamed from selectClosestWordOrLinkFromMouseEvent.
Have this call the new 'selectClosestContextualWordFromMouseEvent' instead of the vanilla 'selectClosestWordFromMouseEvent'.
* page/EventHandler.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup): Added.

LayoutTests:

* editing/selection/context-menu-text-selection-lookup-expected.txt: Added.
* editing/selection/context-menu-text-selection-lookup.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingBehaviorh">trunk/Source/WebCore/editing/EditingBehavior.h</a></li>
<li><a href="#trunkSourceWebCoreeditingmacDictionaryLookupmm">trunk/Source/WebCore/editing/mac/DictionaryLookup.mm</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>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingselectioncontextmenutextselectionlookupexpectedtxt">trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectioncontextmenutextselectionlookuphtml">trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/LayoutTests/ChangeLog        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-22  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        Context menu doesn't account for selection semantics
+        https://bugs.webkit.org/show_bug.cgi?id=143958
+        &lt;rdar://problem/19735706&gt;
+
+        Reviewed by Tim Horton.
+
+        * editing/selection/context-menu-text-selection-lookup-expected.txt: Added.
+        * editing/selection/context-menu-text-selection-lookup.html: Added.
+
</ins><span class="cx"> 2015-04-22  Jeremy Jones  &lt;jeremyj@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Expect failure on windows for treeitem-child-exposed test.
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectioncontextmenutextselectionlookupexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup-expected.txt (0 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup-expected.txt        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+CONSOLE MESSAGE: line 31: ReferenceError: Can't find variable: expectedText
+This test checks that triggering the context menu selects/doesn't select using surround text as context (as platform-appropriate).
+
+New York
+RUNNING
+RUNNING
+RUNNING
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectioncontextmenutextselectionlookuphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup.html (0 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup.html                                (rev 0)
+++ trunk/LayoutTests/editing/selection/context-menu-text-selection-lookup.html        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+&lt;body onload=&quot;load()&quot;&gt;
+&lt;p&gt;This test checks that triggering the context menu selects/doesn't select using surround text as context (as platform-appropriate).&lt;/p&gt;
+&lt;div id=&quot;text&quot;&gt;New York&lt;/div&gt;
+&lt;div id=&quot;resultmac&quot;&gt;RUNNING&lt;/div&gt;
+&lt;div id=&quot;resultwin&quot;&gt;RUNNING&lt;/div&gt;
+&lt;div id=&quot;resultunix&quot;&gt;RUNNING&lt;/div&gt;
+&lt;/body&gt;
+&lt;script&gt;
+function test(platform, selectionExpected, expectedText, result)
+{
+    // clear selection
+    window.getSelection().removeAllRanges();
+
+    internals.settings.setEditingBehavior(platform);
+
+    var text = document.getElementById(&quot;text&quot;);
+
+    var x = text.offsetParent.offsetLeft + text.offsetLeft + 4;
+    var y = text.offsetParent.offsetTop + text.offsetTop + text.offsetHeight / 2;
+
+    eventSender.mouseMoveTo(x, y);
+    eventSender.contextClick();
+    // esc key to kill the context menu
+    eventSender.keyDown(String.fromCharCode(0x001B), null);
+
+    var resultElement = document.getElementById(result);
+    var selectionType = window.getSelection().type;
+    if (selectionExpected) {
+        if (selectionType == &quot;Range&quot;) {
+            var selectionText = window.getSelection().toString();
+            if (selectionText == expectedText)
+                resultElement.innerHTML = &quot;SUCCESS&quot;;
+            else
+                resultElement.innerHTML = &quot;FAILURE: We expected &quot; + expectedText + &quot;, but we got &quot; + selectionText + &quot;.&quot;;
+        } else
+            resultElement.innerHTML = &quot;FAILURE: There should be a selection.&quot;;
+    } else {
+        if (selectionType == &quot;Range&quot;)
+            resultElement.innerHTML = &quot;FAILURE: There shouldn't be a selection.&quot;;
+        else
+            resultElement.innerHTML = &quot;SUCCESS&quot;;
+    }
+}
+
+function load()
+{
+    if (!window.eventSender || !window.testRunner || !window.internals)
+        return;
+
+    testRunner.dumpAsText();
+
+    test('mac', true, 'New York', 'resultmac');
+    test('win', false, '', 'resultwin');
+    test('unix', false, '', 'resultunix');
+}
+&lt;/script&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/Source/WebCore/ChangeLog        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-04-22  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        Context menu doesn't account for selection semantics
+        https://bugs.webkit.org/show_bug.cgi?id=143958
+        &lt;rdar://problem/19735706&gt;
+
+        Reviewed by Tim Horton.
+
+        Before using the default word-only selection for context menus, check with the
+        lookup service to see if we can get a semantically appropriate selection.
+
+        * editing/EditingBehavior.h:
+        (WebCore::EditingBehavior::shouldSelectBasedOnDictionaryLookup): Added, so that we can
+        behavior correctly when using non-Mac editing behavior.
+        * editing/mac/DictionaryLookup.mm:
+        (WebCore::rangeForDictionaryLookupAtHitTestResult): Modified to honor standard WebKit
+        behavior when hit testing at end-of-line/end-of-paragraph, etc.
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::shouldAppendTrailingWhitespace): New helper function to share code.
+        (WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup): Added.
+        (WebCore::EventHandler::selectClosestContextualWordFromMouseEvent): Added.
+        (WebCore::EventHandler::selectClosestContextualWordOrLinkFromMouseEvent): Renamed from selectClosestWordOrLinkFromMouseEvent.
+        Have this call the new 'selectClosestContextualWordFromMouseEvent' instead of the vanilla 'selectClosestWordFromMouseEvent'.
+        * page/EventHandler.h:
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::selectClosestWordFromHitTestResultBasedOnLookup): Added.
+
</ins><span class="cx"> 2015-04-21  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [Mac] Extend action menus to support PDF
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingBehaviorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingBehavior.h (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingBehavior.h        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/Source/WebCore/editing/EditingBehavior.h        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -89,6 +89,8 @@
</span><span class="cx">     // space when deleting password cause space been showed insecurely.
</span><span class="cx">     bool shouldRebalanceWhiteSpacesInSecureField() const { return m_type != EditingIOSBehavior; }
</span><span class="cx"> 
</span><ins>+    bool shouldSelectBasedOnDictionaryLookup() const { return m_type == EditingMacBehavior; }
+
</ins><span class="cx"> private:
</span><span class="cx">     EditingBehaviorType m_type;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacDictionaryLookupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/DictionaryLookup.mm (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/DictionaryLookup.mm        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/Source/WebCore/editing/mac/DictionaryLookup.mm        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -143,6 +143,10 @@
</span><span class="cx">     if (shouldUseSelection(position, selection))
</span><span class="cx">         return rangeForDictionaryLookupForSelection(selection, options);
</span><span class="cx"> 
</span><ins>+    VisibleSelection selectionAccountingForLineRules = VisibleSelection(position);
+    selectionAccountingForLineRules.expandUsingGranularity(WordGranularity);
+    position = selectionAccountingForLineRules.start();
+
</ins><span class="cx">     // As context, we are going to use 250 characters of text before and after the point.
</span><span class="cx">     RefPtr&lt;Range&gt; fullCharacterRange = rangeExpandedAroundPositionByCharacters(position, 250);
</span><span class="cx">     if (!fullCharacterRange)
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -588,19 +588,53 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static AppendTrailingWhitespace shouldAppendTrailingWhitespace(const MouseEventWithHitTestResults&amp; result, const Frame&amp; frame)
+{
+    return (result.event().clickCount() == 2 &amp;&amp; frame.editor().isSelectTrailingWhitespaceEnabled()) ? ShouldAppendTrailingWhitespace : DontAppendTrailingWhitespace;
+}
+
</ins><span class="cx"> void EventHandler::selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&amp; result)
</span><span class="cx"> {
</span><del>-    if (m_mouseDownMayStartSelect) {
-        selectClosestWordFromHitTestResult(result.hitTestResult(),
-            (result.event().clickCount() == 2 &amp;&amp; m_frame.editor().isSelectTrailingWhitespaceEnabled()) ? ShouldAppendTrailingWhitespace : DontAppendTrailingWhitespace);
-    }
</del><ins>+    if (m_mouseDownMayStartSelect)
+        selectClosestWordFromHitTestResult(result.hitTestResult(), shouldAppendTrailingWhitespace(result, m_frame));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void EventHandler::selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&amp; result)
</del><ins>+#if !PLATFORM(MAC)
+VisibleSelection EventHandler::selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult&amp;)
</ins><span class="cx"> {
</span><ins>+    return VisibleSelection();
+}
+#endif
+    
+void EventHandler::selectClosestContextualWordFromMouseEvent(const MouseEventWithHitTestResults&amp; mouseEvent)
+{
+    Node* targetNode = mouseEvent.targetNode();
+    const HitTestResult&amp; result = mouseEvent.hitTestResult();
+    VisibleSelection newSelection;
+    bool appendTrailingWhitespace = shouldAppendTrailingWhitespace(mouseEvent, m_frame);
+    
+    if (targetNode &amp;&amp; targetNode-&gt;renderer()) {
+        newSelection = selectClosestWordFromHitTestResultBasedOnLookup(result);
+        if (newSelection.isNone()) {
+            VisiblePosition pos(targetNode-&gt;renderer()-&gt;positionForPoint(result.localPoint(), nullptr));
+            if (pos.isNotNull()) {
+                newSelection = VisibleSelection(pos);
+                newSelection.expandUsingGranularity(WordGranularity);
+            }
+        }
+        
+        if (appendTrailingWhitespace == ShouldAppendTrailingWhitespace &amp;&amp; newSelection.isRange())
+            newSelection.appendTrailingWhitespace();
+        
+        updateSelectionForMouseDownDispatchingSelectStart(targetNode, expandSelectionToRespectSelectOnMouseDown(*targetNode, newSelection), WordGranularity);
+    }
+}
+    
+void EventHandler::selectClosestContextualWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&amp; result)
+{
</ins><span class="cx">     Element* urlElement = result.hitTestResult().URLElement();
</span><span class="cx">     if (!urlElement || !isDraggableLink(*urlElement))
</span><del>-        return selectClosestWordFromMouseEvent(result);
</del><ins>+        return selectClosestContextualWordFromMouseEvent(result);
</ins><span class="cx"> 
</span><span class="cx">     Node* targetNode = result.targetNode();
</span><span class="cx"> 
</span><span class="lines">@@ -2798,7 +2832,7 @@
</span><span class="cx">         // available for text selections.  But only if we're above text.
</span><span class="cx">         &amp;&amp; (m_frame.selection().selection().isContentEditable() || (mouseEvent.targetNode() &amp;&amp; mouseEvent.targetNode()-&gt;isTextNode()))) {
</span><span class="cx">         m_mouseDownMayStartSelect = true; // context menu events are always allowed to perform a selection
</span><del>-        selectClosestWordOrLinkFromMouseEvent(mouseEvent);
</del><ins>+        selectClosestContextualWordOrLinkFromMouseEvent(mouseEvent);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     swallowEvent = !dispatchMouseEvent(eventNames().contextmenuEvent, mouseEvent.targetNode(), true, 0, event, false);
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/Source/WebCore/page/EventHandler.h        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -325,8 +325,10 @@
</span><span class="cx">     bool eventActivatedView(const PlatformMouseEvent&amp;) const;
</span><span class="cx">     bool updateSelectionForMouseDownDispatchingSelectStart(Node*, const VisibleSelection&amp;, TextGranularity);
</span><span class="cx">     void selectClosestWordFromHitTestResult(const HitTestResult&amp;, AppendTrailingWhitespace);
</span><ins>+    VisibleSelection selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult&amp;);
</ins><span class="cx">     void selectClosestWordFromMouseEvent(const MouseEventWithHitTestResults&amp;);
</span><del>-    void selectClosestWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&amp;);
</del><ins>+    void selectClosestContextualWordFromMouseEvent(const MouseEventWithHitTestResults&amp;);
+    void selectClosestContextualWordOrLinkFromMouseEvent(const MouseEventWithHitTestResults&amp;);
</ins><span class="cx"> 
</span><span class="cx">     bool handleMouseDoubleClickEvent(const PlatformMouseEvent&amp;);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (183137 => 183138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm        2015-04-22 21:41:04 UTC (rev 183137)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm        2015-04-22 22:10:29 UTC (rev 183138)
</span><span class="lines">@@ -31,7 +31,9 @@
</span><span class="cx"> #include &quot;Chrome.h&quot;
</span><span class="cx"> #include &quot;ChromeClient.h&quot;
</span><span class="cx"> #include &quot;DataTransfer.h&quot;
</span><ins>+#include &quot;DictionaryLookup.h&quot;
</ins><span class="cx"> #include &quot;DragController.h&quot;
</span><ins>+#include &quot;Editor.h&quot;
</ins><span class="cx"> #include &quot;EventNames.h&quot;
</span><span class="cx"> #include &quot;FocusController.h&quot;
</span><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="lines">@@ -45,6 +47,7 @@
</span><span class="cx"> #include &quot;Page.h&quot;
</span><span class="cx"> #include &quot;Pasteboard.h&quot;
</span><span class="cx"> #include &quot;PlatformEventFactoryMac.h&quot;
</span><ins>+#include &quot;Range.h&quot;
</ins><span class="cx"> #include &quot;RenderLayer.h&quot;
</span><span class="cx"> #include &quot;RenderListBox.h&quot;
</span><span class="cx"> #include &quot;RenderWidget.h&quot;
</span><span class="lines">@@ -1007,4 +1010,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+VisibleSelection EventHandler::selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult&amp; result)
+{
+    if (!m_frame.editor().behavior().shouldSelectBasedOnDictionaryLookup())
+        return VisibleSelection();
+
+    NSDictionary *options = nil;
+    if (RefPtr&lt;Range&gt; range = rangeForDictionaryLookupAtHitTestResult(result, &amp;options))
+        return VisibleSelection(range.get());
+
+    return VisibleSelection();
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre>
</div>
</div>

</body>
</html>