84587 2012-04-23 05:09:57 -0700 Web Inspector: Rename and extract UISourceCodeImpl into JavaScriptSource 2012-04-23 06:26:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 607606 0 pfeldman 2012-04-23 05:09:57 -0700 This is a first step from the meta bug https://bugs.webkit.org/show_bug.cgi?id=84586. 607608 1 138325 pfeldman 2012-04-23 05:20:56 -0700 Created attachment 138325 Patch 607632 2 pfeldman 2012-04-23 06:26:36 -0700 Committed r114892: <http://trac.webkit.org/changeset/114892> 138325 2012-04-23 05:20:56 -0700 2012-04-23 05:56:09 -0700 Patch bug-84587-20120423162055.patch text/plain 18168 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0ODg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWEzNjBjYjMyYmMzNDEz Y2M0MjhiYzU4MzAzMjlkMTkzMzIxNzM1My4uNjEyYWUwYjBjMGNlYWU2NzIzZjNlOGJhNmQyNzk0 YjRlYTI3NzdlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTA0LTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlbmFtZSBhbmQgZXh0cmFjdCBVSVNvdXJjZUNvZGVJbXBsIGludG8gSmF2YVNjcmlwdFNv dXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1 ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBj aGFuZ2VzIG90aGVyIHRoYW4gZXh0cmFjdGlvbiBoZXJlLiBUaGlzIGlzIHRoZSBmaXJzdCBzdGVw IGluIHRoZSBSZXNvdXJjZQorICAgICAgICBoaWVyYXJjaHkgcmVmYWN0b3JpbmcgZGVzY3JpYmVk IGluIGJ1ZyA4NDU4Ni4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJD b3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1m cm9udC1lbmQucHk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNjcmlw dE1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcGlsZXJTY3JpcHRNYXBwaW5n LnByb3RvdHlwZS5hZGRTY3JpcHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGVi dWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0phdmFTY3JpcHRTb3VyY2UuanM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFT Y3JpcHRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UucHJv dG90eXBlLmJyZWFrcG9pbnRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlLnByb3RvdHlwZS5icmVha3BvaW50QWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRTb3VyY2UucHJvdG90eXBlLmJyZWFrcG9pbnRSZW1vdmVkKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlLnByb3RvdHlwZS5jb25zb2xlTWVzc2FnZXMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UucHJvdG90eXBlLmNvbnNvbGVN ZXNzYWdlQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UucHJv dG90eXBlLmNvbnNvbGVNZXNzYWdlc0NsZWFyZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvUmF3U291cmNlQ29kZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SYXdTb3VyY2VD b2RlLnByb3RvdHlwZS5fY3JlYXRlVUlTb3VyY2VDb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NuaXBwZXRzTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU25pcHBl dHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZS5fc25pcHBldEFkZGVkKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5TbmlwcGV0c1NjcmlwdE1hcHBpbmcucHJvdG90eXBlLl9jcmVhdGVVSVNvdXJjZUNv ZGVGb3JTY3JpcHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYzoK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgorCiAyMDEyLTA0 LTIzICBWaW5lZXQgQ2hhdWRoYXJ5ICA8cmdmNzQ4QG1vdG9yb2xhLmNvbT4KIAogICAgICAgICBK UyBiaW5kaW5nIGNvZGUgZ2VuZXJhdG9yIGRvZXNuJ3QgaGFuZGxlICJhdHRyaWJ1dGUgdW5zaWdu ZWQgbG9uZ1tdIiB3ZWxsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggZDlmZDlhMjlhODM4Y2ZkZWI0YTM1 MDI3YjA1MmFlMWM3MTE2Y2JjNi4uZTcyYzQ2MjFkYzBkNzdjZjExMGFkZjQ3ZTQ3ZjNlZTIyZTdj ZTBmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQpAQCAtNjM1OSw2ICs2MzU5LDcgQEAKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcycsCiAgICAgICAgICAgICAnaW5zcGVj dG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0Q29udGV4dE1hbmFnZXIuanMnLAogICAgICAgICAgICAg J2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdEZvcm1hdHRlci5qcycsCisgICAgICAgICAg ICAnaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlLmpzJywKICAgICAgICAgICAg ICdpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcycsCiAgICAgICAg ICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzJywKICAgICAgICAg ICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3RpY3MuanMnLApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2ogYi9Tb3VyY2Uv V2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagppbmRleCA5ZGIyNjVkM2VlYjU3 YTZkZjYxNTU4ZDRmNmY2Yzk2YWJjMTNjYmIxLi5iMmRmZGI2OGQxMDhiOTM4YTNkZWJkMDAxNzM1 YWZlYjVjM2ZkZWRlIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9X ZWJDb3JlLnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3Jl LnZjcHJvagpAQCAtNzQxMDUsNiArNzQxMDUsMTAgQEAKIAkJCQkJPgogCQkJCTwvRmlsZT4KIAkJ CQk8RmlsZQorCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcSmF2YVNj cmlwdFNvdXJjZS5qcyIKKwkJCQkJPgorCQkJCTwvRmlsZT4KKwkJCQk8RmlsZQogCQkJCQlSZWxh dGl2ZVBhdGg9Ii4uXGluc3BlY3Rvclxmcm9udC1lbmRcSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz IgogCQkJCQk+CiAJCQkJPC9GaWxlPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBp bGUtZnJvbnQtZW5kLnB5CmluZGV4IGRlMDU2OTFjYWU5ZDlkODU0MDExNzg3ODhmNzFiYjY1NTlh N2QzNzkuLjgyODc0NTc5ZjYyMzYyZGU2MzBhYjg3MzJiNDlmMzFiMTU1NDE4OWMgMTAwNzU1Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weQorKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkKQEAgLTE1NCw2ICsx NTQsNyBAQCBtb2R1bGVzID0gWwogICAgICAgICAgICAgIk5hdmlnYXRvck92ZXJsYXlDb250cm9s bGVyLmpzIiwKICAgICAgICAgICAgICJOYXZpZ2F0b3JWaWV3LmpzIiwKICAgICAgICAgICAgICJK YXZhU2NyaXB0Q29udGV4dE1hbmFnZXIuanMiLAorICAgICAgICAgICAgIkphdmFTY3JpcHRSZXNv dXJjZS5qcyIsCiAgICAgICAgICAgICAiT2JqZWN0UG9wb3ZlckhlbHBlci5qcyIsCiAgICAgICAg ICAgICAiT2JqZWN0UHJvcGVydGllc1NlY3Rpb24uanMiLAogICAgICAgICAgICAgIlByb3BlcnRp ZXNTaWRlYmFyUGFuZS5qcyIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCmluZGV4IDA1YTkwOTU4Njkz NTVkOTg3YjYyNWU3NDVkNjc3NjY5MTM0ZWE4M2UuLmQ4ZDI5MmQ4OTNhNzI1Nzk4YTc0N2NkZGJl MGMzZDE1ZjBlYjY2ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCkBAIC0xMTcsNyArMTE3LDcg QEAgV2ViSW5zcGVjdG9yLkNvbXBpbGVyU2NyaXB0TWFwcGluZy5wcm90b3R5cGUgPSB7CiAgICAg ICAgICAgICAgICAgY29udGVudFByb3ZpZGVyID0gbmV3IFdlYkluc3BlY3Rvci5TdGF0aWNDb250 ZW50UHJvdmlkZXIoInRleHQvamF2YXNjcmlwdCIsIHNvdXJjZUNvbnRlbnQpOwogICAgICAgICAg ICAgZWxzZQogICAgICAgICAgICAgICAgIGNvbnRlbnRQcm92aWRlciA9IG5ldyBXZWJJbnNwZWN0 b3IuQ29tcGlsZXJTb3VyY2VNYXBwaW5nQ29udGVudFByb3ZpZGVyKHNvdXJjZVVSTCk7Ci0gICAg ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJ bXBsKHNvdXJjZVVSTCwgc291cmNlVVJMLCBjb250ZW50UHJvdmlkZXIpOworICAgICAgICAgICAg dmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZShzb3Vy Y2VVUkwsIHNvdXJjZVVSTCwgY29udGVudFByb3ZpZGVyKTsKICAgICAgICAgICAgIHVpU291cmNl Q29kZS5pc0NvbnRlbnRTY3JpcHQgPSBzY3JpcHQuaXNDb250ZW50U2NyaXB0OwogICAgICAgICAg ICAgdWlTb3VyY2VDb2RlLmlzRWRpdGFibGUgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuX3Vp U291cmNlQ29kZUJ5VVJMW3NvdXJjZVVSTF0gPSB1aVNvdXJjZUNvZGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2Vu dGF0aW9uTW9kZWwuanMKaW5kZXggZmRjN2VlY2Y2OWIzZjE4NjhjMzVjNTk0MWVlZTVmMGExMmE1 MDhjOS4uNTg3MzhhMTRiMjUwNzAwMDMxNGNhNzUwNWZlOTBmNjRiNWVhMmI0MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlv bk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtNTUyLDgzICs1NTIsNiBAQCBXZWJJbnNwZWN0b3Iu RGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAKIFdlYkluc3BlY3Rvci5E ZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0 b3IuT2JqZWN0LnByb3RvdHlwZTsKIAotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGV4dGVu ZHMge1dlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGV9Ci0gKiBAcGFyYW0ge3N0cmluZ30gaWQKLSAq IEBwYXJhbSB7c3RyaW5nfSB1cmwKLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkNvbnRlbnRQcm92 aWRlcn0gY29udGVudFByb3ZpZGVyCi0gKi8KLVdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBs ID0gZnVuY3Rpb24oaWQsIHVybCwgY29udGVudFByb3ZpZGVyKQotewotICAgIFdlYkluc3BlY3Rv ci5VSVNvdXJjZUNvZGUuY2FsbCh0aGlzLCBpZCwgdXJsLCBjb250ZW50UHJvdmlkZXIpOwotICAg IC8qKgotICAgICAqIEB0eXBlIHtPYmplY3QuPHN0cmluZyxXZWJJbnNwZWN0b3IuVUlCcmVha3Bv aW50Pn0KLSAgICAgKi8KLSAgICB0aGlzLl9icmVha3BvaW50cyA9IHt9OwotICAgIC8qKgotICAg ICAqIEB0eXBlIHtBcnJheS48V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdl Pn0KLSAgICAgKi8KLSAgICB0aGlzLl9jb25zb2xlTWVzc2FnZXMgPSBbXTsKLX0KLQotV2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZUltcGwucHJvdG90eXBlID0gewotICAgIC8qKgotICAgICAqIEBy ZXR1cm4ge09iamVjdC48c3RyaW5nLFdlYkluc3BlY3Rvci5VSUJyZWFrcG9pbnQ+fQotICAgICAq LwotICAgIGJyZWFrcG9pbnRzOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhp cy5fYnJlYWtwb2ludHM7Ci0gICAgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJhbSB7bnVtYmVy fSBsaW5lTnVtYmVyCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlCcmVha3BvaW50fSBi cmVha3BvaW50Ci0gICAgICovCi0gICAgYnJlYWtwb2ludEFkZGVkOiBmdW5jdGlvbihsaW5lTnVt YmVyLCBicmVha3BvaW50KQotICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2Jy ZWFrcG9pbnRzW1N0cmluZyhsaW5lTnVtYmVyKV0pOwotICAgICAgICB0aGlzLl9icmVha3BvaW50 c1tTdHJpbmcobGluZU51bWJlcildID0gYnJlYWtwb2ludDsKLSAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQnJlYWtw b2ludEFkZGVkLCBicmVha3BvaW50KTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFt IHtudW1iZXJ9IGxpbmVOdW1iZXIKLSAgICAgKi8KLSAgICBicmVha3BvaW50UmVtb3ZlZDogZnVu Y3Rpb24obGluZU51bWJlcikKLSAgICB7Ci0gICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5f YnJlYWtwb2ludHNbU3RyaW5nKGxpbmVOdW1iZXIpXTsKLSAgICAgICAgZGVsZXRlIHRoaXMuX2Jy ZWFrcG9pbnRzW1N0cmluZyhsaW5lTnVtYmVyKV07Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkJyZWFrcG9pbnRS ZW1vdmVkLCBicmVha3BvaW50KTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHJldHVybiB7 QXJyYXkuPFdlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZT59Ci0gICAgICov Ci0gICAgY29uc29sZU1lc3NhZ2VzOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4g dGhpcy5fY29uc29sZU1lc3NhZ2VzOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAcGFyYW0g e1dlYkluc3BlY3Rvci5QcmVzZW50YXRpb25Db25zb2xlTWVzc2FnZX0gbWVzc2FnZQotICAgICAq LwotICAgIGNvbnNvbGVNZXNzYWdlQWRkZWQ6IGZ1bmN0aW9uKG1lc3NhZ2UpCi0gICAgewotICAg ICAgICB0aGlzLl9jb25zb2xlTWVzc2FnZXMucHVzaChtZXNzYWdlKTsKLSAgICAgICAgdGhpcy5k aXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMu Q29uc29sZU1lc3NhZ2VBZGRlZCwgbWVzc2FnZSk7Ci0gICAgfSwKLQotICAgIGNvbnNvbGVNZXNz YWdlc0NsZWFyZWQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuX2NvbnNvbGVNZXNz YWdlcyA9IFtdOwotICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNw ZWN0b3IuVUlTb3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2FnZXNDbGVhcmVkKTsKLSAgICB9 Ci19Ci0KLVdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBsLnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZTsKLQogLyoqCiAgKiBAY29uc3Ry dWN0b3IKICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3VyY2VDb2Rl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3Jp cHRTb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3Jp cHRTb3VyY2UuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYWUxNzY0OGI4MzJkODdkMDc0NDE5NWUyODFjNTRlMWEw OTNiNWViMwotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSmF2YVNjcmlwdFNvdXJjZS5qcwpAQCAtMCwwICsxLDEwNSBAQAorLyoKKyAqIENvcHly aWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0OgorICoKKyAqICAgICAqIFJlZGlzdHJp YnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Cisg KiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIuCisgKiAgICAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXBy b2R1Y2UgdGhlIGFib3ZlCisgKiBjb3B5cmlnaHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0 aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyCisgKiBpbiB0aGUgZG9jdW1lbnRhdGlv biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCisgKiBkaXN0cmlidXRp b24uCisgKiAgICAgKiBOZWl0aGVyIHRoZSBuYW1lIG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFt ZXMgb2YgaXRzCisgKiBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9t b3RlIHByb2R1Y3RzIGRlcml2ZWQgZnJvbQorICogdGhpcyBzb2Z0d2FyZSB3aXRob3V0IHNwZWNp ZmljIHByaW9yIHdyaXR0ZW4gcGVybWlzc2lvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBS T1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisgKiAiQVMg SVMiIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVU IE5PVAorICogTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFC SUxJVFkgQU5EIEZJVE5FU1MgRk9SCisgKiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xB SU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVAorICogT1dORVIgT1IgQ09OVFJJ QlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsCisg KiBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyAqIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWQorICogVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKy8qKgorICogQGNvbnN0 cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0KKyAqIEBwYXJh bSB7c3RyaW5nfSBpZAorICogQHBhcmFtIHtzdHJpbmd9IHVybAorICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuQ29udGVudFByb3ZpZGVyfSBjb250ZW50UHJvdmlkZXIKKyAqLworV2ViSW5zcGVjdG9y LkphdmFTY3JpcHRTb3VyY2UgPSBmdW5jdGlvbihpZCwgdXJsLCBjb250ZW50UHJvdmlkZXIpCit7 CisgICAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5jYWxsKHRoaXMsIGlkLCB1cmwsIGNvbnRl bnRQcm92aWRlcik7CisgICAgLyoqCisgICAgICogQHR5cGUge09iamVjdC48c3RyaW5nLFdlYklu c3BlY3Rvci5VSUJyZWFrcG9pbnQ+fQorICAgICAqLworICAgIHRoaXMuX2JyZWFrcG9pbnRzID0g e307CisgICAgLyoqCisgICAgICogQHR5cGUge0FycmF5LjxXZWJJbnNwZWN0b3IuUHJlc2VudGF0 aW9uQ29uc29sZU1lc3NhZ2U+fQorICAgICAqLworICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdlcyA9 IFtdOworfQorCitXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZS5wcm90b3R5cGUgPSB7Cisg ICAgLyoqCisgICAgICogQHJldHVybiB7T2JqZWN0LjxzdHJpbmcsV2ViSW5zcGVjdG9yLlVJQnJl YWtwb2ludD59CisgICAgICovCisgICAgYnJlYWtwb2ludHM6IGZ1bmN0aW9uKCkKKyAgICB7Cisg ICAgICAgIHJldHVybiB0aGlzLl9icmVha3BvaW50czsKKyAgICB9LAorCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtudW1iZXJ9IGxpbmVOdW1iZXIKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rv ci5VSUJyZWFrcG9pbnR9IGJyZWFrcG9pbnQKKyAgICAgKi8KKyAgICBicmVha3BvaW50QWRkZWQ6 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQpCisgICAgeworICAgICAgICBjb25zb2xl LmFzc2VydCghdGhpcy5fYnJlYWtwb2ludHNbU3RyaW5nKGxpbmVOdW1iZXIpXSk7CisgICAgICAg IHRoaXMuX2JyZWFrcG9pbnRzW1N0cmluZyhsaW5lTnVtYmVyKV0gPSBicmVha3BvaW50OworICAg ICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlLkV2ZW50cy5CcmVha3BvaW50QWRkZWQsIGJyZWFrcG9pbnQpOworICAgIH0sCisKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge251bWJlcn0gbGluZU51bWJlcgorICAgICAqLworICAgIGJyZWFr cG9pbnRSZW1vdmVkOiBmdW5jdGlvbihsaW5lTnVtYmVyKQorICAgIHsKKyAgICAgICAgdmFyIGJy ZWFrcG9pbnQgPSB0aGlzLl9icmVha3BvaW50c1tTdHJpbmcobGluZU51bWJlcildOworICAgICAg ICBkZWxldGUgdGhpcy5fYnJlYWtwb2ludHNbU3RyaW5nKGxpbmVOdW1iZXIpXTsKKyAgICAgICAg dGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5F dmVudHMuQnJlYWtwb2ludFJlbW92ZWQsIGJyZWFrcG9pbnQpOworICAgIH0sCisKKyAgICAvKioK KyAgICAgKiBAcmV0dXJuIHtBcnJheS48V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVN ZXNzYWdlPn0KKyAgICAgKi8KKyAgICBjb25zb2xlTWVzc2FnZXM6IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIHJldHVybiB0aGlzLl9jb25zb2xlTWVzc2FnZXM7CisgICAgfSwKKworICAgIC8q KgorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlByZXNlbnRhdGlvbkNvbnNvbGVNZXNzYWdl fSBtZXNzYWdlCisgICAgICovCisgICAgY29uc29sZU1lc3NhZ2VBZGRlZDogZnVuY3Rpb24obWVz c2FnZSkKKyAgICB7CisgICAgICAgIHRoaXMuX2NvbnNvbGVNZXNzYWdlcy5wdXNoKG1lc3NhZ2Up OworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVUlT b3VyY2VDb2RlLkV2ZW50cy5Db25zb2xlTWVzc2FnZUFkZGVkLCBtZXNzYWdlKTsKKyAgICB9LAor CisgICAgY29uc29sZU1lc3NhZ2VzQ2xlYXJlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAg dGhpcy5fY29uc29sZU1lc3NhZ2VzID0gW107CisgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUuRXZlbnRzLkNvbnNvbGVNZXNzYWdl c0NsZWFyZWQpOworICAgIH0KK30KKworV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UucHJv dG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VD b2RlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SYXdTb3VyY2VDb2Rl LmpzCmluZGV4IDQxYTUwNDI5ZTk4ZGEwODYwYzk4ODk1OWRhMjkzZTYzNWM4OGU3ZTYuLjQzZjBl MjBjYzMwODc4ZjhkOWJlMzc1MmE5NjI3NDdjYjZhYmZmNWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jhd1NvdXJjZUNvZGUuanMKQEAgLTIxNiw3ICsy MTYsNyBAQCBXZWJJbnNwZWN0b3IuUmF3U291cmNlQ29kZS5wcm90b3R5cGUgPSB7CiAgICAgICov CiAgICAgX2NyZWF0ZVVJU291cmNlQ29kZTogZnVuY3Rpb24oaWQsIHVybCwgY29udGVudFByb3Zp ZGVyKQogICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3Iu VUlTb3VyY2VDb2RlSW1wbChpZCwgdXJsLCBjb250ZW50UHJvdmlkZXIpOworICAgICAgICB2YXIg dWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKGlkLCB1cmws IGNvbnRlbnRQcm92aWRlcik7CiAgICAgICAgIHVpU291cmNlQ29kZS5pc0NvbnRlbnRTY3JpcHQg PSB0aGlzLmlzQ29udGVudFNjcmlwdDsKICAgICAgICAgdWlTb3VyY2VDb2RlLmlzRWRpdGFibGUg PSB0aGlzLl9zY3JpcHRzLmxlbmd0aCA9PT0gMSAmJiAhdGhpcy5fc2NyaXB0c1swXS5saW5lT2Zm c2V0ICYmICF0aGlzLl9zY3JpcHRzWzBdLmNvbHVtbk9mZnNldCAmJiAhdGhpcy5fZm9ybWF0dGVk OwogICAgICAgICByZXR1cm4gdWlTb3VyY2VDb2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TbmlwcGV0c01vZGVsLmpzCmluZGV4IDA1MGYzMmY4YTNmMjM5 MTI2Nzg2NWY4Y2E3ZjA1NDI2MmUwMzhmOTEuLjU4OWE1MTkxZGIzZTJiMzZkOTBkNGQ4OTMwMTg4 OTMyMGU3ZDE4MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU25pcHBldHNNb2RlbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NuaXBwZXRzTW9kZWwuanMKQEAgLTM5NCw3ICszOTQsNyBAQCBXZWJJbnNwZWN0b3IuU25p cHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIHZhciB1aVNv dXJjZUNvZGVJZCA9ICIiOyAvLyBGSVhNRTogdG8gYmUgaW1wbGVtZW50ZWQuCiAgICAgICAgIHZh ciB1aVNvdXJjZUNvZGVVUkwgPSAiIjsgLy8gRklYTUU6IHRvIGJlIGltcGxlbWVudGVkLgotICAg ICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBs KHVpU291cmNlQ29kZUlkLCB1aVNvdXJjZUNvZGVVUkwsIG5ldyBXZWJJbnNwZWN0b3IuU25pcHBl dENvbnRlbnRQcm92aWRlcihzbmlwcGV0KSk7CisgICAgICAgIHZhciB1aVNvdXJjZUNvZGUgPSBu ZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UodWlTb3VyY2VDb2RlSWQsIHVpU291cmNl Q29kZVVSTCwgbmV3IFdlYkluc3BlY3Rvci5TbmlwcGV0Q29udGVudFByb3ZpZGVyKHNuaXBwZXQp KTsKICAgICAgICAgdWlTb3VyY2VDb2RlLmlzU25pcHBldCA9IHRydWU7CiAgICAgICAgIHVpU291 cmNlQ29kZS5pc0VkaXRhYmxlID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fdWlTb3VyY2VDb2RlRm9y U25pcHBldC5wdXQoc25pcHBldCwgdWlTb3VyY2VDb2RlKTsKQEAgLTQxNyw3ICs0MTcsNyBAQCBX ZWJJbnNwZWN0b3IuU25pcHBldHNTY3JpcHRNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgKi8K ICAgICBfY3JlYXRlVUlTb3VyY2VDb2RlRm9yU2NyaXB0OiBmdW5jdGlvbihzY3JpcHQpCiAgICAg ewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNv ZGVJbXBsKHNjcmlwdC5zb3VyY2VVUkwsIHNjcmlwdC5zb3VyY2VVUkwsIG5ldyBXZWJJbnNwZWN0 b3IuU2NyaXB0Q29udGVudFByb3ZpZGVyKHNjcmlwdCkpOworICAgICAgICB2YXIgdWlTb3VyY2VD b2RlID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlKHNjcmlwdC5zb3VyY2VVUkws IHNjcmlwdC5zb3VyY2VVUkwsIG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0Q29udGVudFByb3ZpZGVy KHNjcmlwdCkpOwogICAgICAgICB1aVNvdXJjZUNvZGUuaXNTbmlwcGV0RXZhbHVhdGlvbiA9IHRy dWU7CiAgICAgICAgIHZhciBvbGRVSVNvdXJjZUNvZGUgPSB0aGlzLl91aVNvdXJjZUNvZGVGb3JT Y3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdOwogICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGVGb3JT Y3JpcHRJZFtzY3JpcHQuc2NyaXB0SWRdID0gdWlTb3VyY2VDb2RlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWJLaXQucXJjCmluZGV4IGQxZDdkZjIyZTBjNmZhZmQ0 MmM0N2FkMTJkNWE3MDk0YzhkODlhMWYuLmRlMTE5OWI1ZDA3MzZjMzJjNjcyYmQ1NmQ2MTg4M2Ni NWFhZTY1N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv V2ViS2l0LnFyYworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1dlYktp dC5xcmMKQEAgLTc5LDYgKzc5LDcgQEAKICAgICA8ZmlsZT5JbnNwZWN0b3JWaWV3LmpzPC9maWxl PgogICAgIDxmaWxlPkphdmFTY3JpcHRDb250ZXh0TWFuYWdlci5qczwvZmlsZT4KICAgICA8Zmls ZT5KYXZhU2NyaXB0Rm9ybWF0dGVyLmpzPC9maWxlPgorICAgIDxmaWxlPkphdmFTY3JpcHRTb3Vy Y2UuanM8L2ZpbGU+CiAgICAgPGZpbGU+SmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzPC9maWxlPgog ICAgIDxmaWxlPktleWJvYXJkU2hvcnRjdXQuanM8L2ZpbGU+CiAgICAgPGZpbGU+TWVtb3J5U3Rh dGlzdGljcy5qczwvZmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmh0bWwgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL2luc3BlY3Rvci5odG1sCmluZGV4IDcxYjhmY2M3Y2Y2YWY0YzdjZTRlZjQzMTJlMTVmYzcw ZTZlY2E0MTMuLjEyN2NlZTgyMGNhY2NjM2Q5NmM2MzEwMDEzOWQzODM0YWNhNWI3NzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbApA QCAtMTc2LDYgKzE3Niw3IEBAIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUg UE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFz Y3JpcHQiIHNyYz0iRGVidWdnZXJNb2RlbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iU2NyaXB0TWFwcGluZy5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iVUlTb3VyY2VDb2RlLmpzIj48L3Nj cmlwdD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJKYXZhU2NyaXB0 U291cmNlLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIg c3JjPSJEZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0 IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJCcmVha3BvaW50TWFuYWdlci5qcyI+PC9zY3Jp cHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQ29udGVudFByb3Zp ZGVycy5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYTAzM2RkYzJkZTBhMzE3ZTZiYTEzOTA3ZDE4ODY2 YzA1NTgwOTZlMS4uMmExNWIwNmJjYjBiMWQ1MmY3YThjZTRiNzg0NGRmM2YzNWZiNzM3ZCAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA0LTIzICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5A Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbmFtZSBhbmQgZXh0cmFj dCBVSVNvdXJjZUNvZGVJbXBsIGludG8gSmF2YVNjcmlwdFNvdXJjZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQ1ODcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9kZWJ1Z2dlci9icmVh a3BvaW50LW1hbmFnZXIuaHRtbDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0 cy1wYW5lbC5odG1sOgorCiAyMDEyLTA0LTIzICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBVbnJldmlld2VkIHRlc3QgZXhwZWN0 YXRpb25zIHVwZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9icmVha3BvaW50LW1hbmFnZXIuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dl ci9icmVha3BvaW50LW1hbmFnZXIuaHRtbAppbmRleCAwODdhM2ZkNzY0NzkyNjY1NzVjYmZhNDEx ZTQ2Y2VmZjRmY2E0OGQyLi42MjIwZGZkNWNjMGY5MTM4NWRlOTVkMmNmNTIxMjcxMjNhOTFjZTY4 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvYnJlYWtwb2ludC1t YW5hZ2VyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL2JyZWFrcG9p bnQtbWFuYWdlci5odG1sCkBAIC02MCw3ICs2MCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIHNl cmlhbGl6ZWRCcmVha3BvaW50cy5wdXNoKGNyZWF0ZUJyZWFrcG9pbnQoImEuanMiLCAyMCwgIiIs IGZhbHNlKSk7CiAgICAgc2VyaWFsaXplZEJyZWFrcG9pbnRzLnB1c2goY3JlYXRlQnJlYWtwb2lu dCgiYi5qcyIsIDMsICIiLCB0cnVlKSk7CiAKLSAgICBmdW5jdGlvbiBjcmVhdGVVSVNvdXJjZUNv ZGUoaWQsIHVybCkgeyByZXR1cm4gbmV3IFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBsKGlk LCB1cmwsIG51bGwpOyB9CisgICAgZnVuY3Rpb24gY3JlYXRlVUlTb3VyY2VDb2RlKGlkLCB1cmwp IHsgcmV0dXJuIG5ldyBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZShpZCwgdXJsLCBudWxs KTsgfQogCiAgICAgdmFyIHNjcmlwdE1hcHBpbmcgPSB7fTsKICAgICBzY3JpcHRNYXBwaW5nLnJh d0xvY2F0aW9uVG9VSUxvY2F0aW9uID0gZnVuY3Rpb24ocmF3TG9jYXRpb24pIHsgcmV0dXJuIHJh d0xvY2F0aW9uOyB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy L3NjcmlwdHMtcGFuZWwuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9zY3Jp cHRzLXBhbmVsLmh0bWwKaW5kZXggODE0OTE5YTk4MjEwNWY1MTg2MDA2MGFkMmZhYWUzMWZhODM4 NzkyNC4uM2QxYTIzMWI5N2NmMDI1NzVmMmMwZWJmYmQzYzIyNjU2MmI3NmZlNCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3NjcmlwdHMtcGFuZWwuaHRtbAorKysg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvc2NyaXB0cy1wYW5lbC5odG1sCkBAIC00 Myw3ICs0Myw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIH0KICAgICBmdW5jdGlvbiBjcmVhdGVV SVNvdWNlQ29kZSh1cmwpCiAgICAgewotICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gbmV3IFdl Ykluc3BlY3Rvci5VSVNvdXJjZUNvZGVJbXBsKDAsIHVybCwgbnVsbCwgbnVsbCk7CisgICAgICAg IHZhciB1aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2UoMCwg dXJsLCBudWxsLCBudWxsKTsKICAgICAgICAgdWlTb3VyY2VDb2RlLnJlcXVlc3RDb250ZW50ID0g ZnVuY3Rpb24oY2FsbGJhY2spCiAgICAgICAgIHsKICAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu YWRkUmVzdWx0KCJTb3VyY2UgcmVxdWVzdGVkIGZvciAiICsgdXJsKTsK