239948 2022-05-01 16:59:11 -0700 [iOS] Add support for the "Markup Image" action when right clicking an image in editable content 2022-05-02 08:56:53 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi hi katherine_cheney megan_gardner thorton webkit-bug-importer oldest_to_newest 1865738 0 wenson_hsieh 2022-05-01 16:59:11 -0700 rdar://92064672 1865748 1 458656 wenson_hsieh 2022-05-01 18:50:57 -0700 Created attachment 458656 Patch 1865826 2 458656 wenson_hsieh 2022-05-02 08:11:59 -0700 Comment on attachment 458656 Patch Thanks for the review! 1865842 3 ews-feeder 2022-05-02 08:56:48 -0700 Committed r293663 (250167@main): <https://commits.webkit.org/250167@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 458656. 458656 2022-05-01 18:50:57 -0700 2022-05-02 08:56:50 -0700 Patch bug-239948-20220501185056.patch text/plain 12498 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjkzNjQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE0OWE4OTg2NDk0MjI3OWYw OWQ1NjFkYzU4OGUzMDY0OTY4ZjQyMTUuLjIzM2UyODQ1MjlhYTRkMmNkN2MwZmUyNjFlZTEwMWIy ZDFmN2M2ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjItMDUtMDEgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gQWRkIHN1cHBv cnQgZm9yIHRoZSAiTWFya3VwIEltYWdlIiBhY3Rpb24gd2hlbiByaWdodCBjbGlja2luZyBhbiBp bWFnZSBpbiBlZGl0YWJsZSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzk5NDgKKyAgICAgICAgcmRhcjovLzkyMDY0NjcyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zZXJ0IGEgIk1hcmt1 cCBJbWFnZSIgbWVudSBhY3Rpb24gd2hlbiByaWdodCBjbGlja2luZyBhbiBlZGl0YWJsZSBpbWFn ZSBlbGVtZW50IG9uIGlQYWQgdmlhIHRyYWNrcGFkLCBidXQgb25seQorICAgICAgICB3aGVuIHRo ZSBpbWFnZSBoYXMgcmVsZXZhbnQgaW1hZ2UgYW5hbHlzaXMgbWFya3VwIHJlc3VsdHMuIFNlZSBi ZWxvdyBmb3IgbW9yZSBkZXRhaWxzLgorCisgICAgICAgIFRlc3Q6IEltYWdlQW5hbHlzaXNUZXN0 cy5NYXJrdXBJbWFnZVVzaW5nQ29udGV4dE1lbnUKKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBwcmVwYXJlU2VsZWN0aW9uRm9yQ29u dGV4dE1lbnVXaXRoTG9jYXRpb25JblZpZXc6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisKKyAgICAg ICAgSW4gdGhlIGNhc2Ugd2hlcmUgYSBzaW5nbGUgaW1hZ2UgaXMgc2VsZWN0ZWQgaW4gZWRpdGFi bGUgY29udGVudCwgbWFrZSB0aGlzIG1ldGhvZCBhZGRpdGlvbmFsbHkgd2FpdCB1bnRpbCB3ZSd2 ZQorICAgICAgICBmaW5pc2hlZCBhbmFseXppbmcgdGhlIHNlbGVjdGVkIGltYWdlLCBzdWNoIHRo YXQgdGhlIHN1YnNlcXVlbnQgY2FsbCB0byBgLWJ1aWxkTWVudUZvcldlYlZpZXdXaXRoQnVpbGRl cjpgIHdoaWNoCisgICAgICAgIHBvcHVsYXRlcyBpdGVtcyBpbiB0aGUgcmlnaHQgY2xpY2sgY29u dGV4dCBtZW51IHdpbGwgaW5jbHVkZSB0aGUgIk1hcmt1cCBJbWFnZSIgaXRlbSBpZiB0aGVyZSBh cmUgcmVsZXZhbnQKKyAgICAgICAgcmVzdWx0cy4KKworICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IGJ1aWxkTWVudUZvcldlYlZpZXdXaXRoQnVpbGRlcjpdKToKKworICAgICAgICBBbHNvIG1vdmUg dGhlIGxvY2F0aW9uIG9mIHRoaXMgaXRlbSB0byBiZWZvcmUgdGhlIEZvcm1hdCAoQi9JL1UpIG1l bnUgaXRlbXMgaW4gYm90aCB0aGUgY2FsbG91dCBiYXIgYW5kIHRoZQorICAgICAgICBlZGl0aW5n IGNvbnRleHQgbWVudS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9T Lm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnByZXBhcmVTZWxlY3Rpb25Gb3JD b250ZXh0TWVudVdpdGhMb2NhdGlvbkluVmlldyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW06CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnByZXBhcmVTZWxlY3Rpb25Gb3JDb250 ZXh0TWVudVdpdGhMb2NhdGlvbkluVmlldyk6CisKKyAgICAgICAgSW4gdGhlIGNhc2Ugd2hlcmUg YW4gaW1hZ2UgZWxlbWVudCBpcyBjbGlja2VkLCBqdXN0IHNlbGVjdCB0aGUgaW1hZ2UgZWxlbWVu dCBpbnN0ZWFkIG9mIHRyeWluZyB0byBkZXRlY3QgYQorICAgICAgICBuZWFyYnkgd29yZCBvciBs aW5rLiBXZSBhbHNvIGltbWVkaWF0ZWx5IHNlbmQgYSBmdWxsIGVkaXRvciBzdGF0ZSB1cGRhdGUg aGVyZSwgc3VjaCB0aGF0IHRoZSBlZGl0b3Igc3RhdGUncworICAgICAgICBgc2VsZWN0ZWRFZGl0 YWJsZUltYWdlYCB3aWxsIGJlIHVwIHRvIGRhdGUgd2hlbiB0aGUgY29tcGxldGlvbiBoYW5kbGVy IGluIHRoZSBVSSBwcm9jZXNzIGlzIGludm9rZWQuCisKIDIwMjItMDQtMzAgIFdlbnNvbiBIc2ll aCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBUaGUgIk1hcmt1 cCBJbWFnZSIgc2VydmljZXMgbWVudSBpdGVtIHNob3VsZCBiZSBnYXRlZCBvbiBpbWFnZSBhbmFs eXNpcyByZXN1bHRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDU5 ZmIxYjZiOGQ0OWUyNTlmODkwOTgwYTc1NzMyMjI0YTdhODVjMmMuLmY0MWRhNGY1M2UxOTIwMTYw YTFjOTFkMGEyMmE5ZjMzODcxMTNjNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5oCkBAIC04ODIsNyArODgyLDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVxdWVzdERpY3Rh dGlvbkNvbnRleHQoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBTdHJpbmcmLCBjb25zdCBT dHJpbmcmLCBjb25zdCBTdHJpbmcmKT4mJik7CiAjaWYgRU5BQkxFKFJFVkVBTCkKICAgICB2b2lk IHJlcXVlc3RSVkl0ZW1JbkN1cnJlbnRTZWxlY3RlZFJhbmdlKENvbXBsZXRpb25IYW5kbGVyPHZv aWQoY29uc3QgUmV2ZWFsSXRlbSYpPiYmKTsKLSAgICB2b2lkIHByZXBhcmVTZWxlY3Rpb25Gb3JD b250ZXh0TWVudVdpdGhMb2NhdGlvbkluVmlldyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCwgQ29t cGxldGlvbkhhbmRsZXI8dm9pZChib29sLCBjb25zdCBSZXZlYWxJdGVtJik+JiYpOworICAgIHZv aWQgcHJlcGFyZVNlbGVjdGlvbkZvckNvbnRleHRNZW51V2l0aExvY2F0aW9uSW5WaWV3KFdlYkNv cmU6OkludFBvaW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wsIGNvbnN0IFJldmVhbEl0 ZW0mKT4mJik7CiAjZW5kaWYKICAgICB2b2lkIHdpbGxJbnNlcnRGaW5hbERpY3RhdGlvblJlc3Vs dCgpOwogICAgIHZvaWQgZGlkSW5zZXJ0RmluYWxEaWN0YXRpb25SZXN1bHQoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tCmluZGV4IGRkMDhjZDU4NzRmYTY3YWViNzJlMmU4ZGIzMGFlMjU5ZDFhNGVhNGUuLjJmYWQy YzBmNmUzNjNiYjhkNTVjMjk2ODg3NzQwMTYzOWEzNmJhMjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAt NzY4Myw4ICs3NjgzLDIyIEBAIC0gKHZvaWQpcmVxdWVzdFJWSXRlbUluU2VsZWN0ZWRSYW5nZVdp dGhDb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShSVkl0ZW0gKml0ZW0pCiAKIC0gKHZvaWQpcHJl cGFyZVNlbGVjdGlvbkZvckNvbnRleHRNZW51V2l0aExvY2F0aW9uSW5WaWV3OihDR1BvaW50KWxv Y2F0aW9uSW5WaWV3IGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKEJPT0wgc2hvdWxkUHJlc2Vu dE1lbnUsIFJWSXRlbSAqaXRlbSkpY29tcGxldGlvbkhhbmRsZXIKIHsKLSAgICBfcGFnZS0+cHJl cGFyZVNlbGVjdGlvbkZvckNvbnRleHRNZW51V2l0aExvY2F0aW9uSW5WaWV3KFdlYkNvcmU6OnJv dW5kZWRJbnRQb2ludChsb2NhdGlvbkluVmlldyksIFtwcm90ZWN0ZWRDb21wbGV0aW9uSGFuZGxl ciA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uSGFuZGxlcildKGJvb2wgc2hvdWxkUHJlc2VudE1l bnUsIGNvbnN0IFdlYktpdDo6UmV2ZWFsSXRlbSYgaXRlbSkgewotICAgICAgICBwcm90ZWN0ZWRD b21wbGV0aW9uSGFuZGxlcihzaG91bGRQcmVzZW50TWVudSwgaXRlbS5pdGVtKCkpOworI2lmIEVO QUJMRShJTUFHRV9BTkFMWVNJU19FTkhBTkNFTUVOVFMpCisgICAgX2ltYWdlQW5hbHlzaXNNYXJr dXBEYXRhID0gc3RkOjpudWxsb3B0OworI2VuZGlmCisKKyAgICBfcGFnZS0+cHJlcGFyZVNlbGVj dGlvbkZvckNvbnRleHRNZW51V2l0aExvY2F0aW9uSW5WaWV3KFdlYkNvcmU6OnJvdW5kZWRJbnRQ b2ludChsb2NhdGlvbkluVmlldyksIFt3ZWFrU2VsZiA9IFdlYWtPYmpDUHRyPFdLQ29udGVudFZp ZXc+KHNlbGYpLCBjb21wbGV0aW9uSGFuZGxlciA9IG1ha2VCbG9ja1B0cihjb21wbGV0aW9uSGFu ZGxlcildKGJvb2wgc2hvdWxkUHJlc2VudE1lbnUsIGF1dG8mIGl0ZW0pIHsKKyAgICAgICAgYXV0 byBzdHJvbmdTZWxmID0gd2Vha1NlbGYuZ2V0KCk7CisgICAgICAgIGlmICghc3Ryb25nU2VsZikK KyAgICAgICAgICAgIHJldHVybiBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSwgbmlsKTsKKworI2lm IEVOQUJMRShJTUFHRV9BTkFMWVNJU19FTkhBTkNFTUVOVFMpCisgICAgICAgIFtzdHJvbmdTZWxm IGRvQWZ0ZXJDb21wdXRpbmdJbWFnZUFuYWx5c2lzUmVzdWx0c0Zvck1hcmt1cDpbY29tcGxldGlv bkhhbmRsZXIsIHNob3VsZFByZXNlbnRNZW51LCBpdGVtID0gUmV0YWluUHRyIHsgaXRlbS5pdGVt KCkgfV0oKSBtdXRhYmxlIHsKKyAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHNob3VsZFBy ZXNlbnRNZW51LCBpdGVtLmdldCgpKTsKKyAgICAgICAgfV07CisjZWxzZQorICAgICAgICBjb21w bGV0aW9uSGFuZGxlcihzaG91bGRQcmVzZW50TWVudSwgaXRlbS5pdGVtKCkpOworI2VuZGlmCiAg ICAgfSk7CiB9CiAjZW5kaWYKQEAgLTk4ODUsNyArOTg5OSw3IEBAIC0gKHZvaWQpYnVpbGRNZW51 Rm9yV2ViVmlld1dpdGhCdWlsZGVyOihpZCA8VUlNZW51QnVpbGRlcj4pYnVpbGRlcgogewogI2lm IEVOQUJMRShJTUFHRV9BTkFMWVNJU19FTkhBTkNFTUVOVFMpCiAgICAgaWYgKGF1dG8gbWVudSA9 IHNlbGYuaW1hZ2VBbmFseXNpc01hcmt1cE1lbnUpCi0gICAgICAgIFtidWlsZGVyIGluc2VydFNp YmxpbmdNZW51Om1lbnUgYWZ0ZXJNZW51Rm9ySWRlbnRpZmllcjpVSU1lbnVTdGFuZGFyZEVkaXRd OworICAgICAgICBbYnVpbGRlciBpbnNlcnRTaWJsaW5nTWVudTptZW51IGJlZm9yZU1lbnVGb3JJ ZGVudGlmaWVyOlVJTWVudUZvcm1hdF07CiAjZW5kaWYKIAogI2lmIEVOQUJMRShBUFBfSElHSExJ R0hUUykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJv eHlJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1t CmluZGV4IDE5NDlmMDIwZTUxNTBlMTQ0ZjczMTQ0ZjY3OWE1YWM0MDVhMzE5NDUuLmUxYzM1ZDU1 Zjc4NmIxMmIyMzliYzFlOWUzYWQ1YWQ2OTk3ZDQ5MTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQpAQCAtNTMyLDcgKzUzMiw3IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpyZXF1ZXN0UlZJdGVtSW5DdXJyZW50U2VsZWN0ZWRSYW5nZShDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKGNvCiAgICAgc2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQ YWdlOjpSZXF1ZXN0UlZJdGVtSW5DdXJyZW50U2VsZWN0ZWRSYW5nZSgpLCBXVEZNb3ZlKGNhbGxi YWNrRnVuY3Rpb24pKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnByZXBhcmVTZWxlY3Rpb25G b3JDb250ZXh0TWVudVdpdGhMb2NhdGlvbkluVmlldyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCBw b2ludCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sLCBjb25zdCBSZXZlYWxJdGVtJik+JiYg Y2FsbGJhY2tGdW5jdGlvbikKK3ZvaWQgV2ViUGFnZVByb3h5OjpwcmVwYXJlU2VsZWN0aW9uRm9y Q29udGV4dE1lbnVXaXRoTG9jYXRpb25JblZpZXcoSW50UG9pbnQgcG9pbnQsIENvbXBsZXRpb25I YW5kbGVyPHZvaWQoYm9vbCwgY29uc3QgUmV2ZWFsSXRlbSYpPiYmIGNhbGxiYWNrRnVuY3Rpb24p CiB7CiAgICAgaWYgKCFoYXNSdW5uaW5nUHJvY2VzcygpKQogICAgICAgICByZXR1cm4gY2FsbGJh Y2tGdW5jdGlvbihmYWxzZSwgUmV2ZWFsSXRlbSgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA0M2Y2YjAyM2M5ZThkNTg5NDY3Y2M5OTRhZjg1MGIx OTY3MmYwNGEyLi45MzMwYzVhYzdhMzhlMTlkMGU0MTJmZjRlYTU2YzA2NzUzODdmYjQxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC04MDYsNyArODA2 LDcgQEAgcHVibGljOgogI2lmIEVOQUJMRShSRVZFQUwpCiAgICAgUmV0YWluUHRyPFJWSXRlbT4g cmV2ZWFsSXRlbUZvckN1cnJlbnRTZWxlY3Rpb24oKTsKICAgICB2b2lkIHJlcXVlc3RSVkl0ZW1J bkN1cnJlbnRTZWxlY3RlZFJhbmdlKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoY29uc3QgV2ViS2l0 OjpSZXZlYWxJdGVtJik+JiYpOwotICAgIHZvaWQgcHJlcGFyZVNlbGVjdGlvbkZvckNvbnRleHRN ZW51V2l0aExvY2F0aW9uSW5WaWV3KGNvbnN0IFdlYkNvcmU6OkludFBvaW50LCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKGJvb2wsIGNvbnN0IFJldmVhbEl0ZW0mKT4mJik7CisgICAgdm9pZCBwcmVw YXJlU2VsZWN0aW9uRm9yQ29udGV4dE1lbnVXaXRoTG9jYXRpb25JblZpZXcoV2ViQ29yZTo6SW50 UG9pbnQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCwgY29uc3QgUmV2ZWFsSXRlbSYpPiYm KTsKICNlbmRpZgogICAgIHZvaWQgd2lsbEluc2VydEZpbmFsRGljdGF0aW9uUmVzdWx0KCk7CiAg ICAgdm9pZCBkaWRJbnNlcnRGaW5hbERpY3RhdGlvblJlc3VsdCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCA2ODVjNmYw YTY2ZWY5NWRhNzAwYWMxOTg4Yjg0MjJjODFlNWViYmMyLi5jMmVkZmE2NzI0YTJjY2JhNzk2MmUz ZWZhYjM4MTZmOTY2ZDM0NmY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMjQxNSwxNSArMjQxNSwyNiBAQCB2b2lkIFdl YlBhZ2U6OnJlcXVlc3RSVkl0ZW1JbkN1cnJlbnRTZWxlY3RlZFJhbmdlKENvbXBsZXRpb25IYW5k bGVyPHZvaWQoY29uc3QgVwogICAgIGNvbXBsZXRpb25IYW5kbGVyKFJldmVhbEl0ZW0ocmV2ZWFs SXRlbUZvckN1cnJlbnRTZWxlY3Rpb24oKSkpOwogfQogCi12b2lkIFdlYlBhZ2U6OnByZXBhcmVT ZWxlY3Rpb25Gb3JDb250ZXh0TWVudVdpdGhMb2NhdGlvbkluVmlldyhjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCBwb2ludCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sLCBjb25zdCBSZXZlYWxJ dGVtJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCi17Ci0gICAgY29uc3RleHByIE9wdGlvblNldDxI aXRUZXN0UmVxdWVzdDo6VHlwZT4gaGl0VHlwZSB7IEhpdFRlc3RSZXF1ZXN0OjpUeXBlOjpSZWFk T25seSwgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6OkFjdGl2ZSwgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6 OkFsbG93VmlzaWJsZUNoaWxkRnJhbWVDb250ZW50T25seSB9OwotICAgIGF1dG8mIGV2ZW50SGFu ZGVyID0gbV9wYWdlLT5tYWluRnJhbWUoKS5ldmVudEhhbmRsZXIoKTsKLSAgICBIaXRUZXN0UmVz dWx0IHJlc3VsdCA9IGV2ZW50SGFuZGVyLmhpdFRlc3RSZXN1bHRBdFBvaW50KHBvaW50LCBoaXRU eXBlKTsKLSAgICAKLSAgICBldmVudEhhbmRlci5zZWxlY3RDbG9zZXN0Q29udGV4dHVhbFdvcmRP ckxpbmtGcm9tSGl0VGVzdFJlc3VsdChyZXN1bHQsIFdlYkNvcmU6OkRvbnRBcHBlbmRUcmFpbGlu Z1doaXRlc3BhY2UpOwotICAgIAotICAgIGNvbXBsZXRpb25IYW5kbGVyKHRydWUsIFJldmVhbEl0 ZW0ocmV2ZWFsSXRlbUZvckN1cnJlbnRTZWxlY3Rpb24oKSkpOwordm9pZCBXZWJQYWdlOjpwcmVw YXJlU2VsZWN0aW9uRm9yQ29udGV4dE1lbnVXaXRoTG9jYXRpb25JblZpZXcoSW50UG9pbnQgcG9p bnQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCwgY29uc3QgUmV2ZWFsSXRlbSYpPiYmIGNv bXBsZXRpb25IYW5kbGVyKQoreworICAgIGNvbnN0ZXhwciBPcHRpb25TZXQgaGl0VHlwZSB7IEhp dFRlc3RSZXF1ZXN0OjpUeXBlOjpSZWFkT25seSwgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6OkFjdGl2 ZSwgSGl0VGVzdFJlcXVlc3Q6OlR5cGU6OkFsbG93VmlzaWJsZUNoaWxkRnJhbWVDb250ZW50T25s eSB9OworICAgIFJlZiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7CisgICAgYXV0byByZXN1 bHQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVyKCkuaGl0VGVzdFJlc3VsdEF0UG9pbnQocG9pbnQsIGhp dFR5cGUpOworICAgIFJlZlB0ciBoaXROb2RlID0gcmVzdWx0LmlubmVyTm9uU2hhcmVkTm9kZSgp OworICAgIGlmICghaGl0Tm9kZSkKKyAgICAgICAgcmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKGZh bHNlLCB7IH0pOworCisgICAgaWYgKGlzPEhUTUxJbWFnZUVsZW1lbnQ+KCpoaXROb2RlKSAmJiBo aXROb2RlLT5oYXNFZGl0YWJsZVN0eWxlKCkpIHsKKyAgICAgICAgYXV0byByYW5nZSA9IG1ha2VS YW5nZVNlbGVjdGluZ05vZGUoKmhpdE5vZGUpOworICAgICAgICBpZiAocmFuZ2UgJiYgZnJhbWUt PnNlbGVjdGlvbigpLnNldFNlbGVjdGVkUmFuZ2UocmFuZ2UsIEFmZmluaXR5OjpVcHN0cmVhbSwg RnJhbWVTZWxlY3Rpb246OlNob3VsZENsb3NlVHlwaW5nOjpZZXMsIFVzZXJUcmlnZ2VyZWQpKSB7 CisgICAgICAgICAgICBsYXlvdXRJZk5lZWRlZCgpOworICAgICAgICAgICAgc2VuZEVkaXRvclN0 YXRlVXBkYXRlKCk7CisgICAgICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIodHJ1ZSwg eyB9KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGZyYW1lLT5ldmVudEhhbmRsZXIoKS5zZWxl Y3RDbG9zZXN0Q29udGV4dHVhbFdvcmRPckxpbmtGcm9tSGl0VGVzdFJlc3VsdChyZXN1bHQsIERv bnRBcHBlbmRUcmFpbGluZ1doaXRlc3BhY2UpOworICAgIGNvbXBsZXRpb25IYW5kbGVyKHRydWUs IHsgcmV2ZWFsSXRlbUZvckN1cnJlbnRTZWxlY3Rpb24oKSB9KTsKIH0KICNlbmRpZgogCmRpZmYg LS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2Q4OWFlNWMw ODlmYWQ1NzI4ZjRkODY5NDNmM2Q5YmJmODE1NWZmZS4uYTg4YjZjNTg3ODkzZTFlMzM5ZTUyYWIz NTM5MjhhNmQ5OWU0NjEwNyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTA1LTAxICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIEFkZCBzdXBwb3J0IGZvciB0 aGUgIk1hcmt1cCBJbWFnZSIgYWN0aW9uIHdoZW4gcmlnaHQgY2xpY2tpbmcgYW4gaW1hZ2UgaW4g ZWRpdGFibGUgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjM5OTQ4CisgICAgICAgIHJkYXI6Ly85MjA2NDY3MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhbiBBUEkgdGVzdCB0byB2ZXJp ZnkgdGhhdCB0aGUgIk1hcmt1cCBJbWFnZSIgaXMgaW5jbHVkZWQgaW4gdGhlIGNvbnRleHQgbWVu dSB3aGVuIHJpZ2h0IGNsaWNraW5nIGFuIGltYWdlCisgICAgICAgIGVsZW1lbnQgaW5zaWRlIGFu IGVkaXRhYmxlIHdlYiB2aWV3LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9JbWFnZUFuYWx5c2lzVGVzdHMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpz aW11bGF0ZUVkaXRDb250ZXh0TWVudUFwcGVhcmFuY2UpOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6VEVTVCk6CisKIDIwMjItMDQtMzAgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBs ZS5jb20+CiAKICAgICAgICAgW21hY09TXSBUaGUgIk1hcmt1cCBJbWFnZSIgc2VydmljZXMgbWVu dSBpdGVtIHNob3VsZCBiZSBnYXRlZCBvbiBpbWFnZSBhbmFseXNpcyByZXN1bHRzCmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0ltYWdlQW5hbHlzaXNU ZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW1hZ2VBbmFs eXNpc1Rlc3RzLm1tCmluZGV4IGRhZjY4ZWVhMzEyMDMzZWRlOWQ4OTNhZmI0ZjEwZjJkYzZiOTZh ZWQuLmE3ODhmMDE2ODc4Y2Q1NDU2YTNjYTI2Njg3YWMxY2QxZDNlYTIwYzcgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW1hZ2VBbmFseXNpc1Rlc3Rz Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW1hZ2VBbmFs eXNpc1Rlc3RzLm1tCkBAIC0zNTIsNiArMzUyLDE4IEBAIHN0YXRpYyB2b2lkIHNpbXVsYXRlQ2Fs bG91dEJhckFwcGVhcmFuY2UoVGVzdFdLV2ViVmlldyAqd2ViVmlldykKICAgICBVdGlsOjpydW4o JmRvbmUpOwogfQogCitzdGF0aWMgQk9PTCBzaW11bGF0ZUVkaXRDb250ZXh0TWVudUFwcGVhcmFu Y2UoVGVzdFdLV2ViVmlldyAqd2ViVmlldywgQ0dQb2ludCBsb2NhdGlvbikKK3sKKyAgICBfX2Js b2NrIEJPT0wgcmVzdWx0OworICAgIF9fYmxvY2sgYm9vbCBkb25lID0gZmFsc2U7CisgICAgW3dl YlZpZXcudGV4dElucHV0Q29udGVudFZpZXcgcHJlcGFyZVNlbGVjdGlvbkZvckNvbnRleHRNZW51 V2l0aExvY2F0aW9uSW5WaWV3OmxvY2F0aW9uIGNvbXBsZXRpb25IYW5kbGVyOl4oQk9PTCBzaG91 bGRQcmVzZW50LCBSVkl0ZW0gKikgeworICAgICAgICByZXN1bHQgPSBzaG91bGRQcmVzZW50Owor ICAgICAgICBkb25lID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBVdGlsOjpydW4oJmRvbmUpOworICAg IHJldHVybiByZXN1bHQ7Cit9CisKIHN0YXRpYyB2b2lkIGludm9rZUltYWdlTWFya3VwQWN0aW9u KFRlc3RXS1dlYlZpZXcgKndlYlZpZXcpCiB7CiAgICAgc2ltdWxhdGVDYWxsb3V0QmFyQXBwZWFy YW5jZSh3ZWJWaWV3KTsKQEAgLTM2Miw2ICszNzQsMjIgQEAgc3RhdGljIHZvaWQgaW52b2tlSW1h Z2VNYXJrdXBBY3Rpb24oVGVzdFdLV2ViVmlldyAqd2ViVmlldykKICAgICBbd2ViVmlldyB3YWl0 Rm9yTmV4dFByZXNlbnRhdGlvblVwZGF0ZV07CiB9CiAKK1RFU1QoSW1hZ2VBbmFseXNpc1Rlc3Rz LCBNYXJrdXBJbWFnZVVzaW5nQ29udGV4dE1lbnUpCit7CisgICAgSW1hZ2VBbmFseXNpc01hcmt1 cFN3aXp6bGVyIHN3aXp6bGVyIHsgaWNvbkltYWdlKCkuYXV0b3JlbGVhc2UoKSwgQ0dSZWN0TWFr ZSgxMCwgMTAsIDIxNSwgMTc0KSB9OworCisgICAgYXV0byB3ZWJWaWV3ID0gY3JlYXRlV2ViVmll d1dpdGhUZXh0UmVjb2duaXRpb25FbmhhbmNlbWVudHMoKTsKKyAgICBbd2ViVmlldyBfc2V0RWRp dGFibGU6WUVTXTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6 QCJpbWFnZSJdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsK KworICAgIEVYUEVDVF9UUlVFKHNpbXVsYXRlRWRpdENvbnRleHRNZW51QXBwZWFyYW5jZSh3ZWJW aWV3LmdldCgpLCBDR1BvaW50TWFrZSgxMDAsIDEwMCkpKTsKKworICAgIGF1dG8gbWVudUJ1aWxk ZXIgPSBhZG9wdE5TKFtbVGVzdFVJTWVudUJ1aWxkZXIgYWxsb2NdIGluaXRdKTsKKyAgICBbd2Vi VmlldyBidWlsZE1lbnVXaXRoQnVpbGRlcjptZW51QnVpbGRlci5nZXQoKV07CisgICAgRVhQRUNU X05PVF9OVUxMKFttZW51QnVpbGRlciBhY3Rpb25XaXRoVGl0bGU6V2ViQ29yZTo6Y29udGV4dE1l bnVJdGVtVGl0bGVNYXJrdXBJbWFnZSgpXSk7Cit9CisKIFRFU1QoSW1hZ2VBbmFseXNpc1Rlc3Rz LCBNZW51Q29udHJvbGxlckl0ZW1zKQogewogICAgIEltYWdlQW5hbHlzaXNNYXJrdXBTd2l6emxl ciBzd2l6emxlciB7IGljb25JbWFnZSgpLmF1dG9yZWxlYXNlKCksIENHUmVjdE1ha2UoMTAsIDEw LCAyMTUsIDE3NCkgfTsK