Changeset 205983 in webkit

Timestamp:

Sep 15, 2016 10:58:01 AM (8 years ago)

Author:

Beth Dakin

Message:

dictionaryPopupInfoForRange() can change selection temporarily; updates should not
be sent to the UIProcess.
​https://bugs.webkit.org/show_bug.cgi?id=162008
-and corresponding-
rdar://problem/28312297

Reviewed by Tim Horton.

This patch prevents the selection changes that occur while gathering
dictionaryPopupInfo from being propagated to the UIProcess.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::didChangeSelection):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::dictionaryPopupInfoForRange):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-14  Beth Dakin  <bdakin@apple.com>
+
+        dictionaryPopupInfoForRange() can change selection temporarily; updates should not 
+        be sent to the UIProcess.
+        https://bugs.webkit.org/show_bug.cgi?id=162008
+        -and corresponding-
+        rdar://problem/28312297
+
+        Reviewed by Tim Horton.
+
+        This patch prevents the selection changes that occur while gathering 
+        dictionaryPopupInfo from being propagated to the UIProcess.
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didChangeSelection):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::dictionaryPopupInfoForRange):
+
 2016-09-14  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4837 +4837 @@
 void WebPage::didChangeSelection()
 {
+    // The act of getting Dictionary Popup info can make selection changes that we should not propagate to the UIProcess.
+    // Specifically, if there is a caret selection, it will change to a range selection of the word around the caret. And
+    // then it will change back.
+    if (m_isGettingDictionaryPopupInfo)
+        return;
+
     Frame& frame = m_page->focusController().focusedOrMainFrame();
     FrameView* view = frame.view();

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

@@ -1488 +1488 @@
     bool m_shouldDispatchFakeMouseMoveEvents;
     bool m_isEditorStateMissingPostLayoutData { false };
+    bool m_isGettingDictionaryPopupInfo { false };
 
     enum class EditorStateIsContentEditable { No, Yes, Unset };

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

@@ -89 +89 @@
 #import <WebCore/htmlediting.h>
 #import <WebKitSystemInterface.h>
+#import <wtf/TemporaryChange.h>
 
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
@@ -418 +419 @@
 DictionaryPopupInfo WebPage::dictionaryPopupInfoForRange(Frame* frame, Range& range, NSDictionary **options, TextIndicatorPresentationTransition presentationTransition)
 {
+    TemporaryChange<bool> isGettingDictionaryPopupInfoChange { m_isGettingDictionaryPopupInfo, true };
+
     DictionaryPopupInfo dictionaryPopupInfo;
     if (range.text().stripWhiteSpace().isEmpty())