Changeset 175524 in webkit

Timestamp:

Nov 4, 2014, 12:20:46 AM (11 years ago)

Author:

timothy_horton@apple.com

Message:

Dictionary lookup panel pops up at random when clicking on selected text
​https://bugs.webkit.org/show_bug.cgi?id=138353
<rdar://problem/18861406>

• WebProcess/WebPage/WebPage.h:

Fix the build; this needs to be public.

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::rangeForDictionaryLookupAtHitTestResult):
Use the right selection (the one we just tested) in the change from r175517.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebPage/mac/WebPageMac.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
+
+        * WebProcess/WebPage/WebPage.h:
+        Fix the build; this needs to be public.
+
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::rangeForDictionaryLookupAtHitTestResult):
+        Use the right selection (the one we just tested) in the change from r175517.
+
 2014-11-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -657 +657 @@
     void stopSpeaking();
 
+    void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&);
 #endif
 
@@ -972 +973 @@
     void performDictionaryLookupAtLocation(const WebCore::FloatPoint&);
     void performDictionaryLookupOfCurrentSelection();
-    void performDictionaryLookupForSelection(WebCore::Frame*, const WebCore::VisibleSelection&);
     void performDictionaryLookupForRange(WebCore::Frame*, WebCore::Range&, NSDictionary *options);
 

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -572 +572 @@
     VisibleSelection selection = frame->page()->focusController().focusedOrMainFrame().selection().selection();
     if (shouldUseSelection(position, selection))
-        return rangeForDictionaryLookupForSelection(frame->selection().selection(), options);
+        return rangeForDictionaryLookupForSelection(selection, options);
 
     // As context, we are going to use 250 characters of text before and after the point.