Changeset 176736 in webkit

Timestamp:

Dec 3, 2014, 12:13:02 PM (12 years ago)

Author:

dburkart@apple.com

Message:

Merged r176678. rdar://problems/19072236

Location:

branches/safari-600.3-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (2 diffs)

branches/safari-600.3-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-03  Dana Burkart  <dburkart@apple.com>
+
+        Merge r176678. <rdar://problem/19072236>
+
+    2014-12-02  Tim Horton  <timothy_horton@apple.com>
+
+            TextIndicator can get stuck (especially if we don't get LUNotificationPopoverWillClose when we should)
+            https://bugs.webkit.org/show_bug.cgi?id=139175
+            <rdar://problem/19072236>
+
+            Reviewed by Beth Dakin.
+
+            * UIProcess/API/mac/WKView.mm:
+            (-[WKView scrollWheel:]):
+            (-[WKView mouseDown:]):
+            Work around <rdar://problem/19086993> by always explicitly clearing the
+            active text indicator in mouseDown: and scrollWheel:.
+            This way, even if you manage to get a text indicator that outlives the
+            Look Up popover (or find-in-page, or whatever), it will be dismissed
+            by clicking or scrolling the view.
+
+
 2014-12-02  Dana Burkart  <dburkart@apple.com>
 

branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1210 +1210 @@
         return;
 
+    // Work around <rdar://problem/19086993> by always clearing the active text indicator on scroll.
+    [self _setTextIndicator:nullptr fadeOut:NO];
+
     if (_data->_allowsBackForwardNavigationGestures) {
         [self _ensureGestureController];
@@ -1257 +1260 @@
     [self _setMouseDownEvent:event];
     _data->_ignoringMouseDraggedEvents = NO;
+
+    // Work around <rdar://problem/19086993> by always clearing the active text indicator on mouseDown.
+    [self _setTextIndicator:nullptr fadeOut:NO];
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
     [_data->_actionMenuController wkView:self willHandleMouseDown:event];