222022 2021-02-16 19:57:26 -0800 [iOS] Add support for additional accessibility image extraction contextmenu actions 2021-02-17 09:37:03 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi hi megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1730098 0 hi 2021-02-16 19:57:26 -0800 . 1730099 1 hi 2021-02-16 19:57:50 -0800 <rdar://problem/74157750> 1730100 2 420584 hi 2021-02-16 19:58:35 -0800 Created attachment 420584 Patch 1730115 3 420584 thorton 2021-02-16 20:45:25 -0800 Comment on attachment 420584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420584&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:9718 > +static NSMutableArray<UIMenuElement *> *menuElementsFromDefaultActions(const RetainPtr<NSArray>& defaultElementActions, RetainPtr<_WKActivatedElementInfo> elementInfo) For some reason I can't expand the context, is the return value really already a mutable array? (since you only change the type here) 1730120 4 420584 hi 2021-02-16 20:55:37 -0800 Comment on attachment 420584 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420584&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:9718 >> +static NSMutableArray<UIMenuElement *> *menuElementsFromDefaultActions(const RetainPtr<NSArray>& defaultElementActions, RetainPtr<_WKActivatedElementInfo> elementInfo) > > For some reason I can't expand the context, is the return value really already a mutable array? (since you only change the type here) Yes the return value (after the `nil` on :9721) is an `NSMutableArray`. 1730320 5 ews-feeder 2021-02-17 09:37:00 -0800 Committed r273007: <https://commits.webkit.org/r273007> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420584. 420584 2021-02-16 19:58:35 -0800 2021-02-17 09:37:02 -0800 Patch 74157750-OpenSource.diff text/plain 3636 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggODFlNmExNTllMzcxLi4xNWUzMWI2MDVlODggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTYgQEAKKzIwMjEtMDItMTYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgor CisgICAgICAgIFtpT1NdIEFkZCBzdXBwb3J0IGZvciBhZGRpdGlvbmFsIGFjY2Vzc2liaWxpdHkg aW1hZ2UgZXh0cmFjdGlvbiBjb250ZXh0bWVudSBhY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjIwMjIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzc0MTU3NzUwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBjb250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb246XSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgY29udGV4dE1lbnVJbnRlcmFjdGlvbjp3aWxsRW5kRm9yQ29u ZmlndXJhdGlvbjphbmltYXRvcjpdKToKKwogMjAyMS0wMi0xNiAgQ2hyaXMgRHVtZXogIDxjZHVt ZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZHVjZSBleHBsaWNpdCB1c2FnZSBvZiBbb2JqQyBh dXRvcmVsZWFzZV0gaW4gV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggMWQxOTUyNjIxMmQ2Li42ZTg1 YWYzNWI4ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTQ4Myw3ICs0ODMsMTAgQEAgcHJpdmF0ZToKICAg ICBDR1JlY3QgX2ltYWdlRXh0cmFjdGlvbkludGVyYWN0aW9uQm91bmRzOwogICAgIFZlY3RvcjxC bG9ja1B0cjx2b2lkKCk+PiBfYWN0aW9uc1RvUGVyZm9ybUFmdGVyUGVuZGluZ0ltYWdlRXh0cmFj dGlvbjsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpTdXBwcmVzc0ludGVyYWN0aW9uVG9r ZW4+IF9zdXBwcmVzc0ltYWdlRXh0cmFjdGlvblRva2VuOwotI2VuZGlmCisjaWYgVVNFKFVJQ09O VEVYVE1FTlUpCisgICAgUmV0YWluUHRyPFVJTWVudT4gX2ltYWdlRXh0cmFjdGlvbkNvbnRleHRN ZW51OworI2VuZGlmIC8vIFVTRShVSUNPTlRFWFRNRU5VKQorI2VuZGlmIC8vIEVOQUJMRShJTUFH RV9FWFRSQUNUSU9OKQogCiAjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICNpbXBvcnQgPFdl YktpdEFkZGl0aW9ucy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb25BZGRpdGlvbnNBZnRlci5oPgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0KaW5kZXggNmUxNzAxMjU0Y2Q3Li41MDJjZDg5NTFjNDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQpAQCAtOTcxNSw3ICs5NzE1LDcgQEAgc3RhdGljIE5TQXJyYXk8VUlNZW51RWxlbWVudCAq PiAqbWVudUVsZW1lbnRzRnJvbUxlZ2FjeVByZXZpZXcoVUlWaWV3Q29udHJvbGxlcgogICAgIHJl dHVybiBhY3Rpb25zOwogfQogCi1zdGF0aWMgTlNBcnJheTxVSU1lbnVFbGVtZW50ICo+ICptZW51 RWxlbWVudHNGcm9tRGVmYXVsdEFjdGlvbnMoY29uc3QgUmV0YWluUHRyPE5TQXJyYXk+JiBkZWZh dWx0RWxlbWVudEFjdGlvbnMsIFJldGFpblB0cjxfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbz4gZWxl bWVudEluZm8pCitzdGF0aWMgTlNNdXRhYmxlQXJyYXk8VUlNZW51RWxlbWVudCAqPiAqbWVudUVs ZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25zKGNvbnN0IFJldGFpblB0cjxOU0FycmF5PiYgZGVmYXVs dEVsZW1lbnRBY3Rpb25zLCBSZXRhaW5QdHI8X1dLQWN0aXZhdGVkRWxlbWVudEluZm8+IGVsZW1l bnRJbmZvKQogewogICAgIGlmICghZGVmYXVsdEVsZW1lbnRBY3Rpb25zIHx8ICFkZWZhdWx0RWxl bWVudEFjdGlvbnMuZ2V0KCkuY291bnQpCiAgICAgICAgIHJldHVybiBuaWw7CkBAIC05OTg3LDYg Kzk5ODcsMTAgQEAgLSAodm9pZCljb250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb246KHZvaWQo XikoVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKikpY28KIAogICAgICAgICAgICAgICAgIFJl dGFpblB0cjxOU0FycmF5PF9XS0VsZW1lbnRBY3Rpb24gKj4+IGRlZmF1bHRBY3Rpb25zRnJvbUFz c2lzdGFudCA9IFtzdHJvbmdTZWxmLT5fYWN0aW9uU2hlZXRBc3Npc3RhbnQgZGVmYXVsdEFjdGlv bnNGb3JJbWFnZVNoZWV0OmVsZW1lbnRJbmZvLmdldCgpXTsKICAgICAgICAgICAgICAgICBhdXRv IGFjdGlvbnMgPSBtZW51RWxlbWVudHNGcm9tRGVmYXVsdEFjdGlvbnMoZGVmYXVsdEFjdGlvbnNG cm9tQXNzaXN0YW50LCBlbGVtZW50SW5mbyk7CisjaWYgRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04p CisgICAgICAgICAgICAgICAgaWYgKFVJTWVudSAqaW1hZ2VFeHRyYWN0aW9uQ29udGV4dE1lbnUg PSBzdHJvbmdTZWxmLT5faW1hZ2VFeHRyYWN0aW9uQ29udGV4dE1lbnUuZ2V0KCkpCisgICAgICAg ICAgICAgICAgICAgIFthY3Rpb25zIGFkZE9iamVjdDppbWFnZUV4dHJhY3Rpb25Db250ZXh0TWVu dV07CisjZW5kaWYgLy8gRU5BQkxFKElNQUdFX0VYVFJBQ1RJT04pCiAgICAgICAgICAgICAgICAg cmV0dXJuIFtVSU1lbnUgbWVudVdpdGhUaXRsZTpzdHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1h dGlvbi50aXRsZSBjaGlsZHJlbjphY3Rpb25zXTsKICAgICAgICAgICAgIH07CiAKQEAgLTEwMjQx LDYgKzEwMjQ1LDEwIEBAIC0gKHZvaWQpY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0 TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gd2lsbEVuZEZvCiAgICAgX2NvbnRleHRNZW51 SGFzUmVxdWVzdGVkTGVnYWN5RGF0YSA9IE5POwogICAgIF9jb250ZXh0TWVudUVsZW1lbnRJbmZv ID0gbnVsbHB0cjsKIAorI2lmIEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQorICAgIF9pbWFnZUV4 dHJhY3Rpb25Db250ZXh0TWVudS5jbGVhcigpOworI2VuZGlmIC8vIEVOQUJMRShJTUFHRV9FWFRS QUNUSU9OKQorCiAgICAgW2FuaW1hdG9yIGFkZENvbXBsZXRpb246W3dlYWtTZWxmID0gV2Vha09i akNQdHI8V0tDb250ZW50Vmlldz4oc2VsZildICgpIHsKICAgICAgICAgYXV0byBzdHJvbmdTZWxm ID0gd2Vha1NlbGYuZ2V0KCk7CiAgICAgICAgIGlmICghc3Ryb25nU2VsZikK