197231 2019-04-24 04:55:34 -0700 Rename _highlightLongPressCanClick and only add gesture recognizer when necessary 2019-04-24 05:24:01 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino graouts webkit-bug-importer oldest_to_newest 1529950 0 dino 2019-04-24 04:55:34 -0700 Rename _highlightLongPressCanClick and only add gesture recognizer when necessary 1529951 1 webkit-bug-importer 2019-04-24 04:56:31 -0700 <rdar://problem/50164234> 1529952 2 368119 dino 2019-04-24 05:00:48 -0700 Created attachment 368119 Patch 1529957 3 368119 graouts 2019-04-24 05:15:14 -0700 Comment on attachment 368119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368119&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:756 > + } Maybe I'm not used to this kind of use of a block, but this looks a bit nasty to have this code only be conditionalized with a build-time flag. Could we have this wrapped in a function with an early return if the build-time flag and condition are as expected? 1529960 4 dino 2019-04-24 05:24:01 -0700 Committed r244586: <https://trac.webkit.org/changeset/244586> 368119 2019-04-24 05:00:48 -0700 2019-04-24 05:15:14 -0700 Patch bug-197231-20190424220046.patch text/plain 6229 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzMzQ3MTM4ZjI1Yzk2YzYx NzM0MWU3NzFjZjExNmFiMjEzZjZmMGQuLjBjMzE3NzhhZWE2MjY5NjQ0NjRkYmY3MjJkMWM4M2Y3 MDQ2YzBlOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDQtMjQgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBfaGlnaGxpZ2h0TG9uZ1By ZXNzQ2FuQ2xpY2sgYW5kIG9ubHkgYWRkIGdlc3R1cmUgcmVjb2duaXplciB3aGVuIG5lY2Vzc2Fy eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3MjMx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MDE2NDIzND4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWUgX2hpZ2hsaWdodExvbmdQcmVzc0Nh bkNsaWNrIHRvIF9sb25nUHJlc3NDYW5DbGljayBzaW5jZSBpdCB3aWxsIGJlCisgICAgICAgIHVz ZWQgaW4gb3RoZXIgcGxhY2VzLgorCisgICAgICAgIE9ubHkgYXR0YWNoIHRoZSBfaGlnaGxpZ2h0 TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgd2hlbiB3ZSdyZSBub3QKKyAgICAgICAgdXNpbmcg bG9uZyBwcmVzc2VzIGZvciBwcmV2aWV3LiBUaGlzIG1pZ2h0IHJldmVydCBpbiB0aGUgZnV0dXJl LCBpZiB3ZQorICAgICAgICBjYW4gc2V0IHVwIGFuIGFwcHJvcHJpYXRlIGdlc3R1cmUgcmVzb2x1 dGlvbiBiZXR3ZWVuIHRoZSB0d28uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVu dFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHNldHVwSW50ZXJhY3Rp b25dKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfd2ViVG91Y2hFdmVudDpwcmV2ZW50c05h dGl2ZUdlc3R1cmVzOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9oaWdobGlnaHRMb25n UHJlc3NSZWNvZ25pemVkOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9pbnRlcmFjdGlv blNob3VsZEJlZ2luRnJvbVByZXZpZXdJdGVtQ29udHJvbGxlcjpmb3JQb3NpdGlvbjpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBfcHJlc2VudGVkVmlld0NvbnRyb2xsZXJGb3JQcmV2aWV3 SXRlbUNvbnRyb2xsZXI6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3ByZXZpZXdJdGVt Q29udHJvbGxlckRpZENhbmNlbFByZXZpZXc6XSk6CisKIDIwMTktMDQtMjIgIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBhZGRpdGlvbmFsIG1lbWJlcnMgYW5k IHByb3RvY29scyBmcm9tIFdlYktpdEFkZGl0aW9ucyBpbiBXS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaAppbmRleCAyZDFhMGFiMTE2MzY0NGYwNTRjYzc4MGJkNmE0MGVhOTlkOWMz ZDU4Li42NDRiZWUzMzMxOGQ4MTk0NDE3YWVhYTRhYWVhNWM1MDQ2OTA4ZmQ4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oCkBAIC0zMDgsNyArMzA4LDcgQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAg ICBCT09MIF9pc1RhcEhpZ2hsaWdodElEVmFsaWQ7CiAgICAgQk9PTCBfcG90ZW50aWFsVGFwSW5Q cm9ncmVzczsKICAgICBCT09MIF9pc0RvdWJsZVRhcFBlbmRpbmc7Ci0gICAgQk9PTCBfaGlnaGxp Z2h0TG9uZ1ByZXNzQ2FuQ2xpY2s7CisgICAgQk9PTCBfbG9uZ1ByZXNzQ2FuQ2xpY2s7CiAgICAg Qk9PTCBfaGFzVGFwSGlnaGxpZ2h0Rm9yUG90ZW50aWFsVGFwOwogICAgIEJPT0wgX3NlbGVjdGlv bk5lZWRzVXBkYXRlOwogICAgIEJPT0wgX3Nob3VsZFJlc3RvcmVTZWxlY3Rpb247CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQppbmRleCBlOGE4OTNkZDZmMDhiZjljMWRhOWY1MzJhM2ZjNjZhYzY5ODNhOGNkLi5jYjFi ZWQ4OTUxMTI2NWI3Y2Q3MTNhOTA0NjFiMjhiNGU3YmFhNjQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAg LTc0NSwxMiArNzQ1LDE1IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNGb2N1c2VkRWxlbWVudChX ZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24gZm9jdXNlZEVsCiAgICAgX2hpZ2hsaWdo dExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyID0gYWRvcHROUyhbW19VSVdlYkhpZ2hsaWdodExv bmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyIGFsbG9jXSBpbml0V2l0aFRhcmdldDpzZWxmIGFjdGlv bjpAc2VsZWN0b3IoX2hpZ2hsaWdodExvbmdQcmVzc1JlY29nbml6ZWQ6KV0pOwogICAgIFtfaGln aGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsYXk6aGlnaGxpZ2h0RGVsYXld OwogICAgIFtfaGlnaGxpZ2h0TG9uZ1ByZXNzR2VzdHVyZVJlY29nbml6ZXIgc2V0RGVsZWdhdGU6 c2VsZl07Ci0gICAgW3NlbGYgYWRkR2VzdHVyZVJlY29nbml6ZXI6X2hpZ2hsaWdodExvbmdQcmVz c0dlc3R1cmVSZWNvZ25pemVyLmdldCgpXTsKIAogI2lmIEhBVkUoTElOS19QUkVWSUVXKQogICAg IGlmICghc2VsZi5zaG91bGRVc2VQcmV2aWV3Rm9yTG9uZ1ByZXNzKQogI2VuZGlmCisgICAgewor ICAgICAgICBbc2VsZiBhZGRHZXN0dXJlUmVjb2duaXplcjpfaGlnaGxpZ2h0TG9uZ1ByZXNzR2Vz dHVyZVJlY29nbml6ZXIuZ2V0KCldOworCiAgICAgICAgIFtzZWxmIF9jcmVhdGVBbmRDb25maWd1 cmVMb25nUHJlc3NHZXN0dXJlUmVjb2duaXplcl07CisgICAgfQogCiAjaWYgRU5BQkxFKERBVEFf SU5URVJBQ1RJT04pCiAgICAgW3NlbGYgc2V0dXBEcmFnQW5kRHJvcEludGVyYWN0aW9uc107CkBA IC0xMzkyLDcgKzEzOTUsNyBAQCBzdGF0aWMgV2ViQ29yZTo6RmxvYXRRdWFkIGluZmxhdGVRdWFk KGNvbnN0IFdlYkNvcmU6OkZsb2F0UXVhZCYgcXVhZCwgZmxvYXQgaW5mbAogLSAodm9pZClfd2Vi VG91Y2hFdmVudDooY29uc3QgV2ViS2l0OjpOYXRpdmVXZWJUb3VjaEV2ZW50Jil0b3VjaEV2ZW50 IHByZXZlbnRzTmF0aXZlR2VzdHVyZXM6KEJPT0wpcHJldmVudHNOYXRpdmVHZXN0dXJlCiB7CiAg ICAgaWYgKHByZXZlbnRzTmF0aXZlR2VzdHVyZSkgewotICAgICAgICBfaGlnaGxpZ2h0TG9uZ1By ZXNzQ2FuQ2xpY2sgPSBOTzsKKyAgICAgICAgX2xvbmdQcmVzc0NhbkNsaWNrID0gTk87CiAKICAg ICAgICAgX2NhblNlbmRUb3VjaEV2ZW50c0FzeW5jaHJvbm91c2x5ID0gWUVTOwogICAgICAgICBb X3RvdWNoRXZlbnRHZXN0dXJlUmVjb2duaXplciBzZXREZWZhdWx0UHJldmVudGVkOllFU107CkBA IC0yMTg3LDIyICsyMTkwLDIyIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1NhbWVQYWlyKFVJR2Vz dHVyZVJlY29nbml6ZXIgKmEsIFVJR2VzdHVyZVJlY29nbml6ZXIgKmIsIFVJCiAKICAgICBzd2l0 Y2ggKFtnZXN0dXJlUmVjb2duaXplciBzdGF0ZV0pIHsKICAgICBjYXNlIFVJR2VzdHVyZVJlY29n bml6ZXJTdGF0ZUJlZ2FuOgotICAgICAgICBfaGlnaGxpZ2h0TG9uZ1ByZXNzQ2FuQ2xpY2sgPSBZ RVM7CisgICAgICAgIF9sb25nUHJlc3NDYW5DbGljayA9IFlFUzsKICAgICAgICAgY2FuY2VsUG90 ZW50aWFsVGFwSWZOZWNlc3Nhcnkoc2VsZik7CiAgICAgICAgIF9wYWdlLT50YXBIaWdobGlnaHRB dFBvc2l0aW9uKFtnZXN0dXJlUmVjb2duaXplciBzdGFydFBvaW50XSwgKytfbGF0ZXN0VGFwSUQp OwogICAgICAgICBfaXNUYXBIaWdobGlnaHRJRFZhbGlkID0gWUVTOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIFVJR2VzdHVyZVJlY29nbml6ZXJTdGF0ZUVuZGVkOgotICAgICAgICBpZiAoX2hp Z2hsaWdodExvbmdQcmVzc0NhbkNsaWNrICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzRWxlbWVu dCkgeworICAgICAgICBpZiAoX2xvbmdQcmVzc0NhbkNsaWNrICYmIF9wb3NpdGlvbkluZm9ybWF0 aW9uLmlzRWxlbWVudCkgewogICAgICAgICAgICAgW3NlbGYgX2F0dGVtcHRDbGlja0F0TG9jYXRp b246Z2VzdHVyZVJlY29nbml6ZXIuc3RhcnRQb2ludCBtb2RpZmllckZsYWdzOmdlc3R1cmVSZWNv Z25pemVyTW9kaWZpZXJGbGFncyhnZXN0dXJlUmVjb2duaXplcildOwogICAgICAgICAgICAgW3Nl bGYgX2ZpbmlzaEludGVyYWN0aW9uXTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBbc2Vs ZiBfY2FuY2VsSW50ZXJhY3Rpb25dOwotICAgICAgICBfaGlnaGxpZ2h0TG9uZ1ByZXNzQ2FuQ2xp Y2sgPSBOTzsKKyAgICAgICAgX2xvbmdQcmVzc0NhbkNsaWNrID0gTk87CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgVUlHZXN0dXJlUmVjb2duaXplclN0YXRlQ2FuY2VsbGVkOgogICAgICAgICBb c2VsZiBfY2FuY2VsSW50ZXJhY3Rpb25dOwotICAgICAgICBfaGlnaGxpZ2h0TG9uZ1ByZXNzQ2Fu Q2xpY2sgPSBOTzsKKyAgICAgICAgX2xvbmdQcmVzc0NhbkNsaWNrID0gTk87CiAgICAgICAgIGJy ZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwpAQCAtNzE5Miw3ICs3MTk1LDcgQEAg c3RhdGljIEJPT0wgc2hvdWxkVXNlUHJldmlld0ZvckxvbmdQcmVzcygpCiAKIC0gKEJPT0wpX2lu dGVyYWN0aW9uU2hvdWxkQmVnaW5Gcm9tUHJldmlld0l0ZW1Db250cm9sbGVyOihVSVByZXZpZXdJ dGVtQ29udHJvbGxlciAqKWNvbnRyb2xsZXIgZm9yUG9zaXRpb246KENHUG9pbnQpcG9zaXRpb24K IHsKLSAgICBpZiAoIV9oaWdobGlnaHRMb25nUHJlc3NDYW5DbGljaykKKyAgICBpZiAoIV9sb25n UHJlc3NDYW5DbGljaykKICAgICAgICAgcmV0dXJuIE5POwogCiAgICAgV2ViS2l0OjpJbnRlcmFj dGlvbkluZm9ybWF0aW9uUmVxdWVzdCByZXF1ZXN0KFdlYkNvcmU6OnJvdW5kZWRJbnRQb2ludChw b3NpdGlvbikpOwpAQCAtNzM1Miw3ICs3MzU1LDcgQEAgc3RhdGljIE5TU3RyaW5nICpwcmV2aWV3 SWRlbnRpZmllckZvckVsZW1lbnRBY3Rpb24oX1dLRWxlbWVudEFjdGlvbiAqYWN0aW9uKQogICAg IGJvb2wgaXNWYWxpZFVSTEZvckltYWdlUHJldmlldyA9ICFjb3JlVGFyZ2V0VVJMLmlzRW1wdHko KSAmJiAoV1RGOjpwcm90b2NvbElzSW5IVFRQRmFtaWx5KGNvcmVUYXJnZXRVUkwpIHx8IFdURjo6 cHJvdG9jb2xJcyhjb3JlVGFyZ2V0VVJMLCAiZGF0YSIpKTsKIAogICAgIGlmIChbX3ByZXZpZXdJ dGVtQ29udHJvbGxlciB0eXBlXSA9PSBVSVByZXZpZXdJdGVtVHlwZUxpbmspIHsKLSAgICAgICAg X2hpZ2hsaWdodExvbmdQcmVzc0NhbkNsaWNrID0gTk87CisgICAgICAgIF9sb25nUHJlc3NDYW5D bGljayA9IE5POwogICAgICAgICBfcGFnZS0+c3RhcnRJbnRlcmFjdGlvbldpdGhFbGVtZW50QXRQ b3NpdGlvbihfcG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1ZXN0LnBvaW50KTsKIAogICAgICAgICAv LyBUcmVhdCBhbmltYXRlZCBpbWFnZXMgbGlrZSBhIGxpbmsgcHJldmlldwpAQCAtNzUwNCw3ICs3 NTA3LDcgQEAgc3RhdGljIE5TU3RyaW5nICpwcmV2aWV3SWRlbnRpZmllckZvckVsZW1lbnRBY3Rp b24oX1dLRWxlbWVudEFjdGlvbiAqYWN0aW9uKQogCiAtICh2b2lkKV9wcmV2aWV3SXRlbUNvbnRy b2xsZXJEaWRDYW5jZWxQcmV2aWV3OihVSVByZXZpZXdJdGVtQ29udHJvbGxlciAqKWNvbnRyb2xs ZXIKIHsKLSAgICBfaGlnaGxpZ2h0TG9uZ1ByZXNzQ2FuQ2xpY2sgPSBOTzsKKyAgICBfbG9uZ1By ZXNzQ2FuQ2xpY2sgPSBOTzsKICAgICAKICAgICBbX3dlYlZpZXcgX2RpZERpc21pc3NGb3JjZVBy ZXNzUHJldmlld107CiB9Cg==