213950 2020-07-03 20:16:28 -0700 [macOS] Tests that show system menu popups may fail when run concurrently 2020-07-03 23:38:58 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh darin dino hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1668718 0 wenson_hsieh 2020-07-03 20:16:28 -0700 <rdar://problem/64551566> 1668721 1 403505 wenson_hsieh 2020-07-03 20:34:22 -0700 Created attachment 403505 For EWS 1668722 2 403505 darin 2020-07-03 21:14:58 -0700 Comment on attachment 403505 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=403505&action=review > Tools/WebKitTestRunner/mac/TestControllerMac.mm:134 > + static NeverDestroyed<InstanceMethodSwizzler> cancelTrackingSwizzler { NSMenu.class, @selector(cancelTracking), reinterpret_cast<IMP>(swizzledCancelTracking) }; > + static NeverDestroyed<ClassMethodSwizzler> menuPopUpSwizzler { NSMenu.class, @selector(popUpContextMenu:withEvent:forView:), reinterpret_cast<IMP>(swizzledPopUpContextMenu) }; > + static NeverDestroyed<InstanceMethodSwizzler> carbonMenuPopUpSwizzler { Do these really need NeverDestroyed? Maybe they would with ARC, but I don’t see why they need it without ARC. Keep in mind that NeverDestroyed does not make something stay alive for the duration of execution: being a global makes that happen. NeverDestroyed simply prevents the destructor from being called, which is useful for such objects if they have destructors. 1668729 3 403505 wenson_hsieh 2020-07-03 21:54:00 -0700 Comment on attachment 403505 For EWS View in context: https://bugs.webkit.org/attachment.cgi?id=403505&action=review >> Tools/WebKitTestRunner/mac/TestControllerMac.mm:134 >> + static NeverDestroyed<InstanceMethodSwizzler> carbonMenuPopUpSwizzler { > > Do these really need NeverDestroyed? Maybe they would with ARC, but I don’t see why they need it without ARC. Keep in mind that NeverDestroyed does not make something stay alive for the duration of execution: being a global makes that happen. NeverDestroyed simply prevents the destructor from being called, which is useful for such objects if they have destructors. That's a good point — the `NeverDestroyed<>` doesn't add anything here. I changed these into just `static InstanceMethodSwizzler …` and `static ClassMethodSwizzler …`. 1668732 4 403507 wenson_hsieh 2020-07-03 21:58:07 -0700 Created attachment 403507 Remove NeverDestroyed. 1668752 5 ews-feeder 2020-07-03 23:38:57 -0700 Committed r263929: <https://trac.webkit.org/changeset/263929> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403507. 403505 2020-07-03 20:34:22 -0700 2020-07-03 21:14:58 -0700 For EWS bug-213950-20200703203422.patch text/plain 4124 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzODE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODEwMDM1OTU5ZmJhNmExNDExNTQxM2I4ZDc2M2I0MTdi Mzk2ZGM2MS4uM2Q1M2MwNDAzYmIwMDIzMTJhZjQ1MjJmNDVlZTg3NjBjNWU3MGIyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTA3LTAzICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor CisgICAgICAgIFttYWNPU10gVGVzdHMgdGhhdCBzaG93IHN5c3RlbSBtZW51IHBvcHVwcyBtYXkg ZmFpbCB3aGVuIHJ1biBjb25jdXJyZW50bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzk1MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ1NTE1 NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFr ZSBpdCBwb3NzaWJsZSB0byBydW4gdGVzdHMgdGhhdCBwcmVzZW50IHN5c3RlbSBtb2RhbCBwb3B1 cHMgc2ltdWx0YW5lb3VzbHksIHdpdGhvdXQgdGhlIHBvc3NpYmlsaXR5IG9mIHRoZXNlCisgICAg ICAgIHRlc3RzIGludGVyZmVyaW5nIHdpdGggZWFjaCBvdGhlci4gRXhhbXBsZXMgaW5jbHVkZSBj b250ZXh0IG1lbnVzLCBzZWxlY3QgbWVudXMsIGFuZCB0aGUgRE9NIHBhc3RlIHBvcHVwLiBUbyBk bworICAgICAgICB0aGlzLCB3ZSBzd2l6emxlIG91dCBjb2RlcGF0aHMgZm9yIHNob3dpbmcgYW5k IGRpbWlzc2luZyBwb3B1cHMsIGFuZCBpbnN0ZWFkIGRpc3BhdGNoIG5vdGlmaWNhdGlvbnMgYW5k IHRoZQorICAgICAgICBhcHByb3ByaWF0ZSBOU01lbnVEZWxlZ2F0ZSBtZXRob2RzIG91cnNlbHZl cy4KKworICAgICAgICBUaGlzIGNoYW5nZSBoYXMgdGhlIHNpZGUgZWZmZWN0IG9mIGZpeGluZyBz ZXZlcmFsIGxheW91dCB0ZXN0cyB0aGF0IGFyZSBjdXJyZW50bHkgdGltaW5nIG91dCBvbmx5IG9u IGFybTY0ZQorICAgICAgICBtYWNPUywgZHVlIHRvIHJlYXNvbnMgZGV0YWlsZWQgaW4gPHJkYXI6 Ly9wcm9ibGVtLzY1MDg0NTAzPi4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL1Rl c3RDb250cm9sbGVyTWFjLm1tOgorICAgICAgICAoV1RSOjpzZXRTd2l6emxlZFBvcFVwTWVudSk6 CisgICAgICAgIChXVFI6OnN3aXp6bGVkUG9wVXBDb250ZXh0TWVudSk6CisgICAgICAgIChXVFI6 OnN3aXp6bGVkUG9wVXBNZW51KToKKyAgICAgICAgKFdUUjo6c3dpenpsZWRDYW5jZWxUcmFja2lu Zyk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUluaXRpYWxpemUpOgor CiAyMDIwLTA3LTAxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeCB0aGUgV2ViS2l0IGJ1aWxkIGFmdGVyIDxyZGFyOi8vcHJvYmxlbS82NDI4ODE5 MT4KZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1Rlc3RDb250cm9sbGVy TWFjLm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0K aW5kZXggZjQ1NDk4ZWQ5Y2NlYzZjN2MwMDdjMzUwNDBlYTFiYzJiZTZiZDEwMC4uNzg2OTdmMjBm NDUzNzE1MGFiOGZjOTZhODE5MjgxMTg0ZDU2N2QwNiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0KQEAgLTY5LDYgKzY5LDQ3IEBAIHN0YXRp YyBQbGF0Zm9ybVdpbmRvdyB3dHJfTlNBcHBsaWNhdGlvbl9rZXlXaW5kb3coaWQgc2VsZiwgU0VM IF9jbWQpCiAgICAgcmV0dXJuIFdUUjo6UGxhdGZvcm1XZWJWaWV3OjprZXlXaW5kb3coKTsKIH0K IAorc3RhdGljIF9fd2VhayBOU01lbnUgKmdDdXJyZW50UG9wVXBNZW51ID0gbmlsOworc3RhdGlj IHZvaWQgc2V0U3dpenpsZWRQb3BVcE1lbnUoTlNNZW51ICptZW51KQoreworICAgIGlmIChnQ3Vy cmVudFBvcFVwTWVudSA9PSBtZW51KQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoW21lbnUu ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihtZW51V2lsbE9wZW46KV0pCisg ICAgICAgIFttZW51LmRlbGVnYXRlIG1lbnVXaWxsT3BlbjptZW51XTsKKworICAgIGdDdXJyZW50 UG9wVXBNZW51ID0gbWVudTsKKworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWlu X3F1ZXVlKCksIF57CisgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRl cl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6TlNNZW51RGlkQmVnaW5UcmFja2luZ05vdGlmaWNhdGlv biBvYmplY3Q6bmlsXTsKKyAgICB9KTsKK30KKworc3RhdGljIHZvaWQgc3dpenpsZWRQb3BVcENv bnRleHRNZW51KENsYXNzLCBTRUwsIE5TTWVudSAqbWVudSwgTlNFdmVudCAqLCBOU1ZpZXcgKikK K3sKKyAgICBzZXRTd2l6emxlZFBvcFVwTWVudShtZW51KTsKK30KKworc3RhdGljIHZvaWQgc3dp enpsZWRQb3BVcE1lbnUoaWQsIFNFTCwgTlNNZW51ICptZW51LCBOU1BvaW50LCBDR0Zsb2F0LCBO U1ZpZXcgKiwgTlNJbnRlZ2VyLCBOU0ZvbnQgKiwgTlNVSW50ZWdlciwgTlNEaWN0aW9uYXJ5ICop Cit7CisgICAgc2V0U3dpenpsZWRQb3BVcE1lbnUobWVudSk7Cit9CisKK3N0YXRpYyB2b2lkIHN3 aXp6bGVkQ2FuY2VsVHJhY2tpbmcoTlNNZW51ICptZW51LCBTRUwpCit7CisgICAgaWYgKG1lbnUg IT0gZ0N1cnJlbnRQb3BVcE1lbnUpCisgICAgICAgIHJldHVybjsKKworICAgIGdDdXJyZW50UG9w VXBNZW51ID0gbmlsOworCisgICAgaWYgKFttZW51LmRlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IobWVudURpZENsb3NlOildKQorICAgICAgICBbbWVudS5kZWxlZ2F0ZSBtZW51 RGlkQ2xvc2U6bWVudV07CisKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9x dWV1ZSgpLCBeeworICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd IHBvc3ROb3RpZmljYXRpb25OYW1lOk5TTWVudURpZEVuZFRyYWNraW5nTm90aWZpY2F0aW9uIG9i amVjdDpuaWxdOworICAgIH0pOworfQorCiB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUlu aXRpYWxpemUoKQogewogICAgIHBvc2VBc0NsYXNzKCJXZWJLaXRUZXN0UnVubmVyUGFzdGVib2Fy ZCIsICJOU1Bhc3RlYm9hcmQiKTsKQEAgLTg3LDYgKzEyOCwxNCBAQCB2b2lkIFRlc3RDb250cm9s bGVyOjpwbGF0Zm9ybUluaXRpYWxpemUoKQogICAgIH0KICAgICAKICAgICBtZXRob2Rfc2V0SW1w bGVtZW50YXRpb24oa2V5V2luZG93TWV0aG9kLCAoSU1QKXd0cl9OU0FwcGxpY2F0aW9uX2tleVdp bmRvdyk7CisKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SW5zdGFuY2VNZXRob2RTd2l6emxl cj4gY2FuY2VsVHJhY2tpbmdTd2l6emxlciB7IE5TTWVudS5jbGFzcywgQHNlbGVjdG9yKGNhbmNl bFRyYWNraW5nKSwgcmVpbnRlcnByZXRfY2FzdDxJTVA+KHN3aXp6bGVkQ2FuY2VsVHJhY2tpbmcp IH07CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPENsYXNzTWV0aG9kU3dpenpsZXI+IG1lbnVQ b3BVcFN3aXp6bGVyIHsgTlNNZW51LmNsYXNzLCBAc2VsZWN0b3IocG9wVXBDb250ZXh0TWVudTp3 aXRoRXZlbnQ6Zm9yVmlldzopLCByZWludGVycHJldF9jYXN0PElNUD4oc3dpenpsZWRQb3BVcENv bnRleHRNZW51KSB9OworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxJbnN0YW5jZU1ldGhvZFN3 aXp6bGVyPiBjYXJib25NZW51UG9wVXBTd2l6emxlciB7CisgICAgICAgIE5TQ2xhc3NGcm9tU3Ry aW5nKEAiTlNDYXJib25NZW51SW1wbCIpLAorICAgICAgICBOU1NlbGVjdG9yRnJvbVN0cmluZyhA InBvcFVwTWVudTphdExvY2F0aW9uOndpZHRoOmZvclZpZXc6d2l0aFNlbGVjdGVkSXRlbTp3aXRo Rm9udDp3aXRoRmxhZ3M6d2l0aE9wdGlvbnM6IiksCisgICAgICAgIHJlaW50ZXJwcmV0X2Nhc3Q8 SU1QPihzd2l6emxlZFBvcFVwTWVudSkKKyAgICB9OwogfQogCiB2b2lkIFRlc3RDb250cm9sbGVy OjpwbGF0Zm9ybURlc3Ryb3koKQo= 403507 2020-07-03 21:58:07 -0700 2020-07-03 23:38:58 -0700 Remove NeverDestroyed. bug-213950-20200703215806.patch text/plain 4073 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzODE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODEwMDM1OTU5ZmJhNmExNDExNTQxM2I4ZDc2M2I0MTdi Mzk2ZGM2MS4uNTY1YTYxMzRlY2QyYWRmM2RhMjJjNTRmNzljYTAyZTI1OWQ1YWZjYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDIwLTA3LTAzICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgor CisgICAgICAgIFttYWNPU10gVGVzdHMgdGhhdCBzaG93IHN5c3RlbSBtZW51IHBvcHVwcyBtYXkg ZmFpbCB3aGVuIHJ1biBjb25jdXJyZW50bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIxMzk1MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjQ1NTE1 NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgTWFrZSBp dCBwb3NzaWJsZSB0byBydW4gdGVzdHMgdGhhdCBwcmVzZW50IHN5c3RlbSBtb2RhbCBwb3B1cHMg c2ltdWx0YW5lb3VzbHksIHdpdGhvdXQgdGhlIHBvc3NpYmlsaXR5IG9mIHRoZXNlCisgICAgICAg IHRlc3RzIGludGVyZmVyaW5nIHdpdGggZWFjaCBvdGhlci4gRXhhbXBsZXMgaW5jbHVkZSBjb250 ZXh0IG1lbnVzLCBzZWxlY3QgbWVudXMsIGFuZCB0aGUgRE9NIHBhc3RlIHBvcHVwLiBUbyBkbwor ICAgICAgICB0aGlzLCB3ZSBzd2l6emxlIG91dCBjb2RlcGF0aHMgZm9yIHNob3dpbmcgYW5kIGRp bWlzc2luZyBwb3B1cHMsIGFuZCBpbnN0ZWFkIGRpc3BhdGNoIG5vdGlmaWNhdGlvbnMgYW5kIHRo ZQorICAgICAgICBhcHByb3ByaWF0ZSBOU01lbnVEZWxlZ2F0ZSBtZXRob2RzIG91cnNlbHZlcy4K KworICAgICAgICBUaGlzIGNoYW5nZSBoYXMgdGhlIHNpZGUgZWZmZWN0IG9mIGZpeGluZyBzZXZl cmFsIGxheW91dCB0ZXN0cyB0aGF0IGFyZSBjdXJyZW50bHkgdGltaW5nIG91dCBvbmx5IG9uIGFy bTY0ZQorICAgICAgICBtYWNPUywgZHVlIHRvIHJlYXNvbnMgZGV0YWlsZWQgaW4gPHJkYXI6Ly9w cm9ibGVtLzY1MDg0NTAzPi4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvbWFjL1Rlc3RD b250cm9sbGVyTWFjLm1tOgorICAgICAgICAoV1RSOjpzZXRTd2l6emxlZFBvcFVwTWVudSk6Cisg ICAgICAgIChXVFI6OnN3aXp6bGVkUG9wVXBDb250ZXh0TWVudSk6CisgICAgICAgIChXVFI6OnN3 aXp6bGVkUG9wVXBNZW51KToKKyAgICAgICAgKFdUUjo6c3dpenpsZWRDYW5jZWxUcmFja2luZyk6 CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUluaXRpYWxpemUpOgorCiAy MDIwLTA3LTAxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg ICAgIEZpeCB0aGUgV2ViS2l0IGJ1aWxkIGFmdGVyIDxyZGFyOi8vcHJvYmxlbS82NDI4ODE5MT4K ZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1Rlc3RDb250cm9sbGVyTWFj Lm1tIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0KaW5k ZXggZjQ1NDk4ZWQ5Y2NlYzZjN2MwMDdjMzUwNDBlYTFiYzJiZTZiZDEwMC4uNmI3NWU2YTZhMzRl YmExYzE3NDk3MWQ2NTNiNTlhMTNjZDE0OTc3MyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVz dFJ1bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9tYWMvVGVzdENvbnRyb2xsZXJNYWMubW0KQEAgLTY5LDYgKzY5LDQ3IEBAIHN0YXRpYyBQ bGF0Zm9ybVdpbmRvdyB3dHJfTlNBcHBsaWNhdGlvbl9rZXlXaW5kb3coaWQgc2VsZiwgU0VMIF9j bWQpCiAgICAgcmV0dXJuIFdUUjo6UGxhdGZvcm1XZWJWaWV3OjprZXlXaW5kb3coKTsKIH0KIAor c3RhdGljIF9fd2VhayBOU01lbnUgKmdDdXJyZW50UG9wVXBNZW51ID0gbmlsOworc3RhdGljIHZv aWQgc2V0U3dpenpsZWRQb3BVcE1lbnUoTlNNZW51ICptZW51KQoreworICAgIGlmIChnQ3VycmVu dFBvcFVwTWVudSA9PSBtZW51KQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoW21lbnUuZGVs ZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihtZW51V2lsbE9wZW46KV0pCisgICAg ICAgIFttZW51LmRlbGVnYXRlIG1lbnVXaWxsT3BlbjptZW51XTsKKworICAgIGdDdXJyZW50UG9w VXBNZW51ID0gbWVudTsKKworICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1 ZXVlKCksIF57CisgICAgICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0g cG9zdE5vdGlmaWNhdGlvbk5hbWU6TlNNZW51RGlkQmVnaW5UcmFja2luZ05vdGlmaWNhdGlvbiBv YmplY3Q6bmlsXTsKKyAgICB9KTsKK30KKworc3RhdGljIHZvaWQgc3dpenpsZWRQb3BVcENvbnRl eHRNZW51KENsYXNzLCBTRUwsIE5TTWVudSAqbWVudSwgTlNFdmVudCAqLCBOU1ZpZXcgKikKK3sK KyAgICBzZXRTd2l6emxlZFBvcFVwTWVudShtZW51KTsKK30KKworc3RhdGljIHZvaWQgc3dpenps ZWRQb3BVcE1lbnUoaWQsIFNFTCwgTlNNZW51ICptZW51LCBOU1BvaW50LCBDR0Zsb2F0LCBOU1Zp ZXcgKiwgTlNJbnRlZ2VyLCBOU0ZvbnQgKiwgTlNVSW50ZWdlciwgTlNEaWN0aW9uYXJ5ICopCit7 CisgICAgc2V0U3dpenpsZWRQb3BVcE1lbnUobWVudSk7Cit9CisKK3N0YXRpYyB2b2lkIHN3aXp6 bGVkQ2FuY2VsVHJhY2tpbmcoTlNNZW51ICptZW51LCBTRUwpCit7CisgICAgaWYgKG1lbnUgIT0g Z0N1cnJlbnRQb3BVcE1lbnUpCisgICAgICAgIHJldHVybjsKKworICAgIGdDdXJyZW50UG9wVXBN ZW51ID0gbmlsOworCisgICAgaWYgKFttZW51LmRlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IobWVudURpZENsb3NlOildKQorICAgICAgICBbbWVudS5kZWxlZ2F0ZSBtZW51RGlk Q2xvc2U6bWVudV07CisKKyAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1 ZSgpLCBeeworICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHBv c3ROb3RpZmljYXRpb25OYW1lOk5TTWVudURpZEVuZFRyYWNraW5nTm90aWZpY2F0aW9uIG9iamVj dDpuaWxdOworICAgIH0pOworfQorCiB2b2lkIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUluaXRp YWxpemUoKQogewogICAgIHBvc2VBc0NsYXNzKCJXZWJLaXRUZXN0UnVubmVyUGFzdGVib2FyZCIs ICJOU1Bhc3RlYm9hcmQiKTsKQEAgLTg3LDYgKzEyOCwxNCBAQCB2b2lkIFRlc3RDb250cm9sbGVy OjpwbGF0Zm9ybUluaXRpYWxpemUoKQogICAgIH0KICAgICAKICAgICBtZXRob2Rfc2V0SW1wbGVt ZW50YXRpb24oa2V5V2luZG93TWV0aG9kLCAoSU1QKXd0cl9OU0FwcGxpY2F0aW9uX2tleVdpbmRv dyk7CisKKyAgICBzdGF0aWMgSW5zdGFuY2VNZXRob2RTd2l6emxlciBjYW5jZWxUcmFja2luZ1N3 aXp6bGVyIHsgTlNNZW51LmNsYXNzLCBAc2VsZWN0b3IoY2FuY2VsVHJhY2tpbmcpLCByZWludGVy cHJldF9jYXN0PElNUD4oc3dpenpsZWRDYW5jZWxUcmFja2luZykgfTsKKyAgICBzdGF0aWMgQ2xh c3NNZXRob2RTd2l6emxlciBtZW51UG9wVXBTd2l6emxlciB7IE5TTWVudS5jbGFzcywgQHNlbGVj dG9yKHBvcFVwQ29udGV4dE1lbnU6d2l0aEV2ZW50OmZvclZpZXc6KSwgcmVpbnRlcnByZXRfY2Fz dDxJTVA+KHN3aXp6bGVkUG9wVXBDb250ZXh0TWVudSkgfTsKKyAgICBzdGF0aWMgSW5zdGFuY2VN ZXRob2RTd2l6emxlciBjYXJib25NZW51UG9wVXBTd2l6emxlciB7CisgICAgICAgIE5TQ2xhc3NG cm9tU3RyaW5nKEAiTlNDYXJib25NZW51SW1wbCIpLAorICAgICAgICBOU1NlbGVjdG9yRnJvbVN0 cmluZyhAInBvcFVwTWVudTphdExvY2F0aW9uOndpZHRoOmZvclZpZXc6d2l0aFNlbGVjdGVkSXRl bTp3aXRoRm9udDp3aXRoRmxhZ3M6d2l0aE9wdGlvbnM6IiksCisgICAgICAgIHJlaW50ZXJwcmV0 X2Nhc3Q8SU1QPihzd2l6emxlZFBvcFVwTWVudSkKKyAgICB9OwogfQogCiB2b2lkIFRlc3RDb250 cm9sbGVyOjpwbGF0Zm9ybURlc3Ryb3koKQo=