200783 2019-08-15 13:10:14 -0700 Tidy up some event stream helpers in basic-gestures.js 2019-08-15 17:37:27 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner simon.fraser thorton webkit-bug-importer oldest_to_newest 1561710 0 wenson_hsieh 2019-08-15 13:10:14 -0700 SSIA 1561732 1 376418 wenson_hsieh 2019-08-15 13:46:47 -0700 Created attachment 376418 Patch 1561852 2 376418 commit-queue 2019-08-15 17:37:26 -0700 Comment on attachment 376418 Patch Clearing flags on attachment: 376418 Committed r248752: <https://trac.webkit.org/changeset/248752> 1561853 3 commit-queue 2019-08-15 17:37:27 -0700 All reviewed patches have been landed. Closing bug. 376418 2019-08-15 13:46:47 -0700 2019-08-15 17:37:26 -0700 Patch bug-200783-20190815134646.patch text/plain 15314 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NzE1CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmE2ZGMxOTFiZGFlYTFkYmMyMzdh OTZkODUzZDZiODk2ZjIxZTUzNy4uMzkxOGM3MjU4OTQwZDMzOWJjMmI4MzBmOTM0YTU4ZWM4ZjRh OWFjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA4LTE1ICBXZW5zb24gSHNpZWggIDx3 ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRpZHkgdXAgc29tZSBldmVudCBzdHJl YW0gaGVscGVycyBpbiBiYXNpYy1nZXN0dXJlcy5qcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwNzgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZXNvdXJjZXMvYmFzaWMtZ2VzdHVyZXMuanM6CisK KyAgICAgICAgTWFrZSBhIGZldyBzbWFsbCBhZGp1c3RtZW50czoKKyAgICAgICAgKDEpIEludm9r ZSB1aVNjcmlwdENvbXBsZXRlIHdpdGhpbiB0aGUgY29tcGxldGlvbiBjYWxsYmFjayBvZiBzZW5k RXZlbnRTdHJlYW0uIFRoaXMgYWN0dWFsbHkgZG9lc24ndCByZXN1bHQgaW4KKyAgICAgICAgICAg IGFueSBiZWhhdmlvciBkaWZmZXJlbmNlcywgc2luY2UgVUlTY3JpcHRDb250cm9sbGVyIHdpbGws IGJ5IGRlZmF1bHQsIHdhaXQgZm9yIG5vbi1wZXJzaXN0ZW50IGFzeW5jaHJvbm91cworICAgICAg ICAgICAgdGFza3MgdG8gZmluaXNoIGJlZm9yZSBhbGxvd2luZyB0aGUgVUktc2lkZSBzY3JpcHQg aW52b2NhdGlvbiB0byBmaW5pc2guCisgICAgICAgICgyKSBGaXggc29tZSBtaW5vciBpbmRlbnRh dGlvbiBpc3N1ZXMgaW4gbG9uZ1ByZXNzQW5kSG9sZEF0UG9pbnQsIHRvdWNoQW5kRHJhZ0Zyb21Q b2ludFRvUG9pbnQsIGhvbGRBdFBvaW50LAorICAgICAgICAgICAgYW5kIGNvbnRpbnVlVG91Y2hB bmREcmFnRnJvbVBvaW50VG9Qb2ludC4KKwogMjAxOS0wOC0xNCAgTXlsZXMgQy4gTWF4ZmllbGQg IDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXSExTTF0gVmFyaWFibGVzIHNob3Vs ZG4ndCBiZSBhYmxlIHRvIGhhdmUgdm9pZCB0eXBlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9y ZXNvdXJjZXMvYmFzaWMtZ2VzdHVyZXMuanMgYi9MYXlvdXRUZXN0cy9yZXNvdXJjZXMvYmFzaWMt Z2VzdHVyZXMuanMKaW5kZXggMDM4ZmNlYWRmYjQxZjIzMDMyZjgyNmZlNjA3YzgzYTk1ODc5ODZi NS4uM2MxOWFkMjRmNmU2ODc2NTIyOTZlOTA0NjRkNjEyZGZjYTlhZGZmZSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvcmVzb3VyY2VzL2Jhc2ljLWdlc3R1cmVzLmpzCisrKyBiL0xheW91dFRlc3Rz L3Jlc291cmNlcy9iYXNpYy1nZXN0dXJlcy5qcwpAQCAtNjgsNDQgKzY4LDQ1IEBAIGZ1bmN0aW9u IGxvbmdQcmVzc0FuZEhvbGRBdFBvaW50KHgsIHkpCiAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJl c29sdmUgPT4gewogICAgICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KGAKICAgICAgICAgICAg IChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIHZhciBldmVudFN0cmVhbSA9IHsKLSAgICAgICAg ICAgIGV2ZW50cyA6IFsKLSAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIGlu dGVycG9sYXRlIDogImxpbmVhciIsCi0gICAgICAgICAgICAgICAgICAgIHRpbWVzdGVwOiAwLjEs Ci0gICAgICAgICAgICAgICAgICAgIGNvb3JkaW5hdGVTcGFjZSA6ICJjb250ZW50IiwKLSAgICAg ICAgICAgICAgICAgICAgc3RhcnRFdmVudCA6IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlu cHV0VHlwZSA6ICJoYW5kIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVPZmZzZXQgOiAw LAotICAgICAgICAgICAgICAgICAgICAgICAgdG91Y2hlcyA6IFsKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0VHlwZSA6 ICJmaW5nZXIiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJiZWdh biIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlkIDogMSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgeCA6ICR7eH0sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHkgOiAke3l9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzc3Vy ZSA6IDAKKyAgICAgICAgICAgICAgICBjb25zdCBldmVudFN0cmVhbSA9IHsKKyAgICAgICAgICAg ICAgICAgICAgZXZlbnRzIDogWworICAgICAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludGVycG9sYXRlIDogImxpbmVhciIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdGltZXN0ZXA6IDAuMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb29yZGluYXRlU3BhY2UgOiAiY29udGVudCIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc3RhcnRFdmVudCA6IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRU eXBlIDogImhhbmQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lT2Zmc2V0 IDogMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdG91Y2hlcyA6IFsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiZmluZ2VyIiwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJiZWdhbiIsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaWQgOiAxLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHggOiAke3h9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHkgOiAke3l9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHByZXNzdXJlIDogMAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBlbmRFdmVudCA6IHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRUeXBlIDogImhhbmQiLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB0aW1lT2Zmc2V0IDogMi4wLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB0b3VjaGVzIDogWworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0 VHlwZSA6ICJmaW5nZXIiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBoYXNlIDogIm1vdmVkIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpZCA6IDEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeCA6ICR7 eH0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeSA6ICR7eX0sCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc3N1cmUgOiAwCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIF0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAg ICAgICAgICAgICBdCi0gICAgICAgICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAgICAgICAg IGVuZEV2ZW50IDogewotICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRUeXBlIDogImhhbmQi LAotICAgICAgICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6IDIuMCwKLSAgICAgICAgICAg ICAgICAgICAgICAgIHRvdWNoZXMgOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgewot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiZmluZ2VyIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAibW92ZWQiLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpZCA6IDEsCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHggOiAke3h9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB5IDogJHt5 fSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc3N1cmUgOiAwCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgXQotICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9XX07CisgICAgICAgICAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICB9OwogCi0gICAgICAg ICAgICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFtKEpTT04uc3RyaW5naWZ5KGV2ZW50U3Ry ZWFtKSwgZnVuY3Rpb24oKSB7fSk7Ci0gICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLnVpU2Ny aXB0Q29tcGxldGUoKTsKKyAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3Ry ZWFtKEpTT04uc3RyaW5naWZ5KGV2ZW50U3RyZWFtKSwgKCkgPT4gdWlDb250cm9sbGVyLnVpU2Ny aXB0Q29tcGxldGUoKSk7CiAgICAgICAgICAgICB9KSgpO2AsIHJlc29sdmUpOwogICAgIH0pOwog fQpAQCAtMTI3LDQ0ICsxMjgsNDUgQEAgZnVuY3Rpb24gdG91Y2hBbmREcmFnRnJvbVBvaW50VG9Q b2ludChzdGFydFgsIHN0YXJ0WSwgZW5kWCwgZW5kWSkKICAgICByZXR1cm4gbmV3IFByb21pc2Uo cmVzb2x2ZSA9PiB7CiAgICAgICAgIHRlc3RSdW5uZXIucnVuVUlTY3JpcHQoYAogICAgICAgICAg ICAgKGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgdmFyIGV2ZW50U3RyZWFtID0gewotICAgICAg ICAgICAgZXZlbnRzIDogWwotICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAg aW50ZXJwb2xhdGUgOiAibGluZWFyIiwKLSAgICAgICAgICAgICAgICAgICAgdGltZXN0ZXA6IDAu MSwKLSAgICAgICAgICAgICAgICAgICAgY29vcmRpbmF0ZVNwYWNlIDogImNvbnRlbnQiLAotICAg ICAgICAgICAgICAgICAgICBzdGFydEV2ZW50IDogewotICAgICAgICAgICAgICAgICAgICAgICAg aW5wdXRUeXBlIDogImhhbmQiLAotICAgICAgICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6 IDAsCi0gICAgICAgICAgICAgICAgICAgICAgICB0b3VjaGVzIDogWwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRUeXBl IDogImZpbmdlciIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBoYXNlIDogImJl Z2FuIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWQgOiAxLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB4IDogJHtzdGFydFh9LAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB5IDogJHtzdGFydFl9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBwcmVzc3VyZSA6IDAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgICAgICAgICBdCi0gICAgICAgICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAg ICAgICAgIGVuZEV2ZW50IDogewotICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRUeXBlIDog ImhhbmQiLAotICAgICAgICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6IDAuNSwKLSAgICAg ICAgICAgICAgICAgICAgICAgIHRvdWNoZXMgOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiZmluZ2Vy IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAibW92ZWQiLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZCA6IDEsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHggOiAke2VuZFh9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB5IDogJHtlbmRZfSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc3N1cmUg OiAwCisgICAgICAgICAgICAgICAgY29uc3QgZXZlbnRTdHJlYW0gPSB7CisgICAgICAgICAgICAg ICAgICAgIGV2ZW50cyA6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnRlcnBvbGF0ZSA6ICJsaW5lYXIiLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHRpbWVzdGVwOiAwLjEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29vcmRpbmF0ZVNwYWNlIDogImNvbnRlbnQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg IHN0YXJ0RXZlbnQgOiB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0VHlw ZSA6ICJoYW5kIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6 IDAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRvdWNoZXMgOiBbCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW5wdXRUeXBlIDogImZpbmdlciIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAiYmVnYW4iLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGlkIDogMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB4IDogJHtzdGFydFh9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHkgOiAke3N0YXJ0WX0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcHJlc3N1cmUgOiAwCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVuZEV2ZW50IDog eworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiaGFuZCIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVPZmZzZXQgOiAwLjUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHRvdWNoZXMgOiBbCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW5wdXRUeXBlIDogImZpbmdlciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcGhhc2UgOiAibW92ZWQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlkIDogMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB4IDogJHtlbmRYfSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB5 IDogJHtlbmRZfSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVz c3VyZSA6IDAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0K LSAgICAgICAgICAgICAgICAgICAgICAgIF0KLSAgICAgICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgfV19OworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAg ICBdCisgICAgICAgICAgICAgICAgfTsKIAotICAgICAgICAgICAgdWlDb250cm9sbGVyLnNlbmRF dmVudFN0cmVhbShKU09OLnN0cmluZ2lmeShldmVudFN0cmVhbSksIGZ1bmN0aW9uKCkge30pOwot ICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCk7CisgICAgICAg ICAgICAgICAgdWlDb250cm9sbGVyLnNlbmRFdmVudFN0cmVhbShKU09OLnN0cmluZ2lmeShldmVu dFN0cmVhbSksICgpID0+IHVpQ29udHJvbGxlci51aVNjcmlwdENvbXBsZXRlKCkpOwogICAgICAg ICAgICAgfSkoKTtgLCByZXNvbHZlKTsKICAgICB9KTsKIH0KQEAgLTE3NCw0NCArMTc2LDQ1IEBA IGZ1bmN0aW9uIGhvbGRBdFBvaW50KHgsIHkpCiAgICAgcmV0dXJuIG5ldyBQcm9taXNlKHJlc29s dmUgPT4gewogICAgICAgICB0ZXN0UnVubmVyLnJ1blVJU2NyaXB0KGAKICAgICAgICAgICAgIChm dW5jdGlvbigpIHsKLSAgICAgICAgICAgIHZhciBldmVudFN0cmVhbSA9IHsKLSAgICAgICAgICAg IGV2ZW50cyA6IFsKLSAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIGludGVy cG9sYXRlIDogImxpbmVhciIsCi0gICAgICAgICAgICAgICAgICAgIHRpbWVzdGVwOiAwLjEsCi0g ICAgICAgICAgICAgICAgICAgIGNvb3JkaW5hdGVTcGFjZSA6ICJjb250ZW50IiwKLSAgICAgICAg ICAgICAgICAgICAgc3RhcnRFdmVudCA6IHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0 VHlwZSA6ICJoYW5kIiwKLSAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVPZmZzZXQgOiAwLAot ICAgICAgICAgICAgICAgICAgICAgICAgdG91Y2hlcyA6IFsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0VHlwZSA6ICJm aW5nZXIiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJtb3ZlZCIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlkIDogMSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgeCA6ICR7eH0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHkgOiAke3l9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzc3VyZSA6 IDAKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAg ICBdCi0gICAgICAgICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAgICAgICAgIGVuZEV2ZW50 IDogewotICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRUeXBlIDogImhhbmQiLAotICAgICAg ICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6IDUuMCwKLSAgICAgICAgICAgICAgICAgICAg ICAgIHRvdWNoZXMgOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgewotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiZmluZ2VyIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAibW92ZWQiLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZCA6IDEsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHgg OiAke3h9LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB5IDogJHt5fSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc3N1cmUgOiAwCisgICAgICAgICAgICAgICAg Y29uc3QgZXZlbnRTdHJlYW0gPSB7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50cyA6IFsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRl cnBvbGF0ZSA6ICJsaW5lYXIiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVzdGVw OiAwLjEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29vcmRpbmF0ZVNwYWNlIDogImNv bnRlbnQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0RXZlbnQgOiB7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0VHlwZSA6ICJoYW5kIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6IDAsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRvdWNoZXMgOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRU eXBlIDogImZpbmdlciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cGhhc2UgOiAibW92ZWQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGlkIDogMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4IDogJHt4 fSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB5IDogJHt5fSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzc3VyZSA6IDAKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZW5kRXZlbnQgOiB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlucHV0VHlwZSA6ICJoYW5kIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGltZU9mZnNldCA6IDUuMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdG91Y2hl cyA6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiZmluZ2VyIiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwaGFzZSA6ICJtb3ZlZCIsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWQgOiAxLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHggOiAke3h9LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHkgOiAke3l9LAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHByZXNzdXJlIDogMAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgXQotICAgICAgICAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICB9XX07CisgICAgICAgICAgICAgICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICB9OwogCi0gICAgICAgICAg ICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFtKEpTT04uc3RyaW5naWZ5KGV2ZW50U3RyZWFt KSwgZnVuY3Rpb24oKSB7fSk7Ci0gICAgICAgICAgICAgICAgdWlDb250cm9sbGVyLnVpU2NyaXB0 Q29tcGxldGUoKTsKKyAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFt KEpTT04uc3RyaW5naWZ5KGV2ZW50U3RyZWFtKSwgKCkgPT4gdWlDb250cm9sbGVyLnVpU2NyaXB0 Q29tcGxldGUoKSk7CiAgICAgICAgICAgICB9KSgpO2AsIHJlc29sdmUpOwogICAgIH0pOwogfQpA QCAtMjIxLDQ0ICsyMjQsNDUgQEAgZnVuY3Rpb24gY29udGludWVUb3VjaEFuZERyYWdGcm9tUG9p bnRUb1BvaW50KHN0YXJ0WCwgc3RhcnRZLCBlbmRYLCBlbmRZKQogICAgIHJldHVybiBuZXcgUHJv bWlzZShyZXNvbHZlID0+IHsKICAgICAgICAgdGVzdFJ1bm5lci5ydW5VSVNjcmlwdChgCiAgICAg ICAgICAgICAoZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgdmFyIGV2ZW50U3RyZWFtID0gewot ICAgICAgICAgICAgIGV2ZW50cyA6IFsKLSAgICAgICAgICAgICAgICAgICAgICAgewotICAgICAg ICAgICAgICAgICAgICAgICBpbnRlcnBvbGF0ZSA6ICJsaW5lYXIiLAotICAgICAgICAgICAgICAg ICAgICAgICB0aW1lc3RlcDogMC4xLAotICAgICAgICAgICAgICAgICAgICAgICBjb29yZGluYXRl U3BhY2UgOiAiY29udGVudCIsCi0gICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0RXZlbnQgOiB7 Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiaGFuZCIsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICB0aW1lT2Zmc2V0IDogMCwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRvdWNoZXMgOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgewotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiZmluZ2VyIiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAibW92ZWQiLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZCA6IDEsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHggOiAke3N0YXJ0WH0sCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHkgOiAke3N0YXJ0WX0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHByZXNzdXJlIDogMAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAg ICAgICAgICAgICAgICAgICAgICAgIF0KLSAgICAgICAgICAgICAgICAgICAgICAgfSwKLSAgICAg ICAgICAgICAgICAgICAgICAgZW5kRXZlbnQgOiB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnB1dFR5cGUgOiAiaGFuZCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lT2Zm c2V0IDogMC41LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgdG91Y2hlcyA6IFsKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGlucHV0VHlwZSA6ICJmaW5nZXIiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBwaGFzZSA6ICJtb3ZlZCIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlkIDogMSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeCA6ICR7ZW5k WH0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHkgOiAke2VuZFl9LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzc3VyZSA6IDAKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBdCi0gICAg ICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICB9XX07CisgICAgICAgICAgICAgICAg Y29uc3QgZXZlbnRTdHJlYW0gPSB7CisgICAgICAgICAgICAgICAgICAgIGV2ZW50cyA6IFsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRl cnBvbGF0ZSA6ICJsaW5lYXIiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVzdGVw OiAwLjEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29vcmRpbmF0ZVNwYWNlIDogImNv bnRlbnQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0RXZlbnQgOiB7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlucHV0VHlwZSA6ICJoYW5kIiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgdGltZU9mZnNldCA6IDAsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRvdWNoZXMgOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRU eXBlIDogImZpbmdlciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cGhhc2UgOiAibW92ZWQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGlkIDogMSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4IDogJHtz dGFydFh9LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHkgOiAke3N0 YXJ0WX0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc3N1cmUg OiAwCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGVuZEV2ZW50IDogeworICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnB1dFR5cGUgOiAiaGFuZCIsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRpbWVPZmZzZXQgOiAwLjUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRvdWNoZXMgOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5wdXRUeXBlIDogImZpbmdl ciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGhhc2UgOiAibW92 ZWQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlkIDogMSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4IDogJHtlbmRYfSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB5IDogJHtlbmRZfSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwcmVzc3VyZSA6IDAKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgICAgIH07CiAKLSAgICAg ICAgICAgICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFtKEpTT04uc3RyaW5naWZ5KGV2ZW50 U3RyZWFtKSwgZnVuY3Rpb24oKSB7fSk7Ci0gICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci51 aVNjcmlwdENvbXBsZXRlKCk7Ci0gICAgICAgICAgICAgfSkoKTtgLCByZXNvbHZlKTsKKyAgICAg ICAgICAgICAgICB1aUNvbnRyb2xsZXIuc2VuZEV2ZW50U3RyZWFtKEpTT04uc3RyaW5naWZ5KGV2 ZW50U3RyZWFtKSwgKCkgPT4gdWlDb250cm9sbGVyLnVpU2NyaXB0Q29tcGxldGUoKSk7CisgICAg ICAgICAgICB9KSgpO2AsIHJlc29sdmUpOwogICAgIH0pOwogfQo=