Title: [230447] trunk/Source/WebKit
- Revision
- 230447
- Author
- megan_gard...@apple.com
- Date
- 2018-04-09 12:31:01 -0700 (Mon, 09 Apr 2018)
Log Message
Switch to UIWKTextInteractionAssistant for non-editable text
https://bugs.webkit.org/show_bug.cgi?id=182834
Switch to only using one assistant for text selection.
Reviewed by Timothy Hatcher and Andy Estes.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView useSelectionAssistantWithGranularity:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (230446 => 230447)
--- trunk/Source/WebKit/ChangeLog 2018-04-09 17:58:57 UTC (rev 230446)
+++ trunk/Source/WebKit/ChangeLog 2018-04-09 19:31:01 UTC (rev 230447)
@@ -1,3 +1,15 @@
+2018-04-09 Megan Gardner <megan_gard...@apple.com>
+
+ Switch to UIWKTextInteractionAssistant for non-editable text
+ https://bugs.webkit.org/show_bug.cgi?id=182834
+
+ Switch to only using one assistant for text selection.
+
+ Reviewed by Timothy Hatcher and Andy Estes.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView useSelectionAssistantWithGranularity:]):
+
2018-04-09 Michael Catanzaro <mcatanz...@igalia.com>
Unreviewed, move 'using namespace' back to the right place after r230429
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (230446 => 230447)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-09 17:58:57 UTC (rev 230446)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2018-04-09 19:31:01 UTC (rev 230447)
@@ -1902,30 +1902,17 @@
- (void)useSelectionAssistantWithGranularity:(WKSelectionGranularity)selectionGranularity
{
-#if ENABLE(UNIFIED_TEXT_SELECTION)
- selectionGranularity = WKSelectionGranularityCharacter;
-#endif
- if (selectionGranularity == WKSelectionGranularityDynamic) {
- if (_textSelectionAssistant) {
- [_textSelectionAssistant deactivateSelection];
- _textSelectionAssistant = nil;
- }
- if (!_webSelectionAssistant)
- _webSelectionAssistant = adoptNS([[UIWKSelectionAssistant alloc] initWithView:self]);
- } else if (selectionGranularity == WKSelectionGranularityCharacter) {
- if (_webSelectionAssistant)
- _webSelectionAssistant = nil;
+ _webSelectionAssistant = nil;
- if (!_textSelectionAssistant)
- _textSelectionAssistant = adoptNS([[UIWKTextInteractionAssistant alloc] initWithView:self]);
- else {
- // Reset the gesture recognizers in case editibility has changed.
- [_textSelectionAssistant setGestureRecognizers];
- }
+ if (!_textSelectionAssistant)
+ _textSelectionAssistant = adoptNS([[UIWKTextInteractionAssistant alloc] initWithView:self]);
+ else {
+ // Reset the gesture recognizers in case editibility has changed.
+ [_textSelectionAssistant setGestureRecognizers];
+ }
- if (self.isFirstResponder && !self.suppressAssistantSelectionView)
- [_textSelectionAssistant activateSelection];
- }
+ if (self.isFirstResponder && !self.suppressAssistantSelectionView)
+ [_textSelectionAssistant activateSelection];
}
- (void)clearSelection
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
