141824 2015-02-19 20:46:23 -0800 Selecting revisions for A/B testing is hard 2015-02-20 13:39:12 -0800 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 138516 1 rniwa rniwa cdumez kling oldest_to_newest 1070600 0 rniwa 2015-02-19 20:46:23 -0800 The UI is too crappy. 1070603 1 246936 rniwa 2015-02-19 21:02:30 -0800 Created attachment 246936 Improves the UI 1070802 2 rniwa 2015-02-20 13:39:12 -0800 Committed r180451: <http://trac.webkit.org/changeset/180451> 246936 2015-02-19 21:02:30 -0800 2015-02-20 09:24:19 -0800 Improves the UI bug-141824-20150219210222.patch text/plain 16084 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTgwMzc5KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM0IEBACisyMDE1LTAyLTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFNlbGVjdGluZyByZXZpc2lvbnMgZm9yIEEvQiB0ZXN0aW5nIGlzIGhhcmQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MTgyNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUg cmV2aXNpb25zIHVzZWQgaW4gQS9CIHRlc3RpbmcgYmFzZWQgb24gdGhlIHNlbGVjdGlvbiBpbiB0 aGUgb3ZlcnZpZXcgY2hhcnQuIFRoaXMgYWxsb3dzIHVzZXJzIHRvCisgICAgICAgIGludHVpdGl2 ZWx5IHNlbGVjdCByZXZpc2lvbnMgYmFzZWQgb24gcG9pbnRzIHNob3duIGluIHRoZSBjaGFydC4g UmVtb3ZlZCB0aGUgb2xkIHNlbGVjdCBlbGVtZW50cyB1c2VkIHRvCisgICAgICAgIHNlbGVjdCBB L0IgdGVzdGluZyBwb2ludHMgbWFudWFsbHkuCisKKyAgICAgICAgQWxzbyByZW5hbWVkICd0ZXN0 U2V0cycgdG8gJ2NvbmZpZ3VyYXRpb25zJywgJ3Jvb3RzJyB0byAncm9vdENvbmZpZ3VyYXRpb25z JywgYW5kICdyZXZpc2lvbnMnIGluIGVhY2ggcm9vdCdzCisgICAgICAgIHNldHMgdG8gJ29wdGlv bnMnIGZvciBjbGFyaXR5LgorCisgICAgICAgICogcHVibGljL3YyL2FwcC5jc3M6IFJlb3JnYW5p emVkIHN0eWxlIHJ1bGVzLiAKKworICAgICAgICAqIHB1YmxpYy92Mi9hcHAuanM6CisgICAgICAg IChBcHAuQW5hbHlzaXNUYXNrQ29udHJvbGxlcik6CisgICAgICAgIChBcHAuQW5hbHlzaXNUYXNr Q29udHJvbGxlci5fdGFza1VwZGF0ZWQpOiBNZXJnZWQgdXBkYXRlVGVzdEdyb3VwUGFuZXMuCisg ICAgICAgIChBcHAuQW5hbHlzaXNUYXNrQ29udHJvbGxlci5fY2hhcnREYXRhQ2hhbmdlZCk6IFJl bmFtZWQgZnJvbSBwYW5lRG9tYWluLiBJdCdzIG5vdyBhbiBvYnNlcnZlciBpbnN0ZWFkIG9mCisg ICAgICAgIGEgcHJvcGVydHksIHdoaWNoIHNldHMgJ292ZXJ2aWV3RG9tYWluJyBwcm9wZXJ0eSBh cyB3ZWxsIGFzIG90aGVyIHByb3BlcnRpZXMuCisgICAgICAgIChBcHAuQW5hbHlzaXNUYXNrQ29u dHJvbGxlci51cGRhdGVSb290Q29uZmlndXJhdGlvbnMpOiBSZW5hbWVkIGZyb20gdXBkYXRlUm9v dHMuCisgICAgICAgIChBcHAuQW5hbHlzaXNUYXNrQ29udHJvbGxlci5fdXBkYXRlUm9vdHNCeVNl bGVjdGVkUG9pbnRzKTogQWRkZWQuIFNlbGVjdCByb290cyBiYXNlZCBvbiB0aGUgc2VsZWN0ZWQg cG9pbnRzCisgICAgICAgIGluIHRoZSBvdmVydmlldyBjaGFydC4KKworICAgICAgICAqIHB1Ymxp Yy92Mi9jaGFydC1wYW5lLmNzczogQWRkZWQgYXJyb3dzIG5leHQgdG8gdGhlIGNvbmZpZ3VyYXRp b24gbmFtZXMgKGUuZy4gJ0EnKSB0byBpbmRpY2F0ZSB3aGV0aGVyCisgICAgICAgIGluZGl2aWR1 YWwgYnVpbGQgcmVxdWVzdHMgLyB0ZXN0IHJlc3VsdHMgYXJlIHNob3duIG9yIG5vdC4KKworICAg ICAgICAqIHB1YmxpYy92Mi9pbmRleC5odG1sOiBSZW1vdmVkIHRoZSBzZWxlY3QgZWxlbWVudCBw ZXIgY29uZmlndXJhdGlvbiBjb2x1bW4uIEFsc28gbW92ZWQgdGhlIHNlbGVjdCBlbGVtZW50Cisg ICAgICAgIGZvciB0aGUgbnVtYmVyIG9mIHJ1bnMgYXMgaXQgZG9lc24ndCBiZWxvbmcgaW4gdGhl IHNhbWUgdGFibGUgYXMgdGhlIG9uZSB0aGF0IGxpc3RzIHJlcG9zaXRvcmllcyBhbmQgcm9vdHMu CisKIDIwMTUtMDItMTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmVsYXRpb25zaGlwIGJldHdlZW4gQS9CIHRlc3RpbmcgcmVzdWx0cyBhcmUgdW5jbGVhcgpJ bmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9hcHAuY3NzCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvYXBwLmNzcwkocmV2aXNp b24gMTgwMzc5KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9hcHAuY3Nz CSh3b3JraW5nIGNvcHkpCkBAIC00MjEsNiArNDIxLDIxIEBAIHRhYmxlLmRhc2hib2FyZCB0Ym9k eSB0ZCAuZmFpbHVyZSB7CiAgICAgdmVydGljYWwtYWxpZ246IG1pZGRsZTsKIH0KIAorLmNoYXJ0 LXBhbmUsCisuYW5hbHlzaXMtZ3JvdXAgeworICAgIGJvcmRlcjogMXB4IHNvbGlkICNiYmI7Cisg ICAgYm9yZGVyLXJhZGl1czogMC41cmVtOworICAgIGJveC1zaGFkb3c6IHJnYmEoMCwgMCwgMCwg MC4wMykgMXB4IDFweCAwcHggMHB4OworICAgIHBhZGRpbmc6IDA7CisgICAgbWFyZ2luLWJvdHRv bTogMXJlbTsKKyAgICBvdXRsaW5lOiBub25lOworICAgIHBvc2l0aW9uOiByZWxhdGl2ZTsKK30K KworZm9ybSAuYW5hbHlzaXMtZ3JvdXAgPiAqIHsKKyAgICBtYXJnaW46IDAuNXJlbTsKK30KKwog I2FuYWx5c2lzLXRhc2tzLAogLmFuYWx5c2lzLWdyb3VwID4gdGFibGUgewogICAgIGJvcmRlcjog c29saWQgMHB4ICM5OTk7CkBAIC00NzIsMjAgKzQ4NywxNSBAQCB0YWJsZS5kYXNoYm9hcmQgdGJv ZHkgdGQgLmZhaWx1cmUgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLS5hbmFseXNpcy1ncm91 cCB7Ci0gICAgZGlzcGxheTogYmxvY2s7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotICAgIG1p bi1oZWlnaHQ6IDYuNXJlbTsKLX0KLQogLmFuYWx5c2lzLWdyb3VwIC5yZXN1bHRzIHsKKyAgICBt YXJnaW46IDAuNXJlbTsKICAgICBtYXJnaW4tcmlnaHQ6IDIwcmVtOwogfQogCiAuYW5hbHlzaXMt Z3JvdXAgLnJlZmVyZW5jZS1jaGFydCB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwotICAgIHRv cDogMS4ycmVtOwotICAgIHJpZ2h0OiAtMC43cmVtOworICAgIHRvcDogMS44cmVtOworICAgIHJp Z2h0OiAwcmVtOwogICAgIHdpZHRoOiAxOXJlbTsKICAgICBoZWlnaHQ6IDVyZW07CiB9CkBAIC01 MzIsMTcgKzU0Miw2IEBAIHRhYmxlLmRhc2hib2FyZCB0Ym9keSB0ZCAuZmFpbHVyZSB7CiAgICAg Y29sb3I6ICMzMzM7CiB9CiAKLS5hbmFseXNpcy1ncm91cCB7Ci0gICAgYm9yZGVyOiAxcHggc29s aWQgI2JiYjsKLSAgICBib3JkZXItcmFkaXVzOiAwLjVyZW07Ci0gICAgYm94LXNoYWRvdzogcmdi YSgwLCAwLCAwLCAwLjAzKSAxcHggMXB4IDBweCAwcHg7Ci0gICAgbWFyZ2luLWJvdHRvbTogMS41 cmVtOwotfQotCi0uYW5hbHlzaXMtZ3JvdXAgPiAqIHsKLSAgICBtYXJnaW46IDAuNXJlbTsKLX0K LQogLmFuYWx5c2lzLWdyb3VwID4gaDEgewogICAgIGZvbnQtc2l6ZTogMS4xcmVtOwogICAgIGZv bnQtd2VpZ2h0OiBub3JtYWw7CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YyL2FwcC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YyL2FwcC5qcwkocmV2aXNpb24gMTgwMzc5KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3B1YmxpYy92Mi9hcHAuanMJKHdvcmtpbmcgY29weSkKQEAgLTk3OSw3ICs5NzksNiBAQCBBcHAu QW5hbHlzaXNUYXNrQ29udHJvbGxlciA9IEVtYmVyLkNvbnRyCiAgICAgcGxhdGZvcm06IEVtYmVy LmNvbXB1dGVkLmFsaWFzKCdtb2RlbC5wbGF0Zm9ybScpLAogICAgIG1ldHJpYzogRW1iZXIuY29t cHV0ZWQuYWxpYXMoJ21vZGVsLm1ldHJpYycpLAogICAgIGRldGFpbHM6IEVtYmVyLmNvbXB1dGVk LmFsaWFzKCdwYW5lLmRldGFpbHMnKSwKLSAgICB0ZXN0U2V0czogW10sCiAgICAgcm9vdHM6IFtd LAogICAgIGJ1Z1RyYWNrZXJzOiBbXSwKICAgICBwb3NzaWJsZVJlcGV0aXRpb25Db3VudHM6IFsx LCAyLCAzLCA0LCA1LCA2XSwKQEAgLTk5NSw3ICs5OTQsMTIgQEAgQXBwLkFuYWx5c2lzVGFza0Nv bnRyb2xsZXIgPSBFbWJlci5Db250cgogICAgICAgICAgICAgcGxhdGZvcm1JZDogbW9kZWwuZ2V0 KCdwbGF0Zm9ybScpLmdldCgnaWQnKSwKICAgICAgICAgICAgIG1ldHJpY0lkOiBtb2RlbC5nZXQo J21ldHJpYycpLmdldCgnaWQnKSwKICAgICAgICAgfSkpOwotICAgIH0ub2JzZXJ2ZXMoJ21vZGVs Jykub24oJ2luaXQnKSwKKworICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CisgICAgICAgIG1vZGVs LmdldCgndGVzdEdyb3VwcycpLnRoZW4oZnVuY3Rpb24gKGdyb3VwcykgeworICAgICAgICAgICAg c2VsZi5zZXQoJ3Rlc3RHcm91cFBhbmVzJywgZ3JvdXBzLm1hcChmdW5jdGlvbiAoZ3JvdXApIHsg cmV0dXJuIEFwcC5UZXN0R3JvdXBQYW5lLmNyZWF0ZSh7Y29udGVudDogZ3JvdXB9KTsgfSkpOwor ICAgICAgICB9KTsKKyAgICB9Lm9ic2VydmVzKCdtb2RlbCcsICdtb2RlbC50ZXN0R3JvdXBzJyku b24oJ2luaXQnKSwKICAgICBfZmV0Y2hlZE1hbmlmZXN0OiBmdW5jdGlvbiAoKQogICAgIHsKICAg ICAgICAgdmFyIHRyYWNrZXJJZFRvQnVnTnVtYmVyID0ge307CkBAIC0xMDEyLDcgKzEwMTYsNyBA QCBBcHAuQW5hbHlzaXNUYXNrQ29udHJvbGxlciA9IEVtYmVyLkNvbnRyCiAgICAgICAgICAgICB9 KTsKICAgICAgICAgfSkpOwogICAgIH0sCi0gICAgcGFuZURvbWFpbjogZnVuY3Rpb24gKCkKKyAg ICBfY2hhcnREYXRhQ2hhbmdlZDogZnVuY3Rpb24gKCkKICAgICB7CiAgICAgICAgIHZhciBwYW5l ID0gdGhpcy5nZXQoJ3BhbmUnKTsKICAgICAgICAgaWYgKCFwYW5lKQpAQCAtMTA0Niw1MiArMTA1 MCwyMCBAQCBBcHAuQW5hbHlzaXNUYXNrQ29udHJvbGxlciA9IEVtYmVyLkNvbnRyCiAKICAgICAg ICAgdmFyIG1hcmdpbiA9IChlbmQudGltZSAtIHN0YXJ0LnRpbWUpICogMC4xOwogICAgICAgICB0 aGlzLnNldCgnaGlnaGxpZ2h0ZWRJdGVtcycsIGhpZ2hsaWdodGVkSXRlbXMpOworICAgICAgICB0 aGlzLnNldCgnb3ZlcnZpZXdFbmRQb2ludHMnLCBbc3RhcnQsIGVuZF0pOwogICAgICAgICB0aGlz LnNldCgnYW5hbHlzaXNQb2ludHMnLCBmb3JtYXRlZFBvaW50cyk7CiAKLSAgICAgICAgdmFyIHBh bmVEb21haW4gPSBbc3RhcnQudGltZSAtIG1hcmdpbiwgK2VuZC50aW1lICsgbWFyZ2luXTsKKyAg ICAgICAgdmFyIG92ZXJ2aWV3RG9tYWluID0gW3N0YXJ0LnRpbWUgLSBtYXJnaW4sICtlbmQudGlt ZSArIG1hcmdpbl07CiAKICAgICAgICAgdmFyIHRlc3RHcm91cFBhbmVzID0gdGhpcy5nZXQoJ3Rl c3RHcm91cFBhbmVzJyk7CiAgICAgICAgIGlmICh0ZXN0R3JvdXBQYW5lcykgewogICAgICAgICAg ICAgdGVzdEdyb3VwUGFuZXMuc2V0RWFjaCgnb3ZlcnZpZXdQYW5lJywgcGFuZSk7Ci0gICAgICAg ICAgICB0ZXN0R3JvdXBQYW5lcy5zZXRFYWNoKCdvdmVydmlld0RvbWFpbicsIHBhbmVEb21haW4p OworICAgICAgICAgICAgdGVzdEdyb3VwUGFuZXMuc2V0RWFjaCgnb3ZlcnZpZXdEb21haW4nLCBv dmVydmlld0RvbWFpbik7CiAgICAgICAgIH0KIAotICAgICAgICByZXR1cm4gcGFuZURvbWFpbjsK LSAgICB9LnByb3BlcnR5KCdwYW5lLmNoYXJ0RGF0YScpLAotICAgIHRlc3RTZXRzOiBmdW5jdGlv biAoKQotICAgIHsKLSAgICAgICAgdmFyIGFuYWx5c2lzUG9pbnRzID0gdGhpcy5nZXQoJ2FuYWx5 c2lzUG9pbnRzJyk7Ci0gICAgICAgIGlmICghYW5hbHlzaXNQb2ludHMpCi0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIHZhciBwb2ludE9wdGlvbnMgPSBbe3ZhbHVlOiAnICcsIGxhYmVsOiAn Tm9uZSd9XQotICAgICAgICAgICAgLmNvbmNhdChhbmFseXNpc1BvaW50cy5tYXAoZnVuY3Rpb24g KHBvaW50KSB7IHJldHVybiB7dmFsdWU6IHBvaW50LmlkLCBsYWJlbDogcG9pbnQubGFiZWx9OyB9 KSk7Ci0gICAgICAgIHJldHVybiBbCi0gICAgICAgICAgICBFbWJlci5PYmplY3QuY3JlYXRlKHtu YW1lOiAiQSIsIG9wdGlvbnM6IHBvaW50T3B0aW9ucywgc2VsZWN0aW9uOiBwb2ludE9wdGlvbnNb MV19KSwKLSAgICAgICAgICAgIEVtYmVyLk9iamVjdC5jcmVhdGUoe25hbWU6ICJCIiwgb3B0aW9u czogcG9pbnRPcHRpb25zLCBzZWxlY3Rpb246IHBvaW50T3B0aW9uc1twb2ludE9wdGlvbnMubGVu Z3RoIC0gMV19KSwKLSAgICAgICAgXTsKLSAgICB9LnByb3BlcnR5KCdhbmFseXNpc1BvaW50cycp LAotICAgIF9yb290Q2hhbmdlZEZvclRlc3RTZXQ6IGZ1bmN0aW9uICgpCi0gICAgewotICAgICAg ICB2YXIgc2V0cyA9IHRoaXMuZ2V0KCd0ZXN0U2V0cycpOwotICAgICAgICB2YXIgcm9vdHMgPSB0 aGlzLmdldCgncm9vdHMnKTsKLSAgICAgICAgaWYgKCFzZXRzIHx8ICFyb290cykKLSAgICAgICAg ICAgIHJldHVybjsKLQotICAgICAgICBzZXRzLmZvckVhY2goZnVuY3Rpb24gKHRlc3RTZXQsIHNl dEluZGV4KSB7Ci0gICAgICAgICAgICB2YXIgY3VycmVudFNlbGVjdGlvbiA9IHRlc3RTZXQuZ2V0 KCdzZWxlY3Rpb24nKTsKLSAgICAgICAgICAgIGlmIChjdXJyZW50U2VsZWN0aW9uID09IHRlc3RT ZXQuZ2V0KCdwcmV2aW91c1NlbGVjdGlvbicpKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAg ICAgICAgICAgIHRlc3RTZXQuc2V0KCdwcmV2aW91c1NlbGVjdGlvbicsIGN1cnJlbnRTZWxlY3Rp b24pOwotICAgICAgICAgICAgdmFyIHBvaW50SW5kZXggPSB0ZXN0U2V0LmdldCgnb3B0aW9ucycp LmluZGV4T2YoY3VycmVudFNlbGVjdGlvbik7Ci0KLSAgICAgICAgICAgIHJvb3RzLmZvckVhY2go ZnVuY3Rpb24gKHJvb3QpIHsKLSAgICAgICAgICAgICAgICB2YXIgc2V0ID0gcm9vdC5zZXRzW3Nl dEluZGV4XTsKLSAgICAgICAgICAgICAgICBzZXQuc2V0KCdzZWxlY3Rpb24nLCBzZXQucmV2aXNp b25zW3BvaW50SW5kZXhdKTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICB9KTsKLQotICAgIH0u b2JzZXJ2ZXMoJ3Rlc3RTZXRzLkBlYWNoLnNlbGVjdGlvbicpLAotICAgIHVwZGF0ZVJvb3RzOiBm dW5jdGlvbiAoKQorICAgICAgICB0aGlzLnNldCgnb3ZlcnZpZXdEb21haW4nLCBvdmVydmlld0Rv bWFpbik7CisgICAgfS5vYnNlcnZlcygncGFuZS5jaGFydERhdGEnKSwKKyAgICB1cGRhdGVSb290 Q29uZmlndXJhdGlvbnM6IGZ1bmN0aW9uICgpCiAgICAgewogICAgICAgICB2YXIgYW5hbHlzaXNQ b2ludHMgPSB0aGlzLmdldCgnYW5hbHlzaXNQb2ludHMnKTsKICAgICAgICAgaWYgKCFhbmFseXNp c1BvaW50cykKQEAgLTExMTUsMzMgKzEwODcsMjUgQEAgQXBwLkFuYWx5c2lzVGFza0NvbnRyb2xs ZXIgPSBFbWJlci5Db250cgogICAgICAgICAgICAgaWYgKCF0cmlnZ2VyYWJsZSkKICAgICAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIHNlbGYuc2V0KCdyb290cycsIHRyaWdnZXJh YmxlLmdldCgnYWNjZXB0ZWRSZXBvc2l0b3JpZXMnKS5tYXAoZnVuY3Rpb24gKHJlcG9zaXRvcnkp IHsKKyAgICAgICAgICAgIHNlbGYuc2V0KCdjb25maWd1cmF0aW9ucycsIFsnQScsICdCJ10pOwor ICAgICAgICAgICAgc2VsZi5zZXQoJ3Jvb3RDb25maWd1cmF0aW9ucycsIHRyaWdnZXJhYmxlLmdl dCgnYWNjZXB0ZWRSZXBvc2l0b3JpZXMnKS5tYXAoZnVuY3Rpb24gKHJlcG9zaXRvcnkpIHsKICAg ICAgICAgICAgICAgICB2YXIgcmVwb3NpdG9yeUlkID0gcmVwb3NpdG9yeS5nZXQoJ2lkJyk7Ci0g ICAgICAgICAgICAgICAgdmFyIHJldmlzaW9ucyA9IFt7dmFsdWU6ICcgJywgbGFiZWw6ICdOb25l J31dLmNvbmNhdChyZXBvc2l0b3J5VG9SZXZpc2lvbnNbcmVwb3NpdG9yeUlkXSk7CisgICAgICAg ICAgICAgICAgdmFyIG9wdGlvbnMgPSBbe3ZhbHVlOiAnICcsIGxhYmVsOiAnTm9uZSd9XS5jb25j YXQocmVwb3NpdG9yeVRvUmV2aXNpb25zW3JlcG9zaXRvcnlJZF0pOwogICAgICAgICAgICAgICAg IHJldHVybiBFbWJlci5PYmplY3QuY3JlYXRlKHsKKyAgICAgICAgICAgICAgICAgICAgcmVwb3Np dG9yeTogcmVwb3NpdG9yeSwKICAgICAgICAgICAgICAgICAgICAgbmFtZTogcmVwb3NpdG9yeS5n ZXQoJ25hbWUnKSwKICAgICAgICAgICAgICAgICAgICAgc2V0czogWwogICAgICAgICAgICAgICAg ICAgICAgICAgRW1iZXIuT2JqZWN0LmNyZWF0ZSh7bmFtZTogJ0FbJyArIHJlcG9zaXRvcnlJZCAr ICddJywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXZpc2lvbnM6IHJldmlzaW9ucywK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3Rpb246IHJldmlzaW9uc1sxXX0pLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM6IG9wdGlvbnMsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc2VsZWN0aW9uOiBvcHRpb25zWzFdfSksCiAgICAgICAgICAgICAg ICAgICAgICAgICBFbWJlci5PYmplY3QuY3JlYXRlKHtuYW1lOiAnQlsnICsgcmVwb3NpdG9yeUlk ICsgJ10nLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldmlzaW9uczogcmV2aXNpb25z LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdGlvbjogcmV2aXNpb25zW3Jldmlz aW9ucy5sZW5ndGggLSAxXX0pLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wdGlvbnM6 IG9wdGlvbnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2VsZWN0aW9uOiBvcHRpb25z W29wdGlvbnMubGVuZ3RoIC0gMV19KSwKICAgICAgICAgICAgICAgICAgICAgXSwKICAgICAgICAg ICAgICAgICB9KTsKICAgICAgICAgICAgIH0pKTsKICAgICAgICAgfSk7CiAgICAgfS5vYnNlcnZl cygnYW5hbHlzaXNQb2ludHMnKSwKLSAgICB1cGRhdGVUZXN0R3JvdXBQYW5lczogZnVuY3Rpb24g KCkKLSAgICB7Ci0gICAgICAgIHZhciBtb2RlbCA9IHRoaXMuZ2V0KCdtb2RlbCcpOwotICAgICAg ICBpZiAoIW1vZGVsKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIgc2VsZiA9IHRo aXM7Ci0gICAgICAgIG1vZGVsLmdldCgndGVzdEdyb3VwcycpLnRoZW4oZnVuY3Rpb24gKGdyb3Vw cykgewotICAgICAgICAgICAgc2VsZi5zZXQoJ3Rlc3RHcm91cFBhbmVzJywgZ3JvdXBzLm1hcChm dW5jdGlvbiAoZ3JvdXApIHsgcmV0dXJuIEFwcC5UZXN0R3JvdXBQYW5lLmNyZWF0ZSh7Y29udGVu dDogZ3JvdXB9KTsgfSkpOwotICAgICAgICB9KTsKLSAgICB9Lm9ic2VydmVzKCdtb2RlbCcpLAog ICAgIGFjdGlvbnM6IHsKICAgICAgICAgYXNzb2NpYXRlQnVnOiBmdW5jdGlvbiAoYnVnVHJhY2tl ciwgYnVnTnVtYmVyKQogICAgICAgICB7CkBAIC0xMTU2LDExICsxMTIwLDEyIEBAIEFwcC5BbmFs eXNpc1Rhc2tDb250cm9sbGVyID0gRW1iZXIuQ29udHIKICAgICAgICAgY3JlYXRlVGVzdEdyb3Vw OiBmdW5jdGlvbiAobmFtZSwgcmVwZXRpdGlvbkNvdW50KQogICAgICAgICB7CiAgICAgICAgICAg ICB2YXIgcm9vdHMgPSB7fTsKLSAgICAgICAgICAgIHRoaXMuZ2V0KCdyb290cycpLm1hcChmdW5j dGlvbiAocm9vdCkgeworICAgICAgICAgICAgdGhpcy5nZXQoJ3Jvb3RDb25maWd1cmF0aW9ucycp Lm1hcChmdW5jdGlvbiAocm9vdCkgewogICAgICAgICAgICAgICAgIHJvb3RzW3Jvb3QuZ2V0KCdu YW1lJyldID0gcm9vdC5nZXQoJ3NldHMnKS5tYXAoZnVuY3Rpb24gKGl0ZW0pIHsgcmV0dXJuIGl0 ZW0uZ2V0KCdzZWxlY3Rpb24nKS52YWx1ZTsgfSk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAg ICAgIEFwcC5UZXN0R3JvdXAuY3JlYXRlKHRoaXMuZ2V0KCdtb2RlbCcpLCBuYW1lLCByb290cywg cmVwZXRpdGlvbkNvdW50KS50aGVuKGZ1bmN0aW9uICgpIHsKLSAgICAgICAgICAgICAgICAKKyAg ICAgICAgICAgIH0sIGZ1bmN0aW9uIChlcnJvcikgeworICAgICAgICAgICAgICAgIGFsZXJ0KCdG YWlsZWQgdG8gY3JlYXRlIGEgbmV3IHRlc3QgZ3JvdXA6JyArIGVycm9yKTsKICAgICAgICAgICAg IH0pOwogICAgICAgICB9LAogICAgICAgICB0b2dnbGVTaG93UmVxdWVzdExpc3Q6IGZ1bmN0aW9u IChjb25maWd1cmF0aW9uKQpAQCAtMTE2OCw2ICsxMTMzLDM1IEBAIEFwcC5BbmFseXNpc1Rhc2tD b250cm9sbGVyID0gRW1iZXIuQ29udHIKICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24udG9nZ2xl UHJvcGVydHkoJ3Nob3dSZXF1ZXN0TGlzdCcpOwogICAgICAgICB9CiAgICAgfSwKKyAgICBfdXBk YXRlUm9vdHNCeVNlbGVjdGVkUG9pbnRzOiBmdW5jdGlvbiAoKQorICAgIHsKKyAgICAgICAgdmFy IHJvb3RDb25maWd1cmF0aW9ucyA9IHRoaXMuZ2V0KCdyb290Q29uZmlndXJhdGlvbnMnKTsKKyAg ICAgICAgdmFyIHBhbmUgPSB0aGlzLmdldCgncGFuZScpOworICAgICAgICBpZiAoIXJvb3RDb25m aWd1cmF0aW9ucyB8fCAhcGFuZSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIg cm9vdFNldFBvaW50czsKKyAgICAgICAgdmFyIHNlbGVjdGVkUG9pbnRzID0gcGFuZS5nZXQoJ3Nl bGVjdGVkUG9pbnRzJyk7CisgICAgICAgIGlmIChzZWxlY3RlZFBvaW50cyAmJiBzZWxlY3RlZFBv aW50cy5sZW5ndGggPj0gMikKKyAgICAgICAgICAgIHJvb3RTZXRQb2ludHMgPSBbc2VsZWN0ZWRQ b2ludHNbMF0sIHNlbGVjdGVkUG9pbnRzW3NlbGVjdGVkUG9pbnRzLmxlbmd0aCAtIDFdXTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgcm9vdFNldFBvaW50cyA9IHRoaXMuZ2V0KCdvdmVydmll d0VuZFBvaW50cycpOworICAgICAgICBpZiAoIXJvb3RTZXRQb2ludHMpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgcm9vdENvbmZpZ3VyYXRpb25zLmZvckVhY2goZnVuY3Rpb24gKHJv b3QpIHsKKyAgICAgICAgICAgIHJvb3QuZ2V0KCdzZXRzJykuZm9yRWFjaChmdW5jdGlvbiAoc2V0 LCBzZXRJbmRleCkgeworICAgICAgICAgICAgICAgIGlmIChzZXRJbmRleCA+PSByb290U2V0UG9p bnRzLmxlbmd0aCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAg IHZhciB0YXJnZXRSZXZpc2lvbiA9IHJvb3RTZXRQb2ludHNbc2V0SW5kZXhdLm1lYXN1cmVtZW50 LnJldmlzaW9uRm9yUmVwb3NpdG9yeShyb290LmdldCgncmVwb3NpdG9yeScpLmdldCgnaWQnKSk7 CisgICAgICAgICAgICAgICAgdmFyIHNlbGVjdGVkT3B0aW9uOworICAgICAgICAgICAgICAgIGlm ICh0YXJnZXRSZXZpc2lvbikKKyAgICAgICAgICAgICAgICAgICAgc2VsZWN0ZWRPcHRpb24gPSBz ZXQuZ2V0KCdvcHRpb25zJykuZmluZChmdW5jdGlvbiAob3B0aW9uKSB7IHJldHVybiBvcHRpb24u dmFsdWUgPT0gdGFyZ2V0UmV2aXNpb247IH0pOworICAgICAgICAgICAgICAgIHNldC5zZXQoJ3Nl bGVjdGlvbicsIHNlbGVjdGVkT3B0aW9uIHx8IHNldHNbaV0uZ2V0KCdvcHRpb25zJylbMF0pOwor ICAgICAgICAgICAgfSk7CisgICAgICAgIH0pOworCisgICAgfS5vYnNlcnZlcygncGFuZS5zZWxl Y3RlZFBvaW50cycpLAogfSk7CiAKIEFwcC5UZXN0R3JvdXBQYW5lID0gRW1iZXIuT2JqZWN0UHJv eHkuZXh0ZW5kKHsKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjIvY2hh cnQtcGFuZS5jc3MKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92Mi9jaGFydC1wYW5lLmNzcwkocmV2aXNpb24gMTgwMzc5KQorKysgV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3B1YmxpYy92Mi9jaGFydC1wYW5lLmNzcwkod29ya2luZyBjb3B5KQpAQCAtMSwx MiArMSwzIEBACi0uY2hhcnQtcGFuZSB7Ci0gICAgYm9yZGVyOiAxcHggc29saWQgI2JiYjsKLSAg ICBib3JkZXItcmFkaXVzOiAwLjVyZW07Ci0gICAgYm94LXNoYWRvdzogcmdiYSgwLCAwLCAwLCAw LjAzKSAxcHggMXB4IDBweCAwcHg7Ci0gICAgcGFkZGluZzogMDsKLSAgICBtYXJnaW4tYm90dG9t OiAxcmVtOwotICAgIG91dGxpbmU6IG5vbmU7Ci0gICAgcG9zaXRpb246IHJlbGF0aXZlOwotfQog LmNoYXJ0LXBhbmUgaGVhZGVyIHsKICAgICBiYWNrZ3JvdW5kOiAjZmZmOwogICAgIG1hcmdpbjog MDsKQEAgLTI5NCwxMyArMjg1LDE1IEBACiAgICAgY3Vyc29yOiBwb2ludGVyOwogfQogCi0uY2hh cnQtcGFuZSAuY29tbWl0cy12aWV3ZXIgY2FwdGlvbjpiZWZvcmUgeworLmNoYXJ0LXBhbmUgLmNv bW1pdHMtdmlld2VyIGNhcHRpb246YmVmb3JlLAorLmFuYWx5c2lzLWdyb3VwIC5yZXN1bHRzIC5z dW1tYXJ5IC5jb25maWctbGV0dGVyOmJlZm9yZSB7CiAgICAgZGlzcGxheTogaW5saW5lLWJsb2Nr OwogICAgIHdpZHRoOiAwLjhyZW07CiAgICAgY29udGVudDogIlwyNUJFIjsgLyogRG93biBhcnJv dyAqLwogfQogCi0uY2hhcnQtcGFuZSAuY29tbWl0cy12aWV3ZXIuaGlkZGVuIGNhcHRpb246YmVm b3JlIHsKKy5jaGFydC1wYW5lIC5jb21taXRzLXZpZXdlci5oaWRkZW4gY2FwdGlvbjpiZWZvcmUs CisuYW5hbHlzaXMtZ3JvdXAgLnJlc3VsdHMgLmhpZGVSZXF1ZXN0cyAuc3VtbWFyeSAuY29uZmln LWxldHRlcjpiZWZvcmUgewogICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKICAgICB3aWR0aDog MC44cmVtOwogICAgIGNvbnRlbnQ6ICJcMjVCOCI7IC8qIFJpZ2h0IGFycm93ICovCkluZGV4OiBX ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2luZGV4Lmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92Mi9pbmRleC5odG1sCShyZXZpc2lv biAxODAzNzkpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YyL2luZGV4Lmh0 bWwJKHdvcmtpbmcgY29weSkKQEAgLTUzNSw3ICs1MzUsNyBAQAogICAgICAgICAgICAgICAgICAg ICB7e2ludGVyYWN0aXZlLWNoYXJ0CiAgICAgICAgICAgICAgICAgICAgICAgICBjaGFydERhdGE9 cGFuZS5jaGFydERhdGEKICAgICAgICAgICAgICAgICAgICAgICAgIHJhbmdlcz1wYW5lLmFuYWx5 dGljUmFuZ2VzCi0gICAgICAgICAgICAgICAgICAgICAgICBkb21haW49cGFuZURvbWFpbgorICAg ICAgICAgICAgICAgICAgICAgICAgZG9tYWluPW92ZXJ2aWV3RG9tYWluCiAgICAgICAgICAgICAg ICAgICAgICAgICBpbnRlcmFjdGl2ZT10cnVlCiAgICAgICAgICAgICAgICAgICAgICAgICBjaGFy dFBvaW50UmFkaXVzPTIKICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRJdGVtPXBhbmUu aG92ZXJlZE9yU2VsZWN0ZWRJdGVtCkBAIC02MjEsNTIgKzYyMSwzNSBAQAogICAgIDwvc2NyaXB0 PgogCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L3gtaGFuZGxlYmFycyIgZGF0YS10ZW1wbGF0ZS1u YW1lPSJ0ZXN0R3JvdXBGb3JtIj4KLSAgICB7eyNpZiByb290c319CiAgICAgICAgIDxmb3JtIG1l dGhvZD0iUE9TVCIge3thY3Rpb24gImNyZWF0ZVRlc3RHcm91cCIgbmV3VGVzdEdyb3VwTmFtZSBy ZXBldGl0aW9uQ291bnQgb249InN1Ym1pdCJ9fT4KICAgICAgICAgICAgIDxzZWN0aW9uIGNsYXNz PSJhbmFseXNpcy1ncm91cCI+CiAgICAgICAgICAgICAgICAgPGgxPnt7aW5wdXQgbmFtZT0ibmFt ZSIgdmFsdWU9bmV3VGVzdEdyb3VwTmFtZSBwbGFjZWhvbGRlcj0iVGVzdCBncm91cCBuYW1lIiBy ZXF1aXJlZD10cnVlIHR5cGU9InRleHQifX08L2gxPgogICAgICAgICAgICAgICAgIDx0YWJsZT4K ICAgICAgICAgICAgICAgICAgICAgPHRoZWFkPgogICAgICAgICAgICAgICAgICAgICAgICAgPHRy PgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0aD5Sb290PC90aD4KLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICB7eyNlYWNoIHRlc3RTZXRzfX0KLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPHRoPgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAge3tu YW1lfX0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHt7dmlldyBFbWJlci5T ZWxlY3QKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb250ZW50PW9w dGlvbnMKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25WYWx1 ZVBhdGg9ImNvbnRlbnQudmFsdWUiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgb3B0aW9uTGFiZWxQYXRoPSJjb250ZW50LmxhYmVsIgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdGlvbj1zZWxlY3Rpb259fQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8L3RoPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0 aD5Db25maWd1cmF0aW9uPC90aD4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB7eyNlYWNo IGNvbmZpZ3VyYXRpb25zfX0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHRoPnt7 dGhpc319PC90aD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7ey9lYWNofX0KICAgICAg ICAgICAgICAgICAgICAgICAgIDwvdHI+CiAgICAgICAgICAgICAgICAgICAgIDwvdGhlYWQ+CiAg ICAgICAgICAgICAgICAgICAgIDx0Ym9keT4KLSAgICAgICAgICAgICAgICAgICAgICAgIHt7I2Vh Y2ggcm9vdHN9fQorICAgICAgICAgICAgICAgICAgICAgICAge3sjZWFjaCByb290Q29uZmlndXJh dGlvbnN9fQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx0cj4KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHRoPnt7bmFtZX19PC90aD4KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAge3sjZWFjaCBzZXRzfX0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDx0ZD57e3ZpZXcgRW1iZXIuU2VsZWN0IG5hbWU9bmFtZSBjb250ZW50PXJldmlzaW9u cyBkaXNhYmxlZD10cnVlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8dGQ+ e3t2aWV3IEVtYmVyLlNlbGVjdCBuYW1lPW5hbWUgY29udGVudD1vcHRpb25zIGRpc2FibGVkPXRy dWUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25WYWx1ZVBh dGg9ImNvbnRlbnQudmFsdWUiIG9wdGlvbkxhYmVsUGF0aD0iY29udGVudC5sYWJlbCIKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3Rpb249c2VsZWN0aW9ufX08 L3RkPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB7ey9lYWNofX0KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8L3RyPgogICAgICAgICAgICAgICAgICAgICAgICAge3svZWFj aH19CiAgICAgICAgICAgICAgICAgICAgIDwvdGJvZHk+Ci0gICAgICAgICAgICAgICAgICAgIDx0 Ym9keT4KLSAgICAgICAgICAgICAgICAgICAgICAgIDx0cj4KLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8dGg+TnVtYmVyIG9mIHJ1bnM8L3RoPgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDx0ZCBjb2xzcGFuPTI+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHt7dmll dyBFbWJlci5TZWxlY3QgY29udGVudD1wb3NzaWJsZVJlcGV0aXRpb25Db3VudHMgdmFsdWU9cmVw ZXRpdGlvbkNvdW50fX0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L3RkPgotICAgICAg ICAgICAgICAgICAgICAgICAgPC90cj4KLSAgICAgICAgICAgICAgICAgICAgPC90Ym9keT4KICAg ICAgICAgICAgICAgICA8L3RhYmxlPgotCisgICAgICAgICAgICAgICAgPGxhYmVsPk51bWJlciBv ZiBydW5zIHt7dmlldyBFbWJlci5TZWxlY3QgY29udGVudD1wb3NzaWJsZVJlcGV0aXRpb25Db3Vu dHMgdmFsdWU9cmVwZXRpdGlvbkNvdW50fX08L2xhYmVsPgogICAgICAgICAgICAgICAgIDxidXR0 b24gdHlwZT0ic3VibWl0Ij5TdGFydCBBL0IgdGVzdGluZzwvYnV0dG9uPgogICAgICAgICAgICAg PC9zZWN0aW9uPgogICAgICAgICA8L2Zvcm0+Ci0gICAge3svaWZ9fQogICAgIDwvc2NyaXB0Pgog CiA8L2hlYWQ+Cg==