Changeset 251012 in webkit

Timestamp:

Oct 11, 2019, 10:22:28 AM (7 years ago)

Author:

dino@apple.com

Message:

REGRESSION: fast/events/touch/ios/long-press-on-image.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=202845
Source/WebKit:

Reviewed by Antoine Quint.

Update _contentsOfUserInterfaceItem so that it returns more information
on a context menu.

• UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _contentsOfUserInterfaceItem:]):

LayoutTests:

<rdar://51717197>

Reviewed by Antoine Quint.

This test failed because images no longer pop up action sheets, but
instead use context menus.

We no longer need to test the actions in the context menu here, since
it is covered by the TestWebKitAPI/Tests/WebKitCocoa/ContextMenus test.

However, we can still use this test to ensure we are getting a
context menu on the correct element.

• fast/events/touch/ios/long-press-on-image-expected.txt:
• fast/events/touch/ios/long-press-on-image.html:
• platform/iphone-7/fast/events/touch/force-press-on-link.html: This

test currently fails and needs to be rewritten (rdar://problem/52699530),
but at least update it to use the new data from the Internal API.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/long-press-on-image-expected.txt (modified) (1 diff)
• LayoutTests/fast/events/touch/ios/long-press-on-image.html (modified) (2 diffs)
• LayoutTests/platform/iphone-7/fast/events/touch/force-press-on-link.html (modified) (2 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-10-11  Dean Jackson  <dino@apple.com>
+
+        REGRESSION: fast/events/touch/ios/long-press-on-image.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=202845
+        <rdar://51717197>
+
+        Reviewed by Antoine Quint.
+
+        This test failed because images no longer pop up action sheets, but
+        instead use context menus.
+
+        We no longer need to test the actions in the context menu here, since
+        it is covered by the TestWebKitAPI/Tests/WebKitCocoa/ContextMenus test.
+
+        However, we can still use this test to ensure we are getting a
+        context menu on the correct element.
+
+        * fast/events/touch/ios/long-press-on-image-expected.txt:
+        * fast/events/touch/ios/long-press-on-image.html:
+        * platform/iphone-7/fast/events/touch/force-press-on-link.html: This
+        test currently fails and needs to be rewritten (rdar://problem/52699530),
+        but at least update it to use the new data from the Internal API.
+
 2019-10-11  Peng Liu  <peng.liu6@apple.com>
 

trunk/LayoutTests/fast/events/touch/ios/long-press-on-image-expected.txt

@@ -1 @@
-Available Actions: 
-Share…
-Add to Photos
-Copy
-Cancel
-PASS
+PASS: context menu triggered on image

trunk/LayoutTests/fast/events/touch/ios/long-press-on-image.html

@@ -15 +15 @@
             (function() {
                 uiController.longPressAtPoint(30, 20, function() {
-                    uiController.uiScriptComplete(JSON.stringify(uiController.contentsOfUserInterfaceItem('actionSheet')));
+                    uiController.uiScriptComplete(JSON.stringify(uiController.contentsOfUserInterfaceItem('contextMenu')));
                 });
              })();`
@@ -28 +28 @@
             if (testRunner.runUIScript) {
                 testRunner.runUIScript(getUIScript(), function(result) {
-                    var actionDictionary = JSON.parse(result);
-                    var actionStrings = actionDictionary.actionSheet;
+                    var results = JSON.parse(result).contextMenu;
                     var output = '';
-                    if (actionStrings[0] == 'Share…' && actionStrings[1] == 'Add to Photos' && actionStrings[2] == 'Copy' && actionStrings[3] == 'Cancel') {
-                        output += 'Available Actions: <br>';
-                        output +=  actionStrings.join('<br>');
-                        output += '<br>';
-                        output += 'PASS';
-                    }
-                    else {
-                        output += 'Available Actions: <br>';
-                        output += actionStrings.join('<br>');
-                        output += '<br>';
-                        output += 'FAIL'
-                    }
+                    if (results.imageURL.includes("dice.png") && results.isImage && !results.isLink)
+                        output += 'PASS: context menu triggered on image';
+                    else
+                        output += 'FAIL: context menu was not triggered on image';
 
                     document.getElementById('target').innerHTML = output;

trunk/LayoutTests/platform/iphone-7/fast/events/touch/force-press-on-link.html

@@ -53 +53 @@
              
                 uiController.didShowForcePressPreviewCallback = function() {
-                    uiController.uiScriptComplete(JSON.stringify(uiController.contentsOfUserInterfaceItem('linkPreviewPopoverContents')));
+                    uiController.uiScriptComplete(JSON.stringify(uiController.contentsOfUserInterfaceItem('contextMenu')));
                 };
              
@@ -79 +79 @@
             if (testRunner.runUIScript) {
                 testRunner.runUIScript(getUIScript(), function(result) {
-                    var uiContentsDictionary = JSON.parse(result);
-                    var pageURL = uiContentsDictionary.linkPreviewPopoverContents.pageURL;
-                    if (pageURL = 'http://localhost:54321')
+                    var results = JSON.parse(result).contextMenu;
+                    if (results.url == 'http://localhost:54321' && results.isLink)
                         output += 'PASS: correct page loaded in popover';
                     document.getElementById('target').innerHTML = output;

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-11  Dean Jackson  <dino@apple.com>
+
+        REGRESSION: fast/events/touch/ios/long-press-on-image.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=202845
+
+        Reviewed by Antoine Quint.
+
+        Update _contentsOfUserInterfaceItem so that it returns more information
+        on a context menu.
+
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _contentsOfUserInterfaceItem:]):
+
 2019-10-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -7896 +7896 @@
 
 #if HAVE(LINK_PREVIEW)
-    if ([userInterfaceItem isEqualToString:@"linkPreviewPopoverContents"]) {
+    if ([userInterfaceItem isEqualToString:@"contextMenu"]) {
         if (self._shouldUseContextMenus)
-            return @{ userInterfaceItem: @{ @"pageURL": WTF::userVisibleString(_positionInformation.url) } };
+            return @{ userInterfaceItem: @{
+                @"url": _positionInformation.url.isValid() ? WTF::userVisibleString(_positionInformation.url) : @"",
+                @"isLink": [NSNumber numberWithBool:_positionInformation.isLink],
+                @"isImage": [NSNumber numberWithBool:_positionInformation.isImage],
+                @"imageURL": _positionInformation.imageURL.isValid() ? WTF::userVisibleString(_positionInformation.imageURL) : @""
+            } };
 
         NSString *url = [_previewItemController previewData][UIPreviewDataLink];
-        return @{ userInterfaceItem: @{ @"pageURL": url } };
+        return @{ userInterfaceItem: @{
+            @"url": url,
+            @"isLink": [NSNumber numberWithBool:_positionInformation.isLink],
+            @"isImage": [NSNumber numberWithBool:_positionInformation.isImage],
+            @"imageURL": _positionInformation.imageURL.isValid() ? WTF::userVisibleString(_positionInformation.imageURL) : @""
+        } };
     }
 #endif