147743 2015-08-06 13:06:19 -0700 Allow long press to cancel link preview 2015-08-06 13:15:24 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica commit-queue oldest_to_newest 1115416 0 enrica 2015-08-06 13:06:19 -0700 We want to allow the context menu to appear during link preview. rdar://problem/22128839 1115418 1 258388 enrica 2015-08-06 13:10:51 -0700 Created attachment 258388 Patch 1115420 2 commit-queue 2015-08-06 13:12:34 -0700 Attachment 258388 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:1081: Non-label code inside switch statements should be indented. [whitespace/indent] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1115421 3 enrica 2015-08-06 13:15:24 -0700 Committed revision 188053 258388 2015-08-06 13:10:51 -0700 2015-08-06 13:12:55 -0700 Patch menu-on-link-preview.txt text/plain 5283 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODA1MikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE1LTA4LTA2ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgbG9uZyBwcmVzcyB0 byBjYW5jZWwgbGluayBwcmV2aWV3LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ3NzQzCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzIyMTI4ODM5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICBXZSBzaG91bGQgYmUg YWJsZSB0byBzaG93IHRoZSBjb250ZXh0IG1lbnUgYXQgdGhlIGJlZ2lubmlnIG9mIGxpbmsgcHJl dmlldy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06 CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3JlbW92ZURlZmF1bHRHZXN0dXJlUmVjb2duaXpl cnNdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfYWRkRGVmYXVsdEdlc3R1cmVSZWNvZ25p emVyc10pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGdlc3R1cmVSZWNvZ25pemVyOnNob3Vs ZFJlY29nbml6ZVNpbXVsdGFuZW91c2x5V2l0aEdlc3R1cmVSZWNvZ25pemVyOl0pOgorICAgICAg ICAoLVtXS0NvbnRlbnRWaWV3IF9sb25nUHJlc3NSZWNvZ25pemVkOl0pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9zaW5nbGVUYXBSZWNvZ25pemVkOl0pOgorICAgICAgICAoLVtXS0NvbnRl bnRWaWV3IF9yZWdpc3RlclByZXZpZXddKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfdW5y ZWdpc3RlclByZXZpZXddKToKKwogMjAxNS0wOC0wNiAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBs ZS5jb20+CiAKICAgICAgICAgTWVkaWEgU2Vzc2lvbjogcmVuYW1lIGlzRm9jdXNlZENvbnRlbnRN ZWRpYUVsZW1lbnRQYXVzZWQgYW5kIGdldCByaWQgb2YgY2FsbGJhY2sKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24uaAkocmV2aXNpb24gMTg3NzQzKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNyw3 IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7CiAgICAgUmV0YWluUHRyPFdLRm9ybUlu cHV0U2Vzc2lvbj4gX2Zvcm1JbnB1dFNlc3Npb247CiAgICAgUmV0YWluUHRyPFdLRmlsZVVwbG9h ZFBhbmVsPiBfZmlsZVVwbG9hZFBhbmVsOwogICAgIFJldGFpblB0cjxVSUdlc3R1cmVSZWNvZ25p emVyPiBfcHJldmlld0dlc3R1cmVSZWNvZ25pemVyOworICAgIFJldGFpblB0cjxVSUdlc3R1cmVS ZWNvZ25pemVyPiBfcHJldmlld1NlY29uZGFyeUdlc3R1cmVSZWNvZ25pemVyOwogI2lmIEhBVkUo TElOS19QUkVWSUVXKQogICAgIFJldGFpblB0cjxVSVByZXZpZXdJdGVtQ29udHJvbGxlcj4gX3By ZXZpZXdJdGVtQ29udHJvbGxlcjsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHJldmlz aW9uIDE4Nzc0MykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MTIsNyArNDEyLDYgQEAgLSAodm9p ZClfcmVtb3ZlRGVmYXVsdEdlc3R1cmVSZWNvZ25pemVycwogICAgIFtzZWxmIHJlbW92ZUdlc3R1 cmVSZWNvZ25pemVyOl90b3VjaEV2ZW50R2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOwogICAgIFtz ZWxmIHJlbW92ZUdlc3R1cmVSZWNvZ25pemVyOl9zaW5nbGVUYXBHZXN0dXJlUmVjb2duaXplci5n ZXQoKV07CiAgICAgW3NlbGYgcmVtb3ZlR2VzdHVyZVJlY29nbml6ZXI6X2hpZ2hsaWdodExvbmdQ cmVzc0dlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKLSAgICBbc2VsZiByZW1vdmVHZXN0dXJlUmVj b2duaXplcjpfbG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOwogICAgIFtzZWxmIHJl bW92ZUdlc3R1cmVSZWNvZ25pemVyOl9kb3VibGVUYXBHZXN0dXJlUmVjb2duaXplci5nZXQoKV07 CiAgICAgW3NlbGYgcmVtb3ZlR2VzdHVyZVJlY29nbml6ZXI6X3R3b0ZpbmdlckRvdWJsZVRhcEdl c3R1cmVSZWNvZ25pemVyLmdldCgpXTsKIH0KQEAgLTQyMiw3ICs0MjEsNiBAQCAtICh2b2lkKV9h ZGREZWZhdWx0R2VzdHVyZVJlY29nbml6ZXJzCiAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6 ZXI6X3RvdWNoRXZlbnRHZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAgICAgW3NlbGYgYWRkR2Vz dHVyZVJlY29nbml6ZXI6X3NpbmdsZVRhcEdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKICAgICBb c2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29n bml6ZXIuZ2V0KCldOwotICAgIFtzZWxmIGFkZEdlc3R1cmVSZWNvZ25pemVyOl9sb25nUHJlc3NH ZXN0dXJlUmVjb2duaXplci5nZXQoKV07CiAgICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6 X2RvdWJsZVRhcEdlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKICAgICBbc2VsZiBhZGRHZXN0dXJl UmVjb2duaXplcjpfdHdvRmluZ2VyRG91YmxlVGFwR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCldOwog fQpAQCAtODczLDYgKzg3MSw5IEBAIC0gKEJPT0wpZ2VzdHVyZVJlY29nbml6ZXI6KFVJR2VzdHVy ZVJlY28KICAgICBpZiAoaXNTYW1lUGFpcihnZXN0dXJlUmVjb2duaXplciwgb3RoZXJHZXN0dXJl UmVjb2duaXplciwgX3NpbmdsZVRhcEdlc3R1cmVSZWNvZ25pemVyLmdldCgpLCBfdGV4dFNlbGVj dGlvbkFzc2lzdGFudC5nZXQoKS5zaW5nbGVUYXBHZXN0dXJlKSkKICAgICAgICAgcmV0dXJuIFlF UzsKIAorICAgIGlmIChpc1NhbWVQYWlyKGdlc3R1cmVSZWNvZ25pemVyLCBvdGhlckdlc3R1cmVS ZWNvZ25pemVyLCBfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIuZ2V0KCksIF9w cmV2aWV3U2Vjb25kYXJ5R2VzdHVyZVJlY29nbml6ZXIuZ2V0KCkpKQorICAgICAgICByZXR1cm4g WUVTOworCiAgICAgaWYgKGlzU2FtZVBhaXIoZ2VzdHVyZVJlY29nbml6ZXIsIG90aGVyR2VzdHVy ZVJlY29nbml6ZXIsIF9oaWdobGlnaHRMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplci5nZXQoKSwg X3ByZXZpZXdHZXN0dXJlUmVjb2duaXplci5nZXQoKSkpCiAgICAgICAgIHJldHVybiBZRVM7CiAK QEAgLTEwNzMsMjEgKzEwNzQsMjUgQEAgLSAodm9pZClfbG9uZ1ByZXNzUmVjb2duaXplZDooVUlM b25nUHJlcwogewogICAgIEFTU0VSVChnZXN0dXJlUmVjb2duaXplciA9PSBfbG9uZ1ByZXNzR2Vz dHVyZVJlY29nbml6ZXIpOwogCi0jaWYgSEFWRShMSU5LX1BSRVZJRVcpCi0gICAgaWYgKFtfcHJl dmlld0l0ZW1Db250cm9sbGVyIGludGVyYWN0aW9uSW5Qcm9ncmVzc10pCi0gICAgICAgIHJldHVy bjsKLSNlbmRpZgotCiAgICAgX2xhc3RJbnRlcmFjdGlvbkxvY2F0aW9uID0gZ2VzdHVyZVJlY29n bml6ZXIuc3RhcnRQb2ludDsKIAotICAgIGlmIChbZ2VzdHVyZVJlY29nbml6ZXIgc3RhdGVdID09 IFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUJlZ2FuKSB7CisgICAgc3dpdGNoIChbZ2VzdHVyZVJl Y29nbml6ZXIgc3RhdGVdKSB7CisgICAgY2FzZSBVSUdlc3R1cmVSZWNvZ25pemVyU3RhdGVCZWdh bjoKKyAgICB7CiAgICAgICAgIFNFTCBhY3Rpb24gPSBbc2VsZiBfYWN0aW9uRm9yTG9uZ1ByZXNz XTsKICAgICAgICAgaWYgKGFjdGlvbikgewogICAgICAgICAgICAgW3NlbGYgcGVyZm9ybVNlbGVj dG9yOmFjdGlvbl07CiAgICAgICAgICAgICBbc2VsZiBfY2FuY2VsTG9uZ1ByZXNzR2VzdHVyZVJl Y29nbml6ZXJdOwotICAgICAgICAgICAgW1VJQXBwIF9jYW5jZWxBbGxUb3VjaGVzXTsKICAgICAg ICAgfQogICAgIH0KKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBVSUdlc3R1cmVSZWNvZ25pemVy U3RhdGVDYW5jZWxsZWQ6CisgICAgY2FzZSBVSUdlc3R1cmVSZWNvZ25pemVyU3RhdGVFbmRlZDoK KyAgICAgICAgW19hY3Rpb25TaGVldEFzc2lzdGFudCBjbGVhbnVwU2hlZXRdOworICAgICAgICBi cmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9CiB9CiAKIC0gKHZvaWQp X3NpbmdsZVRhcFJlY29nbml6ZWQ6KFVJVGFwR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVj b2duaXplcgpAQCAtMzIxNCwxMiArMzIxOSwxNCBAQCAtICh2b2lkKV9yZWdpc3RlclByZXZpZXcK ICAgICBfcHJldmlld0l0ZW1Db250cm9sbGVyID0gYWRvcHROUyhbW1VJUHJldmlld0l0ZW1Db250 cm9sbGVyIGFsbG9jXSBpbml0V2l0aFZpZXc6c2VsZl0pOwogICAgIFtfcHJldmlld0l0ZW1Db250 cm9sbGVyIHNldERlbGVnYXRlOnNlbGZdOwogICAgIF9wcmV2aWV3R2VzdHVyZVJlY29nbml6ZXIg PSBfcHJldmlld0l0ZW1Db250cm9sbGVyLmdldCgpLnByZXNlbnRhdGlvbkdlc3R1cmVSZWNvZ25p emVyOworICAgIF9wcmV2aWV3U2Vjb25kYXJ5R2VzdHVyZVJlY29nbml6ZXIgPSBfcHJldmlld0l0 ZW1Db250cm9sbGVyLmdldCgpLnByZXNlbnRhdGlvblNlY29uZGFyeUdlc3R1cmVSZWNvZ25pemVy OwogfQogCiAtICh2b2lkKV91bnJlZ2lzdGVyUHJldmlldwogewogICAgIFtfcHJldmlld0l0ZW1D b250cm9sbGVyIHNldERlbGVnYXRlOm5pbF07CiAgICAgX3ByZXZpZXdHZXN0dXJlUmVjb2duaXpl ciA9IG5pbDsKKyAgICBfcHJldmlld1NlY29uZGFyeUdlc3R1cmVSZWNvZ25pemVyID0gbmlsOwog ICAgIF9wcmV2aWV3SXRlbUNvbnRyb2xsZXIgPSBuaWw7CiB9CiAK