169905 2017-03-20 20:31:42 -0700 ComponentBase should enqueue itself to render when it becomes connected 2017-03-22 15:51:04 -0700 1 1 1 Unclassified WebKit Perf Dashboard Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez dewei_zhu kling koivisto rniwa oldest_to_newest 1289696 0 rniwa 2017-03-20 20:31:42 -0700 When a component becomes connected to a document, it should enqueue itself to render. 1289699 1 304985 rniwa 2017-03-20 20:41:39 -0700 Created attachment 304985 Improves ComponentBase 1290236 2 304985 rniwa 2017-03-22 15:50:59 -0700 Comment on attachment 304985 Improves ComponentBase Clearing flags on attachment: 304985 Committed r214280: <http://trac.webkit.org/changeset/214280> 1290237 3 rniwa 2017-03-22 15:51:04 -0700 All reviewed patches have been landed. Closing bug. 304985 2017-03-20 20:41:39 -0700 2017-03-22 15:50:59 -0700 Improves ComponentBase bug-169905-20170320204138.patch text/plain 23865 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjE0MjA2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBkZWYyMTQ0MjM5YzRiNDhhNGJiYzNmMWY4YTdiYWM3MjVmY2EzMWZmLi4wN2I2OTRhNGIz YzMzYTQzMjYzZWNlZTcxNDNkY2E0MmUzMzcxY2YzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSw0OCBAQAogMjAxNy0wMy0yMCAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAorICAgICAgICBDb21wb25lbnRCYXNlIHNob3VsZCBlbnF1ZXVlIGl0c2Vs ZiB0byByZW5kZXIgd2hlbiBpdCBiZWNvbWVzIGNvbm5lY3RlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5OTA1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhIGNvbXBvbmVudCBiZWNvbWVzIGNv bm5lY3RlZCB0byBhIGRvY3VtZW50LCBlbnF1ZXVlIGl0c2VsZiB0byByZW5kZXIgYXV0b21hdGlj YWxseS4KKyAgICAgICAgQWxzbyBhZGRlZCB0aGUgc3VwcG9ydCBmb3IgYm9vbGVhbiBhdHRyaWJ1 dGUgdG8gQ29tcG9uZW50QmFzZS5jcmVhdGVFbGVtZW50LgorCisgICAgICAgICogUmVhZE1lLm1k OiBBZGRlZCBhbiBpbnN0cnVjdGlvbiB0byByYWlzZSB0aGUgdXBsb2FkIGxpbWl0IHBlciByMjE0 MDY1LgorICAgICAgICAqIGJyb3dzZXItdGVzdHMvY29tcG9uZW50LWJhc2UtdGVzdHMuanM6IEFk ZGVkIHRlc3RzIGZvciB0aGUgbmV3IGJlaGF2aW9yIGFuZCBjcmVhdGVFbGVtZW50LiBBbHNvIG1v dmVkCisgICAgICAgIHRoZSB0ZXN0cyByZWxhdGVkIHRvIGVucXVldWVUb1JlbmRlck9uUmVzaXpl IG91dCBvZiBkZWZpbmVFbGVtZW50IHRlc3RzLgorCisgICAgICAgICogYnJvd3Nlci10ZXN0cy9p bmRleC5odG1sOgorICAgICAgICAoQnJvd3NpbmdDb250ZXh0LnByb3RvdHlwZS5jb25zdHJ1Y3Rv cik6IE92ZXJyaWRlIHJlcXVlc3RBbmltYXRpb25GcmFtZSBzbyB0aGF0IHRoZSBjYWxsYmFjayB3 b3VsZCBiZQorICAgICAgICBpbnZvbHZlZCBpbW1lZGlhdGVseSBkdXJpZ24gdGVzdGluZy4KKwor ICAgICAgICAqIHB1YmxpYy92My9jb21wb25lbnRzL2Jhc2UuanM6CisgICAgICAgIChDb21wb25l bnRCYXNlKTogRW5xdWV1ZSBpdHNlbGYgdG8gcmVuZGVyIGR1cmluZyBjb25zdHJ1Y3Rpb24gaWYg Y3VzdG9tIGVsZW1lbnRzIGlzIG5vdCBhdmFpbGFibGUuCisgICAgICAgIChDb21wb25lbnRCYXNl LmRlZmluZUVsZW1lbnQpOgorICAgICAgICAoQ29tcG9uZW50QmFzZS5kZWZpbmVFbGVtZW50LmVs ZW1lbnRDbGFzcy5wcm90b3R5cGUuY29ubmVjdGVkQ2FsbGJhY2spOiBFbnF1ZXVlIGl0c2VsZiB0 byByZW5kZXIgd2hlbgorICAgICAgICB0aGUgY29tcG9uZW50J3MgZWxlbWVudCBiZWNhbWUgY29u bmVjdGVkLgorICAgICAgICAoQ29tcG9uZW50QmFzZS5jcmVhdGVFbGVtZW50KTogVXNlIEFycmF5 LmlzQXJyYXkgaW5zdGVhZCBvZiBpbnN0YW5jZW9mIHRvIG1ha2UgaXQgd29yayB3aXRoIGFycmF5 cyBtYWRlCisgICAgICAgIGluIG90aGVyIHJlYWxtcyAoZ2xvYmFsIG9iamVjdHMpIGR1cmluZyB0 ZXN0aW5nLiBBZGRlZCB0aGUgc3VwcG9ydCBmb3IgYm9vbGVhbiBhdHRyaWJ1dGVzLiBTZXR0aW5n IGFuCisgICAgICAgIGF0dHJpYnV0ZSB2YWx1ZSB0byB0cnVlIHdvdWxkIHNldCB0aGUgYXR0cmli dXRlLCBhbmQgc2V0dGluZyBpdCB0byBmYWxzZSB3b3VsZCBub3Qgc2V0IHRoZSBhdHRyaWJ1dGUu CisgICAgICAgIChDb21wb25lbnRCYXNlLnVzZU5hdGl2ZUN1c3RvbUVsZW1lbnRzKTogQWRkZWQu IFRydWUgaWZmIHdpbmRvdy5jdXN0b21FbGVtZW50cyBpcyBkZWZpbmVkLgorCisgICAgICAgICog cHVibGljL3YzL2NvbXBvbmVudHMvY2hhcnQtcGFuZS1iYXNlLmpzOgorICAgICAgICAoQ2hhcnRQ YW5lQmFzZS5wcm90b3R5cGUucmVuZGVyKTogTm8gbG9uZ2VyIG5lZWQgdG8gY2FsbCBlbnF1ZXVl VG9SZW5kZXIgb24gdGhlIGNvbW1pdCBsb2cgdmlld2VyLgorCisgICAgICAgICogcHVibGljL3Yz L2NvbXBvbmVudHMvY29tbWl0LWxvZy12aWV3ZXIuanM6CisgICAgICAgIChDb21taXRMb2dWaWV3 ZXIucHJvdG90eXBlLnJlbmRlcik6IE5vIGxvbmdlciBuZWVkIHRvIGNhbGwgZW5xdWV1ZVRvUmVu ZGVyIG9uIHRoZSBzcGlubmVyIGljb24uCisKKyAgICAgICAgKiBwdWJsaWMvdjMvbW9kZWxzL3Rp bWUtc2VyaWVzLmpzOgorICAgICAgICAoVGltZVNlcmllcyk6IE1hZGUgdGhpcyBhIHByb3BlciBj bGFzcyBkZWNsYXJhdGlvbiBub3cgdGhhdCB3ZSBkb24ndCBpbmNsdWRlIGRhdGEuanMgYWZ0ZXIg cjIxMzMwMC4KKworICAgICAgICAqIHB1YmxpYy92My9wYWdlcy9jaGFydC1wYW5lLmpzOgorICAg ICAgICAoQ2hhcnRQYW5lLnByb3RvdHlwZS5fcmVuZGVyQWN0aW9uVG9vbGJhcik6IE5vIGxvbmdl ciBuZWVkIHRvIGNhbGwgZW5xdWV1ZVRvUmVuZGVyIG9uIHRoZSBjbG9zZSBpY29uLgorCisgICAg ICAgICogcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qczoKKyAgICAgICAgKFN1bW1hcnlQ YWdlLnByb3RvdHlwZS5fcmVuZGVyQ2VsbCk6IE5vIGxvbmdlciBuZWVkIHRvIGNhbGwgZW5xdWV1 ZVRvUmVuZGVyIG9uIHRoZSBzcGlubmVyIGljb24uCisKKzIwMTctMDMtMjAgIFJ5b3N1a2UgTml3 YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKICAgICAgICAgRGVsZXRlIGFub3RoZXIgZnVuY3Rpb24g dGhhdCB3YXMgc3VwcG9zZWQgdG8gYmUgcmVtb3ZlZCBpbiB0aGUgcHJldmlvdXMgY29tbWl0Lgog CiAgICAgICAgICogcHVibGljL3YzL21vZGVscy9idWlsZC1yZXF1ZXN0LmpzOgpkaWZmIC0tZ2l0 IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL1JlYWRNZS5tZCBiL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9SZWFkTWUubWQKaW5kZXggOGYyMTQxMGIzNjViNjQxMDQxZTBiZGQ3ZGJlYzQyMTRm ODBiMmY0YS4uNmNmYzBlMzhmZWQwZjVkNjNmMDg3ZDY5NTlhZDI2ODgzYTAwMzY3NiAxMDA2NDQK LS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL1JlYWRNZS5tZAorKysgYi9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvUmVhZE1lLm1kCkBAIC04NCw2ICs4NCwxMyBAQCBUaGUgYXBhY2hlIGxv Z3MgYXJlIGxvY2F0ZWQgYXQgYC9wcml2YXRlL3Zhci9sb2cvYXBhY2hlMmAuCiAgICAgICAgIE9w dGlvbnMgSW5kZXhlcyBNdWx0aVZpZXdzCiAgICAgICAgIHBocF9mbGFnIHpsaWIub3V0cHV0X2Nv bXByZXNzaW9uIG9uCiAKKyA0LiBJbmNyZWFzZSB0aGUgbWF4aW11bSB1cGxvYWQgc2l6ZSBhcyBu ZWVkZWQgZm9yIGFjY2VwdGluZyBjdXN0b20gcm9vdHM6CisKKyAgICAgICAgPElmTW9kdWxlIHBo cDVfbW9kdWxlPgorICAgICAgICBwaHBfdmFsdWUgdXBsb2FkX21heF9maWxlc2l6ZSAxMDBNCisg ICAgICAgIHBocF92YWx1ZSBwb3N0X21heF9zaXplIDEwME0KKyAgICAgICAgPC9JZk1vZHVsZT4K KwogIyMjIFByb3RlY3RpbmcgdGhlIEFkbWluaXN0cmF0aXZlIFBhZ2VzIHRvIFByZXZlbnQgRXhl Y3V0aW9uIG9mIEFyYml0cmFyeSBDb2RlCiAKIEJ5IGRlZmF1bHQsIHRoZSBhcHBsaWNhdGlvbiBn aXZlcyB0aGUgYWRtaW5pc3RyYXRpdmUgcHJpdmlsZWdlIHRvIGV2ZXJ5b25lLiBBbnlvbmUgY2Fu IGFkZCwgcmVtb3ZlLCBvciBlZGl0IHRlc3RzLApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL2Jyb3dzZXItdGVzdHMvY29tcG9uZW50LWJhc2UtdGVzdHMuanMgYi9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvYnJvd3Nlci10ZXN0cy9jb21wb25lbnQtYmFzZS10ZXN0cy5qcwpp bmRleCA4NmMwM2UyNGJiZTllZGVjZDhmMWMyYWZiNjk1MTkyNmYwN2Y5MWYwLi4wMGM3YTI4MTA1 Y2EwOGQyYzU0ZDg0Mzg0Y2Y5Y2U0ZThlM2RkM2FjIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvYnJvd3Nlci10ZXN0cy9jb21wb25lbnQtYmFzZS10ZXN0cy5qcworKysgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvYnJvd3Nlci10ZXN0cy9jb21wb25lbnQtYmFzZS10ZXN0 cy5qcwpAQCAtMTgsNiArMTgsNzggQEAgZGVzY3JpYmUoJ0NvbXBvbmVudEJhc2UnLCBmdW5jdGlv bigpIHsKICAgICAgICAgfSk7CiAgICAgfQogCisgICAgaXQoJ211c3QgZW5xdWV1ZSBhIGNvbm5l Y3RlZCBjb21wb25lbnQgdG8gcmVuZGVyJywgKCkgPT4geworICAgICAgICBjb25zdCBjb250ZXh0 ID0gbmV3IEJyb3dzaW5nQ29udGV4dCgpOworICAgICAgICByZXR1cm4gY29udGV4dC5pbXBvcnRT Y3JpcHRzKFsnaW5zdHJ1bWVudGF0aW9uLmpzJywgJ2NvbXBvbmVudHMvYmFzZS5qcyddLCAnQ29t cG9uZW50QmFzZScpLnRoZW4oKENvbXBvbmVudEJhc2UpID0+IHsKKyAgICAgICAgICAgIGxldCBy ZW5kZXJDYWxsID0gMDsKKyAgICAgICAgICAgIGNsYXNzIFNvbWVDb21wb25lbnQgZXh0ZW5kcyBD b21wb25lbnRCYXNlIHsKKyAgICAgICAgICAgICAgICByZW5kZXIoKSB7IHJlbmRlckNhbGwrKzsg fQorICAgICAgICAgICAgfQorICAgICAgICAgICAgQ29tcG9uZW50QmFzZS5kZWZpbmVFbGVtZW50 KCdzb21lLWNvbXBvbmVudCcsIFNvbWVDb21wb25lbnQpOworCisgICAgICAgICAgICBsZXQgcmVx dWVzdEFuaW1hdGlvbkZyYW1lQ291bnQgPSAwOworICAgICAgICAgICAgbGV0IGNhbGxiYWNrID0g bnVsbDsKKyAgICAgICAgICAgIGNvbnRleHQuZ2xvYmFsLnJlcXVlc3RBbmltYXRpb25GcmFtZSA9 IChuZXdDYWxsYmFjaykgPT4geworICAgICAgICAgICAgICAgIGNhbGxiYWNrID0gbmV3Q2FsbGJh Y2s7CisgICAgICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lQ291bnQrKzsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgZXhwZWN0KHJlcXVlc3RBbmltYXRpb25GcmFtZUNvdW50 KS50by5iZSgwKTsKKyAgICAgICAgICAgIGNvbnN0IGluc3RhbmNlID0gbmV3IFNvbWVDb21wb25l bnQ7CisgICAgICAgICAgICBjb250ZXh0LmRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaW5zdGFu Y2UuZWxlbWVudCgpKTsKKyAgICAgICAgICAgIGV4cGVjdChyZXF1ZXN0QW5pbWF0aW9uRnJhbWVD b3VudCkudG8uYmUoMSk7CisgICAgICAgICAgICBjYWxsYmFjaygpOworICAgICAgICAgICAgZXhw ZWN0KHJlbmRlckNhbGwpLnRvLmJlKDEpOworICAgICAgICAgICAgZXhwZWN0KHJlcXVlc3RBbmlt YXRpb25GcmFtZUNvdW50KS50by5iZSgxKTsKKyAgICAgICAgfSk7CisgICAgfSk7CisKKyAgICBp dCgnbXVzdCBlbnF1ZXVlIGEgY29ubmVjdGVkIGNvbXBvbmVudCB0byByZW5kZXIgdXBvbiBhIHJl c2l6ZSBldmVudCBpZiBlbnF1ZXVlVG9SZW5kZXJPblJlc2l6ZSBpcyB0cnVlJywgKCkgPT4gewor ICAgICAgICBjb25zdCBjb250ZXh0ID0gbmV3IEJyb3dzaW5nQ29udGV4dCgpOworICAgICAgICBy ZXR1cm4gY29udGV4dC5pbXBvcnRTY3JpcHRzKFsnaW5zdHJ1bWVudGF0aW9uLmpzJywgJ2NvbXBv bmVudHMvYmFzZS5qcyddLCAnQ29tcG9uZW50QmFzZScpLnRoZW4oKENvbXBvbmVudEJhc2UpID0+ IHsKKyAgICAgICAgICAgIGNsYXNzIFNvbWVDb21wb25lbnQgZXh0ZW5kcyBDb21wb25lbnRCYXNl IHsKKyAgICAgICAgICAgICAgICBzdGF0aWMgZ2V0IGVucXVldWVUb1JlbmRlck9uUmVzaXplKCkg eyByZXR1cm4gdHJ1ZTsgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgQ29tcG9uZW50QmFz ZS5kZWZpbmVFbGVtZW50KCdzb21lLWNvbXBvbmVudCcsIFNvbWVDb21wb25lbnQpOworCisgICAg ICAgICAgICBsZXQgcmVxdWVzdEFuaW1hdGlvbkZyYW1lQ291bnQgPSAwOworICAgICAgICAgICAg bGV0IGNhbGxiYWNrID0gbnVsbDsKKyAgICAgICAgICAgIGNvbnRleHQuZ2xvYmFsLnJlcXVlc3RB bmltYXRpb25GcmFtZSA9IChuZXdDYWxsYmFjaykgPT4geworICAgICAgICAgICAgICAgIGNhbGxi YWNrID0gbmV3Q2FsbGJhY2s7CisgICAgICAgICAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1l Q291bnQrKzsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZXhwZWN0KHJlcXVlc3RBbmlt YXRpb25GcmFtZUNvdW50KS50by5iZSgwKTsKKyAgICAgICAgICAgIGNvbnN0IGluc3RhbmNlID0g bmV3IFNvbWVDb21wb25lbnQ7CisgICAgICAgICAgICBjb250ZXh0Lmdsb2JhbC5kaXNwYXRjaEV2 ZW50KG5ldyBFdmVudCgncmVzaXplJykpOworICAgICAgICAgICAgY29udGV4dC5kb2N1bWVudC5i b2R5LmFwcGVuZENoaWxkKGluc3RhbmNlLmVsZW1lbnQoKSk7CisgICAgICAgICAgICBjb250ZXh0 Lmdsb2JhbC5kaXNwYXRjaEV2ZW50KG5ldyBFdmVudCgncmVzaXplJykpOworICAgICAgICAgICAg ZXhwZWN0KHJlcXVlc3RBbmltYXRpb25GcmFtZUNvdW50KS50by5iZSgxKTsKKyAgICAgICAgfSk7 CisgICAgfSk7CisKKyAgICBpdCgnbXVzdCBub3QgZW5xdWV1ZSBhIGRpc2Nvbm5lY3RlZCBjb21w b25lbnQgdG8gcmVuZGVyIHVwb24gYSByZXNpemUgZXZlbnQgaWYgZW5xdWV1ZVRvUmVuZGVyT25S ZXNpemUgaXMgdHJ1ZScsICgpID0+IHsKKyAgICAgICAgY29uc3QgY29udGV4dCA9IG5ldyBCcm93 c2luZ0NvbnRleHQoKTsKKyAgICAgICAgcmV0dXJuIGNvbnRleHQuaW1wb3J0U2NyaXB0cyhbJ2lu c3RydW1lbnRhdGlvbi5qcycsICdjb21wb25lbnRzL2Jhc2UuanMnXSwgJ0NvbXBvbmVudEJhc2Un KS50aGVuKChDb21wb25lbnRCYXNlKSA9PiB7CisgICAgICAgICAgICBjbGFzcyBTb21lQ29tcG9u ZW50IGV4dGVuZHMgQ29tcG9uZW50QmFzZSB7CisgICAgICAgICAgICAgICAgc3RhdGljIGdldCBl bnF1ZXVlVG9SZW5kZXJPblJlc2l6ZSgpIHsgcmV0dXJuIHRydWU7IH0KKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIENvbXBvbmVudEJhc2UuZGVmaW5lRWxlbWVudCgnc29tZS1jb21wb25lbnQn LCBTb21lQ29tcG9uZW50KTsKKworICAgICAgICAgICAgbGV0IHJlcXVlc3RBbmltYXRpb25GcmFt ZUNvdW50ID0gMDsKKyAgICAgICAgICAgIGxldCBjYWxsYmFjayA9IG51bGw7CisgICAgICAgICAg ICBjb250ZXh0Lmdsb2JhbC5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUgPSAobmV3Q2FsbGJhY2spID0+ IHsKKyAgICAgICAgICAgICAgICBjYWxsYmFjayA9IG5ld0NhbGxiYWNrOworICAgICAgICAgICAg ICAgIHJlcXVlc3RBbmltYXRpb25GcmFtZUNvdW50Kys7CisgICAgICAgICAgICB9CisKKyAgICAg ICAgICAgIGNvbnN0IGluc3RhbmNlID0gbmV3IFNvbWVDb21wb25lbnQ7CisgICAgICAgICAgICBl eHBlY3QocmVxdWVzdEFuaW1hdGlvbkZyYW1lQ291bnQpLnRvLmJlKDApOworICAgICAgICAgICAg Y29udGV4dC5nbG9iYWwuZGlzcGF0Y2hFdmVudChuZXcgRXZlbnQoJ3Jlc2l6ZScpKTsKKyAgICAg ICAgICAgIGV4cGVjdChyZXF1ZXN0QW5pbWF0aW9uRnJhbWVDb3VudCkudG8uYmUoMCk7CisgICAg ICAgIH0pOworICAgIH0pOworCiAgICAgZGVzY3JpYmUoJ2NvbnN0cnVjdG9yJywgKCkgPT4gewog ICAgICAgICBpdCgnaXMgYSBmdW5jdGlvbicsICgpID0+IHsKICAgICAgICAgICAgIHJldHVybiBu ZXcgQnJvd3NpbmdDb250ZXh0KCkuaW1wb3J0U2NyaXB0KCdjb21wb25lbnRzL2Jhc2UuanMnLCAn Q29tcG9uZW50QmFzZScpLnRoZW4oKENvbXBvbmVudEJhc2UpID0+IHsKQEAgLTQwNiw2ICs0Nzgs MTIxIEBAIGRlc2NyaWJlKCdDb21wb25lbnRCYXNlJywgZnVuY3Rpb24oKSB7CiAgICAgICAgIH0p OwogICAgIH0pOwogCisgICAgZGVzY3JpYmUoJ2NyZWF0ZUVsZW1lbnQoKScsICgpID0+IHsKKwor ICAgICAgICBpdCgnc2hvdWxkIGNyZWF0ZSBhbiBlbGVtZW50IG9mIHRoZSBzcGVjaWZpZWQgbmFt ZScsICgpID0+IHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBuZXcgQnJvd3NpbmdDb250 ZXh0KCk7CisgICAgICAgICAgICByZXR1cm4gY29udGV4dC5pbXBvcnRTY3JpcHQoJ2NvbXBvbmVu dHMvYmFzZS5qcycsICdDb21wb25lbnRCYXNlJykudGhlbigoQ29tcG9uZW50QmFzZSkgPT4gewor ICAgICAgICAgICAgICAgIGNvbnN0IGRpdiA9IENvbXBvbmVudEJhc2UuY3JlYXRlRWxlbWVudCgn ZGl2Jyk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdikudG8uYmUuYShjb250ZXh0Lmdsb2Jh bC5IVE1MRGl2RWxlbWVudCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CisKKyAgICAg ICAgaXQoJ3Nob3VsZCBjcmVhdGUgYW4gZWxlbWVudCB3aXRoIHRoZSBzcGVjaWZpZWQgYXR0cmli dXRlcycsICgpID0+IHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRleHQgPSBuZXcgQnJvd3NpbmdD b250ZXh0KCk7CisgICAgICAgICAgICByZXR1cm4gY29udGV4dC5pbXBvcnRTY3JpcHQoJ2NvbXBv bmVudHMvYmFzZS5qcycsICdDb21wb25lbnRCYXNlJykudGhlbigoQ29tcG9uZW50QmFzZSkgPT4g eworICAgICAgICAgICAgICAgIGNvbnN0IGlucHV0ID0gQ29tcG9uZW50QmFzZS5jcmVhdGVFbGVt ZW50KCdpbnB1dCcsIHsndGl0bGUnOiAnaGknLCAnaWQnOiAnZm9vJywgJ3JlcXVpcmVkJzogZmFs c2UsICdjaGVja2VkJzogdHJ1ZX0pOworICAgICAgICAgICAgICAgIGV4cGVjdChpbnB1dCkudG8u YmUuYShjb250ZXh0Lmdsb2JhbC5IVE1MSW5wdXRFbGVtZW50KTsKKyAgICAgICAgICAgICAgICBl eHBlY3QoaW5wdXQuYXR0cmlidXRlcy5sZW5ndGgpLnRvLmJlKDMpOworICAgICAgICAgICAgICAg IGV4cGVjdChpbnB1dC5hdHRyaWJ1dGVzWzBdLmxvY2FsTmFtZSkudG8uYmUoJ3RpdGxlJyk7Cisg ICAgICAgICAgICAgICAgZXhwZWN0KGlucHV0LmF0dHJpYnV0ZXNbMF0udmFsdWUpLnRvLmJlKCdo aScpOworICAgICAgICAgICAgICAgIGV4cGVjdChpbnB1dC5hdHRyaWJ1dGVzWzFdLmxvY2FsTmFt ZSkudG8uYmUoJ2lkJyk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGlucHV0LmF0dHJpYnV0ZXNb MV0udmFsdWUpLnRvLmJlKCdmb28nKTsKKyAgICAgICAgICAgICAgICBleHBlY3QoaW5wdXQuYXR0 cmlidXRlc1syXS5sb2NhbE5hbWUpLnRvLmJlKCdjaGVja2VkJyk7CisgICAgICAgICAgICAgICAg ZXhwZWN0KGlucHV0LmF0dHJpYnV0ZXNbMl0udmFsdWUpLnRvLmJlKCdjaGVja2VkJyk7CisgICAg ICAgICAgICB9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQoJ3Nob3VsZCBjcmVhdGUgYW4g ZWxlbWVudCB3aXRoIHRoZSBzcGVjaWZpZWQgZXZlbnQgaGFuZGxlcnMgYW5kIGF0dHJpYnV0ZXMn LCAoKSA9PiB7CisgICAgICAgICAgICBjb25zdCBjb250ZXh0ID0gbmV3IEJyb3dzaW5nQ29udGV4 dCgpOworICAgICAgICAgICAgcmV0dXJuIGNvbnRleHQuaW1wb3J0U2NyaXB0KCdjb21wb25lbnRz L2Jhc2UuanMnLCAnQ29tcG9uZW50QmFzZScpLnRoZW4oKENvbXBvbmVudEJhc2UpID0+IHsKKyAg ICAgICAgICAgICAgICBsZXQgY2xpY2tDb3VudCA9IDA7CisgICAgICAgICAgICAgICAgY29uc3Qg ZGl2ID0gQ29tcG9uZW50QmFzZS5jcmVhdGVFbGVtZW50KCdkaXYnLCB7J3RpdGxlJzogJ2hpJywg J29uY2xpY2snOiAoKSA9PiBjbGlja0NvdW50Kyt9KTsKKyAgICAgICAgICAgICAgICBleHBlY3Qo ZGl2KS50by5iZS5hKGNvbnRleHQuZ2xvYmFsLkhUTUxEaXZFbGVtZW50KTsKKyAgICAgICAgICAg ICAgICBleHBlY3QoZGl2LmF0dHJpYnV0ZXMubGVuZ3RoKS50by5iZSgxKTsKKyAgICAgICAgICAg ICAgICBleHBlY3QoZGl2LmF0dHJpYnV0ZXNbMF0ubG9jYWxOYW1lKS50by5iZSgndGl0bGUnKTsK KyAgICAgICAgICAgICAgICBleHBlY3QoZGl2LmF0dHJpYnV0ZXNbMF0udmFsdWUpLnRvLmJlKCdo aScpOworICAgICAgICAgICAgICAgIGV4cGVjdChjbGlja0NvdW50KS50by5iZSgwKTsKKyAgICAg ICAgICAgICAgICBkaXYuY2xpY2soKTsKKyAgICAgICAgICAgICAgICBleHBlY3QoY2xpY2tDb3Vu dCkudG8uYmUoMSk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQo J3Nob3VsZCBjcmVhdGUgYW4gZWxlbWVudCB3aXRoIHRoZSBzcGVjaWZpZWQgY2hpbGRyZW4gd2hl biB0aGVyZSBpcyBubyBhdHRyaWJ1dGUgc3BlY2lmaWVkJywgKCkgPT4geworICAgICAgICAgICAg Y29uc3QgY29udGV4dCA9IG5ldyBCcm93c2luZ0NvbnRleHQoKTsKKyAgICAgICAgICAgIHJldHVy biBjb250ZXh0LmltcG9ydFNjcmlwdCgnY29tcG9uZW50cy9iYXNlLmpzJywgJ0NvbXBvbmVudEJh c2UnKS50aGVuKChDb21wb25lbnRCYXNlKSA9PiB7CisgICAgICAgICAgICAgICAgY29uc3QgZWxl bWVudCA9IENvbXBvbmVudEJhc2UuY3JlYXRlRWxlbWVudDsKKyAgICAgICAgICAgICAgICBjb25z dCBzcGFuID0gZWxlbWVudCgnc3BhbicpOworICAgICAgICAgICAgICAgIGNvbnN0IGRpdiA9IGVs ZW1lbnQoJ2RpdicsIFtzcGFuLCAnaGknXSk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdiku dG8uYmUuYShjb250ZXh0Lmdsb2JhbC5IVE1MRGl2RWxlbWVudCk7CisgICAgICAgICAgICAgICAg ZXhwZWN0KGRpdi5hdHRyaWJ1dGVzLmxlbmd0aCkudG8uYmUoMCk7CisgICAgICAgICAgICAgICAg ZXhwZWN0KGRpdi5jaGlsZE5vZGVzLmxlbmd0aCkudG8uYmUoMik7CisgICAgICAgICAgICAgICAg ZXhwZWN0KGRpdi5jaGlsZE5vZGVzWzBdKS50by5iZShzcGFuKTsKKyAgICAgICAgICAgICAgICBl eHBlY3QoZGl2LmNoaWxkTm9kZXNbMV0pLnRvLmJlLmEoY29udGV4dC5nbG9iYWwuVGV4dCk7Cisg ICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVzWzFdLmRhdGEpLnRvLmJlKCdoaScp OworICAgICAgICAgICAgfSk7CisgICAgICAgIH0pOworCisgICAgICAgIGl0KCdzaG91bGQgY3Jl YXRlIGFuIGVsZW1lbnQgd2l0aCB0aGUgc3BlY2lmaWVkIGNoaWxkcmVuIHdoZW4gdGhlIHNlY29u ZCBhcmd1bWVudCBpcyBhIHNwYW4nLCAoKSA9PiB7CisgICAgICAgICAgICBjb25zdCBjb250ZXh0 ID0gbmV3IEJyb3dzaW5nQ29udGV4dCgpOworICAgICAgICAgICAgcmV0dXJuIGNvbnRleHQuaW1w b3J0U2NyaXB0KCdjb21wb25lbnRzL2Jhc2UuanMnLCAnQ29tcG9uZW50QmFzZScpLnRoZW4oKENv bXBvbmVudEJhc2UpID0+IHsKKyAgICAgICAgICAgICAgICBjb25zdCBlbGVtZW50ID0gQ29tcG9u ZW50QmFzZS5jcmVhdGVFbGVtZW50OworICAgICAgICAgICAgICAgIGNvbnN0IHNwYW4gPSBlbGVt ZW50KCdzcGFuJyk7CisgICAgICAgICAgICAgICAgY29uc3QgZGl2ID0gZWxlbWVudCgnZGl2Jywg c3Bhbik7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdikudG8uYmUuYShjb250ZXh0Lmdsb2Jh bC5IVE1MRGl2RWxlbWVudCk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5hdHRyaWJ1dGVz Lmxlbmd0aCkudG8uYmUoMCk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVz Lmxlbmd0aCkudG8uYmUoMSk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVz WzBdKS50by5iZShzcGFuKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKworICAgICAg ICBpdCgnc2hvdWxkIGNyZWF0ZSBhbiBlbGVtZW50IHdpdGggdGhlIHNwZWNpZmllZCBjaGlsZHJl biB3aGVuIHRoZSBzZWNvbmQgYXJndW1lbnQgaXMgYSBUZXh0IG5vZGUnLCAoKSA9PiB7CisgICAg ICAgICAgICBjb25zdCBjb250ZXh0ID0gbmV3IEJyb3dzaW5nQ29udGV4dCgpOworICAgICAgICAg ICAgcmV0dXJuIGNvbnRleHQuaW1wb3J0U2NyaXB0KCdjb21wb25lbnRzL2Jhc2UuanMnLCAnQ29t cG9uZW50QmFzZScpLnRoZW4oKENvbXBvbmVudEJhc2UpID0+IHsKKyAgICAgICAgICAgICAgICBj b25zdCBlbGVtZW50ID0gQ29tcG9uZW50QmFzZS5jcmVhdGVFbGVtZW50OworICAgICAgICAgICAg ICAgIGNvbnN0IHRleHQgPSBjb250ZXh0LmRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCdoaScpOwor ICAgICAgICAgICAgICAgIGNvbnN0IGRpdiA9IGVsZW1lbnQoJ2RpdicsIHRleHQpOworICAgICAg ICAgICAgICAgIGV4cGVjdChkaXYpLnRvLmJlLmEoY29udGV4dC5nbG9iYWwuSFRNTERpdkVsZW1l bnQpOworICAgICAgICAgICAgICAgIGV4cGVjdChkaXYuYXR0cmlidXRlcy5sZW5ndGgpLnRvLmJl KDApOworICAgICAgICAgICAgICAgIGV4cGVjdChkaXYuY2hpbGROb2Rlcy5sZW5ndGgpLnRvLmJl KDEpOworICAgICAgICAgICAgICAgIGV4cGVjdChkaXYuY2hpbGROb2Rlc1swXSkudG8uYmUodGV4 dCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQoJ3Nob3VsZCBj cmVhdGUgYW4gZWxlbWVudCB3aXRoIHRoZSBzcGVjaWZpZWQgY2hpbGRyZW4gd2hlbiB0aGUgc2Vj b25kIGFyZ3VtZW50IGlzIGEgY29tcG9uZW50JywgKCkgPT4geworICAgICAgICAgICAgY29uc3Qg Y29udGV4dCA9IG5ldyBCcm93c2luZ0NvbnRleHQoKTsKKyAgICAgICAgICAgIHJldHVybiBjb250 ZXh0LmltcG9ydFNjcmlwdCgnY29tcG9uZW50cy9iYXNlLmpzJywgJ0NvbXBvbmVudEJhc2UnKS50 aGVuKChDb21wb25lbnRCYXNlKSA9PiB7CisgICAgICAgICAgICAgICAgY2xhc3MgU29tZUNvbXBv bmVudCBleHRlbmRzIENvbXBvbmVudEJhc2UgeyB9OworICAgICAgICAgICAgICAgIENvbXBvbmVu dEJhc2UuZGVmaW5lRWxlbWVudCgnc29tZS1jb21wb25lbnQnLCBTb21lQ29tcG9uZW50KTsKKyAg ICAgICAgICAgICAgICBjb25zdCBlbGVtZW50ID0gQ29tcG9uZW50QmFzZS5jcmVhdGVFbGVtZW50 OworICAgICAgICAgICAgICAgIGNvbnN0IGNvbXBvbmVudCA9IG5ldyBTb21lQ29tcG9uZW50Owor ICAgICAgICAgICAgICAgIGNvbnN0IGRpdiA9IGVsZW1lbnQoJ2RpdicsIGNvbXBvbmVudCk7Cisg ICAgICAgICAgICAgICAgZXhwZWN0KGRpdikudG8uYmUuYShjb250ZXh0Lmdsb2JhbC5IVE1MRGl2 RWxlbWVudCk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5hdHRyaWJ1dGVzLmxlbmd0aCku dG8uYmUoMCk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVzLmxlbmd0aCku dG8uYmUoMSk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVzWzBdKS50by5i ZShjb21wb25lbnQuZWxlbWVudCgpKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9KTsKKwor ICAgICAgICBpdCgnc2hvdWxkIGNyZWF0ZSBhbiBlbGVtZW50IHdpdGggdGhlIHNwZWNpZmllZCBh dHRyaWJ1dGVzIGFuZCBjaGlsZHJlbicsICgpID0+IHsKKyAgICAgICAgICAgIGNvbnN0IGNvbnRl eHQgPSBuZXcgQnJvd3NpbmdDb250ZXh0KCk7CisgICAgICAgICAgICByZXR1cm4gY29udGV4dC5p bXBvcnRTY3JpcHQoJ2NvbXBvbmVudHMvYmFzZS5qcycsICdDb21wb25lbnRCYXNlJykudGhlbigo Q29tcG9uZW50QmFzZSkgPT4geworICAgICAgICAgICAgICAgIGNvbnN0IGVsZW1lbnQgPSBDb21w b25lbnRCYXNlLmNyZWF0ZUVsZW1lbnQ7CisgICAgICAgICAgICAgICAgY29uc3Qgc3BhbiA9IGVs ZW1lbnQoJ3NwYW4nKTsKKyAgICAgICAgICAgICAgICBjb25zdCBkaXYgPSBlbGVtZW50KCdkaXYn LCB7J2xhbmcnOiAnZW4nfSwgW3NwYW4sICdoaSddKTsKKyAgICAgICAgICAgICAgICBleHBlY3Qo ZGl2KS50by5iZS5hKGNvbnRleHQuZ2xvYmFsLkhUTUxEaXZFbGVtZW50KTsKKyAgICAgICAgICAg ICAgICBleHBlY3QoZGl2LmF0dHJpYnV0ZXMubGVuZ3RoKS50by5iZSgxKTsKKyAgICAgICAgICAg ICAgICBleHBlY3QoZGl2LmF0dHJpYnV0ZXNbMF0ubG9jYWxOYW1lKS50by5iZSgnbGFuZycpOwor ICAgICAgICAgICAgICAgIGV4cGVjdChkaXYuYXR0cmlidXRlc1swXS52YWx1ZSkudG8uYmUoJ2Vu Jyk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVzLmxlbmd0aCkudG8uYmUo Mik7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVzWzBdKS50by5iZShzcGFu KTsKKyAgICAgICAgICAgICAgICBleHBlY3QoZGl2LmNoaWxkTm9kZXNbMV0pLnRvLmJlLmEoY29u dGV4dC5nbG9iYWwuVGV4dCk7CisgICAgICAgICAgICAgICAgZXhwZWN0KGRpdi5jaGlsZE5vZGVz WzFdLmRhdGEpLnRvLmJlKCdoaScpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0pOworCisg ICAgfSk7CisKICAgICBkZXNjcmliZSgnZGVmaW5lRWxlbWVudCgpJywgKCkgPT4gewogCiAgICAg ICAgIGl0KCdtdXN0IGRlZmluZSBhIGN1c3RvbSBlbGVtZW50IHdpdGggYSBjbGFzcyBvZiBhbiBh cHByb3ByaWF0ZSBuYW1lJywgKCkgPT4gewpAQCAtNDY2LDUyICs2NTMsNiBAQCBkZXNjcmliZSgn Q29tcG9uZW50QmFzZScsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0p OwogCi0gICAgICAgIGl0KCdtdXN0IGVucXVldWUgYSBjb25uZWN0ZWQgY29tcG9uZW50IHRvIHJl bmRlciB1cG9uIGEgcmVzaXplIGV2ZW50IGlmIGVucXVldWVUb1JlbmRlck9uUmVzaXplIGlzIHRy dWUnLCAoKSA9PiB7Ci0gICAgICAgICAgICBjb25zdCBjb250ZXh0ID0gbmV3IEJyb3dzaW5nQ29u dGV4dCgpOwotICAgICAgICAgICAgcmV0dXJuIGNvbnRleHQuaW1wb3J0U2NyaXB0cyhbJ2luc3Ry dW1lbnRhdGlvbi5qcycsICdjb21wb25lbnRzL2Jhc2UuanMnXSwgJ0NvbXBvbmVudEJhc2UnKS50 aGVuKChDb21wb25lbnRCYXNlKSA9PiB7Ci0gICAgICAgICAgICAgICAgY2xhc3MgU29tZUNvbXBv bmVudCBleHRlbmRzIENvbXBvbmVudEJhc2UgewotICAgICAgICAgICAgICAgICAgICBzdGF0aWMg Z2V0IGVucXVldWVUb1JlbmRlck9uUmVzaXplKCkgeyByZXR1cm4gdHJ1ZTsgfQotICAgICAgICAg ICAgICAgIH0KLSAgICAgICAgICAgICAgICBDb21wb25lbnRCYXNlLmRlZmluZUVsZW1lbnQoJ3Nv bWUtY29tcG9uZW50JywgU29tZUNvbXBvbmVudCk7Ci0KLSAgICAgICAgICAgICAgICBsZXQgcmVx dWVzdEFuaW1hdGlvbkZyYW1lQ291bnQgPSAwOwotICAgICAgICAgICAgICAgIGxldCBjYWxsYmFj ayA9IG51bGw7Ci0gICAgICAgICAgICAgICAgY29udGV4dC5nbG9iYWwucmVxdWVzdEFuaW1hdGlv bkZyYW1lID0gKG5ld0NhbGxiYWNrKSA9PiB7Ci0gICAgICAgICAgICAgICAgICAgIGNhbGxiYWNr ID0gbmV3Q2FsbGJhY2s7Ci0gICAgICAgICAgICAgICAgICAgIHJlcXVlc3RBbmltYXRpb25GcmFt ZUNvdW50Kys7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAgZXhwZWN0KHJl cXVlc3RBbmltYXRpb25GcmFtZUNvdW50KS50by5iZSgwKTsKLSAgICAgICAgICAgICAgICBjb25z dCBpbnN0YW5jZSA9IG5ldyBTb21lQ29tcG9uZW50OwotICAgICAgICAgICAgICAgIGNvbnRleHQu Z2xvYmFsLmRpc3BhdGNoRXZlbnQobmV3IEV2ZW50KCdyZXNpemUnKSk7Ci0gICAgICAgICAgICAg ICAgY29udGV4dC5kb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGluc3RhbmNlLmVsZW1lbnQoKSk7 Ci0gICAgICAgICAgICAgICAgY29udGV4dC5nbG9iYWwuZGlzcGF0Y2hFdmVudChuZXcgRXZlbnQo J3Jlc2l6ZScpKTsKLSAgICAgICAgICAgICAgICBleHBlY3QocmVxdWVzdEFuaW1hdGlvbkZyYW1l Q291bnQpLnRvLmJlKDEpOwotICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0pOwotCi0gICAgICAg IGl0KCdtdXN0IG5vdCBlbnF1ZXVlIGEgZGlzY29ubmVjdGVkIGNvbXBvbmVudCB0byByZW5kZXIg dXBvbiBhIHJlc2l6ZSBldmVudCBpZiBlbnF1ZXVlVG9SZW5kZXJPblJlc2l6ZSBpcyB0cnVlJywg KCkgPT4gewotICAgICAgICAgICAgY29uc3QgY29udGV4dCA9IG5ldyBCcm93c2luZ0NvbnRleHQo KTsKLSAgICAgICAgICAgIHJldHVybiBjb250ZXh0LmltcG9ydFNjcmlwdHMoWydpbnN0cnVtZW50 YXRpb24uanMnLCAnY29tcG9uZW50cy9iYXNlLmpzJ10sICdDb21wb25lbnRCYXNlJykudGhlbigo Q29tcG9uZW50QmFzZSkgPT4gewotICAgICAgICAgICAgICAgIGNsYXNzIFNvbWVDb21wb25lbnQg ZXh0ZW5kcyBDb21wb25lbnRCYXNlIHsKLSAgICAgICAgICAgICAgICAgICAgc3RhdGljIGdldCBl bnF1ZXVlVG9SZW5kZXJPblJlc2l6ZSgpIHsgcmV0dXJuIHRydWU7IH0KLSAgICAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICAgICAgQ29tcG9uZW50QmFzZS5kZWZpbmVFbGVtZW50KCdzb21lLWNv bXBvbmVudCcsIFNvbWVDb21wb25lbnQpOwotCi0gICAgICAgICAgICAgICAgbGV0IHJlcXVlc3RB bmltYXRpb25GcmFtZUNvdW50ID0gMDsKLSAgICAgICAgICAgICAgICBsZXQgY2FsbGJhY2sgPSBu dWxsOwotICAgICAgICAgICAgICAgIGNvbnRleHQuZ2xvYmFsLnJlcXVlc3RBbmltYXRpb25GcmFt ZSA9IChuZXdDYWxsYmFjaykgPT4gewotICAgICAgICAgICAgICAgICAgICBjYWxsYmFjayA9IG5l d0NhbGxiYWNrOwotICAgICAgICAgICAgICAgICAgICByZXF1ZXN0QW5pbWF0aW9uRnJhbWVDb3Vu dCsrOwotICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIGNvbnN0IGluc3RhbmNl ID0gbmV3IFNvbWVDb21wb25lbnQ7Ci0gICAgICAgICAgICAgICAgZXhwZWN0KHJlcXVlc3RBbmlt YXRpb25GcmFtZUNvdW50KS50by5iZSgwKTsKLSAgICAgICAgICAgICAgICBjb250ZXh0Lmdsb2Jh bC5kaXNwYXRjaEV2ZW50KG5ldyBFdmVudCgncmVzaXplJykpOwotICAgICAgICAgICAgICAgIGV4 cGVjdChyZXF1ZXN0QW5pbWF0aW9uRnJhbWVDb3VudCkudG8uYmUoMCk7Ci0gICAgICAgICAgICB9 KTsKLSAgICAgICAgfSk7Ci0KICAgICB9KTsKIAogfSk7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvYnJvd3Nlci10ZXN0cy9pbmRleC5odG1sIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL2Jyb3dzZXItdGVzdHMvaW5kZXguaHRtbAppbmRleCA2MzMwNDUyNTZhNDdkYzM2 ODM4ZDMzNDYwMDM0OTI4M2YwZWZhMWFlLi5mMTdiNzBlM2U2ODNmZGNiZjI2NzFlZmE4M2JiM2Y2 ZGUwZWM5YTJlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvYnJvd3Nlci10 ZXN0cy9pbmRleC5odG1sCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9icm93c2VyLXRl c3RzL2luZGV4Lmh0bWwKQEAgLTQwLDYgKzQwLDkgQEAgY2xhc3MgQnJvd3NpbmdDb250ZXh0IHsK ICAgICAgICAgaWZyYW1lLnN0eWxlLnRvcCA9ICcwcHgnOwogICAgICAgICBCcm93c2luZ0NvbnRl eHQuX2lmcmFtZXMucHVzaChpZnJhbWUpOwogCisgICAgICAgIC8vIEV4cGVkaXRlIGNhbGxzIHRv IGNhbGxiYWNrcyB0byBtYWtlIHRlc3RzIGdvIGZhc3Rlci4KKyAgICAgICAgaWZyYW1lLmNvbnRl bnRXaW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lID0gKGNhbGxiYWNrKSA9PiBzZXRUaW1lb3V0 KGNhbGxiYWNrLCAwKTsKKwogICAgICAgICB0aGlzLmlmcmFtZSA9IGlmcmFtZTsKICAgICAgICAg dGhpcy5zeW1ib2xzID0ge307CiAgICAgICAgIHRoaXMuZ2xvYmFsID0gdGhpcy5pZnJhbWUuY29u dGVudFdpbmRvdzsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMv djMvY29tcG9uZW50cy9iYXNlLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9jb21wb25lbnRzL2Jhc2UuanMKaW5kZXggMzY1MzYzZDhiODQ5ODI5MDkyMTQwOWNjODgxYmQw MDgzOGVkZDdhNi4uY2FhOGM5MTJkZjdmY2Y3ZGFkOWVhMThjMTI1NzAyOWQ0ZmY2ZDk5MiAxMDA2 NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL2Jh c2UuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRz L2Jhc2UuanMKQEAgLTE3LDcgKzE3LDkgQEAgY2xhc3MgQ29tcG9uZW50QmFzZSB7CiAgICAgICAg IHRoaXMuX3NoYWRvdyA9IG51bGw7CiAgICAgICAgIHRoaXMuX2FjdGlvbkNhbGxiYWNrcyA9IG5l dyBNYXA7CiAKLSAgICAgICAgaWYgKCF3aW5kb3cuY3VzdG9tRWxlbWVudHMgJiYgbmV3LnRhcmdl dC5lbnF1ZXVlVG9SZW5kZXJPblJlc2l6ZSkKKyAgICAgICAgaWYgKCFDb21wb25lbnRCYXNlLnVz ZU5hdGl2ZUN1c3RvbUVsZW1lbnRzKQorICAgICAgICAgICAgdGhpcy5lbnF1ZXVlVG9SZW5kZXIo KTsKKyAgICAgICAgaWYgKCFDb21wb25lbnRCYXNlLnVzZU5hdGl2ZUN1c3RvbUVsZW1lbnRzICYm IG5ldy50YXJnZXQuZW5xdWV1ZVRvUmVuZGVyT25SZXNpemUpCiAgICAgICAgICAgICBDb21wb25l bnRCYXNlLl9jb25uZWN0ZWRDb21wb25lbnRUb1JlbmRlck9uUmVzaXplKHRoaXMpOwogICAgIH0K IApAQCAtMTc0LDcgKzE3Niw3IEBAIGNsYXNzIENvbXBvbmVudEJhc2UgewogCiAgICAgICAgIGNv bnN0IGVucXVldWVUb1JlbmRlck9uUmVzaXplID0gZWxlbWVudEludGVyZmFjZS5lbnF1ZXVlVG9S ZW5kZXJPblJlc2l6ZTsKIAotICAgICAgICBpZiAoIXdpbmRvdy5jdXN0b21FbGVtZW50cykKKyAg ICAgICAgaWYgKCFDb21wb25lbnRCYXNlLnVzZU5hdGl2ZUN1c3RvbUVsZW1lbnRzKQogICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgIGNsYXNzIGVsZW1lbnRDbGFzcyBleHRlbmRzIEhUTUxF bGVtZW50IHsKQEAgLTE5NCw2ICsxOTYsNyBAQCBjbGFzcyBDb21wb25lbnRCYXNlIHsKIAogICAg ICAgICAgICAgY29ubmVjdGVkQ2FsbGJhY2soKQogICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgIHRoaXMuY29tcG9uZW50KCkuZW5xdWV1ZVRvUmVuZGVyKCk7CiAgICAgICAgICAgICAgICAg aWYgKGVucXVldWVUb1JlbmRlck9uUmVzaXplKQogICAgICAgICAgICAgICAgICAgICBDb21wb25l bnRCYXNlLl9jb25uZWN0ZWRDb21wb25lbnRUb1JlbmRlck9uUmVzaXplKHRoaXMuY29tcG9uZW50 KCkpOwogICAgICAgICAgICAgfQpAQCAtMjE1LDE3ICsyMTgsMTkgQEAgY2xhc3MgQ29tcG9uZW50 QmFzZSB7CiAgICAgc3RhdGljIGNyZWF0ZUVsZW1lbnQobmFtZSwgYXR0cmlidXRlcywgY29udGVu dCkKICAgICB7CiAgICAgICAgIHZhciBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudChu YW1lKTsKLSAgICAgICAgaWYgKCFjb250ZW50ICYmIChhdHRyaWJ1dGVzIGluc3RhbmNlb2YgQXJy YXkgfHwgYXR0cmlidXRlcyBpbnN0YW5jZW9mIE5vZGUKKyAgICAgICAgaWYgKCFjb250ZW50ICYm IChBcnJheS5pc0FycmF5KGF0dHJpYnV0ZXMpIHx8IGF0dHJpYnV0ZXMgaW5zdGFuY2VvZiBOb2Rl CiAgICAgICAgICAgICB8fCBhdHRyaWJ1dGVzIGluc3RhbmNlb2YgQ29tcG9uZW50QmFzZSB8fCB0 eXBlb2YoYXR0cmlidXRlcykgIT0gJ29iamVjdCcpKSB7CiAgICAgICAgICAgICBjb250ZW50ID0g YXR0cmlidXRlczsKICAgICAgICAgICAgIGF0dHJpYnV0ZXMgPSB7fTsKICAgICAgICAgfQogCiAg ICAgICAgIGlmIChhdHRyaWJ1dGVzKSB7Ci0gICAgICAgICAgICBmb3IgKHZhciBuYW1lIGluIGF0 dHJpYnV0ZXMpIHsKKyAgICAgICAgICAgIGZvciAobGV0IG5hbWUgaW4gYXR0cmlidXRlcykgewog ICAgICAgICAgICAgICAgIGlmIChuYW1lLnN0YXJ0c1dpdGgoJ29uJykpCiAgICAgICAgICAgICAg ICAgICAgIGVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcihuYW1lLnN1YnN0cmluZygyKSwgYXR0cmli dXRlc1tuYW1lXSk7Ci0gICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGVsc2Ug aWYgKGF0dHJpYnV0ZXNbbmFtZV0gPT09IHRydWUpCisgICAgICAgICAgICAgICAgICAgIGVsZW1l bnQuc2V0QXR0cmlidXRlKG5hbWUsIG5hbWUpOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKGF0 dHJpYnV0ZXNbbmFtZV0gIT09IGZhbHNlKQogICAgICAgICAgICAgICAgICAgICBlbGVtZW50LnNl dEF0dHJpYnV0ZShuYW1lLCBhdHRyaWJ1dGVzW25hbWVdKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQpAQCAtMjgzLDYgKzI4OCw3IEBAIGNsYXNzIENvbXBvbmVudEJhc2UgewogICAgIH0KIH0K IAorQ29tcG9uZW50QmFzZS51c2VOYXRpdmVDdXN0b21FbGVtZW50cyA9ICEhd2luZG93LmN1c3Rv bUVsZW1lbnRzOwogQ29tcG9uZW50QmFzZS5fY29tcG9uZW50QnlOYW1lID0gbmV3IE1hcDsKIENv bXBvbmVudEJhc2UuX2NvbXBvbmVudEJ5Q2xhc3MgPSBuZXcgTWFwOwogQ29tcG9uZW50QmFzZS5f Y3VycmVudGx5Q29uc3RydWN0ZWRCeUludGVyZmFjZSA9IG5ldyBNYXA7CmRpZmYgLS1naXQgYS9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY2hhcnQtcGFuZS1i YXNlLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9jb21wb25lbnRzL2No YXJ0LXBhbmUtYmFzZS5qcwppbmRleCBhZTFmMWVhZTlhNmY1YmI5YWE0MmE0NDdiM2M1MjZlZGE1 MTNmNGU4Li5hZDM3OTY4NmIxODQwZWRjYzAyNGZhZWMzNDJkMWNjOGE5MmZjMWU5IDEwMDY0NAot LS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY2hhcnQt cGFuZS1iYXNlLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29t cG9uZW50cy9jaGFydC1wYW5lLWJhc2UuanMKQEAgLTI1NiwxMCArMjU2LDkgQEAgY2xhc3MgQ2hh cnRQYW5lQmFzZSBleHRlbmRzIENvbXBvbmVudEJhc2UgewogICAgICAgICAgICAgdGhpcy5fbWFp bkNoYXJ0U3RhdHVzLmVucXVldWVUb1JlbmRlcigpOwogCiAgICAgICAgIHZhciBib2R5ID0gdGhp cy5jb250ZW50KCkucXVlcnlTZWxlY3RvcignLmNoYXJ0LXBhbmUtYm9keScpOwotICAgICAgICBp ZiAodGhpcy5fb3BlblJlcG9zaXRvcnkpIHsKKyAgICAgICAgaWYgKHRoaXMuX29wZW5SZXBvc2l0 b3J5KQogICAgICAgICAgICAgYm9keS5jbGFzc0xpc3QuYWRkKCdoYXMtc2Vjb25kLXNpZGViYXIn KTsKLSAgICAgICAgICAgIHRoaXMuX2NvbW1pdExvZ1ZpZXdlci5lbnF1ZXVlVG9SZW5kZXIoKTsK LSAgICAgICAgfSBlbHNlCisgICAgICAgIGVsc2UKICAgICAgICAgICAgIGJvZHkuY2xhc3NMaXN0 LnJlbW92ZSgnaGFzLXNlY29uZC1zaWRlYmFyJyk7CiAKICAgICAgICAgSW5zdHJ1bWVudGF0aW9u LmVuZE1lYXN1cmluZ1RpbWUoJ0NoYXJ0UGFuZScsICdyZW5kZXInKTsKZGlmZiAtLWdpdCBhL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9jb21taXQtbG9nLXZp ZXdlci5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvY29tcG9uZW50cy9j b21taXQtbG9nLXZpZXdlci5qcwppbmRleCA5YTVkMTc0YTUxOTYwYWI0YjhmMTE0NTg5OGUwNmVj NmFiMzkyOTYwLi4yMTUwNzJhOWYyYzhhNTMyMTU5ZmFmY2JjMGI2ZWRjYzQ2OGI0ZDg0IDEwMDY0 NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL2NvbXBvbmVudHMvY29t bWl0LWxvZy12aWV3ZXIuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9jb21wb25lbnRzL2NvbW1pdC1sb2ctdmlld2VyLmpzCkBAIC01NSw4ICs1NSw2IEBAIGNsYXNz IENvbW1pdExvZ1ZpZXdlciBleHRlbmRzIENvbXBvbmVudEJhc2UgewogCiAgICAgcmVuZGVyKCkK ICAgICB7Ci0gICAgICAgIHRoaXMucGFydCgnc3Bpbm5lcicpLmVucXVldWVUb1JlbmRlcigpOwot CiAgICAgICAgIGNvbnN0IHNob3VsZFNob3dSZXBvc2l0b3J5TmFtZSA9IHRoaXMuX3JlcG9zaXRv cnkgJiYgKHRoaXMuX2NvbW1pdHMgfHwgdGhpcy5fZmV0Y2hpbmdQcm9taXNlKTsKICAgICAgICAg dGhpcy5jb250ZW50KCdyZXBvc2l0b3J5LW5hbWUnKS50ZXh0Q29udGVudCA9IHNob3VsZFNob3dS ZXBvc2l0b3J5TmFtZSA/IHRoaXMuX3JlcG9zaXRvcnkubmFtZSgpIDogJyc7CiAgICAgICAgIHRo aXMuY29udGVudCgnc3Bpbm5lci1jb250YWluZXInKS5zdHlsZS5kaXNwbGF5ID0gdGhpcy5fZmV0 Y2hpbmdQcm9taXNlID8gbnVsbCA6ICdub25lJzsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL3RpbWUtc2VyaWVzLmpzIGIvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGltZS1zZXJpZXMuanMKaW5kZXggMGI1NTg2 OGU1MTNlZTg1ZjU1N2M5M2RmNTA2MmRlYWI0ZjYxNWJmMS4uMmY3NmQ1M2M5ODQzY2M1MTM4OGVk OWUyM2QyYjdkNDlhYWU4OTA1MCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3B1YmxpYy92My9tb2RlbHMvdGltZS1zZXJpZXMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy92My9tb2RlbHMvdGltZS1zZXJpZXMuanMKQEAgLTEsOCArMSw2IEBACiAn dXNlIHN0cmljdCc7CiAKLS8vIHYzIFVJIHN0aWxsIHJlbGllcyBvbiBSdW5zRGF0YSBmb3IgYXNz b2NpYXRpbmcgbWV0cmljcyB3aXRoIHVuaXRzLgotLy8gVXNlIGRlY2xhcnRpdmUgc3ludGF4IG9u Y2UgdGhhdCBkZXBlbmRlbmN5IGhhcyBiZWVuIHJlbW92ZWQuCi12YXIgVGltZVNlcmllcyA9IGNs YXNzIHsKK2NsYXNzIFRpbWVTZXJpZXMgewogICAgIGNvbnN0cnVjdG9yKCkKICAgICB7CiAgICAg ICAgIHRoaXMuX2RhdGEgPSBbXTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9wdWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy9wdWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qcwppbmRleCA1ODZjZmU2Y2NmMGNlZmJkM2Ux NWZhZmEyNzg1ZmI5ZDg1MjNjZDE3Li4yZGNmMWQ5ZWU2ZGVlNDM4YTI0M2FkYmUxZDg2YmZlNmRi Y2VjZTM4IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3Bh Z2VzL2NoYXJ0LXBhbmUuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9wYWdlcy9jaGFydC1wYW5lLmpzCkBAIC0yNDcsOCArMjQ3LDYgQEAgY2xhc3MgQ2hhcnRQYW5l IGV4dGVuZHMgQ2hhcnRQYW5lQmFzZSB7CiAgICAgICAgIHZhciBsaW5rID0gQ29tcG9uZW50QmFz ZS5jcmVhdGVMaW5rOwogICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CiAKLSAgICAgICAgdGhpcy5w YXJ0KCdjbG9zZScpLmVucXVldWVUb1JlbmRlcigpOwotCiAgICAgICAgIGlmICh0aGlzLl9jaGFy dHNQYWdlLmNhbkJyZWFrZG93bihwbGF0Zm9ybSwgbWV0cmljKSkgewogICAgICAgICAgICAgYWN0 aW9ucy5wdXNoKGVsZW1lbnQoJ2xpJywgbGluaygnQnJlYWtkb3duJywgZnVuY3Rpb24gKCkgewog ICAgICAgICAgICAgICAgIHNlbGYuX2NoYXJ0c1BhZ2UuaW5zZXJ0QnJlYWtkb3duUGFuZXNBZnRl cihwbGF0Zm9ybSwgbWV0cmljLCBzZWxmKTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Vi a2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMKaW5kZXggNTk1YTZkM2Iw ZWVlOGQ5OTZmNDI4YWM0YTc5ZmQyYmE3ZDRhNmRiNi4uOTUxNWIxNzNhZDBhZTk2MzMyMDQ0NTEx YzFlMjcyYTBjNWI0Y2Q0YiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMKQEAgLTEyMSw4ICsxMjEsNiBAQCBj bGFzcyBTdW1tYXJ5UGFnZSBleHRlbmRzIFBhZ2VXaXRoSGVhZGluZyB7CiAKICAgICBfcmVuZGVy Q2VsbChjZWxsLCBzcGlubmVyLCBhbmNob3IsIHJhdGlvR3JhcGgsIGNvbmZpZ3VyYXRpb25Hcm91 cCkKICAgICB7Ci0gICAgICAgIHNwaW5uZXIuZW5xdWV1ZVRvUmVuZGVyKCk7Ci0KICAgICAgICAg aWYgKGNvbmZpZ3VyYXRpb25Hcm91cC5pc0ZldGNoaW5nKCkpCiAgICAgICAgICAgICBjZWxsLmNs YXNzTGlzdC5hZGQoJ2ZldGNoaW5nJyk7CiAgICAgICAgIGVsc2UK