Title: [176736] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176736
- Author
- dburk...@apple.com
- Date
- 2014-12-03 12:13:02 -0800 (Wed, 03 Dec 2014)
Log Message
Merged r176678. rdar://problems/19072236
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176735 => 176736)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-03 20:10:54 UTC (rev 176735)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-03 20:13:02 UTC (rev 176736)
@@ -1,3 +1,25 @@
+2014-12-03 Dana Burkart <dburk...@apple.com>
+
+ Merge r176678. <rdar://problem/19072236>
+
+ 2014-12-02 Tim Horton <timothy_hor...@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 <dburk...@apple.com>
Merge r176474. <rdar://problem/19063717>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (176735 => 176736)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-03 20:10:54 UTC (rev 176735)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-12-03 20:13:02 UTC (rev 176736)
@@ -1209,6 +1209,9 @@
if ([self _shouldIgnoreWheelEvents])
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];
if (_data->_gestureController->handleScrollWheelEvent(event))
@@ -1256,6 +1259,9 @@
[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];
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
