232437 2021-10-28 08:35:27 -0700 Add WebPageProxy identifiers to `ViewGestures` category logging 2021-10-28 13:27:20 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh cdumez kkinnunen simon.fraser thorton webkit-bug-importer oldest_to_newest 1809681 0 wenson_hsieh 2021-10-28 08:35:27 -0700 This makes it a lot easier to correlate ViewGestures release logging with ViewState logging (i.e. layer tree commits/visible content rect updates) 1809683 1 442709 wenson_hsieh 2021-10-28 08:44:01 -0700 Created attachment 442709 Patch 1809771 2 442709 wenson_hsieh 2021-10-28 12:03:12 -0700 Comment on attachment 442709 Patch Thanks for the review! (smfr requested that we log a pid in `-_didRelaunchProcess` as well, so I'll add that too before landing). 1809773 3 442726 wenson_hsieh 2021-10-28 12:07:10 -0700 Created attachment 442726 Patch 1809805 4 ews-feeder 2021-10-28 13:26:35 -0700 Committed r284997 (243643@main): <https://commits.webkit.org/243643@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442726. 1809806 5 webkit-bug-importer 2021-10-28 13:27:20 -0700 <rdar://problem/84774750> 442709 2021-10-28 08:44:01 -0700 2021-10-28 10:44:59 -0700 Patch bug-232437-20211028084401.patch text/plain 10815 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2ZDZkN2IzZTY2MWMyODUy NTgzNWYzZTExNzZiOWI0ZGEyMTRlMmQuLmE5MzQ4ZGEwMTQzODU1MDU4NDBjYWMzYjEzMzg3MmZi NDU5YjM3NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMjEtMTAtMjggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFdlYlBhZ2VQcm94 eSBpZGVudGlmaWVycyB0byBgVmlld0dlc3R1cmVzYCBjYXRlZ29yeSBsb2dnaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0MzcKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIGl0IGVhc2llciB0 byBjb3JyZWxhdGUgcmVsZWFzZSBsb2dnaW5nIGZyb20gIlZpZXdHZXN0dXJlcyIgYW5kICJWaWV3 U3RhdGUiIGNhdGVnb3JpZXMgaW4gV2ViS2l0MiBieSBoYXZpbmcKKyAgICAgICAgIlZpZXdHZXN0 dXJlcyIgbG9nZ2luZyBpbmNsdWRlICJwYWdlUHJveHlJRD0uLi4iLCBpbnN0ZWFkIG9mIGp1c3Qg dGhlIGNvbnRlbnQgdmlldyBwb2ludGVyLiBUaGlzIG1ha2VzIGl0IG1vcmUKKyAgICAgICAgc3Ry YWlnaHRmb3J3YXJkIHRvIChmb3IgaW5zdGFuY2UpIGRldGVjdCB3aGVuIHRoZSB1c2VyIGlzIHRy eWluZyB0byBpbnRlcmFjdCB3aXRoIGEgcGFnZSB0aGF0IGhhcyBzdG9wcGVkCisgICAgICAgIHJl Y2VpdmluZyBsYXllciB0cmVlIGNvbW1pdHMgaW4gdGhlIFVJIHByb2Nlc3MgZm9yIGFuIGV4dGVu ZGVkIHBlcmlvZCBvZiB0aW1lLgorCisgICAgICAgIE5vdGUgdGhhdCBpbiBhbGwgb2YgdGhlIGJl bG93IGNvZGVwYXRocywgd2UgZWl0aGVyIGFscmVhZHkgY2FsbCBpbnRvIGBfcGFnZWAsIG9yIHRo ZXkncmUgY2FsbGVkIGFzIGEgcmVzdWx0IG9mCisgICAgICAgIGdlc3R1cmUgcmVjb2duaXplciBk ZWxlZ2F0ZSBtZXRob2RzIHRoYXQgc2hvdWxkIG5ldmVyIGJlIGludm9rZWQgYnkgV2ViS2l0IGNs aWVudHMgcHJpb3IgdG8gY29tbW9uCisgICAgICAgIGluaXRpYWxpemF0aW9uICh3aGVyZSB3ZSBp bml0aWFsaXplIGBfcGFnZWApLCBzbyBudWxsIGNoZWNrcyBmb3IgYF9wYWdlYCBhcmUgdW5uZWNl c3NhcnkgaGVyZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmg6CisKKyAgICAgICAgRHJpdmUtYnkgZml4OiBhbHNvIHJlbmFtZSBgbV9jb21taXRQ b3RlbnRpYWxUYXBQb2ludGVySWRgIHRvIGBfY29tbWl0UG90ZW50aWFsVGFwUG9pbnRlcklkYCwg c28gdGhhdCBpdCBpcworICAgICAgICBjb25zaXN0ZW50IHdpdGggdGhlIG90aGVyIE9iamVjdGl2 ZS1DIGl2YXIgbmFtZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfaGFuZGxlU21hcnRNYWdu aWZpY2F0aW9uSW5mb3JtYXRpb25Gb3JQb3RlbnRpYWxUYXA6cmVuZGVyUmVjdDpmaXRFbnRpcmVS ZWN0OnZpZXdwb3J0TWluaW11bVNjYWxlOnZpZXdwb3J0TWF4aW11bVNjYWxlOm5vZGVJc1Jvb3RM ZXZlbDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZW5kUG90ZW50aWFsVGFwQW5kRW5h YmxlRG91YmxlVGFwR2VzdHVyZXNJZk5lY2Vzc2FyeV0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF9zaW5nbGVUYXBJZGVudGlmaWVkOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9z aW5nbGVUYXBEaWRSZXNldDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZG91YmxlVGFw RGlkRmFpbDpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfY29tbWl0UG90ZW50aWFsVGFw RmFpbGVkXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2RpZENvbXBsZXRlU3ludGhldGlj Q2xpY2tdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfc2luZ2xlVGFwUmVjb2duaXplZDpd KToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZG91YmxlVGFwUmVjb2duaXplZDpdKToKKwog MjAyMS0xMC0yNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OIChyMjgxMDU0KTogW2lPU10gQ29udGV4dCBtZW51IHByZXNlbnRzIGZy b20gd3JvbmcgbG9jYXRpb24gd2hlbiBsb25nIHByZXNzaW5nIGEgbGluayBpbiBNYWlsCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmgKaW5kZXggOGZjMDJmNWU5MWQyMDU0MjNmYzU0YzJiOWEzNjU2OTE5NWI0N2Q2Zi4uMzA3 NzZhZjg2MGI4MzI0ZTMzNGJmMWE2NDIzMDk1NDg3ZDViOTU0YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApAQCAt NDI5LDcgKzQyOSw3IEBAIHVzaW5nIEltYWdlQW5hbHlzaXNSZXF1ZXN0SWRlbnRpZmllciA9IE9i amVjdElkZW50aWZpZXI8SW1hZ2VBbmFseXNpc1JlcXVlc3RJZGVuCiAgICAgQk9PTCBfdHJlYXRB c0NvbnRlbnRFZGl0YWJsZVVudGlsTmV4dEVkaXRvclN0YXRlVXBkYXRlOwogICAgIGJvb2wgX2lz V2FpdGluZ09uUG9zaXRpb25JbmZvcm1hdGlvbjsKIAotICAgIFdlYkNvcmU6OlBvaW50ZXJJRCBt X2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZDsKKyAgICBXZWJDb3JlOjpQb2ludGVySUQgX2Nv bW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZDsKIAogICAgIEJPT0wgX2tleWJvYXJkRGlkUmVxdWVz dERpc21pc3NhbDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggM2UyNzE4MjViYmU2MjVjYzIyMzZkZmY2 MWVlM2VjNmI0ODllNjZiMi4uNTNlMTA3NGIyYTk3ZTdmMTJiYjZjMjRiODJjMTM1NzE0NDRhMTc3 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50 Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0yMTY0LDE4ICsyMTY0LDE4IEBAIC0gKHZvaWQpX2hhbmRs ZVNtYXJ0TWFnbmlmaWNhdGlvbkluZm9ybWF0aW9uRm9yUG90ZW50aWFsVGFwOihXZWJLaXQ6OlRh cElkZW50aWZpCiAgICAgLy8gV2UgY2hlY2sgYm90aCB0aGUgc3lzdGVtIHByZWZlcmVuY2UgYW5k IHRoZSBwYWdlIHByZWZlcmVuY2UsIGJlY2F1c2Ugd2Ugb25seSB3YW50IHRoaXMKICAgICAvLyB0 byBhcHBseSBpbiAiZGVza3RvcCIgbW9kZS4KICAgICBpZiAocHJlZmVyZW5jZXMucHJlZmVyRmFz dGVyQ2xpY2tPdmVyRG91YmxlVGFwKCkgJiYgX3BhZ2UtPnByZWZlckZhc3RlckNsaWNrT3ZlckRv dWJsZVRhcCgpKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIlBvdGVudGlh bCB0YXAgZm91bmQgYW4gZWxlbWVudCBhbmQgZmFzdCB0YXBzIGFyZSBwcmVmZXJyZWQuIFRyaWdn ZXIgY2xpY2suICglcCkiLCBzZWxmKTsKKyAgICAgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVz LCAiUG90ZW50aWFsIHRhcCBmb3VuZCBhbiBlbGVtZW50IGFuZCBmYXN0IHRhcHMgYXJlIHByZWZl cnJlZC4gVHJpZ2dlciBjbGljay4gKCVwLCBwYWdlUHJveHlJRD0lbGx1KSIsIHNlbGYsIF9wYWdl LT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAgICAgICAgIGlmIChwcmVmZXJlbmNlcy56b29t T25Eb3VibGVUYXBXaGVuUm9vdCgpICYmIG5vZGVJc1Jvb3RMZXZlbCkgewotICAgICAgICAgICAg UkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiVGhlIGNsaWNrIGhhbmRsZXIgd2FzIG9uIGEgcm9v dC1sZXZlbCBlbGVtZW50LCBzbyBkb24ndCBkaXNhYmxlIGRvdWJsZS10YXAuICglcCkiLCBzZWxm KTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIlRoZSBjbGljayBoYW5k bGVyIHdhcyBvbiBhIHJvb3QtbGV2ZWwgZWxlbWVudCwgc28gZG9uJ3QgZGlzYWJsZSBkb3VibGUt dGFwLiAoJXAsIHBhZ2VQcm94eUlEPSVsbHUpIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50 b1VJbnQ2NCgpKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIGlm IChwcmVmZXJlbmNlcy5hbHdheXNab29tT25Eb3VibGVUYXAoKSkgewotICAgICAgICAgICAgUkVM RUFTRV9MT0coVmlld0dlc3R1cmVzLCAiRFRUWiBpcyBmb3JjZWQgb24sIHNvIGRvbid0IGRpc2Fi bGUgZG91YmxlLXRhcC4gKCVwKSIsIHNlbGYpOworICAgICAgICAgICAgUkVMRUFTRV9MT0coVmll d0dlc3R1cmVzLCAiRFRUWiBpcyBmb3JjZWQgb24sIHNvIGRvbid0IGRpc2FibGUgZG91YmxlLXRh cC4gKCVwLCBwYWdlUHJveHlJRD0lbGx1KSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9V SW50NjQoKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAotICAgICAgICBSRUxF QVNFX0xPRyhWaWV3R2VzdHVyZXMsICJHaXZlIHByZWZlcmVuY2UgdG8gY2xpY2sgYnkgZGlzYWJs aW5nIGRvdWJsZS10YXAuICglcCkiLCBzZWxmKTsKKyAgICAgICAgUkVMRUFTRV9MT0coVmlld0dl c3R1cmVzLCAiR2l2ZSBwcmVmZXJlbmNlIHRvIGNsaWNrIGJ5IGRpc2FibGluZyBkb3VibGUtdGFw LiAoJXAsIHBhZ2VQcm94eUlEPSVsbHUpIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJ bnQ2NCgpKTsKICAgICAgICAgW3NlbGYgX3NldERvdWJsZVRhcEdlc3R1cmVzRW5hYmxlZDpOT107 CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yMTgzLDExICsyMTgzLDExIEBAIC0gKHZvaWQp X2hhbmRsZVNtYXJ0TWFnbmlmaWNhdGlvbkluZm9ybWF0aW9uRm9yUG90ZW50aWFsVGFwOihXZWJL aXQ6OlRhcElkZW50aWZpCiAgICAgYXV0byBjdXJyZW50U2NhbGUgPSBzZWxmLl9jb250ZW50Wm9v bVNjYWxlOwogICAgIGF1dG8gdGFyZ2V0U2NhbGUgPSBfc21hcnRNYWduaWZpY2F0aW9uQ29udHJv bGxlci0+em9vbUZhY3RvckZvclRhcmdldFJlY3QocmVuZGVyUmVjdCwgZml0RW50aXJlUmVjdCwg dmlld3BvcnRNaW5pbXVtU2NhbGUsIHZpZXdwb3J0TWF4aW11bVNjYWxlKTsKICAgICBpZiAoc3Rk OjptaW4odGFyZ2V0U2NhbGUsIGN1cnJlbnRTY2FsZSkgLyBzdGQ6Om1heCh0YXJnZXRTY2FsZSwg Y3VycmVudFNjYWxlKSA+IGZhc3RlclRhcFNpZ25pZmljYW50Wm9vbVRocmVzaG9sZCkgewotICAg ICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJQb3RlbnRpYWwgdGFwIHdvdWxkIG5vdCBj YXVzZSBhIHNpZ25pZmljYW50IHpvb20uIFRyaWdnZXIgY2xpY2suICglcCkiLCBzZWxmKTsKKyAg ICAgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiUG90ZW50aWFsIHRhcCB3b3VsZCBub3Qg Y2F1c2UgYSBzaWduaWZpY2FudCB6b29tLiBUcmlnZ2VyIGNsaWNrLiAoJXAsIHBhZ2VQcm94eUlE PSVsbHUpIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICAgICAg W3NlbGYgX3NldERvdWJsZVRhcEdlc3R1cmVzRW5hYmxlZDpOT107CiAgICAgICAgIHJldHVybjsK ICAgICB9Ci0gICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiUG90ZW50aWFsIHRhcCBtYXkg Y2F1c2Ugc2lnbmlmaWNhbnQgem9vbS4gV2FpdC4gKCVwKSIsIHNlbGYpOworICAgIFJFTEVBU0Vf TE9HKFZpZXdHZXN0dXJlcywgIlBvdGVudGlhbCB0YXAgbWF5IGNhdXNlIHNpZ25pZmljYW50IHpv b20uIFdhaXQuICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmll cigpLnRvVUludDY0KCkpOwogfQogCiAtICh2b2lkKV9jYW5jZWxMb25nUHJlc3NHZXN0dXJlUmVj b2duaXplcgpAQCAtMzA4NCwxMiArMzA4NCwxMiBAQCAtICh2b2lkKV9sb25nUHJlc3NSZWNvZ25p emVkOihVSUxvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKIC0g KHZvaWQpX2VuZFBvdGVudGlhbFRhcEFuZEVuYWJsZURvdWJsZVRhcEdlc3R1cmVzSWZOZWNlc3Nh cnkKIHsKICAgICBpZiAoc2VsZi53ZWJWaWV3Ll9hbGxvd3NEb3VibGVUYXBHZXN0dXJlcykgewot ICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJlbmRpbmcgcG90ZW50aWFsIHRhcCAt IGRvdWJsZSB0YXBzIGFyZSBiYWNrLiAoJXApIiwgc2VsZik7CisgICAgICAgIFJFTEVBU0VfTE9H KFZpZXdHZXN0dXJlcywgImVuZGluZyBwb3RlbnRpYWwgdGFwIC0gZG91YmxlIHRhcHMgYXJlIGJh Y2suICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRv VUludDY0KCkpOwogCiAgICAgICAgIFtzZWxmIF9zZXREb3VibGVUYXBHZXN0dXJlc0VuYWJsZWQ6 WUVTXTsKICAgICB9CiAKLSAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJFbmRpbmcgcG90 ZW50aWFsIHRhcC4gKCVwKSIsIHNlbGYpOworICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywg IkVuZGluZyBwb3RlbnRpYWwgdGFwLiAoJXAsIHBhZ2VQcm94eUlEPSVsbHUpIiwgc2VsZiwgX3Bh Z2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKIAogICAgIF9wb3RlbnRpYWxUYXBJblByb2dy ZXNzID0gTk87CiB9CkBAIC0zMTA1LDcgKzMxMDUsNyBAQCAtICh2b2lkKV9zaW5nbGVUYXBJZGVu dGlmaWVkOihVSVRhcEdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKIAogICAg IGJvb2wgc2hvdWxkUmVxdWVzdE1hZ25pZmljYXRpb25JbmZvcm1hdGlvbiA9IF9wYWdlLT5wcmVm ZXJlbmNlcygpLmZhc3RlckNsaWNrc0VuYWJsZWQoKTsKICAgICBpZiAoc2hvdWxkUmVxdWVzdE1h Z25pZmljYXRpb25JbmZvcm1hdGlvbikKLSAgICAgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVz LCAiU2luZ2xlIHRhcCBpZGVudGlmaWVkLiBSZXF1ZXN0IGRldGFpbHMgb24gcG90ZW50aWFsIHpv b20uICglcCkiLCBzZWxmKTsKKyAgICAgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiU2lu Z2xlIHRhcCBpZGVudGlmaWVkLiBSZXF1ZXN0IGRldGFpbHMgb24gcG90ZW50aWFsIHpvb20uICgl cCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0 KCkpOwogCiAgICAgX3BhZ2UtPnBvdGVudGlhbFRhcEF0UG9zaXRpb24oZ2VzdHVyZVJlY29nbml6 ZXIubG9jYXRpb24sIHNob3VsZFJlcXVlc3RNYWduaWZpY2F0aW9uSW5mb3JtYXRpb24sIFtzZWxm IG5leHRUYXBJZGVudGlmaWVyXSk7CiAgICAgX3BvdGVudGlhbFRhcEluUHJvZ3Jlc3MgPSBZRVM7 CkBAIC0zMTI4LDcgKzMxMjgsNyBAQCAtICh2b2lkKV9zaW5nbGVUYXBEaWRSZXNldDooVUlUYXBH ZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyCiAgICAgY2FuY2VsUG90ZW50aWFs VGFwSWZOZWNlc3Nhcnkoc2VsZik7CiAgICAgaWYgKGF1dG8qIHNpbmdsZVRhcFRvdWNoSWRlbnRp ZmllciA9IFtfc2luZ2xlVGFwR2VzdHVyZVJlY29nbml6ZXIgbGFzdEFjdGl2ZVRvdWNoSWRlbnRp Zmllcl0pIHsKICAgICAgICAgV2ViQ29yZTo6UG9pbnRlcklEIHBvaW50ZXJJZCA9IFtzaW5nbGVU YXBUb3VjaElkZW50aWZpZXIgdW5zaWduZWRJbnRWYWx1ZV07Ci0gICAgICAgIGlmIChtX2NvbW1p dFBvdGVudGlhbFRhcFBvaW50ZXJJZCAhPSBwb2ludGVySWQpCisgICAgICAgIGlmIChfY29tbWl0 UG90ZW50aWFsVGFwUG9pbnRlcklkICE9IHBvaW50ZXJJZCkKICAgICAgICAgICAgIF9wYWdlLT50 b3VjaFdpdGhJZGVudGlmaWVyV2FzUmVtb3ZlZChwb2ludGVySWQpOwogICAgIH0KIApAQCAtMzEz OCwxNCArMzEzOCwxNCBAQCAtICh2b2lkKV9zaW5nbGVUYXBEaWRSZXNldDooVUlUYXBHZXN0dXJl UmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyCiAKIC0gKHZvaWQpX2RvdWJsZVRhcERpZEZh aWw6KFVJVGFwR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcgogewotICAgIFJF TEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIkRvdWJsZSB0YXAgd2FzIG5vdCByZWNvZ25pemVkLiAo JXApIiwgc2VsZik7CisgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiRG91YmxlIHRhcCB3 YXMgbm90IHJlY29nbml6ZWQuICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+ aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogICAgIEFTU0VSVChnZXN0dXJlUmVjb2duaXplciA9 PSBfZG91YmxlVGFwR2VzdHVyZVJlY29nbml6ZXIpOwogfQogCiAtICh2b2lkKV9jb21taXRQb3Rl bnRpYWxUYXBGYWlsZWQKIHsKLSAgICBfcGFnZS0+dG91Y2hXaXRoSWRlbnRpZmllcldhc1JlbW92 ZWQobV9jb21taXRQb3RlbnRpYWxUYXBQb2ludGVySWQpOwotICAgIG1fY29tbWl0UG90ZW50aWFs VGFwUG9pbnRlcklkID0gMDsKKyAgICBfcGFnZS0+dG91Y2hXaXRoSWRlbnRpZmllcldhc1JlbW92 ZWQoX2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZCk7CisgICAgX2NvbW1pdFBvdGVudGlhbFRh cFBvaW50ZXJJZCA9IDA7CiAKICAgICBbc2VsZiBfY2FuY2VsSW50ZXJhY3Rpb25dOwogICAgIApA QCAtMzE2NSwxMCArMzE2NSwxMCBAQCAtICh2b2lkKV9kaWROb3RIYW5kbGVUYXBBc0NsaWNrOihj b25zdCBXZWJDb3JlOjpJbnRQb2ludCYpcG9pbnQKIAogLSAodm9pZClfZGlkQ29tcGxldGVTeW50 aGV0aWNDbGljawogewotICAgIF9wYWdlLT50b3VjaFdpdGhJZGVudGlmaWVyV2FzUmVtb3ZlZCht X2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZCk7Ci0gICAgbV9jb21taXRQb3RlbnRpYWxUYXBQ b2ludGVySWQgPSAwOworICAgIF9wYWdlLT50b3VjaFdpdGhJZGVudGlmaWVyV2FzUmVtb3ZlZChf Y29tbWl0UG90ZW50aWFsVGFwUG9pbnRlcklkKTsKKyAgICBfY29tbWl0UG90ZW50aWFsVGFwUG9p bnRlcklkID0gMDsKIAotICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIlN5bnRoZXRpYyBj bGljayBjb21wbGV0ZWQuICglcCkiLCBzZWxmKTsKKyAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVy ZXMsICJTeW50aGV0aWMgY2xpY2sgY29tcGxldGVkLiAoJXAsIHBhZ2VQcm94eUlEPSVsbHUpIiwg c2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICBbc2VsZiBfcmVzZXRJ bnB1dFZpZXdEZWZlcnJhbF07CiB9CiAKQEAgLTMxOTMsMTIgKzMxOTMsMTIgQEAgLSAodm9pZClf c2luZ2xlVGFwUmVjb2duaXplZDooVUlUYXBHZXN0dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNv Z25pemVyCiAgICAgaWYgKFtfaW5wdXRQZXJpcGhlcmFsIHNpbmdsZVRhcFNob3VsZEVuZEVkaXRp bmddKQogICAgICAgICBbX2lucHV0UGVyaXBoZXJhbCBlbmRFZGl0aW5nXTsKIAotICAgIFJFTEVB U0VfTE9HKFZpZXdHZXN0dXJlcywgIlNpbmdsZSB0YXAgcmVjb2duaXplZCAtIGNvbW1pdCBwb3Rl bnRpYWwgdGFwICglcCkiLCBzZWxmKTsKKyAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJT aW5nbGUgdGFwIHJlY29nbml6ZWQgLSBjb21taXQgcG90ZW50aWFsIHRhcCAoJXAsIHBhZ2VQcm94 eUlEPSVsbHUpIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKIAogICAg IFdlYkNvcmU6OlBvaW50ZXJJRCBwb2ludGVySWQgPSBXZWJDb3JlOjptb3VzZVBvaW50ZXJJRDsK ICAgICBpZiAoYXV0byogc2luZ2xlVGFwVG91Y2hJZGVudGlmaWVyID0gW19zaW5nbGVUYXBHZXN0 dXJlUmVjb2duaXplciBsYXN0QWN0aXZlVG91Y2hJZGVudGlmaWVyXSkgewogICAgICAgICBwb2lu dGVySWQgPSBbc2luZ2xlVGFwVG91Y2hJZGVudGlmaWVyIHVuc2lnbmVkSW50VmFsdWVdOwotICAg ICAgICBtX2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZCA9IHBvaW50ZXJJZDsKKyAgICAgICAg X2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZCA9IHBvaW50ZXJJZDsKICAgICB9CiAgICAgX3Bh Z2UtPmNvbW1pdFBvdGVudGlhbFRhcChXZWJLaXQ6OndlYkV2ZW50TW9kaWZpZXJGbGFncyhnZXN0 dXJlUmVjb2duaXplci5tb2RpZmllckZsYWdzKSwgX2xheWVyVHJlZVRyYW5zYWN0aW9uSWRBdExh c3RJbnRlcmFjdGlvblN0YXJ0LCBwb2ludGVySWQpOwogCkBAIC0zMjA4LDcgKzMyMDgsNyBAQCAt ICh2b2lkKV9zaW5nbGVUYXBSZWNvZ25pemVkOihVSVRhcEdlc3R1cmVSZWNvZ25pemVyICopZ2Vz dHVyZVJlY29nbml6ZXIKIAogLSAodm9pZClfZG91YmxlVGFwUmVjb2duaXplZDooVUlUYXBHZXN0 dXJlUmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyCiB7Ci0gICAgUkVMRUFTRV9MT0coVmll d0dlc3R1cmVzLCAiSWRlbnRpZmllZCBhIGRvdWJsZSB0YXAgKCVwKSIsIHNlbGYpOworICAgIFJF TEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIklkZW50aWZpZWQgYSBkb3VibGUgdGFwICglcCwgcGFn ZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwog CiAgICAgW3NlbGYgX3Jlc2V0SXNEb3VibGVUYXBQZW5kaW5nXTsKICAgICBfbGFzdEludGVyYWN0 aW9uTG9jYXRpb24gPSBnZXN0dXJlUmVjb2duaXplci5sb2NhdGlvbjsK 442726 2021-10-28 12:07:10 -0700 2021-10-28 13:26:36 -0700 Patch bug-232437-20211028120709.patch text/plain 11768 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2ZDZkN2IzZTY2MWMyODUy NTgzNWYzZTExNzZiOWI0ZGEyMTRlMmQuLjUyZDI5ZTVhZWIwMmIyZTI0Nzc1N2U4MGNkMGE5OTRh OWFkNDZjZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMjEtMTAtMjggIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFdlYlBhZ2VQcm94 eSBpZGVudGlmaWVycyB0byBgVmlld0dlc3R1cmVzYCBjYXRlZ29yeSBsb2dnaW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0MzcKKworICAgICAg ICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIE1ha2UgaXQgZWFzaWVyIHRvIGNv cnJlbGF0ZSByZWxlYXNlIGxvZ2dpbmcgZnJvbSAiVmlld0dlc3R1cmVzIiBhbmQgIlZpZXdTdGF0 ZSIgY2F0ZWdvcmllcyBpbiBXZWJLaXQyIGJ5IGhhdmluZworICAgICAgICAiVmlld0dlc3R1cmVz IiBsb2dnaW5nIGluY2x1ZGUgInBhZ2VQcm94eUlEPS4uLiIsIGluc3RlYWQgb2YganVzdCB0aGUg Y29udGVudCB2aWV3IHBvaW50ZXIuIFRoaXMgbWFrZXMgaXQgbW9yZQorICAgICAgICBzdHJhaWdo dGZvcndhcmQgdG8gKGZvciBpbnN0YW5jZSkgZGV0ZWN0IHdoZW4gdGhlIHVzZXIgaXMgdHJ5aW5n IHRvIGludGVyYWN0IHdpdGggYSBwYWdlIHRoYXQgaGFzIHN0b3BwZWQKKyAgICAgICAgcmVjZWl2 aW5nIGxheWVyIHRyZWUgY29tbWl0cyBpbiB0aGUgVUkgcHJvY2VzcyBmb3IgYW4gZXh0ZW5kZWQg cGVyaW9kIG9mIHRpbWUuCisKKyAgICAgICAgTm90ZSB0aGF0IGluIGFsbCBvZiB0aGUgYmVsb3cg Y29kZXBhdGhzLCB3ZSBlaXRoZXIgYWxyZWFkeSBjYWxsIGludG8gYF9wYWdlYCwgb3IgdGhleSdy ZSBjYWxsZWQgYXMgYSByZXN1bHQgb2YKKyAgICAgICAgZ2VzdHVyZSByZWNvZ25pemVyIGRlbGVn YXRlIG1ldGhvZHMgdGhhdCBzaG91bGQgbmV2ZXIgYmUgaW52b2tlZCBieSBXZWJLaXQgY2xpZW50 cyBwcmlvciB0byBjb21tb24KKyAgICAgICAgaW5pdGlhbGl6YXRpb24gKHdoZXJlIHdlIGluaXRp YWxpemUgYF9wYWdlYCksIHNvIG51bGwgY2hlY2tzIGZvciBgX3BhZ2VgIGFyZSB1bm5lY2Vzc2Fy eSBoZXJlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZFJlbGF1bmNoUHJvY2Vzc10pOgorCisgICAgICAgIEFs c28gbG9nIHRoZSB3ZWIgcHJvY2VzcyBwaWQgaGVyZSwgdG8gbWFrZSBpdCBlYXNpZXIgdG8gY29y cmVsYXRlIGxvZ2dpbmcgaW4gV0tXZWJWaWV3IHdpdGggbG9ncyBmcm9tIHRoZQorICAgICAgICBj b3JyZXNwb25kaW5nIHdlYiBwcm9jZXNzLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKworICAgICAgICBEcml2ZS1ieSBmaXg6IGFsc28gcmVu YW1lIGBtX2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZGAgdG8gYF9jb21taXRQb3RlbnRpYWxU YXBQb2ludGVySWRgLCBzbyB0aGF0IGl0IGlzCisgICAgICAgIGNvbnNpc3RlbnQgd2l0aCB0aGUg b3RoZXIgT2JqZWN0aXZlLUMgaXZhciBuYW1lcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9o YW5kbGVTbWFydE1hZ25pZmljYXRpb25JbmZvcm1hdGlvbkZvclBvdGVudGlhbFRhcDpyZW5kZXJS ZWN0OmZpdEVudGlyZVJlY3Q6dmlld3BvcnRNaW5pbXVtU2NhbGU6dmlld3BvcnRNYXhpbXVtU2Nh bGU6bm9kZUlzUm9vdExldmVsOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9lbmRQb3Rl bnRpYWxUYXBBbmRFbmFibGVEb3VibGVUYXBHZXN0dXJlc0lmTmVjZXNzYXJ5XSk6CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX3NpbmdsZVRhcElkZW50aWZpZWQ6XSk6CisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX3NpbmdsZVRhcERpZFJlc2V0Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IF9kb3VibGVUYXBEaWRGYWlsOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9jb21t aXRQb3RlbnRpYWxUYXBGYWlsZWRdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlkQ29t cGxldGVTeW50aGV0aWNDbGlja10pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9zaW5nbGVU YXBSZWNvZ25pemVkOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9kb3VibGVUYXBSZWNv Z25pemVkOl0pOgorCiAyMDIxLTEwLTI2ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyODEwNTQpOiBbaU9TXSBDb250ZXh0IG1l bnUgcHJlc2VudHMgZnJvbSB3cm9uZyBsb2NhdGlvbiB3aGVuIGxvbmcgcHJlc3NpbmcgYSBsaW5r IGluIE1haWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tX ZWJWaWV3SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJ T1MubW0KaW5kZXggZDg1YTRiYWM1YTcxODc5NTY3ZGM2MDYwODdhZWUyYTQwNzNmMjllZi4uNDJm NTRjZTk2OTljZWMxYTgzZGU2OWY0YjdjNDQ0YWRkNWRlNGExNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTczMiw3ICs3MzIsNyBA QCAtICh2b2lkKV9wcm9jZXNzRGlkRXhpdAogCiAtICh2b2lkKV9kaWRSZWxhdW5jaFByb2Nlc3MK IHsKLSAgICBXS1dFQlZJRVdfUkVMRUFTRV9MT0coIiVwIC1bV0tXZWJWaWV3IF9kaWRSZWxhdW5j aFByb2Nlc3NdIiwgc2VsZik7CisgICAgV0tXRUJWSUVXX1JFTEVBU0VfTE9HKCIlcCAtW1dLV2Vi VmlldyBfZGlkUmVsYXVuY2hQcm9jZXNzXSAocGlkPSVkKSIsIHNlbGYsIF9wYWdlLT5wcm9jZXNz SWRlbnRpZmllcigpKTsKICAgICBfaGFzU2NoZWR1bGVkVmlzaWJsZVJlY3RVcGRhdGUgPSBOTzsK ICAgICBfdmlld1N0YWJpbGl0eVdoZW5WaXNpYmxlQ29udGVudFJlY3RVcGRhdGVTY2hlZHVsZWQg PSB7IH07CiAgICAgaWYgKF9nZXN0dXJlQ29udHJvbGxlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAppbmRleCA4ZmMw MmY1ZTkxZDIwNTQyM2ZjNTRjMmI5YTM2NTY5MTk1YjQ3ZDZmLi4zMDc3NmFmODYwYjgzMjRlMzM0 YmYxYTY0MjMwOTU0ODdkNWI5NTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC00MjksNyArNDI5LDcgQEAg dXNpbmcgSW1hZ2VBbmFseXNpc1JlcXVlc3RJZGVudGlmaWVyID0gT2JqZWN0SWRlbnRpZmllcjxJ bWFnZUFuYWx5c2lzUmVxdWVzdElkZW4KICAgICBCT09MIF90cmVhdEFzQ29udGVudEVkaXRhYmxl VW50aWxOZXh0RWRpdG9yU3RhdGVVcGRhdGU7CiAgICAgYm9vbCBfaXNXYWl0aW5nT25Qb3NpdGlv bkluZm9ybWF0aW9uOwogCi0gICAgV2ViQ29yZTo6UG9pbnRlcklEIG1fY29tbWl0UG90ZW50aWFs VGFwUG9pbnRlcklkOworICAgIFdlYkNvcmU6OlBvaW50ZXJJRCBfY29tbWl0UG90ZW50aWFsVGFw UG9pbnRlcklkOwogCiAgICAgQk9PTCBfa2V5Ym9hcmREaWRSZXF1ZXN0RGlzbWlzc2FsOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQppbmRleCAzZTI3MTgyNWJiZTYyNWNjMjIzNmRmZjYxZWUzZWM2YjQ4OWU2NmIy Li41M2UxMDc0YjJhOTdlN2YxMmJiNmMyNGI4MmMxMzU3MTQ0NGExNzc2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KQEAgLTIxNjQsMTggKzIxNjQsMTggQEAgLSAodm9pZClfaGFuZGxlU21hcnRNYWduaWZpY2F0 aW9uSW5mb3JtYXRpb25Gb3JQb3RlbnRpYWxUYXA6KFdlYktpdDo6VGFwSWRlbnRpZmkKICAgICAv LyBXZSBjaGVjayBib3RoIHRoZSBzeXN0ZW0gcHJlZmVyZW5jZSBhbmQgdGhlIHBhZ2UgcHJlZmVy ZW5jZSwgYmVjYXVzZSB3ZSBvbmx5IHdhbnQgdGhpcwogICAgIC8vIHRvIGFwcGx5IGluICJkZXNr dG9wIiBtb2RlLgogICAgIGlmIChwcmVmZXJlbmNlcy5wcmVmZXJGYXN0ZXJDbGlja092ZXJEb3Vi bGVUYXAoKSAmJiBfcGFnZS0+cHJlZmVyRmFzdGVyQ2xpY2tPdmVyRG91YmxlVGFwKCkpIHsKLSAg ICAgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiUG90ZW50aWFsIHRhcCBmb3VuZCBhbiBl bGVtZW50IGFuZCBmYXN0IHRhcHMgYXJlIHByZWZlcnJlZC4gVHJpZ2dlciBjbGljay4gKCVwKSIs IHNlbGYpOworICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJQb3RlbnRpYWwgdGFw IGZvdW5kIGFuIGVsZW1lbnQgYW5kIGZhc3QgdGFwcyBhcmUgcHJlZmVycmVkLiBUcmlnZ2VyIGNs aWNrLiAoJXAsIHBhZ2VQcm94eUlEPSVsbHUpIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50 b1VJbnQ2NCgpKTsKICAgICAgICAgaWYgKHByZWZlcmVuY2VzLnpvb21PbkRvdWJsZVRhcFdoZW5S b290KCkgJiYgbm9kZUlzUm9vdExldmVsKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhWaWV3 R2VzdHVyZXMsICJUaGUgY2xpY2sgaGFuZGxlciB3YXMgb24gYSByb290LWxldmVsIGVsZW1lbnQs IHNvIGRvbid0IGRpc2FibGUgZG91YmxlLXRhcC4gKCVwKSIsIHNlbGYpOworICAgICAgICAgICAg UkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiVGhlIGNsaWNrIGhhbmRsZXIgd2FzIG9uIGEgcm9v dC1sZXZlbCBlbGVtZW50LCBzbyBkb24ndCBkaXNhYmxlIGRvdWJsZS10YXAuICglcCwgcGFnZVBy b3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKHByZWZlcmVuY2VzLmFs d2F5c1pvb21PbkRvdWJsZVRhcCgpKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2Vz dHVyZXMsICJEVFRaIGlzIGZvcmNlZCBvbiwgc28gZG9uJ3QgZGlzYWJsZSBkb3VibGUtdGFwLiAo JXApIiwgc2VsZik7CisgICAgICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJEVFRa IGlzIGZvcmNlZCBvbiwgc28gZG9uJ3QgZGlzYWJsZSBkb3VibGUtdGFwLiAoJXAsIHBhZ2VQcm94 eUlEPSVsbHUpIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQogCi0gICAgICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0 dXJlcywgIkdpdmUgcHJlZmVyZW5jZSB0byBjbGljayBieSBkaXNhYmxpbmcgZG91YmxlLXRhcC4g KCVwKSIsIHNlbGYpOworICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJHaXZlIHBy ZWZlcmVuY2UgdG8gY2xpY2sgYnkgZGlzYWJsaW5nIGRvdWJsZS10YXAuICglcCwgcGFnZVByb3h5 SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogICAgICAg ICBbc2VsZiBfc2V0RG91YmxlVGFwR2VzdHVyZXNFbmFibGVkOk5PXTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KQEAgLTIxODMsMTEgKzIxODMsMTEgQEAgLSAodm9pZClfaGFuZGxlU21hcnRNYWdu aWZpY2F0aW9uSW5mb3JtYXRpb25Gb3JQb3RlbnRpYWxUYXA6KFdlYktpdDo6VGFwSWRlbnRpZmkK ICAgICBhdXRvIGN1cnJlbnRTY2FsZSA9IHNlbGYuX2NvbnRlbnRab29tU2NhbGU7CiAgICAgYXV0 byB0YXJnZXRTY2FsZSA9IF9zbWFydE1hZ25pZmljYXRpb25Db250cm9sbGVyLT56b29tRmFjdG9y Rm9yVGFyZ2V0UmVjdChyZW5kZXJSZWN0LCBmaXRFbnRpcmVSZWN0LCB2aWV3cG9ydE1pbmltdW1T Y2FsZSwgdmlld3BvcnRNYXhpbXVtU2NhbGUpOwogICAgIGlmIChzdGQ6Om1pbih0YXJnZXRTY2Fs ZSwgY3VycmVudFNjYWxlKSAvIHN0ZDo6bWF4KHRhcmdldFNjYWxlLCBjdXJyZW50U2NhbGUpID4g ZmFzdGVyVGFwU2lnbmlmaWNhbnRab29tVGhyZXNob2xkKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9H KFZpZXdHZXN0dXJlcywgIlBvdGVudGlhbCB0YXAgd291bGQgbm90IGNhdXNlIGEgc2lnbmlmaWNh bnQgem9vbS4gVHJpZ2dlciBjbGljay4gKCVwKSIsIHNlbGYpOworICAgICAgICBSRUxFQVNFX0xP RyhWaWV3R2VzdHVyZXMsICJQb3RlbnRpYWwgdGFwIHdvdWxkIG5vdCBjYXVzZSBhIHNpZ25pZmlj YW50IHpvb20uIFRyaWdnZXIgY2xpY2suICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBf cGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogICAgICAgICBbc2VsZiBfc2V0RG91Ymxl VGFwR2VzdHVyZXNFbmFibGVkOk5PXTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICBSRUxF QVNFX0xPRyhWaWV3R2VzdHVyZXMsICJQb3RlbnRpYWwgdGFwIG1heSBjYXVzZSBzaWduaWZpY2Fu dCB6b29tLiBXYWl0LiAoJXApIiwgc2VsZik7CisgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVz LCAiUG90ZW50aWFsIHRhcCBtYXkgY2F1c2Ugc2lnbmlmaWNhbnQgem9vbS4gV2FpdC4gKCVwLCBw YWdlUHJveHlJRD0lbGx1KSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7 CiB9CiAKIC0gKHZvaWQpX2NhbmNlbExvbmdQcmVzc0dlc3R1cmVSZWNvZ25pemVyCkBAIC0zMDg0 LDEyICszMDg0LDEyIEBAIC0gKHZvaWQpX2xvbmdQcmVzc1JlY29nbml6ZWQ6KFVJTG9uZ1ByZXNz R2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcgogLSAodm9pZClfZW5kUG90ZW50 aWFsVGFwQW5kRW5hYmxlRG91YmxlVGFwR2VzdHVyZXNJZk5lY2Vzc2FyeQogewogICAgIGlmIChz ZWxmLndlYlZpZXcuX2FsbG93c0RvdWJsZVRhcEdlc3R1cmVzKSB7Ci0gICAgICAgIFJFTEVBU0Vf TE9HKFZpZXdHZXN0dXJlcywgImVuZGluZyBwb3RlbnRpYWwgdGFwIC0gZG91YmxlIHRhcHMgYXJl IGJhY2suICglcCkiLCBzZWxmKTsKKyAgICAgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAi ZW5kaW5nIHBvdGVudGlhbCB0YXAgLSBkb3VibGUgdGFwcyBhcmUgYmFjay4gKCVwLCBwYWdlUHJv eHlJRD0lbGx1KSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAKICAg ICAgICAgW3NlbGYgX3NldERvdWJsZVRhcEdlc3R1cmVzRW5hYmxlZDpZRVNdOwogICAgIH0KIAot ICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIkVuZGluZyBwb3RlbnRpYWwgdGFwLiAoJXAp Iiwgc2VsZik7CisgICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiRW5kaW5nIHBvdGVudGlh bCB0YXAuICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigp LnRvVUludDY0KCkpOwogCiAgICAgX3BvdGVudGlhbFRhcEluUHJvZ3Jlc3MgPSBOTzsKIH0KQEAg LTMxMDUsNyArMzEwNSw3IEBAIC0gKHZvaWQpX3NpbmdsZVRhcElkZW50aWZpZWQ6KFVJVGFwR2Vz dHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcgogCiAgICAgYm9vbCBzaG91bGRSZXF1 ZXN0TWFnbmlmaWNhdGlvbkluZm9ybWF0aW9uID0gX3BhZ2UtPnByZWZlcmVuY2VzKCkuZmFzdGVy Q2xpY2tzRW5hYmxlZCgpOwogICAgIGlmIChzaG91bGRSZXF1ZXN0TWFnbmlmaWNhdGlvbkluZm9y bWF0aW9uKQotICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJTaW5nbGUgdGFwIGlk ZW50aWZpZWQuIFJlcXVlc3QgZGV0YWlscyBvbiBwb3RlbnRpYWwgem9vbS4gKCVwKSIsIHNlbGYp OworICAgICAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJTaW5nbGUgdGFwIGlkZW50aWZp ZWQuIFJlcXVlc3QgZGV0YWlscyBvbiBwb3RlbnRpYWwgem9vbS4gKCVwLCBwYWdlUHJveHlJRD0l bGx1KSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAKICAgICBfcGFn ZS0+cG90ZW50aWFsVGFwQXRQb3NpdGlvbihnZXN0dXJlUmVjb2duaXplci5sb2NhdGlvbiwgc2hv dWxkUmVxdWVzdE1hZ25pZmljYXRpb25JbmZvcm1hdGlvbiwgW3NlbGYgbmV4dFRhcElkZW50aWZp ZXJdKTsKICAgICBfcG90ZW50aWFsVGFwSW5Qcm9ncmVzcyA9IFlFUzsKQEAgLTMxMjgsNyArMzEy OCw3IEBAIC0gKHZvaWQpX3NpbmdsZVRhcERpZFJlc2V0OihVSVRhcEdlc3R1cmVSZWNvZ25pemVy ICopZ2VzdHVyZVJlY29nbml6ZXIKICAgICBjYW5jZWxQb3RlbnRpYWxUYXBJZk5lY2Vzc2FyeShz ZWxmKTsKICAgICBpZiAoYXV0byogc2luZ2xlVGFwVG91Y2hJZGVudGlmaWVyID0gW19zaW5nbGVU YXBHZXN0dXJlUmVjb2duaXplciBsYXN0QWN0aXZlVG91Y2hJZGVudGlmaWVyXSkgewogICAgICAg ICBXZWJDb3JlOjpQb2ludGVySUQgcG9pbnRlcklkID0gW3NpbmdsZVRhcFRvdWNoSWRlbnRpZmll ciB1bnNpZ25lZEludFZhbHVlXTsKLSAgICAgICAgaWYgKG1fY29tbWl0UG90ZW50aWFsVGFwUG9p bnRlcklkICE9IHBvaW50ZXJJZCkKKyAgICAgICAgaWYgKF9jb21taXRQb3RlbnRpYWxUYXBQb2lu dGVySWQgIT0gcG9pbnRlcklkKQogICAgICAgICAgICAgX3BhZ2UtPnRvdWNoV2l0aElkZW50aWZp ZXJXYXNSZW1vdmVkKHBvaW50ZXJJZCk7CiAgICAgfQogCkBAIC0zMTM4LDE0ICszMTM4LDE0IEBA IC0gKHZvaWQpX3NpbmdsZVRhcERpZFJlc2V0OihVSVRhcEdlc3R1cmVSZWNvZ25pemVyICopZ2Vz dHVyZVJlY29nbml6ZXIKIAogLSAodm9pZClfZG91YmxlVGFwRGlkRmFpbDooVUlUYXBHZXN0dXJl UmVjb2duaXplciAqKWdlc3R1cmVSZWNvZ25pemVyCiB7Ci0gICAgUkVMRUFTRV9MT0coVmlld0dl c3R1cmVzLCAiRG91YmxlIHRhcCB3YXMgbm90IHJlY29nbml6ZWQuICglcCkiLCBzZWxmKTsKKyAg ICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJEb3VibGUgdGFwIHdhcyBub3QgcmVjb2duaXpl ZC4gKCVwLCBwYWdlUHJveHlJRD0lbGx1KSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9V SW50NjQoKSk7CiAgICAgQVNTRVJUKGdlc3R1cmVSZWNvZ25pemVyID09IF9kb3VibGVUYXBHZXN0 dXJlUmVjb2duaXplcik7CiB9CiAKIC0gKHZvaWQpX2NvbW1pdFBvdGVudGlhbFRhcEZhaWxlZAog ewotICAgIF9wYWdlLT50b3VjaFdpdGhJZGVudGlmaWVyV2FzUmVtb3ZlZChtX2NvbW1pdFBvdGVu dGlhbFRhcFBvaW50ZXJJZCk7Ci0gICAgbV9jb21taXRQb3RlbnRpYWxUYXBQb2ludGVySWQgPSAw OworICAgIF9wYWdlLT50b3VjaFdpdGhJZGVudGlmaWVyV2FzUmVtb3ZlZChfY29tbWl0UG90ZW50 aWFsVGFwUG9pbnRlcklkKTsKKyAgICBfY29tbWl0UG90ZW50aWFsVGFwUG9pbnRlcklkID0gMDsK IAogICAgIFtzZWxmIF9jYW5jZWxJbnRlcmFjdGlvbl07CiAgICAgCkBAIC0zMTY1LDEwICszMTY1 LDEwIEBAIC0gKHZvaWQpX2RpZE5vdEhhbmRsZVRhcEFzQ2xpY2s6KGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50Jilwb2ludAogCiAtICh2b2lkKV9kaWRDb21wbGV0ZVN5bnRoZXRpY0NsaWNrCiB7Ci0g ICAgX3BhZ2UtPnRvdWNoV2l0aElkZW50aWZpZXJXYXNSZW1vdmVkKG1fY29tbWl0UG90ZW50aWFs VGFwUG9pbnRlcklkKTsKLSAgICBtX2NvbW1pdFBvdGVudGlhbFRhcFBvaW50ZXJJZCA9IDA7Cisg ICAgX3BhZ2UtPnRvdWNoV2l0aElkZW50aWZpZXJXYXNSZW1vdmVkKF9jb21taXRQb3RlbnRpYWxU YXBQb2ludGVySWQpOworICAgIF9jb21taXRQb3RlbnRpYWxUYXBQb2ludGVySWQgPSAwOwogCi0g ICAgUkVMRUFTRV9MT0coVmlld0dlc3R1cmVzLCAiU3ludGhldGljIGNsaWNrIGNvbXBsZXRlZC4g KCVwKSIsIHNlbGYpOworICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIlN5bnRoZXRpYyBj bGljayBjb21wbGV0ZWQuICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxmLCBfcGFnZS0+aWRl bnRpZmllcigpLnRvVUludDY0KCkpOwogICAgIFtzZWxmIF9yZXNldElucHV0Vmlld0RlZmVycmFs XTsKIH0KIApAQCAtMzE5MywxMiArMzE5MywxMiBAQCAtICh2b2lkKV9zaW5nbGVUYXBSZWNvZ25p emVkOihVSVRhcEdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIKICAgICBpZiAo W19pbnB1dFBlcmlwaGVyYWwgc2luZ2xlVGFwU2hvdWxkRW5kRWRpdGluZ10pCiAgICAgICAgIFtf aW5wdXRQZXJpcGhlcmFsIGVuZEVkaXRpbmddOwogCi0gICAgUkVMRUFTRV9MT0coVmlld0dlc3R1 cmVzLCAiU2luZ2xlIHRhcCByZWNvZ25pemVkIC0gY29tbWl0IHBvdGVudGlhbCB0YXAgKCVwKSIs IHNlbGYpOworICAgIFJFTEVBU0VfTE9HKFZpZXdHZXN0dXJlcywgIlNpbmdsZSB0YXAgcmVjb2du aXplZCAtIGNvbW1pdCBwb3RlbnRpYWwgdGFwICglcCwgcGFnZVByb3h5SUQ9JWxsdSkiLCBzZWxm LCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogCiAgICAgV2ViQ29yZTo6UG9pbnRl cklEIHBvaW50ZXJJZCA9IFdlYkNvcmU6Om1vdXNlUG9pbnRlcklEOwogICAgIGlmIChhdXRvKiBz aW5nbGVUYXBUb3VjaElkZW50aWZpZXIgPSBbX3NpbmdsZVRhcEdlc3R1cmVSZWNvZ25pemVyIGxh c3RBY3RpdmVUb3VjaElkZW50aWZpZXJdKSB7CiAgICAgICAgIHBvaW50ZXJJZCA9IFtzaW5nbGVU YXBUb3VjaElkZW50aWZpZXIgdW5zaWduZWRJbnRWYWx1ZV07Ci0gICAgICAgIG1fY29tbWl0UG90 ZW50aWFsVGFwUG9pbnRlcklkID0gcG9pbnRlcklkOworICAgICAgICBfY29tbWl0UG90ZW50aWFs VGFwUG9pbnRlcklkID0gcG9pbnRlcklkOwogICAgIH0KICAgICBfcGFnZS0+Y29tbWl0UG90ZW50 aWFsVGFwKFdlYktpdDo6d2ViRXZlbnRNb2RpZmllckZsYWdzKGdlc3R1cmVSZWNvZ25pemVyLm1v ZGlmaWVyRmxhZ3MpLCBfbGF5ZXJUcmVlVHJhbnNhY3Rpb25JZEF0TGFzdEludGVyYWN0aW9uU3Rh cnQsIHBvaW50ZXJJZCk7CiAKQEAgLTMyMDgsNyArMzIwOCw3IEBAIC0gKHZvaWQpX3NpbmdsZVRh cFJlY29nbml6ZWQ6KFVJVGFwR2VzdHVyZVJlY29nbml6ZXIgKilnZXN0dXJlUmVjb2duaXplcgog CiAtICh2b2lkKV9kb3VibGVUYXBSZWNvZ25pemVkOihVSVRhcEdlc3R1cmVSZWNvZ25pemVyICop Z2VzdHVyZVJlY29nbml6ZXIKIHsKLSAgICBSRUxFQVNFX0xPRyhWaWV3R2VzdHVyZXMsICJJZGVu dGlmaWVkIGEgZG91YmxlIHRhcCAoJXApIiwgc2VsZik7CisgICAgUkVMRUFTRV9MT0coVmlld0dl c3R1cmVzLCAiSWRlbnRpZmllZCBhIGRvdWJsZSB0YXAgKCVwLCBwYWdlUHJveHlJRD0lbGx1KSIs IHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAKICAgICBbc2VsZiBfcmVz ZXRJc0RvdWJsZVRhcFBlbmRpbmddOwogICAgIF9sYXN0SW50ZXJhY3Rpb25Mb2NhdGlvbiA9IGdl c3R1cmVSZWNvZ25pemVyLmxvY2F0aW9uOwo=