84326 2012-04-19 03:22:47 -0700 Web Inspector: reuse ParsedUrl in the UISourceCode 2012-04-19 04:40:07 -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 605472 0 pfeldman 2012-04-19 03:22:47 -0700 There is a lot of code duplication taking place there now. 605480 1 137871 pfeldman 2012-04-19 03:52:22 -0700 Created attachment 137871 Patch 605499 2 pfeldman 2012-04-19 04:40:07 -0700 Committed r114623: <http://trac.webkit.org/changeset/114623> 137871 2012-04-19 03:52:22 -0700 2012-04-19 04:35:51 -0700 Patch bug-84326-20120419145220.patch text/plain 15198 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjVjODU0ZjgyMzhkYTNh YTVmOWIwMDdhMzIwNzA4MDg1OWNjYzkyMy4uYzdjYmNkNDQ2Yzk5Y2VjYzkxODA5NzliN2IzZjVi ZDQ4ZWM0MTc3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTE5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJldXNlIFBhcnNlZFVybCBpbiB0aGUgVUlTb3VyY2VDb2RlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDMyNgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1pZ3JhdGVkIFVJU291cmNlQ29kZSB0byBQ YXJzZWRVUkwsIG1vdmVkIHRoZSBkaXNwbGF5TmFtZSBsb2dpYyBpbnRvIGl0cyBvbmx5IGNsaWVu dDoKKyAgICAgICAgVGFiYmVkRWRpdG9yQ29udGFpbmVyLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9Db21waWxlclNjcmlwdE1hcHBpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuU291cmNlTWFwUGFyc2VyLnByb3RvdHlwZS5fY2Fub25pY2FsaXplVVJMKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cuZmlsdGVyT3V0RW1wdHlVUkxz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cuY29tcGFyZUZ1bmN0 aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk9wZW5SZXNvdXJjZURpYWxvZy5wcm90b3R5cGUuaXRlbVRpdGxlQXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9wZW5SZXNvdXJjZURpYWxvZy5wcm90b3R5cGUuaXRl bUtleUF0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUGFyc2VkVVJMKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2Ny aXB0c05hdmlnYXRvci5wcm90b3R5cGUuX2dldE9yQ3JlYXRlRm9sZGVyVHJlZUVsZW1lbnQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRvckZvbGRlclRyZWVFbGVtZW50KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRhaW5lci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlLl90aXRsZUZv ckZpbGUpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZS5nZXQgcGFyc2VkVVJMKToKKwogMjAxMi0wNC0xOSAg WGluZ25hbiBXYW5nICA8eGluZ25hbi53YW5nQGludGVsLmNvbT4KIAogICAgICAgICBPcHRpbWl6 ZSBmb3IgREFSV0lOIGluIERpcmVjdENvbnZvbHZlcjo6cHJvY2VzcygpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU2NyaXB0TWFwcGluZy5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBw aW5nLmpzCmluZGV4IGRmYjkwNTk5NDczNjA0NDM3YWM5NWY3M2NjMDRiMGU4NzRmZGE1ODguLjA1 YTkwOTU4NjkzNTVkOTg3YjYyNWU3NDVkNjc3NjY5MTM0ZWE4M2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBwaW5nLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTY3JpcHRNYXBw aW5nLmpzCkBAIC0zNjEsNyArMzYxLDcgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZU1hcFBhcnNlci5w cm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBiYXNlSG9zdCA9IGJhc2Uuc2NoZW1lICsgIjovLyIg KyBiYXNlLmhvc3QgKyAoYmFzZS5wb3J0ID8gIjoiICsgYmFzZS5wb3J0IDogIiIpOwogICAgICAg ICBpZiAodXJsWzBdID09PSAiLyIpCiAgICAgICAgICAgICByZXR1cm4gYmFzZUhvc3QgKyB1cmw7 Ci0gICAgICAgIHJldHVybiBiYXNlSG9zdCArIGJhc2UuZmlyc3RQYXRoQ29tcG9uZW50cyArIHVy bDsKKyAgICAgICAgcmV0dXJuIGJhc2VIb3N0ICsgYmFzZS5mb2xkZXJQYXRoQ29tcG9uZW50cyAr ICIvIiArIHVybDsKICAgICB9LAogCiAgICAgX1ZMUV9CQVNFX1NISUZUOiA1LApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9GaWx0ZXJlZEl0ZW1TZWxlY3Rp b25EaWFsb2cuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVk SXRlbVNlbGVjdGlvbkRpYWxvZy5qcwppbmRleCAxYjQxNDY4ZjA1YTdlMTQxOGRiODU1ZGUwZjBj YjVjNzk5NWU2NjdiLi5mMmE3NjYzYzMyNzdlMTM5YWYwMDYzYTRlZTMxNGI4NTQyMGRmNjk4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZpbHRlcmVkSXRl bVNlbGVjdGlvbkRpYWxvZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0ZpbHRlcmVkSXRlbVNlbGVjdGlvbkRpYWxvZy5qcwpAQCAtNTk5LDE0ICs1OTksMTQgQEAg V2ViSW5zcGVjdG9yLk9wZW5SZXNvdXJjZURpYWxvZyA9IGZ1bmN0aW9uKHBhbmVsLCBwcmVzZW50 YXRpb25Nb2RlbCkKIAogICAgIGZ1bmN0aW9uIGZpbHRlck91dEVtcHR5VVJMcyh1aVNvdXJjZUNv ZGUpCiAgICAgewotICAgICAgICByZXR1cm4gISF1aVNvdXJjZUNvZGUuZmlsZU5hbWU7CisgICAg ICAgIHJldHVybiAhIXVpU291cmNlQ29kZS5wYXJzZWRVUkwubGFzdFBhdGhDb21wb25lbnQ7CiAg ICAgfQogCiAgICAgdGhpcy5fdWlTb3VyY2VDb2RlcyA9IHRoaXMuX3VpU291cmNlQ29kZXMuZmls dGVyKGZpbHRlck91dEVtcHR5VVJMcyk7CiAKICAgICBmdW5jdGlvbiBjb21wYXJlRnVuY3Rpb24o dWlTb3VyY2VDb2RlMSwgdWlTb3VyY2VDb2RlMikKICAgICB7Ci0gICAgICAgIHJldHVybiB1aVNv dXJjZUNvZGUxLmZpbGVOYW1lLmxvY2FsZUNvbXBhcmUodWlTb3VyY2VDb2RlMi5maWxlTmFtZSk7 CisgICAgICAgIHJldHVybiB1aVNvdXJjZUNvZGUxLnBhcnNlZFVSTC5sYXN0UGF0aENvbXBvbmVu dC5sb2NhbGVDb21wYXJlKHVpU291cmNlQ29kZTIucGFyc2VkVVJMLmxhc3RQYXRoQ29tcG9uZW50 KTsKICAgICB9CiAKICAgICB0aGlzLl91aVNvdXJjZUNvZGVzLnNvcnQoY29tcGFyZUZ1bmN0aW9u KTsKQEAgLTY1Myw3ICs2NTMsNyBAQCBXZWJJbnNwZWN0b3IuT3BlblJlc291cmNlRGlhbG9nLnBy b3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBpdGVtVGl0bGVBdDogZnVuY3Rpb24oaXRlbUluZGV4 KQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZXNbaXRlbUluZGV4XS5m aWxlTmFtZTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZXNbaXRlbUluZGV4XS5w YXJzZWRVUkwubGFzdFBhdGhDb21wb25lbnQ7CiAgICAgfSwKIAogICAgIC8qKgpAQCAtNjYyLDcg KzY2Miw3IEBAIFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlID0gewog ICAgICAqLwogICAgIGl0ZW1LZXlBdDogZnVuY3Rpb24oaXRlbUluZGV4KQogICAgIHsKLSAgICAg ICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZXNbaXRlbUluZGV4XS5maWxlTmFtZTsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZXNbaXRlbUluZGV4XS5wYXJzZWRVUkwubGFzdFBh dGhDb21wb25lbnQ7CiAgICAgfSwKIAogICAgIC8qKgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0aWxzLmpzCmluZGV4IGNjODhiMzZiMWYyNzQw NDIxMGVjZDg0YmExYTE2MGM4NTc3MjNiZTYuLjJlOWE5NGFiZDI1ZjZiNjVjMTRjOTMwYTYzN2Fj MjRmYzk2ZTBiNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvUmVzb3VyY2VVdGlscy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlVXRpbHMuanMKQEAgLTQwLDcgKzQwLDkgQEAgV2ViSW5zcGVjdG9yLlBhcnNl ZFVSTCA9IGZ1bmN0aW9uKHVybCkKICAgICB0aGlzLmhvc3QgPSAiIjsKICAgICB0aGlzLnBvcnQg PSAiIjsKICAgICB0aGlzLnBhdGggPSAiIjsKKyAgICB0aGlzLnF1ZXJ5UGFyYW1zID0gIiI7CiAg ICAgdGhpcy5mcmFnbWVudCA9ICIiOworICAgIHRoaXMuZm9sZGVyUGF0aENvbXBvbmVudHMgPSAi IjsKICAgICB0aGlzLmxhc3RQYXRoQ29tcG9uZW50ID0gIiI7CiAKICAgICAvLyBSZWdFeHAgZ3Jv dXBzOgpAQCAtNzIsMTMgKzc0LDE1IEBAIFdlYkluc3BlY3Rvci5QYXJzZWRVUkwgPSBmdW5jdGlv bih1cmwpCiAgICAgICAgIC8vIEZpcnN0IGN1dCB0aGUgcXVlcnkgcGFyYW1zLgogICAgICAgICB2 YXIgcGF0aCA9IHRoaXMucGF0aDsKICAgICAgICAgdmFyIGluZGV4T2ZRdWVyeSA9IHBhdGguaW5k ZXhPZigiPyIpOwotICAgICAgICBpZiAoaW5kZXhPZlF1ZXJ5ICE9PSAtMSkKKyAgICAgICAgaWYg KGluZGV4T2ZRdWVyeSAhPT0gLTEpIHsKKyAgICAgICAgICAgIHRoaXMucXVlcnlQYXJhbXMgPSBw YXRoLnN1YnN0cmluZyhpbmRleE9mUXVlcnkgKyAxKQogICAgICAgICAgICAgcGF0aCA9IHBhdGgu c3Vic3RyaW5nKDAsIGluZGV4T2ZRdWVyeSk7CisgICAgICAgIH0KIAogICAgICAgICAvLyBUaGVu IHRha2UgbGFzdCBwYXRoIGNvbXBvbmVudC4KICAgICAgICAgdmFyIGxhc3RTbGFzaEluZGV4ID0g cGF0aC5sYXN0SW5kZXhPZigiLyIpOwogICAgICAgICBpZiAobGFzdFNsYXNoSW5kZXggIT09IC0x KSB7Ci0gICAgICAgICAgICB0aGlzLmZpcnN0UGF0aENvbXBvbmVudHMgPSBwYXRoLnN1YnN0cmlu ZygwLCBsYXN0U2xhc2hJbmRleCArIDEpOworICAgICAgICAgICAgdGhpcy5mb2xkZXJQYXRoQ29t cG9uZW50cyA9IHBhdGguc3Vic3RyaW5nKDAsIGxhc3RTbGFzaEluZGV4KTsKICAgICAgICAgICAg IHRoaXMubGFzdFBhdGhDb21wb25lbnQgPSBwYXRoLnN1YnN0cmluZyhsYXN0U2xhc2hJbmRleCAr IDEpOwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCmluZGV4IDA5ZDE2MTRjM2Y5MWJlYTAz NTJkOTlhNjY2YmNmNjA3ZmU3NmE0NWYuLmNhMWNjMTM4ZWVjOGNiMzAzMDNiMGE0N2MyNDA5MzIw ZTQ1YWNiODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c05hdmlnYXRvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKQEAgLTE2Miw4ICsxNjIsMTcgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2NyaXB0VHJlZUVs ZW1lbnQgPSB0aGlzLl9zY3JpcHRUcmVlRWxlbWVudHNCeVVJU291cmNlQ29kZS5nZXQodWlTb3Vy Y2VDb2RlKTsKICAgICAgICAgaWYgKCFzY3JpcHRUcmVlRWxlbWVudCkKICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgdmFyIHNjcmlwdFRpdGxlID0gdWlTb3VyY2VDb2RlLmZpbGVOYW1lIHx8 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiKHByb2dyYW0pIik7Ci0gICAgICAgIHNjcmlwdFRyZWVF bGVtZW50LnRpdGxlVGV4dCA9IHNjcmlwdFRpdGxlOworCisgICAgICAgIHZhciB0aXRsZVRleHQ7 CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUucGFyc2VkVVJMLmlzVmFsaWQpIHsKKyAgICAgICAg ICAgIHRpdGxlVGV4dCA9IHVpU291cmNlQ29kZS5wYXJzZWRVUkwubGFzdFBhdGhDb21wb25lbnQ7 CisgICAgICAgICAgICBpZiAodWlTb3VyY2VDb2RlLnBhcnNlZFVSTC5xdWVyeVBhcmFtcykKKyAg ICAgICAgICAgICAgICB0aXRsZVRleHQgKz0gIj8iICsgdWlTb3VyY2VDb2RlLnBhcnNlZFVSTC5x dWVyeVBhcmFtczsKKyAgICAgICAgfSBlbHNlIGlmICh1aVNvdXJjZUNvZGUucGFyc2VkVVJMKQor ICAgICAgICAgICAgdGl0bGVUZXh0ID0gdWlTb3VyY2VDb2RlLnBhcnNlZFVSTC51cmw7CisgICAg ICAgIGVsc2UKKyAgICAgICAgICAgIHRpdGxlVGV4dCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi KHByb2dyYW0pIik7CisgICAgICAgIHNjcmlwdFRyZWVFbGVtZW50LnRpdGxlVGV4dCA9IHRpdGxl VGV4dDsKICAgICB9LAogCiAgICAgLyoqCkBAIC00MjcsNyArNDM2LDcgQEAgV2ViSW5zcGVjdG9y LlNjcmlwdHNOYXZpZ2F0b3IucHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuIHRoaXMu X3NuaXBwZXRzVHJlZTsKICAgICAgICAgaWYgKHVpU291cmNlQ29kZS5pc1NuaXBwZXRFdmFsdWF0 aW9uKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2dldE9yQ3JlYXRlU25pcHBldEV2YWx1YXRp b25zRm9sZGVyVHJlZUVsZW1lbnQoKTsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2dldE9yQ3JlYXRl U2NyaXB0Rm9sZGVyVHJlZUVsZW1lbnQodWlTb3VyY2VDb2RlLmlzQ29udGVudFNjcmlwdCwgdWlT b3VyY2VDb2RlLmRvbWFpbiwgdWlTb3VyY2VDb2RlLmZvbGRlck5hbWUpOworICAgICAgICByZXR1 cm4gdGhpcy5fZ2V0T3JDcmVhdGVTY3JpcHRGb2xkZXJUcmVlRWxlbWVudCh1aVNvdXJjZUNvZGUu aXNDb250ZW50U2NyaXB0LCB1aVNvdXJjZUNvZGUucGFyc2VkVVJMLmhvc3QsIHVpU291cmNlQ29k ZS5wYXJzZWRVUkwuZm9sZGVyUGF0aENvbXBvbmVudHMpOwogICAgIH0sCiAKICAgICAvKioKQEAg LTY2Myw2ICs2NzIsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1lbnQg PSBmdW5jdGlvbihmb2xkZXJJZGVudGlmaWVyLCBkb21haW4sIGZvbAogICAgIHZhciBpY29uQ2xh c3MgPSB0aGlzLmlzRG9tYWluID8gInNjcmlwdHMtbmF2aWdhdG9yLWRvbWFpbi10cmVlLWl0ZW0i IDogInNjcmlwdHMtbmF2aWdhdG9yLWZvbGRlci10cmVlLWl0ZW0iOwogICAgIHZhciB0aXRsZSA9 IHRoaXMuaXNEb21haW4gPyBkb21haW4gOiBmb2xkZXJOYW1lLnN1YnN0cmluZygxKTsKICAgICBX ZWJJbnNwZWN0b3IuQmFzZU5hdmlnYXRvclRyZWVFbGVtZW50LmNhbGwodGhpcywgdGl0bGUsIFtp Y29uQ2xhc3NdLCB0cnVlKTsKKyAgICB0aGlzLnRvb2x0aXAgPSBmb2xkZXJOYW1lOwogfQogCiBX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yRm9sZGVyVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JD b250YWluZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVk aXRvckNvbnRhaW5lci5qcwppbmRleCA2ODExZTc4ZDA1MjBiNzYwNWIyMTQ4ZTAzODY5ZGJmYjQx ZDVjYTBiLi5hMWUwY2NiODg5YWNlOThiZjdkZGZlMzFmNTYzNDE0YmYyOTc2NTMyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNvbnRh aW5lci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVk aXRvckNvbnRhaW5lci5qcwpAQCAtMTMxLDcgKzEzMSwxOCBAQCBXZWJJbnNwZWN0b3IuVGFiYmVk RWRpdG9yQ29udGFpbmVyLnByb3RvdHlwZSA9IHsKICAgICAgKi8KICAgICBfdGl0bGVGb3JGaWxl OiBmdW5jdGlvbih1aVNvdXJjZUNvZGUpCiAgICAgewotICAgICAgICByZXR1cm4gdWlTb3VyY2VD b2RlLmRpc3BsYXlOYW1lOworICAgICAgICBjb25zdCBtYXhEaXNwbGF5TmFtZUxlbmd0aCA9IDMw OworICAgICAgICBjb25zdCBtaW5EaXNwbGF5UXVlcnlQYXJhbUxlbmd0aCA9IDU7CisKKyAgICAg ICAgdmFyIHBhcnNlZFVSTCA9IHVpU291cmNlQ29kZS5wYXJzZWRVUkw7CisgICAgICAgIGlmICgh cGFyc2VkVVJMLmlzVmFsaWQpCisgICAgICAgICAgICByZXR1cm4gcGFyc2VkVVJMLnVybCA/IHBh cnNlZFVSTC51cmwudHJpbU1pZGRsZShtYXhEaXNwbGF5TmFtZUxlbmd0aCkgOiBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIihwcm9ncmFtKSIpOworCisgICAgICAgIHZhciBtYXhEaXNwbGF5UXVlcnlQ YXJhbUxlbmd0aCA9IE1hdGgubWF4KG1pbkRpc3BsYXlRdWVyeVBhcmFtTGVuZ3RoLCBtYXhEaXNw bGF5TmFtZUxlbmd0aCAtIHBhcnNlZFVSTC5sYXN0UGF0aENvbXBvbmVudC5sZW5ndGgpOworICAg ICAgICB2YXIgZGlzcGxheVF1ZXJ5UGFyYW1zID0gcGFyc2VkVVJMLnF1ZXJ5UGFyYW1zID8gIj8i ICsgcGFyc2VkVVJMLnF1ZXJ5UGFyYW1zLnRyaW1FbmQobWF4RGlzcGxheVF1ZXJ5UGFyYW1MZW5n dGggLSAxKSA6ICIiOworICAgICAgICB2YXIgZGlzcGxheUxhc3RQYXRoQ29tcG9uZW50ID0gcGFy c2VkVVJMLmxhc3RQYXRoQ29tcG9uZW50LnRyaW1NaWRkbGUobWF4RGlzcGxheU5hbWVMZW5ndGgg LSBkaXNwbGF5UXVlcnlQYXJhbXMubGVuZ3RoKTsKKyAgICAgICAgdmFyIGRpc3BsYXlOYW1lID0g ZGlzcGxheUxhc3RQYXRoQ29tcG9uZW50ICsgZGlzcGxheVF1ZXJ5UGFyYW1zOworICAgICAgICBy ZXR1cm4gZGlzcGxheU5hbWUgfHwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsK ICAgICB9LAogCiAgICAgLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVUlTb3VyY2VDb2RlLmpzCmluZGV4IDA5ZTU3YmM0Y2MwMjM2MDJjODBjZGIxZjM4ZmE5 MGZmNTA5MmY4MzMuLmVhNzRjNjg4ZGM3OTgzNGUyNjIyMjY1ZjdmMGY3MmMzZDFkZDA3NzEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2Rl LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2Rl LmpzCkBAIC0zOSw2ICszOSw3IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUgPSBmdW5jdGlv bihpZCwgdXJsLCBjb250ZW50UHJvdmlkZXIpCiB7CiAgICAgdGhpcy5faWQgPSBpZDsKICAgICB0 aGlzLl91cmwgPSB1cmw7CisgICAgdGhpcy5fcGFyc2VkVVJMID0gbmV3IFdlYkluc3BlY3Rvci5Q YXJzZWRVUkwodXJsKTsKICAgICB0aGlzLl9jb250ZW50UHJvdmlkZXIgPSBjb250ZW50UHJvdmlk ZXI7CiAgICAgdGhpcy5pc0NvbnRlbnRTY3JpcHQgPSBmYWxzZTsKICAgICB0aGlzLmlzRWRpdGFi bGUgPSBmYWxzZTsKQEAgLTc0LDYgKzc1LDE0IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUu cHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNw ZWN0b3IuUGFyc2VkVVJMfQorICAgICAqLworICAgIGdldCBwYXJzZWRVUkwoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX3BhcnNlZFVSTDsKKyAgICB9LAorCisgICAgLyoqCiAgICAgICog QHBhcmFtIHtmdW5jdGlvbig/c3RyaW5nLGJvb2xlYW4sc3RyaW5nKX0gY2FsbGJhY2sKICAgICAg Ki8KICAgICByZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oY2FsbGJhY2spCkBAIC0xMTAsOTMgKzEx OSw2IEBAIFdlYkluc3BlY3Rvci5VSVNvdXJjZUNvZGUucHJvdG90eXBlID0gewogICAgIH0sCiAK ICAgICAvKioKLSAgICAgKiBAdHlwZSB7c3RyaW5nfQotICAgICAqLwotICAgIGdldCBkb21haW4o KQotICAgIHsKLSAgICAgICAgaWYgKHR5cGVvZih0aGlzLl9kb21haW4pID09PSAidW5kZWZpbmVk IikKLSAgICAgICAgICAgIHRoaXMuX3BhcnNlVVJMKCk7Ci0KLSAgICAgICAgcmV0dXJuIHRoaXMu X2RvbWFpbjsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHR5cGUge3N0cmluZ30KLSAgICAg Ki8KLSAgICBnZXQgZm9sZGVyTmFtZSgpCi0gICAgewotICAgICAgICBpZiAodHlwZW9mKHRoaXMu X2ZvbGRlck5hbWUpID09PSAidW5kZWZpbmVkIikKLSAgICAgICAgICAgIHRoaXMuX3BhcnNlVVJM KCk7Ci0KLSAgICAgICAgcmV0dXJuIHRoaXMuX2ZvbGRlck5hbWU7Ci0gICAgfSwKLQotICAgIC8q KgotICAgICAqIEB0eXBlIHtzdHJpbmd9Ci0gICAgICovCi0gICAgZ2V0IGZpbGVOYW1lKCkKLSAg ICB7Ci0gICAgICAgIGlmICh0eXBlb2YodGhpcy5fZmlsZU5hbWUpID09PSAidW5kZWZpbmVkIikK LSAgICAgICAgICAgIHRoaXMuX3BhcnNlVVJMKCk7Ci0KLSAgICAgICAgcmV0dXJuIHRoaXMuX2Zp bGVOYW1lOwotICAgIH0sCi0KLSAgICAvKioKLSAgICAgKiBAdHlwZSB7c3RyaW5nfQotICAgICAq LwotICAgIGdldCBkaXNwbGF5TmFtZSgpCi0gICAgewotICAgICAgICBpZiAodHlwZW9mKHRoaXMu X2Rpc3BsYXlOYW1lKSA9PT0gInVuZGVmaW5lZCIpCi0gICAgICAgICAgICB0aGlzLl9wYXJzZVVS TCgpOwotCi0gICAgICAgIHJldHVybiB0aGlzLl9kaXNwbGF5TmFtZTsKLSAgICB9LAotCi0gICAg X3BhcnNlVVJMOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB2YXIgcGFyc2VkVVJMID0gdGhp cy51cmwuYXNQYXJzZWRVUkwoKTsKLSAgICAgICAgdmFyIHVybCA9IHBhcnNlZFVSTCA/IHBhcnNl ZFVSTC5wYXRoIDogdGhpcy51cmw7Ci0KLSAgICAgICAgdmFyIGZvbGRlck5hbWUgPSAiIjsKLSAg ICAgICAgdmFyIGZpbGVOYW1lID0gdXJsOwotCi0gICAgICAgIHZhciBwYXRoTGVuZ3RoID0gZmls ZU5hbWUuaW5kZXhPZigiPyIpOwotICAgICAgICBpZiAocGF0aExlbmd0aCA9PT0gLTEpCi0gICAg ICAgICAgICBwYXRoTGVuZ3RoID0gZmlsZU5hbWUubGVuZ3RoOwotCi0gICAgICAgIHZhciBmcm9t SW5kZXggPSBmaWxlTmFtZS5sYXN0SW5kZXhPZigiLyIsIHBhdGhMZW5ndGggLSAyKTsKLSAgICAg ICAgaWYgKGZyb21JbmRleCAhPT0gLTEpIHsKLSAgICAgICAgICAgIGZvbGRlck5hbWUgPSBmaWxl TmFtZS5zdWJzdHJpbmcoMCwgZnJvbUluZGV4KTsKLSAgICAgICAgICAgIGZpbGVOYW1lID0gZmls ZU5hbWUuc3Vic3RyaW5nKGZyb21JbmRleCArIDEpOwotICAgICAgICB9Ci0KLSAgICAgICAgdmFy IGluZGV4T2ZRdWVyeSA9IGZpbGVOYW1lLmluZGV4T2YoIj8iKTsKLSAgICAgICAgaWYgKGluZGV4 T2ZRdWVyeSA9PT0gLTEpCi0gICAgICAgICAgICBpbmRleE9mUXVlcnkgPSBmaWxlTmFtZS5sZW5n dGg7Ci0gICAgICAgIHZhciBsYXN0UGF0aENvbXBvbmVudCA9IGZpbGVOYW1lLnN1YnN0cmluZygw LCBpbmRleE9mUXVlcnkpOwotICAgICAgICB2YXIgcXVlcnlQYXJhbXMgPSBmaWxlTmFtZS5zdWJz dHJpbmcoaW5kZXhPZlF1ZXJ5LCBmaWxlTmFtZS5sZW5ndGgpOwotCi0gICAgICAgIGNvbnN0IG1h eERpc3BsYXlOYW1lTGVuZ3RoID0gMzA7Ci0gICAgICAgIGNvbnN0IG1pbkRpc3BsYXlRdWVyeVBh cmFtTGVuZ3RoID0gNTsKLQotICAgICAgICB2YXIgbWF4RGlzcGxheVF1ZXJ5UGFyYW1MZW5ndGgg PSBNYXRoLm1heChtaW5EaXNwbGF5UXVlcnlQYXJhbUxlbmd0aCwgbWF4RGlzcGxheU5hbWVMZW5n dGggLSBsYXN0UGF0aENvbXBvbmVudC5sZW5ndGgpOwotICAgICAgICB2YXIgZGlzcGxheVF1ZXJ5 UGFyYW1zID0gcXVlcnlQYXJhbXMudHJpbUVuZChtYXhEaXNwbGF5UXVlcnlQYXJhbUxlbmd0aCk7 Ci0gICAgICAgIHZhciBkaXNwbGF5TGFzdFBhdGhDb21wb25lbnQgPSBsYXN0UGF0aENvbXBvbmVu dC50cmltTWlkZGxlKG1heERpc3BsYXlOYW1lTGVuZ3RoIC0gZGlzcGxheVF1ZXJ5UGFyYW1zLmxl bmd0aCk7Ci0gICAgICAgIHZhciBkaXNwbGF5TmFtZSA9IGRpc3BsYXlMYXN0UGF0aENvbXBvbmVu dCArIGRpc3BsYXlRdWVyeVBhcmFtczsKLSAgICAgICAgaWYgKCFkaXNwbGF5TmFtZSkKLSAgICAg ICAgICAgIGRpc3BsYXlOYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIocHJvZ3JhbSkiKTsK LQotICAgICAgICBpZiAoZm9sZGVyTmFtZS5sZW5ndGggPiA4MCkKLSAgICAgICAgICAgIGZvbGRl ck5hbWUgPSAiXHUyMDI2IiArIGZvbGRlck5hbWUuc3Vic3RyaW5nKGZvbGRlck5hbWUubGVuZ3Ro IC0gODApOwotCi0gICAgICAgIHRoaXMuX2RvbWFpbiA9IHBhcnNlZFVSTCA/IHBhcnNlZFVSTC5o b3N0IDogIiI7Ci0gICAgICAgIHRoaXMuX2ZvbGRlck5hbWUgPSBmb2xkZXJOYW1lOwotICAgICAg ICB0aGlzLl9maWxlTmFtZSA9IGZpbGVOYW1lOwotICAgICAgICB0aGlzLl9kaXNwbGF5TmFtZSA9 IGRpc3BsYXlOYW1lOwotICAgIH0sCi0KLSAgICAvKioKICAgICAgKiBAcGFyYW0gez9zdHJpbmd9 IGNvbnRlbnQKICAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IGNvbnRlbnRFbmNvZGVkCiAgICAgICog QHBhcmFtIHtzdHJpbmd9IG1pbWVUeXBlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjRkMjVhODRiZWYxYWE1NGUwY2FlMWYz MDk1ZjdjMmE2MzA5ZTMyYi4uNTY0ZTk3Njk5NjY4OGJiNzE4M2EyZTI0MzQyZjFmYWJlZDI1MWIy ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTE5ICBQYXZlbCBGZWxkbWFuICA8cGZl bGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IHJldXNlIFBhcnNl ZFVybCBpbiB0aGUgVUlTb3VyY2VDb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NDMyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qczoK KyAgICAgICAgKGluaXRpYWxpemVfRGVidWdnZXJUZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlzcGxheS1uYW1lLmh0bWw6CisKIDIwMTItMDQtMTgg IFRha2FzaGkgVG95b3NoaW1hICA8dG95b3NoaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVu cmV2aWV3ZWQsIGFkZCBleHBlY3RlZC50eHQgZm9yIGNvb2tpZXMtd3JvbmctZG9tYWluLXJlamVj dGVkLXJlc3VsdC5waHAgLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3IvZGVidWdnZXItdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyLXRlc3QuanMKaW5kZXggNTcxZGY2ODUxNjQ4NTkzNjZjN2I2NjQ3YjVjYTM4NjE2 Y2U2MTM1ZC4uZjcwYTlmMDAxYjY4N2I1MTAyMDFiOTllZDMxNDg1ZTg2MTljMmJhMyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcwor KysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCkBA IC0xNTcsNyArMTU3LDcgQEAgSW5zcGVjdG9yVGVzdC5zaG93U2NyaXB0U291cmNlT25TY3JpcHRz UGFuZWwgPSBmdW5jdGlvbihwYW5lbCwgc2NyaXB0TmFtZSwgY2FsbGIKIHsKICAgICB2YXIgdWlT b3VyY2VDb2RlcyA9IHBhbmVsLl9wcmVzZW50YXRpb25Nb2RlbC51aVNvdXJjZUNvZGVzKCk7CiAg ICAgZm9yICh2YXIgaSA9IDA7IGkgPCB1aVNvdXJjZUNvZGVzLmxlbmd0aDsgKytpKSB7Ci0gICAg ICAgIGlmICh1aVNvdXJjZUNvZGVzW2ldLmZpbGVOYW1lID09PSBzY3JpcHROYW1lKSB7CisgICAg ICAgIGlmICh1aVNvdXJjZUNvZGVzW2ldLnBhcnNlZFVSTC5sYXN0UGF0aENvbXBvbmVudCA9PT0g c2NyaXB0TmFtZSB8fCB1aVNvdXJjZUNvZGVzW2ldLnBhcnNlZFVSTC51cmwgPT09IHNjcmlwdE5h bWUpIHsKICAgICAgICAgICAgIHBhbmVsLnNob3dVSVNvdXJjZUNvZGUodWlTb3VyY2VDb2Rlc1tp XSk7CiAgICAgICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBwYW5lbC52aXNpYmxlVmlldzsKICAg ICAgICAgICAgIGlmIChzb3VyY2VGcmFtZS5sb2FkZWQpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlzcGxheS1uYW1lLmh0bWwgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvdWktc291cmNlLWNvZGUtZGlzcGxheS1uYW1l Lmh0bWwKaW5kZXggYTExNjIxYjUzNGM4YzE4NTEwOGI3MzYxOWVjM2NjNGRiNDlkYWMxZS4uZDIx ZGQzNDU3NGJhNDNlZTVkYTQ5N2JmMTEwMjM4ZmJiMGM1YjkzZCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2VyL3VpLXNvdXJjZS1jb2RlLWRpc3BsYXktbmFtZS5odG1s CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci91aS1zb3VyY2UtY29kZS1kaXNw bGF5LW5hbWUuaHRtbApAQCAtNyw3ICs3LDcgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgZnVuY3Rp b24gZHVtcFVJU291cmNlQ29kZURpc3BsYXlOYW1lKHVybCkKICAgICB7CiAgICAgICAgIHZhciB1 aVNvdXJjZUNvZGUgPSBuZXcgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZSgiaWQiLCB1cmwsIG51 bGwsIG51bGwpOwotICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgiVUlTb3VyY2VDb2Rl IGRpc3BsYXkgbmFtZSBmb3IgdXJsIFwiIiArIHVybCArICJcIiBpcyBcIiIgKyB1aVNvdXJjZUNv ZGUuZGlzcGxheU5hbWUgKyAiXCIuIik7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KCJVSVNvdXJjZUNvZGUgZGlzcGxheSBuYW1lIGZvciB1cmwgXCIiICsgdXJsICsgIlwiIGlzIFwi IiArIFdlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JDb250YWluZXIucHJvdG90eXBlLl90aXRsZUZv ckZpbGUodWlTb3VyY2VDb2RlKSArICJcIi4iKTsKICAgICB9CiAKICAgICBjb25zdCBiYXNlVVJM ID0gImh0dHA6Ly9sb2NhbGhvc3Q6ODA4MC9mb2xkZXIvIjsK