Title: [214301] trunk/Source/WebKit2
Revision
214301
Author
timothy_hor...@apple.com
Date
2017-03-23 04:33:04 -0700 (Thu, 23 Mar 2017)

Log Message

Test DataDetectors supported schemes in lowercase
https://bugs.webkit.org/show_bug.cgi?id=169994
<rdar://problem/30788920>

Reviewed by Wenson Hsieh.

* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _actionForLongPress]):
(-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
Lower-case the scheme before looking in tapAndHoldSchemes, which is
guaranteed to be in lower-case. WebCore already does this in places
that it confers with tapAndHoldSchemes.

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (214300 => 214301)


--- trunk/Source/WebKit2/ChangeLog	2017-03-23 09:25:06 UTC (rev 214300)
+++ trunk/Source/WebKit2/ChangeLog	2017-03-23 11:33:04 UTC (rev 214301)
@@ -1,3 +1,18 @@
+2017-03-23  Tim Horton  <timothy_hor...@apple.com>
+
+        Test DataDetectors supported schemes in lowercase
+        https://bugs.webkit.org/show_bug.cgi?id=169994
+        <rdar://problem/30788920>
+
+        Reviewed by Wenson Hsieh.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _actionForLongPress]):
+        (-[WKContentView _interactionShouldBeginFromPreviewItemController:forPosition:]):
+        Lower-case the scheme before looking in tapAndHoldSchemes, which is
+        guaranteed to be in lower-case. WebCore already does this in places
+        that it confers with tapAndHoldSchemes.
+
 2017-03-22  Andy Estes  <aes...@apple.com>
 
         [Cocoa] Add an option to exclude overflow when snapshotting a WKWebProcessPlugInNodeHandle

Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (214300 => 214301)


--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-03-23 09:25:06 UTC (rev 214300)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm	2017-03-23 11:33:04 UTC (rev 214301)
@@ -1291,7 +1291,7 @@
 
     if (_positionInformation.isLink) {
         NSURL *targetURL = [NSURL URLWithString:_positionInformation.url];
-        if ([[getDDDetectionControllerClass() tapAndHoldSchemes] containsObject:[targetURL scheme]])
+        if ([[getDDDetectionControllerClass() tapAndHoldSchemes] containsObject:targetURL.scheme.lowercaseString])
             return @selector(_showDataDetectorsSheet);
         return @selector(_showLinkSheet);
     }
@@ -4169,7 +4169,7 @@
             return NO;
         if (WebCore::protocolIsInHTTPFamily(absoluteLinkURL))
             return YES;
-        if ([[getDDDetectionControllerClass() tapAndHoldSchemes] containsObject:[targetURL scheme]])
+        if ([[getDDDetectionControllerClass() tapAndHoldSchemes] containsObject:targetURL.scheme.lowercaseString])
             return YES;
         return NO;
     }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to