Title: [176635] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176635
- Author
- dburk...@apple.com
- Date
- 2014-12-02 06:14:53 -0800 (Tue, 02 Dec 2014)
Log Message
Merge r176414. rdar://problem/19042207
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176634 => 176635)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 14:03:45 UTC (rev 176634)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-02 14:14:53 UTC (rev 176635)
@@ -1,5 +1,27 @@
2014-12-02 Dana Burkart <dburk...@apple.com>
+ Merge r176414. rdar://problem/19042207
+
+ 2014-11-20 Tim Horton <timothy_hor...@apple.com>
+
+ Don't use a TextIndicator BounceAndCrossfade transition if the selection highlight is never shown
+ https://bugs.webkit.org/show_bug.cgi?id=138919
+ <rdar://problem/19042207>
+
+ Reviewed by Beth Dakin.
+
+ * Shared/TextIndicator.h:
+ (WebKit::TextIndicator::presentationTransition):
+ (WebKit::TextIndicator::setPresentationTransition):
+ Add getter and setter pair.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForDataDetectedText]):
+ If the selection highlight will never be shown because there's only a single menu item,
+ use a normal bounce animation instead of bounce + crossfade.
+
+2014-12-02 Dana Burkart <dburk...@apple.com>
+
Merge r176412. rdar://problem/18904600
2014-11-20 Beth Dakin <bda...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit2/Shared/TextIndicator.h (176634 => 176635)
--- branches/safari-600.3-branch/Source/WebKit2/Shared/TextIndicator.h 2014-12-02 14:03:45 UTC (rev 176634)
+++ branches/safari-600.3-branch/Source/WebKit2/Shared/TextIndicator.h 2014-12-02 14:14:53 UTC (rev 176635)
@@ -81,6 +81,10 @@
~TextIndicator();
WebCore::FloatRect selectionRectInWindowCoordinates() const { return m_data.selectionRectInWindowCoordinates; }
+
+ PresentationTransition presentationTransition() const { return m_data.presentationTransition; }
+ void setPresentationTransition(PresentationTransition transition) { m_data.presentationTransition = transition; }
+
WebCore::FloatRect frameRect() const;
Data data() const { return m_data; }
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176634 => 176635)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 14:03:45 UTC (rev 176634)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-02 14:14:53 UTC (rev 176635)
@@ -604,7 +604,10 @@
[_currentActionContext setHighlightFrame:[_wkView.window convertRectToScreen:[_wkView convertRect:_hitTestResult.detectedDataBoundingBox toView:nil]]];
- return [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_currentActionContext mainResult] actionContext:_currentActionContext.get()];
+ NSArray *menuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForResult:[_currentActionContext mainResult] actionContext:_currentActionContext.get()];
+ if (menuItems.count == 1 && _hitTestResult.detectedDataTextIndicator)
+ _hitTestResult.detectedDataTextIndicator->setPresentationTransition(TextIndicator::PresentationTransition::Bounce);
+ return menuItems;
}
- (NSArray *)_defaultMenuItemsForText
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
