229571 2021-08-26 09:59:09 -0700 Add type-safe transaction identifiers for EditorState and FocusedElementInformation 2021-08-26 16:03:16 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh akeerthi hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1787656 0 wenson_hsieh 2021-08-26 09:59:09 -0700 . 1787662 1 436530 wenson_hsieh 2021-08-26 10:13:08 -0700 Created attachment 436530 Patch 1787755 2 436552 wenson_hsieh 2021-08-26 13:07:27 -0700 Created attachment 436552 Tweak ChangeLog wording 1787849 3 436552 wenson_hsieh 2021-08-26 15:52:29 -0700 Comment on attachment 436552 Tweak ChangeLog wording Thanks for the review! 1787857 4 ews-feeder 2021-08-26 16:02:25 -0700 Committed r281668 (241021@main): <https://commits.webkit.org/241021@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436552. 1787858 5 webkit-bug-importer 2021-08-26 16:03:16 -0700 <rdar://problem/82411601> 436530 2021-08-26 10:13:08 -0700 2021-08-26 13:07:26 -0700 Patch bug-229571-20210826101307.patch text/plain 12333 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU4MDgzYjUwNjg4YTE1OGQw MjkxYmY3NmI3NmU0OTU4ZWZmMmQwODAuLjQ3ODI5YWViMzViNWY2OWJhYjVhZTFiZGM3ZjYzMGMx Y2M2NWM1ZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjEtMDgtMjYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHR5cGUtc2FmZSB0 cmFuc2FjdGlvbiBpZGVudGlmaWVycyBmb3IgRWRpdG9yU3RhdGUgYW5kIEZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyOTU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgYHRyYW5zYWN0aW9uSURgIGEgbW9ub3RvbmljIG9iamVjdCBpZGVudGlmaWVyIGlu c3RlYWQgb2YgYSBnZW5lcmljIGBUcmFuc2FjdGlvbklEYCwgYW5kIHJlcGxhY2UKKyAgICAgICAg YEZvY3VzZWRFbGVtZW50SWRlbnRpZmllcmAgKHdoaWNoIGlzIGN1cnJlbnRseSB0eXBlLWRlZmlu ZWQgdG8gYHVpbnQ2NF90YCkgd2l0aCBpdHMgb3duIG1vbm90b25pYyBvYmplY3QKKyAgICAgICAg aWRlbnRpZmllciB0eXBlLgorCisgICAgICAgIEluIGEgZnV0dXJlIHBhdGNoLCBJIHBsYW4gdG8g aW1wbGVtZW50IGEgbWVjaGFuaXNtIHRvIHN5bmNocm9uaXplIGBFZGl0b3JTdGF0ZWAgYW5kIGBG b2N1c2VkRWxlbWVudEluZm9ybWF0aW9uYAorICAgICAgICB1cGRhdGVzLCB3aGljaCB3b3VsZCBy ZXF1aXJlIG9uZSBvciBib3RoIG9mIHRoZXNlIG9iamVjdHMgdG8gYm90aCB0eXBlcyBvZiB0cmFu c2FjdGlvbmFsIGlkZW50aWZpZXJzOyBpbiBvcmRlcgorICAgICAgICB0byBkbyB0aGlzLCB3ZSBu ZWVkIHRvIGVuc3VyZSB0aGF0IHRoZXNlIHR3byBpZGVudGlmaWVycyBhcmUgZGlzdGluY3QgdHlw ZXMsIHNvIHRoYXQgdGhleSBjYW4ndCBiZSBlYXNpbHkgbWl4ZWQKKyAgICAgICAgdXAuCisKKyAg ICAgICAgKiBTaGFyZWQvRWRpdG9yU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JT dGF0ZTo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yU3RhdGU6OmRlY29k ZSk6CisgICAgICAgICogU2hhcmVkL0VkaXRvclN0YXRlLmg6CisgICAgICAgICogU2hhcmVkL0Zv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpGb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpGb2N1c2Vk RWxlbWVudEluZm9ybWF0aW9uOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Gb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uLmg6CisgICAgICAgICogU2hhcmVkL0lkZW50aWZpZXJUeXBlcy5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnVwZGF0ZUVkaXRvclN0YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyB1 cGRhdGVDdXJyZW50Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbjpdKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmVk aXRvclN0YXRlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZWxlbWVudERpZEZv Y3VzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCisgICAgICAg IEFkZGl0aW9uYWxseSByZW5hbWUgYG1fY3VycmVudEZvY3VzZWRFbGVtZW50SWRlbnRpZmllcmAg dG8gYG1fbGFzdEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25JZGVudGlmaWVyYCwgZm9yCisgICAg ICAgIGNvbnNpc3RlbmN5IHdpdGggYG1fbGFzdEVkaXRvclN0YXRlSWRlbnRpZmllcmAuCisKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24pOgorCiAyMDIxLTA4LTI1 ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBzb21lIGlPUy1zcGVjaWZpYyBjb21waWxlLXRpbWUgZ3VhcmRzIHRoYXQgYXJlIG5vIGxvbmdl ciBuZWVkZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmNw cCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmNwcAppbmRleCAzODA4MGJlNzIy NDFjZjdhYjcwYjAxM2NkYThmZjcwOWJkZDBjYTY2Li45ZTg1ZjI3ZTMyOWE1OGJhYjYwMjQyMjZl YmVhNmFiOTUwYWUwZTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JT dGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCkBAIC0z NCw3ICszNCw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiB2b2lkIEVkaXRvclN0YXRl OjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewotICAgIGVuY29kZXIgPDwg dHJhbnNhY3Rpb25JRDsKKyAgICBlbmNvZGVyIDw8IGlkZW50aWZpZXI7CiAgICAgZW5jb2RlciA8 PCBvcmlnaW5JZGVudGlmaWVyRm9yUGFzdGVib2FyZDsKICAgICBlbmNvZGVyIDw8IHNob3VsZEln bm9yZVNlbGVjdGlvbkNoYW5nZXM7CiAgICAgZW5jb2RlciA8PCBzZWxlY3Rpb25Jc05vbmU7CkBA IC01Myw3ICs1Myw3IEBAIHZvaWQgRWRpdG9yU3RhdGU6OmVuY29kZShJUEM6OkVuY29kZXImIGVu Y29kZXIpIGNvbnN0CiAKIGJvb2wgRWRpdG9yU3RhdGU6OmRlY29kZShJUEM6OkRlY29kZXImIGRl Y29kZXIsIEVkaXRvclN0YXRlJiByZXN1bHQpCiB7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShy ZXN1bHQudHJhbnNhY3Rpb25JRCkpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaWRl bnRpZmllcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghZGVjb2Rlci5kZWNv ZGUocmVzdWx0Lm9yaWdpbklkZW50aWZpZXJGb3JQYXN0ZWJvYXJkKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9F ZGl0b3JTdGF0ZS5oCmluZGV4IDk5NzUzZjUwNzljN2MwYzk1OGNlM2EyMTUyZGE2MWY4YmNmMDgy YmIuLmE2NDk4NGI0MWI5OGVhMzY1MGY4Y2EzNzJkOWE0YmM0MjZiZGM4ZjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0VkaXRvclN0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvRWRpdG9yU3RhdGUuaApAQCAtMjYsNyArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNp bmNsdWRlICJBcmd1bWVudENvZGVycy5oIgotI2luY2x1ZGUgIlRyYW5zYWN0aW9uSUQuaCIKKyNp bmNsdWRlICJJZGVudGlmaWVyVHlwZXMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0NvbG9yLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9Gb250QXR0cmlidXRlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvSW50 UmVjdC5oPgpAQCAtNzAsNyArNzAsNyBAQCBlbnVtIExpc3RUeXBlIHsKIH07CiAKIHN0cnVjdCBF ZGl0b3JTdGF0ZSB7Ci0gICAgVHJhbnNhY3Rpb25JRCB0cmFuc2FjdGlvbklEOworICAgIEVkaXRv clN0YXRlSWRlbnRpZmllciBpZGVudGlmaWVyOwogICAgIFN0cmluZyBvcmlnaW5JZGVudGlmaWVy Rm9yUGFzdGVib2FyZDsKICAgICBib29sIHNob3VsZElnbm9yZVNlbGVjdGlvbkNoYW5nZXMgeyBm YWxzZSB9OwogICAgIGJvb2wgc2VsZWN0aW9uSXNOb25lIHsgdHJ1ZSB9OyAvLyBUaGlzIHdpbGwg YmUgZmFsc2Ugd2hlbiB0aGVyZSBpcyBhIGNhcmV0IHNlbGVjdGlvbi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uY3BwIGIvU291cmNl L1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5jcHAKaW5kZXggOTY5MDY2 MWI1MTM3MzMyNjhiMjZkZDdkOWY1ZTgyZGNlNDA2NTNlNi4uNjI3NDQ3MDE0Yzk1ZWZlNjg2NTUw M2QxYzgwN2RhN2U5YTAzMTVmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5jcHAKQEAgLTk4LDcgKzk4LDcgQEAgdm9pZCBGb2N1c2Vk RWxlbWVudEluZm9ybWF0aW9uOjplbmNvZGUoSVBDOjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAog ICAgIGVuY29kZXIgPDwgcGxhY2Vob2xkZXI7CiAgICAgZW5jb2RlciA8PCBsYWJlbDsKICAgICBl bmNvZGVyIDw8IGFyaWFMYWJlbDsKLSAgICBlbmNvZGVyIDw8IGZvY3VzZWRFbGVtZW50SWRlbnRp ZmllcjsKKyAgICBlbmNvZGVyIDw8IGlkZW50aWZpZXI7CiAgICAgZW5jb2RlciA8PCBjb250YWlu ZXJTY3JvbGxpbmdOb2RlSUQ7CiAjaWYgRU5BQkxFKERBVEFMSVNUX0VMRU1FTlQpCiAgICAgZW5j b2RlciA8PCBoYXNTdWdnZXN0aW9uczsKQEAgLTIyMyw3ICsyMjMsNyBAQCBib29sIEZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb246OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIEZvY3VzZWRF bGVtZW50SW5mbwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmFyaWFMYWJlbCkpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmZv Y3VzZWRFbGVtZW50SWRlbnRpZmllcikpCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQu aWRlbnRpZmllcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocmVzdWx0LmNvbnRhaW5lclNjcm9sbGluZ05vZGVJRCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmggYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmgKaW5kZXggNGRiOGUzNTI0OGI4 ODkwZjFjMjE5YjhhYmM4YWYxMDAyNmY4ZjlkMi4uOTA4NGE4ZTUwY2RiMGFhNmZjOTY3MGE0NzFm MGE0NjExNWEwOGJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVs ZW1lbnRJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb24uaApAQCAtMjYsNiArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNs dWRlICJBcmd1bWVudENvZGVycy5oIgorI2luY2x1ZGUgIklkZW50aWZpZXJUeXBlcy5oIgogI2lu Y2x1ZGUgPFdlYkNvcmUvQXV0b2NhcGl0YWxpemVUeXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUv QXV0b2ZpbGwuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0NvbG9yLmg+CkBAIC04Nyw4ICs4OCw2IEBA IHN0cnVjdCBPcHRpb25JdGVtIHsKICAgICBzdGF0aWMgc3RkOjpvcHRpb25hbDxPcHRpb25JdGVt PiBkZWNvZGUoSVBDOjpEZWNvZGVyJik7CiB9OwogCi11c2luZyBGb2N1c2VkRWxlbWVudElkZW50 aWZpZXIgPSB1aW50NjRfdDsKLQogc3RydWN0IEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24gewog ICAgIFdlYkNvcmU6OkludFJlY3QgaW50ZXJhY3Rpb25SZWN0OwogICAgIFdlYkNvcmU6OkVsZW1l bnRDb250ZXh0IGVsZW1lbnRDb250ZXh0OwpAQCAtMTQwLDcgKzEzOSw3IEBAIHN0cnVjdCBGb2N1 c2VkRWxlbWVudEluZm9ybWF0aW9uIHsKICAgICBib29sIHNob3VsZFVzZUxlZ2FjeVNlbGVjdFBv cG92ZXJEaXNtaXNzYWxCZWhhdmlvckluRGF0YUFjdGl2YXRpb24geyBmYWxzZSB9OwogICAgIGJv b2wgaXNGb2N1c2luZ1dpdGhWYWxpZGF0aW9uTWVzc2FnZSB7IGZhbHNlIH07CiAKLSAgICBGb2N1 c2VkRWxlbWVudElkZW50aWZpZXIgZm9jdXNlZEVsZW1lbnRJZGVudGlmaWVyIHsgMCB9OworICAg IEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25JZGVudGlmaWVyIGlkZW50aWZpZXI7CiAgICAgV2Vi Q29yZTo6U2Nyb2xsaW5nTm9kZUlEIGNvbnRhaW5lclNjcm9sbGluZ05vZGVJRCB7IDAgfTsKIAog ICAgIHZvaWQgZW5jb2RlKElQQzo6RW5jb2RlciYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvSWRlbnRpZmllclR5cGVzLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9J ZGVudGlmaWVyVHlwZXMuaAppbmRleCBlZTI5YzQzNGE0ZTJjOTYxMjlkOTgwYzJlZDM0NjJkMjUz ZWY5ZjA3Li44OWI1M2U5Mjc5NjFjMjNkNzFiNzc5MjlhMjQzNjQ4MGI0ZWI4YzgyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9JZGVudGlmaWVyVHlwZXMuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9JZGVudGlmaWVyVHlwZXMuaApAQCAtMjUsNiArMjUsNyBAQAogCiAjcHJh Z21hIG9uY2UKIAorI2luY2x1ZGUgIk1vbm90b25pY09iamVjdElkZW50aWZpZXIuaCIKICNpbmNs dWRlIDx3dGYvT2JqZWN0SWRlbnRpZmllci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQx LDQgKzQyLDEwIEBAIHVzaW5nIFRhcElkZW50aWZpZXIgPSBPYmplY3RJZGVudGlmaWVyPFRhcElk ZW50aWZpZXJUeXBlPjsKIGVudW0gVGV4dENoZWNrZXJSZXF1ZXN0VHlwZSB7IH07CiB1c2luZyBU ZXh0Q2hlY2tlclJlcXVlc3RJRCA9IE9iamVjdElkZW50aWZpZXI8VGV4dENoZWNrZXJSZXF1ZXN0 VHlwZT47CiAKK2VudW0gRWRpdG9yU3RhdGVJZGVudGlmaWVyVHlwZSB7IH07Cit1c2luZyBFZGl0 b3JTdGF0ZUlkZW50aWZpZXIgPSBNb25vdG9uaWNPYmplY3RJZGVudGlmaWVyPEVkaXRvclN0YXRl SWRlbnRpZmllclR5cGU+OworCitlbnVtIEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25JZGVudGlm aWVyVHlwZSB7IH07Cit1c2luZyBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uSWRlbnRpZmllciA9 IE1vbm90b25pY09iamVjdElkZW50aWZpZXI8Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbklkZW50 aWZpZXJUeXBlPjsKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA1ZmIzMDg5NTAxNTYyNDg2NjYxNTNjNjI0ZjQwMzRl YTRhODg0ZmRmLi43NThkMWIzOThlYzc4NTIzZTM0YWFmNGFlNjQ1MTk5ODUxZTAzZTA0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTc0NTksNyArNzQ1OSw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjplZGl0b3JTdGF0ZUNoYW5nZWQoY29uc3QgRWRpdG9yU3Rh dGUmIGVkaXRvclN0YXRlKQogCiBib29sIFdlYlBhZ2VQcm94eTo6dXBkYXRlRWRpdG9yU3RhdGUo Y29uc3QgRWRpdG9yU3RhdGUmIG5ld0VkaXRvclN0YXRlKQogewotICAgIGlmIChuZXdFZGl0b3JT dGF0ZS50cmFuc2FjdGlvbklEIDwgbV9lZGl0b3JTdGF0ZS50cmFuc2FjdGlvbklEKQorICAgIGlm IChuZXdFZGl0b3JTdGF0ZS5pZGVudGlmaWVyIDwgbV9lZGl0b3JTdGF0ZS5pZGVudGlmaWVyKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBhdXRvIG9sZEVkaXRvclN0YXRlID0gc3RkOjpl eGNoYW5nZShtX2VkaXRvclN0YXRlLCBuZXdFZGl0b3JTdGF0ZSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRl eCBjMDgwZmFmYjFmZDg1Yzc5YTFjMWFhNTM1Y2RlODJiOGVjNzM3M2Q2Li40Zjk0MzQ5YjEwNjg0 YjljOWNjZmQzMWMyZjhkZTUzN2VjZmMyZDljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTY2ODQsOSAr NjY4NCw5IEBAIC0gKHZvaWQpX3VwZGF0ZUluaXRpYWxXcml0aW5nRGlyZWN0aW9uSWZOZWNlc3Nh cnkKIC0gKHZvaWQpdXBkYXRlQ3VycmVudEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb246KEZ1bmN0 aW9uPHZvaWQoYm9vbCBkaWRVcGRhdGUpPiYmKWNhbGxiYWNrCiB7CiAgICAgV2Vha09iakNQdHI8 V0tDb250ZW50Vmlldz4gd2Vha1NlbGYgeyBzZWxmIH07Ci0gICAgYXV0byBpZGVudGlmaWVyQmVm b3JlVXBkYXRlID0gX2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uZm9jdXNlZEVsZW1lbnRJZGVu dGlmaWVyOworICAgIGF1dG8gaWRlbnRpZmllckJlZm9yZVVwZGF0ZSA9IF9mb2N1c2VkRWxlbWVu dEluZm9ybWF0aW9uLmlkZW50aWZpZXI7CiAgICAgX3BhZ2UtPnJlcXVlc3RGb2N1c2VkRWxlbWVu dEluZm9ybWF0aW9uKFtjYWxsYmFjayA9IFdURk1vdmUoY2FsbGJhY2spLCBpZGVudGlmaWVyQmVm b3JlVXBkYXRlLCB3ZWFrU2VsZl0gKGF1dG8mIGluZm8pIHsKLSAgICAgICAgaWYgKCF3ZWFrU2Vs ZiB8fCAhaW5mbyB8fCBpbmZvLT5mb2N1c2VkRWxlbWVudElkZW50aWZpZXIgIT0gaWRlbnRpZmll ckJlZm9yZVVwZGF0ZSkgeworICAgICAgICBpZiAoIXdlYWtTZWxmIHx8ICFpbmZvIHx8IGluZm8t PmlkZW50aWZpZXIgIT0gaWRlbnRpZmllckJlZm9yZVVwZGF0ZSkgewogICAgICAgICAgICAgLy8g SWYgdGhlIGZvY3VzZWQgZWxlbWVudCBtYXkgaGF2ZSBjaGFuZ2VkIGluIHRoZSBtZWFudGltZSwg ZG9uJ3Qgb3ZlcndyaXRlIGZvY3VzZWQgZWxlbWVudCBpbmZvcm1hdGlvbi4KICAgICAgICAgICAg IGNhbGxiYWNrKGZhbHNlKTsKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMDRlM2FlMjAxNDNmMmYzZGJkMjA2 NGEzMDJmMDFiODRlZGNhOTY0NS4uMjNlNjI0YjhlMDIwOTQ2MWE2NDllOWIzOTllMTRmYWFiODYx NjM4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK QEAgLTEyMjUsNyArMTIyNSw3IEBAIEVkaXRvclN0YXRlIFdlYlBhZ2U6OmVkaXRvclN0YXRlKFNo b3VsZFBlcmZvcm1MYXlvdXQgc2hvdWxkUGVyZm9ybUxheW91dCkgY29uc3QKICAgICBjb25zdCBW aXNpYmxlU2VsZWN0aW9uJiBzZWxlY3Rpb24gPSBmcmFtZS0+c2VsZWN0aW9uKCkuc2VsZWN0aW9u KCk7CiAgICAgYXV0byYgZWRpdG9yID0gZnJhbWUtPmVkaXRvcigpOwogCi0gICAgcmVzdWx0LnRy YW5zYWN0aW9uSUQgPSBtX2xhc3RFZGl0b3JTdGF0ZVRyYW5zYWN0aW9uSUQuaW5jcmVtZW50KCk7 CisgICAgcmVzdWx0LmlkZW50aWZpZXIgPSBtX2xhc3RFZGl0b3JTdGF0ZUlkZW50aWZpZXIuaW5j cmVtZW50KCk7CiAgICAgcmVzdWx0LnNlbGVjdGlvbklzTm9uZSA9IHNlbGVjdGlvbi5pc05vbmUo KTsKICAgICByZXN1bHQuc2VsZWN0aW9uSXNSYW5nZSA9IHNlbGVjdGlvbi5pc1JhbmdlKCk7CiAg ICAgcmVzdWx0LmlzQ29udGVudEVkaXRhYmxlID0gc2VsZWN0aW9uLmlzQ29udGVudEVkaXRhYmxl KCk7CkBAIC02MDMxLDcgKzYwMzEsNiBAQCB2b2lkIFdlYlBhZ2U6OmVsZW1lbnREaWRGb2N1cyhX ZWJDb3JlOjpFbGVtZW50JiBlbGVtZW50KQogICAgICAgICAgICAgZWxlbWVudC5kb2N1bWVudCgp LmZ1bGxzY3JlZW5NYW5hZ2VyKCkuY2FuY2VsRnVsbHNjcmVlbigpOwogI2VuZGlmCiAKLSAgICAg ICAgKyttX2N1cnJlbnRGb2N1c2VkRWxlbWVudElkZW50aWZpZXI7CiAgICAgICAgIGF1dG8gaW5m b3JtYXRpb24gPSBmb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKCk7CiAgICAgICAgIGlmICghaW5m b3JtYXRpb24pCiAgICAgICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMTg4MWE1ZjM2NjMyM2M3MzQwYzAwOGZmZjg2NjRlMzk1 ZGJjOTVkMy4uMTQzYTE4MzgyYWEwMWUzM2QwMzgyZDVkNzkyMjc1N2NiMWFmN2I3NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtMjI0Myw3ICsyMjQz LDcgQEAgcHJpdmF0ZToKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgbV9wcmV2aW91c0V4cG9zZWRD b250ZW50UmVjdDsKICAgICBPcHRpb25TZXQ8V2ViS2l0OjpXZWJFdmVudDo6TW9kaWZpZXI+IG1f cGVuZGluZ1N5bnRoZXRpY0NsaWNrTW9kaWZpZXJzOwogICAgIFdlYkNvcmU6OlBvaW50ZXJJRCBt X3BlbmRpbmdTeW50aGV0aWNDbGlja1BvaW50ZXJJZCB7IDAgfTsKLSAgICBGb2N1c2VkRWxlbWVu dElkZW50aWZpZXIgbV9jdXJyZW50Rm9jdXNlZEVsZW1lbnRJZGVudGlmaWVyIHsgMCB9OworICAg IEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25JZGVudGlmaWVyIG1fbGFzdEZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb25JZGVudGlmaWVyOwogICAgIHN0ZDo6b3B0aW9uYWw8RHluYW1pY1ZpZXdwb3J0 U2l6ZVVwZGF0ZUlEPiBtX3BlbmRpbmdEeW5hbWljVmlld3BvcnRTaXplVXBkYXRlSUQ7CiAgICAg ZG91YmxlIG1fbGFzdFRyYW5zYWN0aW9uUGFnZVNjYWxlRmFjdG9yIHsgMCB9OwogICAgIFRyYW5z YWN0aW9uSUQgbV9sYXN0VHJhbnNhY3Rpb25JRFdpdGhTY2FsZUNoYW5nZTsKQEAgLTIyODIsNyAr MjI4Miw3IEBAIHByaXZhdGU6CiAKICAgICBlbnVtIGNsYXNzIEVkaXRvclN0YXRlSXNDb250ZW50 RWRpdGFibGUgeyBObywgWWVzLCBVbnNldCB9OwogICAgIG11dGFibGUgRWRpdG9yU3RhdGVJc0Nv bnRlbnRFZGl0YWJsZSBtX2xhc3RFZGl0b3JTdGF0ZVdhc0NvbnRlbnRFZGl0YWJsZSB7IEVkaXRv clN0YXRlSXNDb250ZW50RWRpdGFibGU6OlVuc2V0IH07Ci0gICAgbXV0YWJsZSBUcmFuc2FjdGlv bklEIG1fbGFzdEVkaXRvclN0YXRlVHJhbnNhY3Rpb25JRDsKKyAgICBtdXRhYmxlIEVkaXRvclN0 YXRlSWRlbnRpZmllciBtX2xhc3RFZGl0b3JTdGF0ZUlkZW50aWZpZXI7CiAKICNpZiBQTEFURk9S TShHVEspIHx8IFBMQVRGT1JNKFdQRSkKICAgICBzdGQ6Om9wdGlvbmFsPElucHV0TWV0aG9kU3Rh dGU+IG1faW5wdXRNZXRob2RTdGF0ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggYzM3MTY1NDRiMTU4Njg5ZTA2ZDAxZDg0 ZWZiNmYwYmQ2ZTM4MjM5Yy4uZDUwYzJiNzhmNTYwOTZmYjdlYjBhYjhkZWNkOWE0MDQyYzQ2YzEy MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KQEAgLTMyMjYsNyArMzIyNiw3IEBAIHN0ZDo6b3B0aW9uYWw8Rm9jdXNlZEVsZW1l bnRJbmZvcm1hdGlvbj4gV2ViUGFnZTo6Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbigpCiAgICAg ICAgIGluZm9ybWF0aW9uLnByZXZpb3VzTm9kZVJlY3QgPSByb290Vmlld0JvdW5kcygqcHJldmlv dXNFbGVtZW50KTsKICAgICAgICAgaW5mb3JtYXRpb24uaGFzUHJldmlvdXNOb2RlID0gdHJ1ZTsK ICAgICB9Ci0gICAgaW5mb3JtYXRpb24uZm9jdXNlZEVsZW1lbnRJZGVudGlmaWVyID0gbV9jdXJy ZW50Rm9jdXNlZEVsZW1lbnRJZGVudGlmaWVyOworICAgIGluZm9ybWF0aW9uLmlkZW50aWZpZXIg PSBtX2xhc3RGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uSWRlbnRpZmllci5pbmNyZW1lbnQoKTsK IAogICAgIGlmIChpczxMYWJlbGFibGVFbGVtZW50PigqZm9jdXNlZEVsZW1lbnQpKSB7CiAgICAg ICAgIGlmIChhdXRvIGxhYmVscyA9IGRvd25jYXN0PExhYmVsYWJsZUVsZW1lbnQ+KCpmb2N1c2Vk RWxlbWVudCkubGFiZWxzKCkpIHsK 436552 2021-08-26 13:07:27 -0700 2021-08-26 16:02:26 -0700 Tweak ChangeLog wording bug-229571-20210826130727.patch text/plain 12338 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU4MDgzYjUwNjg4YTE1OGQw MjkxYmY3NmI3NmU0OTU4ZWZmMmQwODAuLmJlY2Q5Y2IwN2I0MDk4ZTc4YmJjNDVlZWQwZDM2ZGRk MTI0Mjc2M2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjEtMDgtMjYgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHR5cGUtc2FmZSB0 cmFuc2FjdGlvbiBpZGVudGlmaWVycyBmb3IgRWRpdG9yU3RhdGUgYW5kIEZvY3VzZWRFbGVtZW50 SW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIyOTU3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE1ha2UgYHRyYW5zYWN0aW9uSURgIGEgbW9ub3RvbmljIG9iamVjdCBpZGVudGlmaWVyIGlu c3RlYWQgb2YgYSBnZW5lcmljIGBUcmFuc2FjdGlvbklEYCwgYW5kIHJlcGxhY2UKKyAgICAgICAg YEZvY3VzZWRFbGVtZW50SWRlbnRpZmllcmAgKHdoaWNoIGlzIGN1cnJlbnRseSB0eXBlLWRlZmlu ZWQgdG8gYHVpbnQ2NF90YCkgd2l0aCBpdHMgb3duIG1vbm90b25pYyBvYmplY3QKKyAgICAgICAg aWRlbnRpZmllciB0eXBlLgorCisgICAgICAgIEluIGEgZnV0dXJlIHBhdGNoLCBJIHBsYW4gdG8g aW1wbGVtZW50IGEgbWVjaGFuaXNtIHRvIHN5bmNocm9uaXplIGBFZGl0b3JTdGF0ZWAgYW5kIGBG b2N1c2VkRWxlbWVudEluZm9ybWF0aW9uYAorICAgICAgICB1cGRhdGVzLCB3aGljaCB3b3VsZCBy ZXF1aXJlIG9uZSBvciBib3RoIG9mIHRoZXNlIG9iamVjdHMgdG8gaG9sZCBib3RoIHR5cGVzIG9m IHRyYW5zYWN0aW9uYWwgaWRlbnRpZmllcnM7IGluCisgICAgICAgIG9yZGVyIHRvIGRvIHRoaXMs IHdlIG5lZWQgdG8gZW5zdXJlIHRoYXQgdGhlc2UgdHdvIGlkZW50aWZpZXJzIGFyZSBkaXN0aW5j dCB0eXBlcywgc28gdGhhdCB0aGV5IGNhbid0IGJlIGVhc2lseQorICAgICAgICBtaXhlZCB1cC4K KworICAgICAgICAqIFNoYXJlZC9FZGl0b3JTdGF0ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkVk aXRvclN0YXRlOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JTdGF0ZTo6 ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvRWRpdG9yU3RhdGUuaDoKKyAgICAgICAgKiBTaGFy ZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZvY3Vz ZWRFbGVtZW50SW5mb3JtYXRpb246OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OkZv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb246OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL0ZvY3Vz ZWRFbGVtZW50SW5mb3JtYXRpb24uaDoKKyAgICAgICAgKiBTaGFyZWQvSWRlbnRpZmllclR5cGVz Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6dXBkYXRlRWRpdG9yU3RhdGUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IHVwZGF0ZUN1cnJlbnRGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uOl0pOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6ZWRpdG9yU3RhdGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjplbGVtZW50 RGlkRm9jdXMpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisKKyAg ICAgICAgQWRkaXRpb25hbGx5IHJlbmFtZSBgbV9jdXJyZW50Rm9jdXNlZEVsZW1lbnRJZGVudGlm aWVyYCB0byBgbV9sYXN0Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbklkZW50aWZpZXJgLCBmb3IK KyAgICAgICAgY29uc2lzdGVuY3kgd2l0aCBgbV9sYXN0RWRpdG9yU3RhdGVJZGVudGlmaWVyYC4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbik6CisKIDIwMjEt MDgtMjUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIHNvbWUgaU9TLXNwZWNpZmljIGNvbXBpbGUtdGltZSBndWFyZHMgdGhhdCBhcmUgbm8g bG9uZ2VyIG5lZWRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3Rh dGUuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuY3BwCmluZGV4IDM4MDgw YmU3MjI0MWNmN2FiNzBiMDEzY2RhOGZmNzA5YmRkMGNhNjYuLjllODVmMjdlMzI5YTU4YmFiNjAy NDIyNmViZWE2YWI5NTBhZTBlN2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0Vk aXRvclN0YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5jcHAK QEAgLTM0LDcgKzM0LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIHZvaWQgRWRpdG9y U3RhdGU6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNvbnN0CiB7Ci0gICAgZW5jb2Rl ciA8PCB0cmFuc2FjdGlvbklEOworICAgIGVuY29kZXIgPDwgaWRlbnRpZmllcjsKICAgICBlbmNv ZGVyIDw8IG9yaWdpbklkZW50aWZpZXJGb3JQYXN0ZWJvYXJkOwogICAgIGVuY29kZXIgPDwgc2hv dWxkSWdub3JlU2VsZWN0aW9uQ2hhbmdlczsKICAgICBlbmNvZGVyIDw8IHNlbGVjdGlvbklzTm9u ZTsKQEAgLTUzLDcgKzUzLDcgQEAgdm9pZCBFZGl0b3JTdGF0ZTo6ZW5jb2RlKElQQzo6RW5jb2Rl ciYgZW5jb2RlcikgY29uc3QKIAogYm9vbCBFZGl0b3JTdGF0ZTo6ZGVjb2RlKElQQzo6RGVjb2Rl ciYgZGVjb2RlciwgRWRpdG9yU3RhdGUmIHJlc3VsdCkKIHsKLSAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHJlc3VsdC50cmFuc2FjdGlvbklEKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3Vs dC5pZGVudGlmaWVyKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFkZWNvZGVy LmRlY29kZShyZXN1bHQub3JpZ2luSWRlbnRpZmllckZvclBhc3RlYm9hcmQpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuaCBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL0VkaXRvclN0YXRlLmgKaW5kZXggOTk3NTNmNTA3OWM3YzBjOTU4Y2UzYTIxNTJkYTYxZjhi Y2YwODJiYi4uYTY0OTg0YjQxYjk4ZWEzNjUwZjhjYTM3MmQ5YTRiYzQyNmJkYzhmMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvRWRpdG9yU3RhdGUuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9FZGl0b3JTdGF0ZS5oCkBAIC0yNiw3ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UK IAogI2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCi0jaW5jbHVkZSAiVHJhbnNhY3Rpb25JRC5o IgorI2luY2x1ZGUgIklkZW50aWZpZXJUeXBlcy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQ29sb3Iu aD4KICNpbmNsdWRlIDxXZWJDb3JlL0ZvbnRBdHRyaWJ1dGVzLmg+CiAjaW5jbHVkZSA8V2ViQ29y ZS9JbnRSZWN0Lmg+CkBAIC03MCw3ICs3MCw3IEBAIGVudW0gTGlzdFR5cGUgewogfTsKIAogc3Ry dWN0IEVkaXRvclN0YXRlIHsKLSAgICBUcmFuc2FjdGlvbklEIHRyYW5zYWN0aW9uSUQ7CisgICAg RWRpdG9yU3RhdGVJZGVudGlmaWVyIGlkZW50aWZpZXI7CiAgICAgU3RyaW5nIG9yaWdpbklkZW50 aWZpZXJGb3JQYXN0ZWJvYXJkOwogICAgIGJvb2wgc2hvdWxkSWdub3JlU2VsZWN0aW9uQ2hhbmdl cyB7IGZhbHNlIH07CiAgICAgYm9vbCBzZWxlY3Rpb25Jc05vbmUgeyB0cnVlIH07IC8vIFRoaXMg d2lsbCBiZSBmYWxzZSB3aGVuIHRoZXJlIGlzIGEgY2FyZXQgc2VsZWN0aW9uLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5jcHAgYi9T b3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcAppbmRleCA5 NjkwNjYxYjUxMzczMzI2OGIyNmRkN2Q5ZjVlODJkY2U0MDY1M2U2Li42Mjc0NDcwMTRjOTVlZmU2 ODY1NTAzZDFjODA3ZGE3ZTlhMDMxNWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcApAQCAtOTgsNyArOTgsNyBAQCB2b2lkIEZv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb246OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29kZXIpIGNv bnN0CiAgICAgZW5jb2RlciA8PCBwbGFjZWhvbGRlcjsKICAgICBlbmNvZGVyIDw8IGxhYmVsOwog ICAgIGVuY29kZXIgPDwgYXJpYUxhYmVsOwotICAgIGVuY29kZXIgPDwgZm9jdXNlZEVsZW1lbnRJ ZGVudGlmaWVyOworICAgIGVuY29kZXIgPDwgaWRlbnRpZmllcjsKICAgICBlbmNvZGVyIDw8IGNv bnRhaW5lclNjcm9sbGluZ05vZGVJRDsKICNpZiBFTkFCTEUoREFUQUxJU1RfRUxFTUVOVCkKICAg ICBlbmNvZGVyIDw8IGhhc1N1Z2dlc3Rpb25zOwpAQCAtMjIzLDcgKzIyMyw3IEBAIGJvb2wgRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbjo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgRm9j dXNlZEVsZW1lbnRJbmZvCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuYXJpYUxhYmVs KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1 bHQuZm9jdXNlZEVsZW1lbnRJZGVudGlmaWVyKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5pZGVudGlmaWVyKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQuY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEKSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaCBiL1NvdXJj ZS9XZWJLaXQvU2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaAppbmRleCA0ZGI4ZTM1 MjQ4Yjg4OTBmMWMyMTliOGFiYzhhZjEwMDI2ZjhmOWQyLi45MDg0YThlNTBjZGIwYWE2ZmM5Njcw YTQ3MWYwYTQ2MTE1YTA4YmY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1 c2VkRWxlbWVudEluZm9ybWF0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNl ZEVsZW1lbnRJbmZvcm1hdGlvbi5oCkBAIC0yNiw2ICsyNiw3IEBACiAjcHJhZ21hIG9uY2UKIAog I2luY2x1ZGUgIkFyZ3VtZW50Q29kZXJzLmgiCisjaW5jbHVkZSAiSWRlbnRpZmllclR5cGVzLmgi CiAjaW5jbHVkZSA8V2ViQ29yZS9BdXRvY2FwaXRhbGl6ZVR5cGVzLmg+CiAjaW5jbHVkZSA8V2Vi Q29yZS9BdXRvZmlsbC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ29sb3IuaD4KQEAgLTg3LDggKzg4 LDYgQEAgc3RydWN0IE9wdGlvbkl0ZW0gewogICAgIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPE9wdGlv bkl0ZW0+IGRlY29kZShJUEM6OkRlY29kZXImKTsKIH07CiAKLXVzaW5nIEZvY3VzZWRFbGVtZW50 SWRlbnRpZmllciA9IHVpbnQ2NF90OwotCiBzdHJ1Y3QgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlv biB7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBpbnRlcmFjdGlvblJlY3Q7CiAgICAgV2ViQ29yZTo6 RWxlbWVudENvbnRleHQgZWxlbWVudENvbnRleHQ7CkBAIC0xNDAsNyArMTM5LDcgQEAgc3RydWN0 IEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24gewogICAgIGJvb2wgc2hvdWxkVXNlTGVnYWN5U2Vs ZWN0UG9wb3ZlckRpc21pc3NhbEJlaGF2aW9ySW5EYXRhQWN0aXZhdGlvbiB7IGZhbHNlIH07CiAg ICAgYm9vbCBpc0ZvY3VzaW5nV2l0aFZhbGlkYXRpb25NZXNzYWdlIHsgZmFsc2UgfTsKIAotICAg IEZvY3VzZWRFbGVtZW50SWRlbnRpZmllciBmb2N1c2VkRWxlbWVudElkZW50aWZpZXIgeyAwIH07 CisgICAgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbklkZW50aWZpZXIgaWRlbnRpZmllcjsKICAg ICBXZWJDb3JlOjpTY3JvbGxpbmdOb2RlSUQgY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEIHsgMCB9 OwogCiAgICAgdm9pZCBlbmNvZGUoSVBDOjpFbmNvZGVyJikgY29uc3Q7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9JZGVudGlmaWVyVHlwZXMuaCBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL0lkZW50aWZpZXJUeXBlcy5oCmluZGV4IGVlMjljNDM0YTRlMmM5NjEyOWQ5ODBjMmVkMzQ2 MmQyNTNlZjlmMDcuLjg5YjUzZTkyNzk2MWMyM2Q3MWI3NzkyOWEyNDM2NDgwYjRlYjhjODIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL0lkZW50aWZpZXJUeXBlcy5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL0lkZW50aWZpZXJUeXBlcy5oCkBAIC0yNSw2ICsyNSw3IEBACiAK ICNwcmFnbWEgb25jZQogCisjaW5jbHVkZSAiTW9ub3RvbmljT2JqZWN0SWRlbnRpZmllci5oIgog I2luY2x1ZGUgPHd0Zi9PYmplY3RJZGVudGlmaWVyLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpA QCAtNDEsNCArNDIsMTAgQEAgdXNpbmcgVGFwSWRlbnRpZmllciA9IE9iamVjdElkZW50aWZpZXI8 VGFwSWRlbnRpZmllclR5cGU+OwogZW51bSBUZXh0Q2hlY2tlclJlcXVlc3RUeXBlIHsgfTsKIHVz aW5nIFRleHRDaGVja2VyUmVxdWVzdElEID0gT2JqZWN0SWRlbnRpZmllcjxUZXh0Q2hlY2tlclJl cXVlc3RUeXBlPjsKIAorZW51bSBFZGl0b3JTdGF0ZUlkZW50aWZpZXJUeXBlIHsgfTsKK3VzaW5n IEVkaXRvclN0YXRlSWRlbnRpZmllciA9IE1vbm90b25pY09iamVjdElkZW50aWZpZXI8RWRpdG9y U3RhdGVJZGVudGlmaWVyVHlwZT47CisKK2VudW0gRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbklk ZW50aWZpZXJUeXBlIHsgfTsKK3VzaW5nIEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25JZGVudGlm aWVyID0gTW9ub3RvbmljT2JqZWN0SWRlbnRpZmllcjxGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9u SWRlbnRpZmllclR5cGU+OworCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDVmYjMwODk1MDE1NjI0ODY2NjE1M2M2MjRm NDAzNGVhNGE4ODRmZGYuLjc1OGQxYjM5OGVjNzg1MjNlMzRhYWY0YWU2NDUxOTk4NTFlMDNlMDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNzQ1OSw3ICs3 NDU5LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmVkaXRvclN0YXRlQ2hhbmdlZChjb25zdCBFZGl0 b3JTdGF0ZSYgZWRpdG9yU3RhdGUpCiAKIGJvb2wgV2ViUGFnZVByb3h5Ojp1cGRhdGVFZGl0b3JT dGF0ZShjb25zdCBFZGl0b3JTdGF0ZSYgbmV3RWRpdG9yU3RhdGUpCiB7Ci0gICAgaWYgKG5ld0Vk aXRvclN0YXRlLnRyYW5zYWN0aW9uSUQgPCBtX2VkaXRvclN0YXRlLnRyYW5zYWN0aW9uSUQpCisg ICAgaWYgKG5ld0VkaXRvclN0YXRlLmlkZW50aWZpZXIgPCBtX2VkaXRvclN0YXRlLmlkZW50aWZp ZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGF1dG8gb2xkRWRpdG9yU3RhdGUgPSBz dGQ6OmV4Y2hhbmdlKG1fZWRpdG9yU3RhdGUsIG5ld0VkaXRvclN0YXRlKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CmluZGV4IGMwODBmYWZiMWZkODVjNzlhMWMxYWE1MzVjZGU4MmI4ZWM3MzczZDYuLjRmOTQzNDli MTA2ODRiOWM5Y2NmZDMxYzJmOGRlNTM3ZWNmYzJkOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNjY4 NCw5ICs2Njg0LDkgQEAgLSAodm9pZClfdXBkYXRlSW5pdGlhbFdyaXRpbmdEaXJlY3Rpb25JZk5l Y2Vzc2FyeQogLSAodm9pZCl1cGRhdGVDdXJyZW50Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbjoo RnVuY3Rpb248dm9pZChib29sIGRpZFVwZGF0ZSk+JiYpY2FsbGJhY2sKIHsKICAgICBXZWFrT2Jq Q1B0cjxXS0NvbnRlbnRWaWV3PiB3ZWFrU2VsZiB7IHNlbGYgfTsKLSAgICBhdXRvIGlkZW50aWZp ZXJCZWZvcmVVcGRhdGUgPSBfZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5mb2N1c2VkRWxlbWVu dElkZW50aWZpZXI7CisgICAgYXV0byBpZGVudGlmaWVyQmVmb3JlVXBkYXRlID0gX2ZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uaWRlbnRpZmllcjsKICAgICBfcGFnZS0+cmVxdWVzdEZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24oW2NhbGxiYWNrID0gV1RGTW92ZShjYWxsYmFjayksIGlkZW50aWZp ZXJCZWZvcmVVcGRhdGUsIHdlYWtTZWxmXSAoYXV0byYgaW5mbykgewotICAgICAgICBpZiAoIXdl YWtTZWxmIHx8ICFpbmZvIHx8IGluZm8tPmZvY3VzZWRFbGVtZW50SWRlbnRpZmllciAhPSBpZGVu dGlmaWVyQmVmb3JlVXBkYXRlKSB7CisgICAgICAgIGlmICghd2Vha1NlbGYgfHwgIWluZm8gfHwg aW5mby0+aWRlbnRpZmllciAhPSBpZGVudGlmaWVyQmVmb3JlVXBkYXRlKSB7CiAgICAgICAgICAg ICAvLyBJZiB0aGUgZm9jdXNlZCBlbGVtZW50IG1heSBoYXZlIGNoYW5nZWQgaW4gdGhlIG1lYW50 aW1lLCBkb24ndCBvdmVyd3JpdGUgZm9jdXNlZCBlbGVtZW50IGluZm9ybWF0aW9uLgogICAgICAg ICAgICAgY2FsbGJhY2soZmFsc2UpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAwNGUzYWUyMDE0M2YyZjNk YmQyMDY0YTMwMmYwMWI4NGVkY2E5NjQ1Li4yM2U2MjRiOGUwMjA5NDYxYTY0OWU5YjM5OWUxNGZh YWI4NjE2Mzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcApAQCAtMTIyNSw3ICsxMjI1LDcgQEAgRWRpdG9yU3RhdGUgV2ViUGFnZTo6ZWRpdG9yU3Rh dGUoU2hvdWxkUGVyZm9ybUxheW91dCBzaG91bGRQZXJmb3JtTGF5b3V0KSBjb25zdAogICAgIGNv bnN0IFZpc2libGVTZWxlY3Rpb24mIHNlbGVjdGlvbiA9IGZyYW1lLT5zZWxlY3Rpb24oKS5zZWxl Y3Rpb24oKTsKICAgICBhdXRvJiBlZGl0b3IgPSBmcmFtZS0+ZWRpdG9yKCk7CiAKLSAgICByZXN1 bHQudHJhbnNhY3Rpb25JRCA9IG1fbGFzdEVkaXRvclN0YXRlVHJhbnNhY3Rpb25JRC5pbmNyZW1l bnQoKTsKKyAgICByZXN1bHQuaWRlbnRpZmllciA9IG1fbGFzdEVkaXRvclN0YXRlSWRlbnRpZmll ci5pbmNyZW1lbnQoKTsKICAgICByZXN1bHQuc2VsZWN0aW9uSXNOb25lID0gc2VsZWN0aW9uLmlz Tm9uZSgpOwogICAgIHJlc3VsdC5zZWxlY3Rpb25Jc1JhbmdlID0gc2VsZWN0aW9uLmlzUmFuZ2Uo KTsKICAgICByZXN1bHQuaXNDb250ZW50RWRpdGFibGUgPSBzZWxlY3Rpb24uaXNDb250ZW50RWRp dGFibGUoKTsKQEAgLTYwMzEsNyArNjAzMSw2IEBAIHZvaWQgV2ViUGFnZTo6ZWxlbWVudERpZEZv Y3VzKFdlYkNvcmU6OkVsZW1lbnQmIGVsZW1lbnQpCiAgICAgICAgICAgICBlbGVtZW50LmRvY3Vt ZW50KCkuZnVsbHNjcmVlbk1hbmFnZXIoKS5jYW5jZWxGdWxsc2NyZWVuKCk7CiAjZW5kaWYKIAot ICAgICAgICArK21fY3VycmVudEZvY3VzZWRFbGVtZW50SWRlbnRpZmllcjsKICAgICAgICAgYXV0 byBpbmZvcm1hdGlvbiA9IGZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24oKTsKICAgICAgICAgaWYg KCFpbmZvcm1hdGlvbikKICAgICAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCAxODgxYTVmMzY2MzIzYzczNDBjMDA4ZmZmODY2 NGUzOTVkYmM5NWQzLi4xNDNhMTgzODJhYTAxZTMzZDAzODJkNWQ3OTIyNzU3Y2IxYWY3Yjc3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0yMjQzLDcg KzIyNDMsNyBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBtX3ByZXZpb3VzRXhw b3NlZENvbnRlbnRSZWN0OwogICAgIE9wdGlvblNldDxXZWJLaXQ6OldlYkV2ZW50OjpNb2RpZmll cj4gbV9wZW5kaW5nU3ludGhldGljQ2xpY2tNb2RpZmllcnM7CiAgICAgV2ViQ29yZTo6UG9pbnRl cklEIG1fcGVuZGluZ1N5bnRoZXRpY0NsaWNrUG9pbnRlcklkIHsgMCB9OwotICAgIEZvY3VzZWRF bGVtZW50SWRlbnRpZmllciBtX2N1cnJlbnRGb2N1c2VkRWxlbWVudElkZW50aWZpZXIgeyAwIH07 CisgICAgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbklkZW50aWZpZXIgbV9sYXN0Rm9jdXNlZEVs ZW1lbnRJbmZvcm1hdGlvbklkZW50aWZpZXI7CiAgICAgc3RkOjpvcHRpb25hbDxEeW5hbWljVmll d3BvcnRTaXplVXBkYXRlSUQ+IG1fcGVuZGluZ0R5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVJRDsK ICAgICBkb3VibGUgbV9sYXN0VHJhbnNhY3Rpb25QYWdlU2NhbGVGYWN0b3IgeyAwIH07CiAgICAg VHJhbnNhY3Rpb25JRCBtX2xhc3RUcmFuc2FjdGlvbklEV2l0aFNjYWxlQ2hhbmdlOwpAQCAtMjI4 Miw3ICsyMjgyLDcgQEAgcHJpdmF0ZToKIAogICAgIGVudW0gY2xhc3MgRWRpdG9yU3RhdGVJc0Nv bnRlbnRFZGl0YWJsZSB7IE5vLCBZZXMsIFVuc2V0IH07CiAgICAgbXV0YWJsZSBFZGl0b3JTdGF0 ZUlzQ29udGVudEVkaXRhYmxlIG1fbGFzdEVkaXRvclN0YXRlV2FzQ29udGVudEVkaXRhYmxlIHsg RWRpdG9yU3RhdGVJc0NvbnRlbnRFZGl0YWJsZTo6VW5zZXQgfTsKLSAgICBtdXRhYmxlIFRyYW5z YWN0aW9uSUQgbV9sYXN0RWRpdG9yU3RhdGVUcmFuc2FjdGlvbklEOworICAgIG11dGFibGUgRWRp dG9yU3RhdGVJZGVudGlmaWVyIG1fbGFzdEVkaXRvclN0YXRlSWRlbnRpZmllcjsKIAogI2lmIFBM QVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV1BFKQogICAgIHN0ZDo6b3B0aW9uYWw8SW5wdXRNZXRo b2RTdGF0ZT4gbV9pbnB1dE1ldGhvZFN0YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQppbmRleCBjMzcxNjU0NGIxNTg2ODllMDZk MDFkODRlZmI2ZjBiZDZlMzgyMzljLi5kNTBjMmI3OGY1NjA5NmZiN2ViMGFiOGRlY2Q5YTQwNDJj NDZjMTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9pb3Mv V2ViUGFnZUlPUy5tbQpAQCAtMzIyNiw3ICszMjI2LDcgQEAgc3RkOjpvcHRpb25hbDxGb2N1c2Vk RWxlbWVudEluZm9ybWF0aW9uPiBXZWJQYWdlOjpmb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uKCkK ICAgICAgICAgaW5mb3JtYXRpb24ucHJldmlvdXNOb2RlUmVjdCA9IHJvb3RWaWV3Qm91bmRzKCpw cmV2aW91c0VsZW1lbnQpOwogICAgICAgICBpbmZvcm1hdGlvbi5oYXNQcmV2aW91c05vZGUgPSB0 cnVlOwogICAgIH0KLSAgICBpbmZvcm1hdGlvbi5mb2N1c2VkRWxlbWVudElkZW50aWZpZXIgPSBt X2N1cnJlbnRGb2N1c2VkRWxlbWVudElkZW50aWZpZXI7CisgICAgaW5mb3JtYXRpb24uaWRlbnRp ZmllciA9IG1fbGFzdEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb25JZGVudGlmaWVyLmluY3JlbWVu dCgpOwogCiAgICAgaWYgKGlzPExhYmVsYWJsZUVsZW1lbnQ+KCpmb2N1c2VkRWxlbWVudCkpIHsK ICAgICAgICAgaWYgKGF1dG8gbGFiZWxzID0gZG93bmNhc3Q8TGFiZWxhYmxlRWxlbWVudD4oKmZv Y3VzZWRFbGVtZW50KS5sYWJlbHMoKSkgewo=