Title: [176052] branches/safari-600.3-branch/Source
- Revision
- 176052
- Author
- [email protected]
- Date
- 2014-11-12 17:52:47 -0800 (Wed, 12 Nov 2014)
Log Message
Merged r175963. rdar://problems/18932770
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebCore/ChangeLog (176051 => 176052)
--- branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 01:45:56 UTC (rev 176051)
+++ branches/safari-600.3-branch/Source/WebCore/ChangeLog 2014-11-13 01:52:47 UTC (rev 176052)
@@ -1,5 +1,21 @@
2014-11-12 Matthew Hanson <[email protected]>
+ Merge r175963. <rdar://problem/18932770>
+
+ 2014-11-11 Tim Horton <[email protected]>
+
+ Data Detectors popovers should be dismissed upon scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=138600
+ <rdar://problem/18932770>
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/mac/DataDetectorsSPI.h:
+ Adjust the SPI header.
+
+
+2014-11-12 Matthew Hanson <[email protected]>
+
Merge r175962. <rdar://problem/18815343>
2014-11-11 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h (176051 => 176052)
--- branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-13 01:45:56 UTC (rev 176051)
+++ branches/safari-600.3-branch/Source/WebCore/platform/spi/mac/DataDetectorsSPI.h 2014-11-13 01:52:47 UTC (rev 176052)
@@ -74,6 +74,6 @@
+ (DDActionsManager *)sharedManager;
- (NSArray *)menuItemsForResult:(DDResultRef)result actionContext:(DDActionContext *)context;
-- (void)unanchorBubbles;
+- (void)requestBubbleClosureUnanchorOnFailure:(BOOL)unanchorOnFailure;
@end
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176051 => 176052)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 01:45:56 UTC (rev 176051)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 01:52:47 UTC (rev 176052)
@@ -1,5 +1,25 @@
2014-11-12 Matthew Hanson <[email protected]>
+ Merge r175963. <rdar://problem/18932770>
+
+ 2014-11-11 Tim Horton <[email protected]>
+
+ Data Detectors popovers should be dismissed upon scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=138600
+ <rdar://problem/18932770>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController prepareForMenu:withEvent:]):
+ Dismiss popovers when we start preparing another menu.
+
+ (-[WKActionMenuController dismissActionMenuPopovers]):
+ Use the new DataDetectors SPI.
+
+
+2014-11-12 Matthew Hanson <[email protected]>
+
Merge r175962. <rdar://problem/18815343>
2014-11-11 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176051 => 176052)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 01:45:56 UTC (rev 176051)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 01:52:47 UTC (rev 176052)
@@ -176,12 +176,13 @@
return;
}
+ [self dismissActionMenuPopovers];
+
_page->performActionMenuHitTestAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]);
_state = ActionMenuState::Pending;
[self _updateActionMenuItemsForStage:MenuUpdateStage::PrepareForMenu];
- [self _hideTextIndicator];
_shouldKeepPreviewPopoverOpen = NO;
}
@@ -243,9 +244,7 @@
- (void)dismissActionMenuPopovers
{
- // Ideally, this would actually dismiss the data detector popovers. We don't currently have the ability to request
- // that and know whether or not it succeeded, so we'll settle for unanchoring.
- [[getDDActionsManagerClass() sharedManager] unanchorBubbles];
+ [[getDDActionsManagerClass() sharedManager] requestBubbleClosureUnanchorOnFailure:YES];
[self _hideTextIndicator];
[self _clearPreviewPopover];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
