110101 2013-02-18 04:14:54 -0800 Web Inspector: [Canvas] group replay log calls by frames 2013-02-18 05:47:20 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 aandrey aandrey apavlov graouts joepeck keishi loislo pfeldman pmuellr timothy vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 835321 0 aandrey 2013-02-18 04:14:54 -0800 Replay log is now grouped by canvas frames (along with draw calls). Patch to follow. 835325 1 188844 aandrey 2013-02-18 04:17:27 -0800 Created attachment 188844 Patch 835394 2 188844 webkit.review.bot 2013-02-18 05:47:17 -0800 Comment on attachment 188844 Patch Clearing flags on attachment: 188844 Committed r143206: <http://trac.webkit.org/changeset/143206> 835395 3 webkit.review.bot 2013-02-18 05:47:20 -0800 All reviewed patches have been landed. Closing bug. 188844 2013-02-18 04:17:27 -0800 2013-02-18 05:47:17 -0800 Patch bug-110101-20130218161349.patch text/plain 18192 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzY5NDY3YTY2YWU1ZDY1 NWMzYTMxMDlmZTNmOTZiNTEwYzBkNDg1NS4uYWFiMmI5MjY4NmQ5NTk3YmU0YjQ1YjEyMDRmNzgx NGE3NjU1MmVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAyLTE4ICBBbmRy ZXkgQWRhaWtpbiAgPGFhbmRyZXlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtDYW52YXNdIGdyb3VwIHJlcGxheSBsb2cgY2FsbHMgYnkgZnJhbWVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTAxMDEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHcm91cCBjYW52YXMgcmVwbGF5 IGxvZyBieSBmcmFtZXMsIHRoZW4gYnkgZHJhdyBjYWxscy4KKworICAgICAgICAqIGluc3BlY3Rv ci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qczoKKyAgICAgICAgKC4pOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3IuanNvbjoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL0NhbnZhc1Byb2ZpbGVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNhbnZh c1Byb2ZpbGVWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DYW52YXNQcm9maWxlVmlldy5w cm90b3R5cGUuZGlzcG9zZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmlsZVZp ZXcucHJvdG90eXBlLl9hcHBlbmRDYWxsTm9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2Fu dmFzUHJvZmlsZVZpZXcucHJvdG90eXBlLl9hcHBlbmREcmF3Q2FsbEdyb3VwKToKKwogMjAxMy0w Mi0xOCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBX ZWIgSW5zcGVjdG9yOiBSZW1vdmUgdW51c2VkIF9maWxlcyBmaWVsZCBpbiBGaWxlU3lzdGVtUHJv amVjdERlbGVnYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0 ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5qZWN0ZWRTY3JpcHRDYW52YXNNb2R1bGVTb3VyY2UuanMKaW5kZXggNjNkYjlkNzMyMDU3OWJi ZGUwMGExM2UwNzYyNDY3MmVjZDFjNTIxNS4uMzYxZWVlNDYzZjdiNWMzZWYxMmE4MDg3NjBjNzJl ODllODUzN2ZhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVk U2NyaXB0Q2FudmFzTW9kdWxlU291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbmplY3RlZFNjcmlwdENhbnZhc01vZHVsZVNvdXJjZS5qcwpAQCAtMjcyMCw2ICsyNzIwLDgg QEAgZnVuY3Rpb24gVHJhY2VMb2coKQogICAgIHRoaXMuX3JlcGxheWFibGVDYWxscyA9IFtdOwog ICAgIC8qKiBAdHlwZSB7IUNhY2hlfSAqLwogICAgIHRoaXMuX3JlcGxheWFibGVzQ2FjaGUgPSBu ZXcgQ2FjaGUoKTsKKyAgICAvKiogQHR5cGUgeyFPYmplY3QuPG51bWJlciwgYm9vbGVhbj59ICov CisgICAgdGhpcy5fZnJhbWVFbmRDYWxsSW5kZXhlcyA9IHt9OwogfQogCiBUcmFjZUxvZy5wcm90 b3R5cGUgPSB7CkBAIC0yNzYyLDYgKzI3NjQsMjIgQEAgVHJhY2VMb2cucHJvdG90eXBlID0gewog ICAgIGFkZENhbGw6IGZ1bmN0aW9uKGNhbGwpCiAgICAgewogICAgICAgICB0aGlzLl9yZXBsYXlh YmxlQ2FsbHMucHVzaChjYWxsLnRvUmVwbGF5YWJsZSh0aGlzLl9yZXBsYXlhYmxlc0NhY2hlKSk7 CisgICAgfSwKKworICAgIGFkZEZyYW1lRW5kTWFyazogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdmFyIGluZGV4ID0gdGhpcy5fcmVwbGF5YWJsZUNhbGxzLmxlbmd0aCAtIDE7CisgICAgICAg IGlmIChpbmRleCA+PSAwKQorICAgICAgICAgICAgdGhpcy5fZnJhbWVFbmRDYWxsSW5kZXhlc1tp bmRleF0gPSB0cnVlOworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0g aW5kZXgKKyAgICAgKiBAcmV0dXJuIHtib29sZWFufQorICAgICAqLworICAgIGlzRnJhbWVFbmRD YWxsQXQ6IGZ1bmN0aW9uKGluZGV4KQorICAgIHsKKyAgICAgICAgcmV0dXJuICEhdGhpcy5fZnJh bWVFbmRDYWxsSW5kZXhlc1tpbmRleF07CiAgICAgfQogfQogCkBAIC0yODQ4LDEyICsyODY2LDUy IEBAIFRyYWNlTG9nUGxheWVyLnByb3RvdHlwZSA9IHsKIAogLyoqCiAgKiBAY29uc3RydWN0b3IK KyAqIEBwYXJhbSB7ZnVuY3Rpb24oKX0gY2FsbGJhY2sKKyAqLworZnVuY3Rpb24gWmVyb1RpbWVv dXRDYWxsYmFjayhjYWxsYmFjaykKK3sKKyAgICB0aGlzLl9jYWxsYmFjayA9IGNhbGxiYWNrOwor ICAgIHRoaXMuX3NjaGVkdWxlZCA9IGZhbHNlOworfQorCitaZXJvVGltZW91dENhbGxiYWNrLnBy b3RvdHlwZSA9IHsKKyAgICBzY2hlZHVsZTogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgaWYg KHRoaXMuX3NjaGVkdWxlZCkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fc2No ZWR1bGVkID0gdHJ1ZTsKKyAgICAgICAgdmFyIGNhbGxiYWNrID0gdGhpcy5fb25DYWxsYmFjay5i aW5kKHRoaXMpOworICAgICAgICAvLyBXZSBuZWVkIGEgZmFzdGVzdCBhc3luYyBjYWxsYmFjaywg d2hhdGV2ZXIgZmlyZXMgZmlyc3QuCisgICAgICAgIC8vIFVzdWFsbHkgYSBwb3N0TWVzc2FnZSBz aG91bGQgYmUgZmFzdGVyIHRoYW4gYSBzZXRUaW1lb3V0KDApLgorICAgICAgICB2YXIgY2hhbm5l bCA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgpOworICAgICAgICBjaGFubmVsLnBvcnQxLm9ubWVzc2Fn ZSA9IGNhbGxiYWNrOworICAgICAgICBjaGFubmVsLnBvcnQyLnBvc3RNZXNzYWdlKCIiKTsKKyAg ICAgICAgaW5zcGVjdGVkV2luZG93LnNldFRpbWVvdXQoY2FsbGJhY2ssIDApOworICAgIH0sCisK KyAgICBjYW5jZWw6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3NjaGVkdWxlZCA9 IGZhbHNlOworICAgIH0sCisKKyAgICBfb25DYWxsYmFjazogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgaWYgKCF0aGlzLl9zY2hlZHVsZWQpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAg IHRoaXMuX3NjaGVkdWxlZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9jYWxsYmFjaygpOworICAg IH0KK30KKworLyoqCisgKiBAY29uc3RydWN0b3IKICAqLwogZnVuY3Rpb24gUmVzb3VyY2VUcmFj a2luZ01hbmFnZXIoKQogewogICAgIHRoaXMuX2NhcHR1cmluZyA9IGZhbHNlOwogICAgIHRoaXMu X3N0b3BDYXB0dXJpbmdPbkZyYW1lRW5kID0gZmFsc2U7CiAgICAgdGhpcy5fbGFzdFRyYWNlTG9n ID0gbnVsbDsKKyAgICB0aGlzLl9mcmFtZUVuZFNjaGVkdWxlciA9IG5ldyBaZXJvVGltZW91dENh bGxiYWNrKHRoaXMubWFya0ZyYW1lRW5kLmJpbmQodGhpcykpOwogfQogCiBSZXNvdXJjZVRyYWNr aW5nTWFuYWdlci5wcm90b3R5cGUgPSB7CkBAIC0yODk4LDYgKzI5NTYsOSBAQCBSZXNvdXJjZVRy YWNraW5nTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IHRoaXMuX2NhcHR1cmluZyA9IGZhbHNlOwogICAgICAgICB0aGlzLl9zdG9wQ2FwdHVyaW5nT25G cmFtZUVuZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9mcmFtZUVuZFNjaGVkdWxlci5jYW5jZWwo KTsKKyAgICAgICAgaWYgKHRoaXMuX2xhc3RUcmFjZUxvZykKKyAgICAgICAgICAgIHRoaXMuX2xh c3RUcmFjZUxvZy5hZGRGcmFtZUVuZE1hcmsoKTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0yOTQx LDIzICszMDAyLDE2IEBAIFJlc291cmNlVHJhY2tpbmdNYW5hZ2VyLnByb3RvdHlwZSA9IHsKICAg ICAgICAgaWYgKCF0aGlzLl9jYXB0dXJpbmcpCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IHRoaXMuX2xhc3RUcmFjZUxvZy5hZGRDYWxsKGNhbGwpOwotICAgICAgICBpZiAodGhpcy5fc3Rv cENhcHR1cmluZ09uRnJhbWVFbmQgJiYgdGhpcy5fbGFzdFRyYWNlTG9nLnNpemUoKSA9PT0gMSkg ewotICAgICAgICAgICAgdGhpcy5fc3RvcENhcHR1cmluZ09uRnJhbWVFbmQgPSBmYWxzZTsKLSAg ICAgICAgICAgIHRoaXMuX3NldFplcm9UaW1lb3V0cyh0aGlzLnN0b3BDYXB0dXJpbmcuYmluZCh0 aGlzLCB0aGlzLl9sYXN0VHJhY2VMb2cpKTsKLSAgICAgICAgfQorICAgICAgICB0aGlzLl9mcmFt ZUVuZFNjaGVkdWxlci5zY2hlZHVsZSgpOwogICAgIH0sCiAKLSAgICAvKioKLSAgICAgKiBAcGFy YW0ge2Z1bmN0aW9uKCl9IGNhbGxiYWNrCi0gICAgICovCi0gICAgX3NldFplcm9UaW1lb3V0czog ZnVuY3Rpb24oY2FsbGJhY2spCisgICAgbWFya0ZyYW1lRW5kOiBmdW5jdGlvbigpCiAgICAgewot ICAgICAgICAvLyBXZSBuZWVkIGEgZmFzdGVzdCBhc3luYyBjYWxsYmFjaywgd2hhdGV2ZXIgZmly ZXMgZmlyc3QuCi0gICAgICAgIC8vIFVzdWFsbHkgYSBwb3N0TWVzc2FnZSBzaG91bGQgYmUgZmFz dGVyIHRoYW4gYSBzZXRUaW1lb3V0KDApLgotICAgICAgICB2YXIgY2hhbm5lbCA9IG5ldyBNZXNz YWdlQ2hhbm5lbCgpOwotICAgICAgICBjaGFubmVsLnBvcnQxLm9ubWVzc2FnZSA9IGNhbGxiYWNr OwotICAgICAgICBjaGFubmVsLnBvcnQyLnBvc3RNZXNzYWdlKCIiKTsKLSAgICAgICAgaW5zcGVj dGVkV2luZG93LnNldFRpbWVvdXQoY2FsbGJhY2ssIDApOworICAgICAgICBpZiAoIXRoaXMuX2xh c3RUcmFjZUxvZykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fbGFzdFRyYWNl TG9nLmFkZEZyYW1lRW5kTWFyaygpOworICAgICAgICBpZiAodGhpcy5fc3RvcENhcHR1cmluZ09u RnJhbWVFbmQpCisgICAgICAgICAgICB0aGlzLnN0b3BDYXB0dXJpbmcodGhpcy5fbGFzdFRyYWNl TG9nKTsKICAgICB9CiB9CiAKQEAgLTMwNjksNiArMzEyMyw5IEBAIEluamVjdGVkQ2FudmFzTW9k dWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCF0cmFjZUxvZykKICAgICAgICAgICAgIHJl dHVybiAiRXJyb3I6IFRyYWNlIGxvZyB3aXRoIHRoZSBnaXZlbiBJRCBub3QgZm91bmQuIjsKIAor ICAgICAgICAvLyBFbnN1cmUgbGFzdCBjYWxsIGVuZHMgYSBmcmFtZS4KKyAgICAgICAgdHJhY2VM b2cuYWRkRnJhbWVFbmRNYXJrKCk7CisKICAgICAgICAgdmFyIHJlcGxheWFibGVDYWxscyA9IHRy YWNlTG9nLnJlcGxheWFibGVDYWxscygpOwogICAgICAgICBpZiAodHlwZW9mIHN0YXJ0T2Zmc2V0 ICE9PSAibnVtYmVyIikKICAgICAgICAgICAgIHN0YXJ0T2Zmc2V0ID0gMDsKQEAgLTMwOTcsNiAr MzE1NCw3IEBAIEluamVjdGVkQ2FudmFzTW9kdWxlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAg IGl0ZW0uc291cmNlVVJMID0gY2FsbEZyYW1lLnNvdXJjZVVSTDsKICAgICAgICAgICAgIGl0ZW0u bGluZU51bWJlciA9IGNhbGxGcmFtZS5saW5lTnVtYmVyOwogICAgICAgICAgICAgaXRlbS5jb2x1 bW5OdW1iZXIgPSBjYWxsRnJhbWUuY29sdW1uTnVtYmVyOworICAgICAgICAgICAgaXRlbS5pc0Zy YW1lRW5kQ2FsbCA9IHRyYWNlTG9nLmlzRnJhbWVFbmRDYWxsQXQoaSk7CiAgICAgICAgICAgICBy ZXN1bHQuY2FsbHMucHVzaChpdGVtKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gcmVzdWx0 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCmluZGV4IGM2Nzc3ZWE2MDMz ZjYxOWI5ODJkZWM5NmMzZTJjZWMxMDI4ZTkzZWMuLjkzZWNiMTUwNDdkNmFlZGQ2ZGE3NzkzZjQ5 MWIxOGQ1ZTA1N2M0MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24K QEAgLTM0OTIsNiArMzQ5Miw3IEBACiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiYXJn dW1lbnRzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkNhbGxBcmd1bWVu dCIgfSwgIm9wdGlvbmFsIjogdHJ1ZSB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog InJlc3VsdCIsICIkcmVmIjogIkNhbGxBcmd1bWVudCIsICJvcHRpb25hbCI6IHRydWUgfSwKICAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpc0RyYXdpbmdDYWxsIiwgInR5cGUiOiAiYm9v bGVhbiIsICJvcHRpb25hbCI6IHRydWUgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJpc0ZyYW1lRW5kQ2FsbCIsICJ0eXBlIjogImJvb2xlYW4iLCAib3B0aW9uYWwiOiB0cnVlIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAicHJvcGVydHkiLCAidHlwZSI6ICJzdHJp bmciLCAib3B0aW9uYWwiOiB0cnVlIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAi dmFsdWUiLCAiJHJlZiI6ICJDYWxsQXJndW1lbnQiLCAib3B0aW9uYWwiOiB0cnVlIH0sCiAgICAg ICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic291cmNlVVJMIiwgInR5cGUiOiAic3RyaW5nIiwg Im9wdGlvbmFsIjogdHJ1ZSB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9DYW52YXNQcm9maWxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ2FudmFzUHJvZmlsZVZpZXcuanMKaW5kZXggM2Q5NmY3NGI2NWJlYzA3MzM4 ZjNhNTNlNmYzMjEyZmJhYWQ0MWQ0MC4uMzM5YjVmM2VmNDhiZWJiNWI1NTk1YjRkY2M4MTgzYTVl ZmU2ZWE3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D YW52YXNQcm9maWxlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NhbnZhc1Byb2ZpbGVWaWV3LmpzCkBAIC05MCw2ICs5MCw4IEBAIFdlYkluc3BlY3Rvci5D YW52YXNQcm9maWxlVmlldyA9IGZ1bmN0aW9uKHByb2ZpbGUpCiAgICAgdGhpcy5fbG9nR3JpZE5v ZGVzID0gW107CiAgICAgLyoqIEB0eXBlIHshQXJyYXkuPFdlYkluc3BlY3Rvci5EYXRhR3JpZE5v ZGU+fSAqLwogICAgIHRoaXMuX2RyYXdDYWxsR3JvdXBzID0gW107CisgICAgLyoqIEB0eXBlIHsh QXJyYXkuPFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGU+fSAqLworICAgIHRoaXMuX2ZyYW1lR3Jv dXBzID0gW107CiAKICAgICB0aGlzLl9zcGxpdFZpZXcuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAg IHRoaXMuX3JlcXVlc3RUcmFjZUxvZygpOwpAQCAtMTA2LDYgKzEwOCw3IEBAIFdlYkluc3BlY3Rv ci5DYW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl9s b2dHcmlkTm9kZXMgPSBbXTsKICAgICAgICAgdGhpcy5fZHJhd0NhbGxHcm91cE5vZGVzID0gW107 CisgICAgICAgIHRoaXMuX2ZyYW1lR3JvdXBzID0gW107CiAgICAgICAgIHRoaXMuX2xpbmtpZmll ci5yZXNldCgpOwogICAgIH0sCiAKQEAgLTM2OSwxMiArMzcyLDM5IEBAIFdlYkluc3BlY3Rvci5D YW52YXNQcm9maWxlVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBkcmF3Q2FsbEdyb3Vw LnNlbGVjdGFibGUgPSB0cnVlOwogICAgICAgICAgICAgZHJhd0NhbGxHcm91cC5kcmF3Q2FsbEdy b3VwSW5kZXggPSBpbmRleDsKICAgICAgICAgICAgIHRoaXMuX2RyYXdDYWxsR3JvdXBzLnB1c2go ZHJhd0NhbGxHcm91cCk7Ci0gICAgICAgICAgICB0aGlzLl9sb2dHcmlkLnJvb3ROb2RlKCkuYXBw ZW5kQ2hpbGQoZHJhd0NhbGxHcm91cCk7CisgICAgICAgICAgICB0aGlzLl9hcHBlbmREcmF3Q2Fs bEdyb3VwKGRyYXdDYWxsR3JvdXApOwogICAgICAgICB9CiAgICAgICAgIGRyYXdDYWxsR3JvdXAu YXBwZW5kQ2hpbGQoZ3JpZE5vZGUpOwogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcGFyYW0g eyFXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfSBkcmF3Q2FsbEdyb3VwCisgICAgICovCisgICAg X2FwcGVuZERyYXdDYWxsR3JvdXA6IGZ1bmN0aW9uKGRyYXdDYWxsR3JvdXApCisgICAgeworICAg ICAgICB2YXIgZnJhbWVHcm91cCA9IHRoaXMuX2ZyYW1lR3JvdXBzLnBlZWtMYXN0KCk7CisgICAg ICAgIGlmIChmcmFtZUdyb3VwKSB7CisgICAgICAgICAgICB2YXIgbGFzdERyYXdDYWxsR3JvdXAg PSBmcmFtZUdyb3VwLmNoaWxkcmVuLnBlZWtMYXN0KCk7CisgICAgICAgICAgICB2YXIgbGFzdE5v ZGUgPSBsYXN0RHJhd0NhbGxHcm91cCAmJiBsYXN0RHJhd0NhbGxHcm91cC5jaGlsZHJlbi5wZWVr TGFzdCgpOworICAgICAgICAgICAgaWYgKGxhc3ROb2RlICYmIGxhc3ROb2RlLmNhbGwuaXNGcmFt ZUVuZENhbGwpCisgICAgICAgICAgICAgICAgZnJhbWVHcm91cCA9IG51bGw7CisgICAgICAgIH0K KyAgICAgICAgaWYgKCFmcmFtZUdyb3VwKSB7CisgICAgICAgICAgICB2YXIgaW5kZXggPSB0aGlz Ll9mcmFtZUdyb3Vwcy5sZW5ndGg7CisgICAgICAgICAgICB2YXIgZGF0YSA9IHt9OworICAgICAg ICAgICAgZGF0YVswXSA9ICIiOworICAgICAgICAgICAgZGF0YVsxXSA9ICJGcmFtZSAjIiArIChp bmRleCArIDEpOworICAgICAgICAgICAgZGF0YVsyXSA9ICIiOworICAgICAgICAgICAgZnJhbWVH cm91cCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlKGRhdGEpOworICAgICAgICAgICAg ZnJhbWVHcm91cC5zZWxlY3RhYmxlID0gdHJ1ZTsKKyAgICAgICAgICAgIGZyYW1lR3JvdXAuZnJh bWVHcm91cEluZGV4ID0gaW5kZXg7CisgICAgICAgICAgICB0aGlzLl9mcmFtZUdyb3Vwcy5wdXNo KGZyYW1lR3JvdXApOworICAgICAgICAgICAgdGhpcy5fbG9nR3JpZC5yb290Tm9kZSgpLmFwcGVu ZENoaWxkKGZyYW1lR3JvdXApOworICAgICAgICB9CisgICAgICAgIGZyYW1lR3JvdXAuYXBwZW5k Q2hpbGQoZHJhd0NhbGxHcm91cCk7CisgICAgfSwKKworICAgIC8qKgogICAgICAqIEBwYXJhbSB7 bnVtYmVyfSBpbmRleAogICAgICAqIEBwYXJhbSB7Q2FudmFzQWdlbnQuQ2FsbH0gY2FsbAogICAg ICAqIEByZXR1cm4geyFXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2RlfQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJlMmM1ZGY2 MzRhMzI3NzJhZGQ3MGZlM2U1YTc0YmVkMzUwNzhjNTEuLjdiOWE3ZmQzZmNiMzBmNzUyYjQxYWZm YmQ4YmFiYzllN2Q5OGZkZjYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wMi0xOCAgQW5k cmV5IEFkYWlraW4gIDxhYW5kcmV5QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBbQ2FudmFzXSBncm91cCByZXBsYXkgbG9nIGNhbGxzIGJ5IGZyYW1lcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEwMTAxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvZmls ZXIvY2FudmFzLXByb2ZpbGVyLXRlc3QuanM6CisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVy L2NhbnZhczJkL2NhbnZhcy1yZXBsYXktbG9nLWdyaWQtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGluc3BlY3Rvci9wcm9maWxlci9jYW52YXMyZC9jYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0bWw6 CisgICAgICAgICogaW5zcGVjdG9yL3Byb2ZpbGVyL2NhbnZhczJkL2NhbnZhcy1zdGFjay10cmFj ZS1leHBlY3RlZC50eHQ6CisKIDIwMTMtMDItMTggIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgRm9sbG93IHVwIHRvIHIxNDMxMTIsIGZpeGluZyB0ZXN0 cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jYW52YXMtcHJv ZmlsZXItdGVzdC5qcyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jYW52YXMtcHJv ZmlsZXItdGVzdC5qcwppbmRleCBkNmQ2YTQyMGQ4YjJiYjFkMmFmNmM2NDQyY2JjYzkzMGIwY2Jh ZDJmLi41YjJlYWVhMTEyNGE5MzA2ZjA1MzE2ZGM3ZDA4NzViYjNmMGFkYjk4IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvY2FudmFzLXByb2ZpbGVyLXRlc3QuanMK KysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2NhbnZhcy1wcm9maWxlci10ZXN0 LmpzCkBAIC02NCw2ICs2NCw3IEBAIEluc3BlY3RvclRlc3QuZHVtcFRyYWNlTG9nQ2FsbCA9IGZ1 bmN0aW9uKGNhbGwsIGluZGVudCkKICAgICAgICAgY2FsbC5wcm9wZXJ0eSA/ICJwcm9wZXJ0eTpc IiIgKyBjYWxsLnByb3BlcnR5ICsgIlwiIiA6ICIiLAogICAgICAgICBjYWxsLnZhbHVlID8gInZh bHVlOiIgKyBjYWxsLnZhbHVlLmRlc2NyaXB0aW9uIDogIiIsCiAgICAgICAgIGNhbGwuaXNEcmF3 aW5nQ2FsbCA/ICJpc0RyYXdpbmdDYWxsOnRydWUiIDogIiIsCisgICAgICAgIGNhbGwuaXNGcmFt ZUVuZENhbGwgPyAiaXNGcmFtZUVuZENhbGw6dHJ1ZSIgOiAiIiwKICAgICAgICAgInNvdXJjZVVS TDoiICsgZm9ybWF0U291cmNlVVJMKGNhbGwuc291cmNlVVJMKSwKICAgICAgICAgImxpbmVOdW1i ZXI6IiArIGNhbGwubGluZU51bWJlciwKICAgICAgICAgImNvbHVtbk51bWJlcjoiICsgY2FsbC5j b2x1bW5OdW1iZXIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9j YW52YXMyZC9jYW52YXMtcmVwbGF5LWxvZy1ncmlkLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L2luc3BlY3Rvci9wcm9maWxlci9jYW52YXMyZC9jYW52YXMtcmVwbGF5LWxvZy1ncmlkLWV4cGVj dGVkLnR4dAppbmRleCBiYWRlMTBjZTYxYzVmN2MzZDI2ZTJjNjhkOTY2N2M1MjY0Y2IyZWNmLi5l MWZkYWFiNmQ1MGQ1ZGQ3Mjc0ODI2Y2ZmZWU0Zjk5YjY1MDk0NGY4IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvY2FudmFzMmQvY2FudmFzLXJlcGxheS1sb2ctZ3Jp ZC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2NhbnZh czJkL2NhbnZhcy1yZXBsYXktbG9nLWdyaWQtZXhwZWN0ZWQudHh0CkBAIC0yLDI0ICsyLDMxIEBA IFRlc3RzIHJlcGxheSBsb2cgZ3JpZC4KIAogQnVnIDEwOTU5MiAKIAotICAgfCAgICAgICAgIERy YXcgY2FsbCBncm91cCAjMSB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IAotIDEg fCAgICAgICAgICAgICAgICBiZWdpblBhdGgoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRt bDoyNiB8IAotIDIgfCAgICAgICByZWN0KDAsIDAsIDEwMCwgMTAwKSB8IGNhbnZhcy1yZXBsYXkt bG9nLWdyaWQuaHRtbDoyNyB8IAotIDMgfCAgICBjb250ZXh0LmZpbGxTdHlsZSA9IHJlZCB8IGNh bnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOCB8IAotIDQgfCAgICAgICAgICAgICAgICAgICAg IGZpbGwoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOSB8IAotICAgfCAgICAgICAg IERyYXcgY2FsbCBncm91cCAjMiB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IAot IDUgfCAgICAgICAgICAgICAgICBiZWdpblBhdGgoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQu aHRtbDoyNiB8IAotIDYgfCAgICAgICAgIHJlY3QoNSwgNSwgOTUsIDk1KSB8IGNhbnZhcy1yZXBs YXktbG9nLWdyaWQuaHRtbDoyNyB8IAotIDcgfCAgY29udGV4dC5maWxsU3R5bGUgPSBncmVlbiB8 IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOCB8IAotIDggfCAgICAgICAgICAgICAgICAg ICAgIGZpbGwoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOSB8IAotICAgfCAgICAg ICAgIERyYXcgY2FsbCBncm91cCAjMyB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 IAotIDkgfCAgICAgICAgICAgICAgICBiZWdpblBhdGgoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdy aWQuaHRtbDoyNiB8IAotMTAgfCAgICAgICByZWN0KDEwLCAxMCwgOTAsIDkwKSB8IGNhbnZhcy1y ZXBsYXktbG9nLWdyaWQuaHRtbDoyNyB8IAotMTEgfCAgIGNvbnRleHQuZmlsbFN0eWxlID0gYmx1 ZSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOCB8IAotMTIgfCAgICAgICAgICAgICAg ICAgICAgIGZpbGwoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOSB8IAotICAgfCAg ICAgICAgIERyYXcgY2FsbCBncm91cCAjNCB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8IAotMTMgfCAgICAgICAgICAgICAgICBiZWdpblBhdGgoKSB8IGNhbnZhcy1yZXBsYXktbG9n LWdyaWQuaHRtbDoyNiB8IAotMTQgfCAgICAgICByZWN0KDE1LCAxNSwgODUsIDg1KSB8IGNhbnZh cy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyNyB8IAotMTUgfCBjb250ZXh0LmZpbGxTdHlsZSA9IHll bGxvdyB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOCB8IAotMTYgfCAgICAgICAgICAg ICAgICAgICAgIGZpbGwoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOSB8IAorICAg fCAgICAgICAgICAgICAgICAgICBGcmFtZSAjMSB8ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB8IHwKKyAgIHwgICAgICAgICBEcmF3IGNhbGwgZ3JvdXAgIzEgfCAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCB8CisgMSB8ICAgICAgICAgICAgICAgIGJlZ2luUGF0aCgpIHwg Y2FudmFzLXJlcGxheS1sb2ctZ3JpZC5odG1sOjI2IHwgfAorIDIgfCAgICAgICByZWN0KDAsIDAs IDEwMCwgMTAwKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyNyB8IHwKKyAzIHwgICAg Y29udGV4dC5maWxsU3R5bGUgPSByZWQgfCBjYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0bWw6Mjgg fCB8CisgNCB8ICAgICAgICAgICAgICAgICAgICAgZmlsbCgpIHwgY2FudmFzLXJlcGxheS1sb2ct Z3JpZC5odG1sOjI5IHwgfAorICAgfCAgICAgICAgIERyYXcgY2FsbCBncm91cCAjMiB8ICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICB8IHwKKyA1IHwgICAgICAgICAgICAgICAgYmVnaW5Q YXRoKCkgfCBjYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0bWw6MjYgfCB8CisgNiB8ICAgICAgICAg cmVjdCg1LCA1LCA5NSwgOTUpIHwgY2FudmFzLXJlcGxheS1sb2ctZ3JpZC5odG1sOjI3IHwgfAor IDcgfCAgY29udGV4dC5maWxsU3R5bGUgPSBncmVlbiB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQu aHRtbDoyOCB8IHwKKyA4IHwgICAgICAgICAgICAgICAgICAgICBmaWxsKCkgfCBjYW52YXMtcmVw bGF5LWxvZy1ncmlkLmh0bWw6MjkgfCB8CisgICB8ICAgICAgICAgICAgICAgICAgIEZyYW1lICMy IHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgfAorICAgfCAgICAgICAgIERyYXcg Y2FsbCBncm91cCAjMyB8ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8IHwKKyA5IHwg ICAgICAgICAgICAgICAgYmVnaW5QYXRoKCkgfCBjYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0bWw6 MjYgfCB8CisxMCB8ICAgICAgIHJlY3QoMTAsIDEwLCA5MCwgOTApIHwgY2FudmFzLXJlcGxheS1s b2ctZ3JpZC5odG1sOjI3IHwgfAorMTEgfCAgIGNvbnRleHQuZmlsbFN0eWxlID0gYmx1ZSB8IGNh bnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOCB8IHwKKzEyIHwgICAgICAgICAgICAgICAgICAg ICBmaWxsKCkgfCBjYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0bWw6MjkgfCB8CisgICB8ICAgICAg ICAgRHJhdyBjYWxsIGdyb3VwICM0IHwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwg fAorMTMgfCAgICAgICAgICAgICAgICBiZWdpblBhdGgoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdy aWQuaHRtbDoyNiB8IHwKKzE0IHwgICAgICAgcmVjdCgxNSwgMTUsIDg1LCA4NSkgfCBjYW52YXMt cmVwbGF5LWxvZy1ncmlkLmh0bWw6MjcgfCB8CisxNSB8IGNvbnRleHQuZmlsbFN0eWxlID0geWVs bG93IHwgY2FudmFzLXJlcGxheS1sb2ctZ3JpZC5odG1sOjI4IHwgfAorMTYgfCAgICAgICAgICAg ICAgICAgICAgIGZpbGwoKSB8IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyOSB8IHwKKyAg IHwgICAgICAgICBEcmF3IGNhbGwgZ3JvdXAgIzUgfCAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCB8CisxNyB8ICAgICAgICAgICAgICAgIGJlZ2luUGF0aCgpIHwgY2FudmFzLXJlcGxh eS1sb2ctZ3JpZC5odG1sOjI2IHwgfAorMTggfCAgICAgICByZWN0KDIwLCAyMCwgODAsIDgwKSB8 IGNhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbDoyNyB8IHwKKzE5IHwgIGNvbnRleHQuZmlsbFN0 eWxlID0gYmxhY2sgfCBjYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0bWw6MjggfCB8CisyMCB8ICAg ICAgICAgICAgICAgICAgICAgZmlsbCgpIHwgY2FudmFzLXJlcGxheS1sb2ctZ3JpZC5odG1sOjI5 IHwgfAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvY2FudmFz MmQvY2FudmFzLXJlcGxheS1sb2ctZ3JpZC5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3By b2ZpbGVyL2NhbnZhczJkL2NhbnZhcy1yZXBsYXktbG9nLWdyaWQuaHRtbAppbmRleCA1Y2YxMTdh MTAzOTNiYjlmYTM2NjQzMWEzY2UzOWNkNmU2ZTI2Y2ViLi5mNTU0NjQ3N2NkN2JiNjk0MzQxNWZj YjZjMjdkMWFjOTI2ZmRhZTgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJv ZmlsZXIvY2FudmFzMmQvY2FudmFzLXJlcGxheS1sb2ctZ3JpZC5odG1sCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9wcm9maWxlci9jYW52YXMyZC9jYW52YXMtcmVwbGF5LWxvZy1ncmlkLmh0 bWwKQEAgLTQyLDYgKzQyLDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgdmFyIHByb2ZpbGVUeXBl ID0gcHJvZmlsZXNQYW5lbC5nZXRQcm9maWxlVHlwZShXZWJJbnNwZWN0b3IuQ2FudmFzUHJvZmls ZVR5cGUuVHlwZUlkKTsKICAgICBwcm9maWxlc1BhbmVsLl9vblByb2ZpbGVUeXBlU2VsZWN0ZWQo e2RhdGE6IHByb2ZpbGVUeXBlfSk7CiAKKyAgICBJbnNwZWN0b3JUZXN0Lm92ZXJyaWRlKHByb2Zp bGVUeXBlLCAiX2lzU2luZ2xlRnJhbWVNb2RlIiwgZnVuY3Rpb24oKSB7IHJldHVybiBmYWxzZTsg fSwgdHJ1ZSAvKnN0aWNreSovKTsKICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIocHJvZmls ZVR5cGUsICJfZGlkU3RhcnRDYXB0dXJpbmdGcmFtZSIsIGRpZFN0YXJ0Q2FwdHVyaW5nRnJhbWUp OwogICAgIHByb2ZpbGVzUGFuZWwudG9nZ2xlUmVjb3JkQnV0dG9uKCk7CiAKQEAgLTUyLDE3ICs1 MywyNiBAQCBmdW5jdGlvbiB0ZXN0KCkKICAgICAgICAgcHJvZmlsZUhlYWRlciA9IHByb2ZpbGVz UGFuZWwuZ2V0UHJvZmlsZXMoV2ViSW5zcGVjdG9yLkNhbnZhc1Byb2ZpbGVUeXBlLlR5cGVJZClb MF07CiAgICAgICAgIHRyYWNlTG9nSWQgPSBwcm9maWxlSGVhZGVyLnRyYWNlTG9nSWQoKTsKICAg ICAgICAgcHJvZmlsZXNQYW5lbC5zaG93UHJvZmlsZShwcm9maWxlSGVhZGVyKTsKLSAgICAgICAg SW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluQ29uc29sZSgiZG9Tb21lQ2FudmFzQ2FsbHMoNCkiLCBk aWRTb21lQ2FudmFzQ2FsbHMpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIocHJv ZmlsZUhlYWRlciwgIl91cGRhdGVDYXB0dXJpbmdTdGF0dXMiLCBkaWRSZWNlaXZlRmlyc3RGcmFt ZSk7CisgICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJbkNvbnNvbGUoImRvU29tZUNhbnZh c0NhbGxzKDIpIik7CiAgICAgfQotICAgIGZ1bmN0aW9uIGRpZFNvbWVDYW52YXNDYWxscygpCisg ICAgZnVuY3Rpb24gZGlkUmVjZWl2ZUZpcnN0RnJhbWUodHJhY2VMb2cpCiAgICAgewotICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIocHJvZmlsZUhlYWRlciwgIl91cGRhdGVDYXB0dXJp bmdTdGF0dXMiLCBvblVwZGF0ZUNhcHR1cmluZ1N0YXR1cyk7CisgICAgICAgIGlmICghdHJhY2VM b2cgfHwgdHJhY2VMb2cuY2FsbHMubGVuZ3RoIDwgMikgeworICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5hZGRTbmlmZmVyKHByb2ZpbGVIZWFkZXIsICJfdXBkYXRlQ2FwdHVyaW5nU3RhdHVzIiwg ZGlkUmVjZWl2ZUZpcnN0RnJhbWUpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9Cisg ICAgICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJbkNvbnNvbGUoImRvU29tZUNhbnZhc0NhbGxz KDMpIiwgZGlkU2Vjb25kRnJhbWVDYWxscyk7CisgICAgfQorICAgIGZ1bmN0aW9uIGRpZFNlY29u ZEZyYW1lQ2FsbHMoKQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKHBy b2ZpbGVIZWFkZXIsICJfdXBkYXRlQ2FwdHVyaW5nU3RhdHVzIiwgZGlkUmVjZWl2ZVNlY29uZEZy YW1lKTsKICAgICAgICAgcHJvZmlsZXNQYW5lbC50b2dnbGVSZWNvcmRCdXR0b24oKTsKICAgICB9 Ci0gICAgZnVuY3Rpb24gb25VcGRhdGVDYXB0dXJpbmdTdGF0dXMoKQorICAgIGZ1bmN0aW9uIGRp ZFJlY2VpdmVTZWNvbmRGcmFtZSgpCiAgICAgewogICAgICAgICBpZiAocHJvZmlsZUhlYWRlci5f YWxpdmUpIHsKLSAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZlcihwcm9maWxlSGVh ZGVyLCAiX3VwZGF0ZUNhcHR1cmluZ1N0YXR1cyIsIG9uVXBkYXRlQ2FwdHVyaW5nU3RhdHVzKTsK KyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZlcihwcm9maWxlSGVhZGVyLCAiX3Vw ZGF0ZUNhcHR1cmluZ1N0YXR1cyIsIGRpZFJlY2VpdmVTZWNvbmRGcmFtZSk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTExLDYgKzEyMSw4IEBAIGZ1bmN0aW9uIHRlc3Qo KQogICAgICAgICAgICAgICAgICAgICBsaW5lICs9ICIgfCAiOwogICAgICAgICAgICAgICAgIGxp bmUgKz0gYWxpZ25UZXh0KHRleHRSb3dzW2ldW2pdLCB0ZXh0V2lkdGhzW2pdKTsKICAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGlmIChsaW5lKQorICAgICAgICAgICAgICAgIGxpbmUgKz0gInwi OwogICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQobGluZSk7CiAgICAgICAgIH0K ICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvY2FudmFz MmQvY2FudmFzLXN0YWNrLXRyYWNlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9wcm9maWxlci9jYW52YXMyZC9jYW52YXMtc3RhY2stdHJhY2UtZXhwZWN0ZWQudHh0CmluZGV4 IDE5NzZkZjNiMzBhYzVlZDkzYzk0ZDlhYWE1YWViNDZhZTMxNThmMDEuLjdkZDRhN2U0ZmYyMmE5 MWY1ZjVlNTcwZDVlNWFkM2EyYzQ3MWEyODkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9wcm9maWxlci9jYW52YXMyZC9jYW52YXMtc3RhY2stdHJhY2UtZXhwZWN0ZWQudHh0Cisr KyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm9maWxlci9jYW52YXMyZC9jYW52YXMtc3RhY2st dHJhY2UtZXhwZWN0ZWQudHh0CkBAIC02LDUgKzYsNSBAQCBCdWcgMTA3ODA1CiAgIHtDYWxsfSAg ZnVuY3Rpb25OYW1lOiJiZWdpblBhdGgiICBhcmd1bWVudHM6W10gIHNvdXJjZVVSTDoiY2FudmFz LXN0YWNrLXRyYWNlLmh0bWwiICBsaW5lTnVtYmVyOjE5ICBjb2x1bW5OdW1iZXI6MTMKICAge0Nh bGx9ICBmdW5jdGlvbk5hbWU6InJlY3QiICBhcmd1bWVudHM6WzAsMCwxMDAsMTAwXSAgc291cmNl VVJMOiJjYW52YXMtc3RhY2stdHJhY2UuaHRtbCIgIGxpbmVOdW1iZXI6MjAgIGNvbHVtbk51bWJl cjoxMwogICB7Q2FsbH0gIHByb3BlcnR5OiJmaWxsU3R5bGUiICB2YWx1ZTpyZWQgIHNvdXJjZVVS TDoiY2FudmFzLXN0YWNrLXRyYWNlLmh0bWwiICBsaW5lTnVtYmVyOjIxICBjb2x1bW5OdW1iZXI6 MjMKLSAge0NhbGx9ICBmdW5jdGlvbk5hbWU6ImZpbGwiICBhcmd1bWVudHM6W10gIGlzRHJhd2lu Z0NhbGw6dHJ1ZSAgc291cmNlVVJMOiJjYW52YXMtc3RhY2stdHJhY2UuaHRtbCIgIGxpbmVOdW1i ZXI6MjIgIGNvbHVtbk51bWJlcjoxMworICB7Q2FsbH0gIGZ1bmN0aW9uTmFtZToiZmlsbCIgIGFy Z3VtZW50czpbXSAgaXNEcmF3aW5nQ2FsbDp0cnVlICBpc0ZyYW1lRW5kQ2FsbDp0cnVlICBzb3Vy Y2VVUkw6ImNhbnZhcy1zdGFjay10cmFjZS5odG1sIiAgbGluZU51bWJlcjoyMiAgY29sdW1uTnVt YmVyOjEzCiAK