226625 2021-06-03 22:04:06 -0700 [iOS] Long pressing images on 9gag.com fails to present context menus 2021-06-04 08:32:30 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin dino hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1766666 0 wenson_hsieh 2021-06-03 22:04:06 -0700 rdar://78136095 1766670 1 430541 wenson_hsieh 2021-06-03 22:37:53 -0700 Created attachment 430541 For EWS 1766769 2 430541 megan_gardner 2021-06-04 08:07:44 -0700 Comment on attachment 430541 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=430541&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:10386 > + })(); I'm unsure why this is a block instead of just a pre-calculated bool. I'm guessing that it's because you can more easily write the logic? 1766771 3 430541 wenson_hsieh 2021-06-04 08:13:51 -0700 Comment on attachment 430541 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=430541&action=review Thanks for the review! >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:10386 >> + })(); > > I'm unsure why this is a block instead of just a pre-calculated bool. I'm guessing that it's because you can more easily write the logic? Indeed — I turned this into a block so that I could use early returns for each of the cases where we can show a preview (I feel that it's *slightly* cleaner than having it all on one line) 1766773 4 ews-feeder 2021-06-04 08:32:29 -0700 Committed r278459 (238479@main): <https://commits.webkit.org/238479@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430541. 430541 2021-06-03 22:37:53 -0700 2021-06-04 08:32:30 -0700 For EWS bug-226625-20210603223752.patch text/plain 14842 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVhZTFhZWY3NzNjMDcwMzA1 M2RjMmVmZjRmMGRhOGFmZmIxYzQyZDkuLjEzYjUzZGMzNmFkN2I0YjU1ODA5OGIzOGQ1ZTczZTM5 YTU3NmIzNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDggQEAKKzIwMjEtMDYtMDMgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTG9uZyBwcmVz c2luZyBpbWFnZXMgb24gOWdhZy5jb20gZmFpbHMgdG8gcHJlc2VudCBjb250ZXh0IG1lbnVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjY2MjUKKyAg ICAgICAgcmRhcjovLzc4MTM2MDk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTWFrZSBzb21lIHNtYWxsIGFkanVzdG1lbnRzIHRvIGNvbnRleHQgbWVu dSBsb2dpYyB0byBhbGxvdyB0aGUgY29udGV4dCBtZW51IHRvIGFwcGVhciB3aGVuIGxvbmcgcHJl c3NpbmcgaW1hZ2VzCisgICAgICAgIHRoYXQgYXJlIGluc2lkZSBsaW5rcyAoYW5jaG9yIGVsZW1l bnRzKSB3aXRoIEphdmFTY3JpcHQgVVJMcy4gU2VlIGJlbG93IGZvciBtb3JlIGRldGFpbHMuCisK KyAgICAgICAgVGVzdDogZmFzdC9ldmVudHMvdG91Y2gvaW9zL2xvbmctcHJlc3Mtb24taW1hZ2Ut aW4tamF2YXNjcmlwdC1saW5rLmh0bWwKKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rp b25TaGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKGlzSmF2YVNjcmlwdFVSTCk6CisKKyAgICAg ICAgUHVsbCBsb2dpYyB0aGF0IGNoZWNrcyBmb3IgImphdmFzY3JpcHQiIFVSTCBzY2hlbWVzIGlu dG8gYSBzZXBhcmF0ZSBoZWxwZXIgZnVuY3Rpb24sIGFuZCB1c2UgaXQgYmVsb3cuCisKKyAgICAg ICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBfY3JlYXRlU2hlZXRXaXRoRWxlbWVudEFjdGlv bnM6ZGVmYXVsdFRpdGxlOnNob3dMaW5rVGl0bGU6XSk6CisgICAgICAgICgtW1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQgZGVmYXVsdEFjdGlvbnNGb3JMaW5rU2hlZXQ6XSk6CisgICAgICAgICgtW1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQgZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0Ol0pOgorCisg ICAgICAgIEFkZCBgX1dLRWxlbWVudEFjdGlvblR5cGVDb3B5YCBmb3IgaW1hZ2Ugc2hlZXRzLCBl dmVuIHdoZW4gdGhlIHRhcmdldCBVUkwgaXMgYSBKYXZhU2NyaXB0IFVSTDsgZXZlbiBpZiB0aGUg aW1hZ2UKKyAgICAgICAgaXMgaW5zaWRlIGEgSmF2YVNjcmlwdCBVUkwsIHdlIHNob3VsZCBiZSBj YXBhYmxlIG9mIHRyaWdnZXJpbmcgdGhlICJDb3B5IiBhY3Rpb24gYnkgY29weWluZyB0aGUgaW1h Z2UgZGF0YSBhbmQKKyAgICAgICAgdGhlIGltYWdlIFVSTCwgcmF0aGVyIHRoYW4gdGhlIEphdmFT Y3JpcHQgVVJMLiBUaGUgY2hhbmdlIGluIGBXZWJQYWdlOjpwZXJmb3JtQWN0aW9uT25FbGVtZW50 YCBiZWxvdyBlbnN1cmVzCisgICAgICAgIHRoYXQgd2UgZG9uJ3QgZW5kIHVwIGNvcHlpbmcgdGhl IEphdmFTY3JpcHQgVVJMLgorCisgICAgICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgaGFu ZGxlRWxlbWVudEFjdGlvbldpdGhUeXBlOmVsZW1lbnQ6bmVlZHNJbnRlcmFjdGlvbjpdKToKKwor ICAgICAgICBNYWtlIGFub3RoZXIgbWlub3IgYWRqdXN0bWVudCB0byBzaGFyZSB0aGUgaW1hZ2VV UkwgaW5zdGVhZCBvZiB0aGUgdGFyZ2V0IFVSTCBpbiB0aGUgY2FzZSB3aGVyZSB0aGUgdGFyZ2V0 IGlzIGEKKyAgICAgICAgSmF2YVNjcmlwdCBVUkwuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBj b250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb246XSk6CisKKyAgICAgICAgQXZvaWQgYmFpbGlu ZyBlYXJseSB3aXRoIGBjb250aW51ZVdpdGhDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24obmlsKTtg IGluIHRoZSBjYXNlIHdoZXJlIHdlJ3JlIGxvbmcgcHJlc3NpbmcgYW4KKyAgICAgICAgaW1hZ2Ug aW5zaWRlIGEgSmF2YVNjcmlwdCBsaW5rLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwZXJmb3JtQWN0 aW9uT25FbGVtZW50KToKKworICAgICAgICBQdXNoIHRoZSBKYXZhU2NyaXB0IFVSTCBjaGVjayBp biBgZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0YCBkb3duIGludG8gYFdlYlBhZ2U6OnBlcmZv cm1BY3Rpb25PbkVsZW1lbnRgLCB3aGVuCisgICAgICAgIGNvcHlpbmcgYW4gaW1hZ2UuIFRoaXMg dHdlYWsgYWxsb3dzIHVzIHRvIHN0aWxsIHNob3cgdGhlIENvcHkgYWN0aW9uIGZvciBpbWFnZXMg aW4gSmF2YVNjcmlwdCBVUkxzLCBidXQganVzdAorICAgICAgICBjb3B5IHRoZSBpbWFnZSBhbmQg aW1hZ2UgVVJMIGluc3RlYWQgb2YgdGhlIEphdmFTY3JpcHQgVVJMLgorCiAyMDIxLTA2LTAzICBX ZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFttYWNPU10g SW1hZ2UgZXh0cmFjdGlvbiBwcmV2aWV3IHBhbmVsIHNob3VsZCBhdXRvbWF0aWNhbGx5IGNsb3Nl IHdoZW4gdGhlIHdlYiB2aWV3IGlzIHVucGFyZW50ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggMjUyN2UwZWZl NDc5YzNjNjk1ODc3OTU1YTlkMWY0MTQ5YjcxMjU5Zi4uODg1N2Y2Njk1ZTVkZGViNmJjOGI2NGJk ZDI4ZmZiNTU0Zjg1YjgyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KQEAgLTMzOCw2ICszMzgsMTIgQEAgLSAoc3Rk OjpvcHRpb25hbDxXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uPiljdXJy ZW50UG9zaXRpb25JbmZvcm0KICAgICByZXR1cm4gX3Bvc2l0aW9uSW5mb3JtYXRpb247CiB9CiAK K3N0YXRpYyBib29sIGlzSmF2YVNjcmlwdFVSTChOU1VSTCAqdXJsKQoreworICAgIGF1dG8gc2No ZW1lID0gdXJsLnNjaGVtZTsKKyAgICByZXR1cm4gc2NoZW1lICYmIFtzY2hlbWUgY2FzZUluc2Vu c2l0aXZlQ29tcGFyZTpAImphdmFzY3JpcHQiXSA9PSBOU09yZGVyZWRTYW1lOworfQorCiAtICh2 b2lkKV9jcmVhdGVTaGVldFdpdGhFbGVtZW50QWN0aW9uczooTlNBcnJheSAqKWFjdGlvbnMgZGVm YXVsdFRpdGxlOihOU1N0cmluZyAqKWRlZmF1bHRUaXRsZSBzaG93TGlua1RpdGxlOihCT09MKXNo b3dMaW5rVGl0bGUKIHsKICAgICBhdXRvIGRlbGVnYXRlID0gX2RlbGVnYXRlLmdldCgpOwpAQCAt MzQ4LDggKzM1NCw2IEBAIC0gKHZvaWQpX2NyZWF0ZVNoZWV0V2l0aEVsZW1lbnRBY3Rpb25zOihO U0FycmF5ICopYWN0aW9ucyBkZWZhdWx0VGl0bGU6KE5TU3RyaW5nCiAgICAgICAgIHJldHVybjsK IAogICAgIE5TVVJMICp0YXJnZXRVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi0+dXJsOwotICAg IE5TU3RyaW5nICp1cmxTY2hlbWUgPSBbdGFyZ2V0VVJMIHNjaGVtZV07Ci0gICAgQk9PTCBpc0ph dmFTY3JpcHRVUkwgPSBbdXJsU2NoZW1lIGxlbmd0aF0gJiYgW3VybFNjaGVtZSBjYXNlSW5zZW5z aXRpdmVDb21wYXJlOkAiamF2YXNjcmlwdCJdID09IE5TT3JkZXJlZFNhbWU7CiAgICAgLy8gRklY TUU6IFdlIHNob3VsZCBjaGVjayBpZiBKYXZhc2NyaXB0IGlzIGVuYWJsZWQgaW4gdGhlIHByZWZl cmVuY2VzLgogCiAgICAgX2ludGVyYWN0aW9uU2hlZXQgPSBhZG9wdE5TKFtbV0tBY3Rpb25TaGVl dCBhbGxvY10gaW5pdF0pOwpAQCAtMzU5LDcgKzM2Myw3IEBAIC0gKHZvaWQpX2NyZWF0ZVNoZWV0 V2l0aEVsZW1lbnRBY3Rpb25zOihOU0FycmF5ICopYWN0aW9ucyBkZWZhdWx0VGl0bGU6KE5TU3Ry aW5nCiAgICAgTlNTdHJpbmcgKnRpdGxlU3RyaW5nID0gbmlsOwogICAgIEJPT0wgdGl0bGVJc1VS TCA9IE5POwogICAgIGlmIChzaG93TGlua1RpdGxlICYmIFtbdGFyZ2V0VVJMIGFic29sdXRlU3Ry aW5nXSBsZW5ndGhdKSB7Ci0gICAgICAgIGlmIChpc0phdmFTY3JpcHRVUkwpCisgICAgICAgIGlm IChpc0phdmFTY3JpcHRVUkwodGFyZ2V0VVJMKSkKICAgICAgICAgICAgIHRpdGxlU3RyaW5nID0g V0VCX1VJX1NUUklOR19LRVkoIkphdmFTY3JpcHQiLCAiSmF2YVNjcmlwdCBBY3Rpb24gU2hlZXQg VGl0bGUiLCAiVGl0bGUgZm9yIGFjdGlvbiBzaGVldCBmb3IgSmF2YVNjcmlwdCBsaW5rIik7CiAg ICAgICAgIGVsc2UgewogICAgICAgICAgICAgdGl0bGVTdHJpbmcgPSBXVEY6OnVzZXJWaXNpYmxl U3RyaW5nKHRhcmdldFVSTCk7CkBAIC01NjMsNyArNTY3LDcgQEAgLSAoUmV0YWluUHRyPE5TQXJy YXk8X1dLRWxlbWVudEFjdGlvbiAqPj4pZGVmYXVsdEFjdGlvbnNGb3JMaW5rU2hlZXQ6KF9XS0Fj dGl2YXQKICAgICAgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRB Y3Rpb24gX2VsZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZVNhdmVJbWFn ZSBhc3Npc3RhbnQ6c2VsZl1dOwogICAgIH0KIAotICAgIGlmICghW1t0YXJnZXRVUkwgc2NoZW1l XSBsZW5ndGhdIHx8IFtbdGFyZ2V0VVJMIHNjaGVtZV0gY2FzZUluc2Vuc2l0aXZlQ29tcGFyZTpA ImphdmFzY3JpcHQiXSAhPSBOU09yZGVyZWRTYW1lKSB7CisgICAgaWYgKCFpc0phdmFTY3JpcHRV UkwodGFyZ2V0VVJMKSkgewogICAgICAgICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tF bGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblR5cGVD b3B5IGFzc2lzdGFudDpzZWxmXV07CiAgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6 W19XS0VsZW1lbnRBY3Rpb24gX2VsZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9u VHlwZVNoYXJlIGFzc2lzdGFudDpzZWxmXV07CiAgICAgfQpAQCAtNTk3LDggKzYwMSw4IEBAIC0g KFJldGFpblB0cjxOU0FycmF5PF9XS0VsZW1lbnRBY3Rpb24gKj4+KWRlZmF1bHRBY3Rpb25zRm9y SW1hZ2VTaGVldDooX1dLQWN0aXZhCiAjZW5kaWYKICAgICBpZiAoVENDQWNjZXNzUHJlZmxpZ2h0 KGdldGtUQ0NTZXJ2aWNlUGhvdG9zKCksIE5VTEwpICE9IGtUQ0NBY2Nlc3NQcmVmbGlnaHREZW5p ZWQpCiAgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRBY3Rpb24g X2VsZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZVNhdmVJbWFnZSBhc3Np c3RhbnQ6c2VsZl1dOwotICAgIGlmICghdGFyZ2V0VVJMLnNjaGVtZS5sZW5ndGggfHwgW3Rhcmdl dFVSTC5zY2hlbWUgY2FzZUluc2Vuc2l0aXZlQ29tcGFyZTpAImphdmFzY3JpcHQiXSAhPSBOU09y ZGVyZWRTYW1lKQotICAgICAgICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50 QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblR5cGVDb3B5IGFz c2lzdGFudDpzZWxmXV07CisKKyAgICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVt ZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblR5cGVDb3B5 IGFzc2lzdGFudDpzZWxmXV07CiAKICNpZiBFTkFCTEUoSU1BR0VfRVhUUkFDVElPTikKICAgICBp ZiAoW19kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGFjdGlvblNoZWV0QXNz aXN0YW50OnNob3VsZEluY2x1ZGVJbWFnZUV4dHJhY3Rpb25BY3Rpb25Gb3JFbGVtZW50OildICYm IFtfZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZiBzaG91bGRJbmNsdWRlSW1hZ2VF eHRyYWN0aW9uQWN0aW9uRm9yRWxlbWVudDplbGVtZW50SW5mb10pCkBAIC0xMDE3LDggKzEwMjEs MTAgQEAgLSAodm9pZCloYW5kbGVFbGVtZW50QWN0aW9uV2l0aFR5cGU6KF9XS0VsZW1lbnRBY3Rp b25UeXBlKXR5cGUgZWxlbWVudDooX1dLQWN0aXYKICAgICBjYXNlIF9XS0VsZW1lbnRBY3Rpb25U eXBlU2hhcmU6CiAgICAgICAgIGlmIChVUkwoZWxlbWVudC5pbWFnZVVSTCkucHJvdG9jb2xJc0Rh dGEoKSAmJiBlbGVtZW50LmltYWdlICYmIFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKGFjdGlvblNoZWV0QXNzaXN0YW50OnNoYXJlRWxlbWVudFdpdGhJbWFnZTpyZWN0Oild KQogICAgICAgICAgICAgW2RlbGVnYXRlIGFjdGlvblNoZWV0QXNzaXN0YW50OnNlbGYgc2hhcmVF bGVtZW50V2l0aEltYWdlOmVsZW1lbnQuaW1hZ2UgcmVjdDplbGVtZW50LmJvdW5kaW5nUmVjdF07 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIFtkZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFu dDpzZWxmIHNoYXJlRWxlbWVudFdpdGhVUkw6ZWxlbWVudC5VUkwgPzogZWxlbWVudC5pbWFnZVVS TCByZWN0OmVsZW1lbnQuYm91bmRpbmdSZWN0XTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAg ICBhdXRvIHVybFRvU2hhcmUgPSBlbGVtZW50LlVSTCAmJiAhaXNKYXZhU2NyaXB0VVJMKGVsZW1l bnQuVVJMKSA/IGVsZW1lbnQuVVJMIDogZWxlbWVudC5pbWFnZVVSTDsKKyAgICAgICAgICAgIFtk ZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFudDpzZWxmIHNoYXJlRWxlbWVudFdpdGhVUkw6dXJs VG9TaGFyZSByZWN0OmVsZW1lbnQuYm91bmRpbmdSZWN0XTsKKyAgICAgICAgfQogICAgICAgICBi cmVhazsKICAgICBjYXNlIF9XS0VsZW1lbnRBY3Rpb25UeXBlSW1hZ2VFeHRyYWN0aW9uOgogI2lm IEVOQUJMRShJTUFHRV9FWFRSQUNUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggMjU0MmM0YmRhMzRh ZTcwZmFlNzUzMzkwMjE2ZDE0MzNkNTY5ZWZhMS4uZTAwYTZlMDExNGFhNDk5OTE1NDM1OTQyYzA2 N2I4NDAxOTBiNjk1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xMDM3Miw4ICsxMDM3MiwyMSBAQCAt ICh2b2lkKWNvbnRpbnVlQ29udGV4dE1lbnVJbnRlcmFjdGlvbjoodm9pZCheKShVSUNvbnRleHRN ZW51Q29uZmlndXJhdGlvbiAqKSljbwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK KyAgICAgICAgYm9vbCBjYW5TaG93SFRUUExpbmtPckRhdGFEZXRlY3RvclByZXZpZXcgPSAoWyZd IHsKKyAgICAgICAgICAgIGlmIChsaW5rVVJMLnByb3RvY29sSXNJbkhUVFBGYW1pbHkoKSkKKyAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAgICAgaWYgKFdlYkNvcmU6OkRh dGFEZXRlY3Rpb246OmNhbkJlUHJlc2VudGVkQnlEYXRhRGV0ZWN0b3JzKGxpbmtVUkwpKQorICAg ICAgICAgICAgICAgIHJldHVybiB0cnVlOworCisgICAgICAgICAgICBpZiAoW3N0cm9uZ1NlbGYg cG9zaXRpb25JbmZvcm1hdGlvbkhhc0ltYWdlT3ZlcmxheURhdGFEZXRlY3Rvcl0pCisgICAgICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAg ICAgfSkoKTsKKwogICAgICAgICBBU1NFUlRfSU1QTElFUyhzdHJvbmdTZWxmLT5fcG9zaXRpb25J bmZvcm1hdGlvbi5pc0ltYWdlLCBzdHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFn ZSk7Ci0gICAgICAgIGlmIChzdHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1hdGlvbi5pc0ltYWdl ICYmIHN0cm9uZ1NlbGYtPl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlICYmICFzdHJvbmdTZWxm LT5fcG9zaXRpb25JbmZvcm1hdGlvbi5pc0xpbmspIHsKKyAgICAgICAgaWYgKHN0cm9uZ1NlbGYt Pl9wb3NpdGlvbkluZm9ybWF0aW9uLmlzSW1hZ2UgJiYgc3Ryb25nU2VsZi0+X3Bvc2l0aW9uSW5m b3JtYXRpb24uaW1hZ2UgJiYgIWNhblNob3dIVFRQTGlua09yRGF0YURldGVjdG9yUHJldmlldykg ewogICAgICAgICAgICAgYXV0byBjZ0ltYWdlID0gc3Ryb25nU2VsZi0+X3Bvc2l0aW9uSW5mb3Jt YXRpb24uaW1hZ2UtPm1ha2VDR0ltYWdlQ29weSgpOwogCiAgICAgICAgICAgICBzdHJvbmdTZWxm LT5fY29udGV4dE1lbnVBY3Rpb25Qcm92aWRlckRlbGVnYXRlTmVlZHNPdmVycmlkZSA9IE5POwpA QCAtMTA0MTQsNyArMTA0MjcsNyBAQCAtICh2b2lkKWNvbnRpbnVlQ29udGV4dE1lbnVJbnRlcmFj dGlvbjoodm9pZCheKShVSUNvbnRleHRNZW51Q29uZmlndXJhdGlvbiAqKSljbwogI2lmIEVOQUJM RShEQVRBX0RFVEVDVElPTikKICAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgSmF2YVNjcmlwdCB1 cmxzIGhlcmUuIEJ1dCBtYWtlIHN1cmUgdGhleSBkb24ndCBzaG93IGEgcHJldmlldy4KICAgICAg ICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzUwNTcyMjgzPgotICAgICAgICBpZiAoIWxpbmtVUkwucHJv dG9jb2xJc0luSFRUUEZhbWlseSgpICYmICFXZWJDb3JlOjpEYXRhRGV0ZWN0aW9uOjpjYW5CZVBy ZXNlbnRlZEJ5RGF0YURldGVjdG9ycyhsaW5rVVJMKSAmJiAhW3N0cm9uZ1NlbGYgcG9zaXRpb25J bmZvcm1hdGlvbkhhc0ltYWdlT3ZlcmxheURhdGFEZXRlY3Rvcl0pIHsKKyAgICAgICAgaWYgKCFj YW5TaG93SFRUUExpbmtPckRhdGFEZXRlY3RvclByZXZpZXcpIHsKICAgICAgICAgICAgIGNvbnRp bnVlV2l0aENvbnRleHRNZW51Q29uZmlndXJhdGlvbihuaWwpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9pb3MvV2ViUGFnZUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lv cy9XZWJQYWdlSU9TLm1tCmluZGV4IGQxY2U1MTIzODkzNWQwMzE4N2U1OGFkZjk5ZTdlNzk2NTcz ZmQ1YzkuLjUwNzA5NjZlYjdmZjZjZDhlNzI5OWQxNTM5ZjE1N2RiM2IxMDc0MGIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCkBA IC0zMTU3LDE2ICszMTU3LDE4IEBAIHZvaWQgV2ViUGFnZTo6cGVyZm9ybUFjdGlvbk9uRWxlbWVu dCh1aW50MzJfdCBhY3Rpb24pCiAKICAgICBpZiAoc3RhdGljX2Nhc3Q8U2hlZXRBY3Rpb24+KGFj dGlvbikgPT0gU2hlZXRBY3Rpb246OkNvcHkpIHsKICAgICAgICAgaWYgKGlzPFJlbmRlckltYWdl PigqZWxlbWVudC5yZW5kZXJlcigpKSkgewotICAgICAgICAgICAgVVJMIHVybDsKLSAgICAgICAg ICAgIFN0cmluZyB0aXRsZTsKLSAgICAgICAgICAgIGlmIChhdXRvKiBsaW5rRWxlbWVudCA9IGNv bnRhaW5pbmdMaW5rQW5jaG9yRWxlbWVudChlbGVtZW50KSkgewotICAgICAgICAgICAgICAgIHVy bCA9IGxpbmtFbGVtZW50LT5ocmVmKCk7Ci0gICAgICAgICAgICAgICAgdGl0bGUgPSBsaW5rRWxl bWVudC0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OnRpdGxlQXR0 cik7Ci0gICAgICAgICAgICAgICAgaWYgKCF0aXRsZS5sZW5ndGgoKSkKLSAgICAgICAgICAgICAg ICAgICAgdGl0bGUgPSBsaW5rRWxlbWVudC0+dGV4dENvbnRlbnQoKTsKLSAgICAgICAgICAgICAg ICB0aXRsZSA9IHN0cmlwTGVhZGluZ0FuZFRyYWlsaW5nSFRNTFNwYWNlcyh0aXRsZSk7CisgICAg ICAgICAgICBVUkwgdXJsVG9Db3B5OworICAgICAgICAgICAgU3RyaW5nIHRpdGxlVG9Db3B5Owor ICAgICAgICAgICAgaWYgKGF1dG8gbGlua0VsZW1lbnQgPSBtYWtlUmVmUHRyKGNvbnRhaW5pbmdM aW5rQW5jaG9yRWxlbWVudChlbGVtZW50KSkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byB1 cmwgPSBsaW5rRWxlbWVudC0+aHJlZigpOyAhdXJsLmlzRW1wdHkoKSAmJiAhdXJsLnByb3RvY29s SXNKYXZhU2NyaXB0KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgdXJsVG9Db3B5ID0gdXJsOwor ICAgICAgICAgICAgICAgICAgICB0aXRsZVRvQ29weSA9IGxpbmtFbGVtZW50LT5hdHRyaWJ1dGVX aXRob3V0U3luY2hyb25pemF0aW9uKEhUTUxOYW1lczo6dGl0bGVBdHRyKTsKKyAgICAgICAgICAg ICAgICAgICAgaWYgKCF0aXRsZVRvQ29weS5sZW5ndGgoKSkKKyAgICAgICAgICAgICAgICAgICAg ICAgIHRpdGxlVG9Db3B5ID0gbGlua0VsZW1lbnQtPnRleHRDb250ZW50KCk7CisgICAgICAgICAg ICAgICAgICAgIHRpdGxlVG9Db3B5ID0gc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3BhY2Vz KHRpdGxlVG9Db3B5KTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICBtX2ludGVyYWN0aW9uTm9kZS0+ZG9jdW1lbnQoKS5lZGl0b3IoKS53cml0ZUltYWdlVG9Q YXN0ZWJvYXJkKCpQYXN0ZWJvYXJkOjpjcmVhdGVGb3JDb3B5QW5kUGFzdGUoUGFnZVBhc3RlYm9h cmRDb250ZXh0OjpjcmVhdGUoZWxlbWVudC5kb2N1bWVudCgpLnBhZ2VJRCgpKSksIGVsZW1lbnQs IHVybCwgdGl0bGUpOworICAgICAgICAgICAgbV9pbnRlcmFjdGlvbk5vZGUtPmRvY3VtZW50KCku ZWRpdG9yKCkud3JpdGVJbWFnZVRvUGFzdGVib2FyZCgqUGFzdGVib2FyZDo6Y3JlYXRlRm9yQ29w eUFuZFBhc3RlKFBhZ2VQYXN0ZWJvYXJkQ29udGV4dDo6Y3JlYXRlKGVsZW1lbnQuZG9jdW1lbnQo KS5wYWdlSUQoKSkpLCBlbGVtZW50LCB1cmxUb0NvcHksIHRpdGxlVG9Db3B5KTsKICAgICAgICAg fSBlbHNlIGlmIChlbGVtZW50LmlzTGluaygpKQogICAgICAgICAgICAgbV9pbnRlcmFjdGlvbk5v ZGUtPmRvY3VtZW50KCkuZWRpdG9yKCkuY29weVVSTChlbGVtZW50LmRvY3VtZW50KCkuY29tcGxl dGVVUkwoc3RyaXBMZWFkaW5nQW5kVHJhaWxpbmdIVE1MU3BhY2VzKGVsZW1lbnQuYXR0cmlidXRl V2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OmhyZWZBdHRyKSkpLCBlbGVtZW50LnRl eHRDb250ZW50KCkpOwogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMDYw MjAyNGY2YTZkNzgwZjUzNTM4Y2U4NzdmZTQ1YzIzZjgwZjkwNi4uYjUwNTdmZjE5OGMzZGM1ZDI0 NzRjNzBkMjk3Nzg4MGRlZTU1YmU0ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA2LTAz ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1Nd IExvbmcgcHJlc3NpbmcgaW1hZ2VzIG9uIDlnYWcuY29tIGZhaWxzIHRvIHByZXNlbnQgY29udGV4 dCBtZW51cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI2NjI1CisgICAgICAgIHJkYXI6Ly83ODEzNjA5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIGxheW91dCB0ZXN0IHRvIHZlcmlmeSB0aGF0 IGEgY29udGV4dCBtZW51IGlzIHByZXNlbnRlZCB3aGVuIGxvbmcgcHJlc3NpbmcgYW4gaW1hZ2Ug aW5zaWRlIGEgbGluayB3aXRoIGEKKyAgICAgICAgSmF2YVNjcmlwdCBVUkwgYXMgYW4gYGhyZWZg LgorCisgICAgICAgICogZmFzdC9ldmVudHMvdG91Y2gvaW9zL2xvbmctcHJlc3Mtb24taW1hZ2Ut aW4tamF2YXNjcmlwdC1saW5rLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9l dmVudHMvdG91Y2gvaW9zL2xvbmctcHJlc3Mtb24taW1hZ2UtaW4tamF2YXNjcmlwdC1saW5rLmh0 bWw6IEFkZGVkLgorCiAyMDIxLTA2LTAzICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBJbmNvcnJlY3QgdGV4dCBzZWxlY3Rpb24gd2hlbiBjcm9zc2luZyBmbGV4IGl0 ZW0gYm91bmRhcnkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lv cy9sb25nLXByZXNzLW9uLWltYWdlLWluLWphdmFzY3JpcHQtbGluay1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9mYXN0L2V2ZW50cy90b3VjaC9pb3MvbG9uZy1wcmVzcy1vbi1pbWFnZS1pbi1q YXZhc2NyaXB0LWxpbmstZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI1NzYzZDVkZjc4YjdjZTIy NzMwMTA0NTJmOTQyY2YwMzQ5YTdkMmYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2V2ZW50cy90b3VjaC9pb3MvbG9uZy1wcmVzcy1vbi1pbWFnZS1pbi1qYXZhc2NyaXB0LWxp bmstZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTEgQEAKK1ZlcmlmaWVzIHRoYXQgbG9uZyBwcmVz c2luZyBhbiBpbWFnZSBpbnNpZGUgYSBKYXZhU2NyaXB0IGxpbmsgcHJlc2VudHMgYSBjb250ZXh0 IG1lbnUuIFRvIG1hbnVhbGx5IHRlc3QsIGxvbmcgcHJlc3Mgb24gdGhlIGltYWdlLgorCitPbiBz dWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dl ZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBQcmVzZW50ZWQgY29udGV4dCBtZW51CitQ QVNTIERpc21pc3NlZCBjb250ZXh0IG1lbnUKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRy dWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50 cy90b3VjaC9pb3MvbG9uZy1wcmVzcy1vbi1pbWFnZS1pbi1qYXZhc2NyaXB0LWxpbmsuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3RvdWNoL2lvcy9sb25nLXByZXNzLW9uLWltYWdlLWlu LWphdmFzY3JpcHQtbGluay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjlhZWI4NjZjOGJiNGIzNmM5YWQ0MDZj ZjZmNWZiOTRiYjliNGIyNzMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy90b3VjaC9pb3MvbG9uZy1wcmVzcy1vbi1pbWFnZS1pbi1qYXZhc2NyaXB0LWxpbmsuaHRt bApAQCAtMCwwICsxLDQ0IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQtdGVzdC1ydW5u ZXIgWyB1c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAtLT4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04 Ij4KKzxodG1sPgorPGhlYWQ+Cis8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0iaW5pdGlh bC1zY2FsZT0xLCB3aWR0aD1kZXZpY2Utd2lkdGgsIHVzZXItc2NhbGFibGU9bm8iPgorPHNjcmlw dCBzcmM9Ii4uLy4uLy4uLy4uL3Jlc291cmNlcy9iYXNpYy1nZXN0dXJlcy5qcyI+PC9zY3JpcHQ+ Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vcmVzb3VyY2VzL3VpLWhlbHBlci5qcyI+PC9zY3Jp cHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMiPjwvc2Ny aXB0PgorPHN0eWxlPgorI3RhcmdldCB7CisgICAgd2lkdGg6IDMyMHB4OworICAgIGhlaWdodDog MjQwcHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogc2lsdmVyOworICAgIGRpc3BsYXk6IGJsb2Nr OworfQorPC9zdHlsZT4KKzxzY3JpcHQ+Citqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKworYWRkRXZl bnRMaXN0ZW5lcigibG9hZCIsIGFzeW5jICgpID0+IHsKKyAgICBkZXNjcmlwdGlvbigiVmVyaWZp ZXMgdGhhdCBsb25nIHByZXNzaW5nIGFuIGltYWdlIGluc2lkZSBhIEphdmFTY3JpcHQgbGluayBw cmVzZW50cyBhIGNvbnRleHQgbWVudS4gVG8gbWFudWFsbHkgdGVzdCwgbG9uZyBwcmVzcyBvbiB0 aGUgaW1hZ2UuIik7CisKKyAgICBpZiAoIXdpbmRvdy50ZXN0UnVubmVyIHx8ICF0ZXN0UnVubmVy LnJ1blVJU2NyaXB0KQorICAgICAgICByZXR1cm47CisKKyAgICBjb25zdCByZWN0ID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoInRhcmdldCIpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAg IGF3YWl0IFVJSGVscGVyLmxvbmdQcmVzc0F0UG9pbnQocmVjdC54ICsgcmVjdC53aWR0aCAvIDIs IHJlY3QueSArIHJlY3QuaGVpZ2h0IC8gMik7CisgICAgYXdhaXQgVUlIZWxwZXIud2FpdEZvckNv bnRleHRNZW51VG9TaG93KCk7CisgICAgdGVzdFBhc3NlZCgiUHJlc2VudGVkIGNvbnRleHQgbWVu dSIpOworCisgICAgYXdhaXQgVUlIZWxwZXIuYWN0aXZhdGVBdCgwLCAwKTsKKyAgICBhd2FpdCBV SUhlbHBlci53YWl0Rm9yQ29udGV4dE1lbnVUb0hpZGUoKTsKKyAgICB0ZXN0UGFzc2VkKCJEaXNt aXNzZWQgY29udGV4dCBtZW51Iik7CisKKyAgICBmaW5pc2hKU1Rlc3QoKTsKK30pOworPC9zY3Jp cHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxhIGlkPSJ0YXJnZXQiIGhyZWY9ImphdmFzY3JpcHQ6dm9p ZCgwKSI+CisgICAgPGltZyBzcmM9Ii4uLy4uLy4uL2ltYWdlcy9yZXNvdXJjZXMvZGljZS5wbmci IHdpZHRoPSIzMjAiIGhlaWdodD0iMjQwIj4KKzwvYT4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCg==