226387 2021-05-28 11:48:37 -0700 [iOS] Adjust logic when determining whether to enable image extraction actions in the callout bar 2021-05-28 13:02:38 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1764863 0 wenson_hsieh 2021-05-28 11:48:37 -0700 rdar://76781788 1764865 1 430036 wenson_hsieh 2021-05-28 11:52:36 -0700 Created attachment 430036 Patch 1764871 2 430036 hi 2021-05-28 11:55:48 -0700 Comment on attachment 430036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430036&action=review r=me > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3790 > + if (WebKit::isImageExtractionAction(action)) > + return editorState.isContentEditable && [super canPerformAction:action withSender:sender]; r=me > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3790 > + return editorState.isContentEditable && [super canPerformAction:action withSender:sender]; NIT: Seeing as how the next line is also `[super canPerformAction:action withSender:sender]` maybe we can adjust the `if` to avoid repeating it? ``` if (WebKit::isImageExtractionAction(action) && !editorState.isContentEditable) return NO; ``` 1764873 3 430036 wenson_hsieh 2021-05-28 11:58:08 -0700 Comment on attachment 430036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=430036&action=review >>> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3790 >>> + return editorState.isContentEditable && [super canPerformAction:action withSender:sender]; >> >> r=me > > NIT: Seeing as how the next line is also `[super canPerformAction:action withSender:sender]` maybe we can adjust the `if` to avoid repeating it? > ``` > if (WebKit::isImageExtractionAction(action) && !editorState.isContentEditable) > return NO; > ``` 👍🏻 1764877 4 430039 wenson_hsieh 2021-05-28 12:06:53 -0700 Created attachment 430039 Patch for landing 1764894 5 ews-feeder 2021-05-28 13:02:36 -0700 Committed r278221 (238259@main): <https://commits.webkit.org/238259@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430039. 430036 2021-05-28 11:52:36 -0700 2021-05-28 12:06:51 -0700 Patch bug-226387-20210528115236.patch text/plain 1989 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NmQzOGFjOWEwNGYxNGU0 Nzc3OGZhNzg3ZWRkMTcwMzg2NjFjOGQuLjg5MTA3NDUyMzZiZTJiYzhiZjEzNWQzZDI2MzdjZjU3 NDQ0MGViNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDUtMjggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRqdXN0IGxv Z2ljIHdoZW4gZGV0ZXJtaW5pbmcgd2hldGhlciB0byBlbmFibGUgaW1hZ2UgZXh0cmFjdGlvbiBh Y3Rpb25zIGluIHRoZSBjYWxsb3V0IGJhcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mzg3CisgICAgICAgIHJkYXI6Ly83Njc4MTc4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENhbGwgaW50byB0aGUg c3VwZXJjbGFzcyAod2hpY2ggY29udGFpbnMgYWRkaXRpb25hbCByZXN0cmljdGlvbnMgYmV5b25k IG91ciBgaXNDb250ZW50RWRpdGFibGVgIGNoZWNrIG9uIHRoZQorICAgICAgICBlZGl0b3Igc3Rh dGUpLCBhbmQgYWRkaXRpb25hbGx5IHJlZmFjdG9yIHRoaXMgaGVscGVyIGZ1bmN0aW9uIHRvIHRh a2UgYSBzZWxlY3RvciBhbmQgcmV0dXJuIHdoZXRoZXIgb3Igbm90IGl0IGlzCisgICAgICAgIG9u ZSBvZiB0aGUgaW1hZ2UgZXh0cmFjdGlvbiBhY3Rpb24gc2VsZWN0b3JzIChhcyBvcHBvc2VkIHRv IHJldHVybmluZyB0aGUgc2VsZWN0b3IgaXRzZWxmKS4KKworICAgICAgICBTZWUgUmFkYXIgZm9y IG1vcmUgZGV0YWlscy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGNhblBlcmZvcm1BY3Rpb25G b3JXZWJWaWV3OndpdGhTZW5kZXI6XSk6CisKIDIwMjEtMDUtMjcgIFdlbnNvbiBIc2llaCAgPHdl bnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0dQVSBQcm9jZXNzXSBBZGQgZGVidWcg bG9nZ2luZyBhcm91bmQgc29tZSBzaGFyZWQgZGlzcGxheSBsaXN0IGNvZGVwYXRocwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KaW5kZXggOWRhNzdjNDQ1MDhjZTE5NDQ2OTRjZjg4ZGVkMGMxZGFhZTU0N2YxZS4uMWJl NDQyMWExNzkxOWYzNGE2YjU2YTM4ZDAwZDM5MTVhYzRhOGY3ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBA IC0zNzg2LDggKzM3ODYsOCBAQCAtIChCT09MKWNhblBlcmZvcm1BY3Rpb25Gb3JXZWJWaWV3OihT RUwpYWN0aW9uIHdpdGhTZW5kZXI6KGlkKXNlbmRlcgogICAgIH0KIAogI2lmIEVOQUJMRShJTUFH RV9FWFRSQUNUSU9OKQotICAgIGlmIChhY3Rpb24gPT0gV2ViS2l0OjppbWFnZUV4dHJhY3Rpb25B Y3Rpb24oKSkKLSAgICAgICAgcmV0dXJuIGVkaXRvclN0YXRlLmlzQ29udGVudEVkaXRhYmxlOwor ICAgIGlmIChXZWJLaXQ6OmlzSW1hZ2VFeHRyYWN0aW9uQWN0aW9uKGFjdGlvbikpCisgICAgICAg IHJldHVybiBlZGl0b3JTdGF0ZS5pc0NvbnRlbnRFZGl0YWJsZSAmJiBbc3VwZXIgY2FuUGVyZm9y bUFjdGlvbjphY3Rpb24gd2l0aFNlbmRlcjpzZW5kZXJdOwogI2VuZGlmCiAKICAgICByZXR1cm4g W3N1cGVyIGNhblBlcmZvcm1BY3Rpb246YWN0aW9uIHdpdGhTZW5kZXI6c2VuZGVyXTsK 430039 2021-05-28 12:06:53 -0700 2021-05-28 13:02:37 -0700 Patch for landing bug-226387-20210528120652.patch text/plain 1956 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MTkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NmQzOGFjOWEwNGYxNGU0 Nzc3OGZhNzg3ZWRkMTcwMzg2NjFjOGQuLjBkN2M0Zjc1NTgzMWUwNDFiZmVkMjJjNjNkMTgyYTRl YzcyZDk2YzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjEtMDUtMjggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRqdXN0IGxv Z2ljIHdoZW4gZGV0ZXJtaW5pbmcgd2hldGhlciB0byBlbmFibGUgaW1hZ2UgZXh0cmFjdGlvbiBh Y3Rpb25zIGluIHRoZSBjYWxsb3V0IGJhcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI2Mzg3CisgICAgICAgIHJkYXI6Ly83Njc4MTc4OAorCisgICAg ICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24gYW5kIERldmluIFJvdXNzby4KKworICAgICAgICBD YWxsIGludG8gdGhlIHN1cGVyY2xhc3MgKHdoaWNoIGNvbnRhaW5zIGFkZGl0aW9uYWwgcmVzdHJp Y3Rpb25zIGJleW9uZCBvdXIgYGlzQ29udGVudEVkaXRhYmxlYCBjaGVjayBvbiB0aGUKKyAgICAg ICAgZWRpdG9yIHN0YXRlKSwgYW5kIGFkZGl0aW9uYWxseSByZWZhY3RvciB0aGlzIGhlbHBlciBm dW5jdGlvbiB0byB0YWtlIGEgc2VsZWN0b3IgYW5kIHJldHVybiB3aGV0aGVyIG9yIG5vdCBpdCBp cworICAgICAgICBvbmUgb2YgdGhlIGltYWdlIGV4dHJhY3Rpb24gYWN0aW9uIHNlbGVjdG9ycyAo YXMgb3Bwb3NlZCB0byByZXR1cm5pbmcgdGhlIHNlbGVjdG9yIGl0c2VsZikuCisKKyAgICAgICAg U2VlIFJhZGFyIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjYW5Q ZXJmb3JtQWN0aW9uRm9yV2ViVmlldzp3aXRoU2VuZGVyOl0pOgorCiAyMDIxLTA1LTI3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtHUFUgUHJvY2Vz c10gQWRkIGRlYnVnIGxvZ2dpbmcgYXJvdW5kIHNvbWUgc2hhcmVkIGRpc3BsYXkgbGlzdCBjb2Rl cGF0aHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDlkYTc3YzQ0NTA4Y2UxOTQ0Njk0Y2Y4OGRlZDBjMWRh YWU1NDdmMWUuLjQ0NTczNDA0ZGNkMGJlNzNmYmI4ZWUwODI0NTJmNTIzZDAwNGNhOTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQpAQCAtMzc4Niw4ICszNzg2LDggQEAgLSAoQk9PTCljYW5QZXJmb3JtQWN0aW9u Rm9yV2ViVmlldzooU0VMKWFjdGlvbiB3aXRoU2VuZGVyOihpZClzZW5kZXIKICAgICB9CiAKICNp ZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKLSAgICBpZiAoYWN0aW9uID09IFdlYktpdDo6aW1h Z2VFeHRyYWN0aW9uQWN0aW9uKCkpCi0gICAgICAgIHJldHVybiBlZGl0b3JTdGF0ZS5pc0NvbnRl bnRFZGl0YWJsZTsKKyAgICBpZiAoV2ViS2l0Ojppc0ltYWdlRXh0cmFjdGlvbkFjdGlvbihhY3Rp b24pICYmICFlZGl0b3JTdGF0ZS5pc0NvbnRlbnRFZGl0YWJsZSkKKyAgICAgICAgcmV0dXJuIE5P OwogI2VuZGlmCiAKICAgICByZXR1cm4gW3N1cGVyIGNhblBlcmZvcm1BY3Rpb246YWN0aW9uIHdp dGhTZW5kZXI6c2VuZGVyXTsK