67850 2011-09-09 09:18:11 -0700 Web Inspector: implement reverse mapping for compiler source maps. 2011-09-20 03:22:33 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 464825 0 podivilov 2011-09-09 09:18:11 -0700 Web Inspector: implement reverse mapping for compiler source maps. 464827 1 106878 podivilov 2011-09-09 09:19:40 -0700 Created attachment 106878 Patch 469272 2 106878 pfeldman 2011-09-19 00:40:36 -0700 Comment on attachment 106878 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106878&action=review > LayoutTests/ChangeLog:3 > + Web Inspector: implement reverse mapping for compiler source maps. What is reverse mapping and why is it needed? 469310 3 podivilov 2011-09-19 03:36:26 -0700 (In reply to comment #2) > (From update of attachment 106878 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=106878&action=review > > > LayoutTests/ChangeLog:3 > > + Web Inspector: implement reverse mapping for compiler source maps. > > What is reverse mapping and why is it needed? Reverse mapping is a mapping from source code to compiled code. It is needed to set breakpoints. 469332 4 107834 podivilov 2011-09-19 05:03:42 -0700 Created attachment 107834 Patch 469333 5 podivilov 2011-09-19 05:04:03 -0700 Updated change log. 469972 6 podivilov 2011-09-20 03:22:33 -0700 Committed r95524: <http://trac.webkit.org/changeset/95524> 106878 2011-09-09 09:19:40 -0700 2011-09-19 05:03:34 -0700 Patch bug-67850-20110909201938.patch text/plain 9101 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ4NTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4N2RlMzYwM2JkNWZmZjYyMGQyMTgx YzgzYWQ2MjExODZhMjdlMDkwLi5lOWYzYmM2ZmViM2ZhZDQ4NDM3NDY5ZTkxMzljYThhMDEyMDg5 ODdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDktMDkgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaW1wbGVt ZW50IHJldmVyc2UgbWFwcGluZyBmb3IgY29tcGlsZXIgc291cmNlIG1hcHMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Nzg1MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2Vy L2NvbXBpbGVyLXNvdXJjZS1tYXBwaW5nLmh0bWw6CisKIDIwMTEtMDktMDkgIENhcnkgQ2xhcmsg IDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkOyBuZXcgYmFzZWxp bmVzIChTa2lhIG9uIE1hYywgR1BVIGVkaXRpb24pCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvY29tcGlsZXItc291cmNlLW1hcHBpbmcuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCmluZGV4 IDRhNDVmNzAyMjZhM2Y4NjEzYjNlZGE5NjJjNDBjMjZjOTQ2YmIwM2UuLjVlNTY0ODY0NmMyYTIy YzRiM2NjMmI2N2VkMjVjNGZkNTA5NTg2NjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCkBAIC0x NCwzMSArMTQsNTIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0RXF1YWxzKHNvdXJjZUNvbHVtbk51bWJlciwgc291cmNlTG9jYXRpb24uY29sdW1uTnVtYmVy KTsKICAgICB9CiAKKyAgICBmdW5jdGlvbiBjaGVja1JldmVyc2VNYXBwaW5nKGNvbXBpbGVkTGlu ZU51bWJlciwgY29tcGlsZWRDb2x1bW5OdW1iZXIsIHNvdXJjZVVSTCwgc291cmNlTGluZU51bWJl ciwgbWFwcGluZykKKyAgICB7CisgICAgICAgIHZhciBjb21waWxlZExvY2F0aW9uID0gbWFwcGlu Zy5zb3VyY2VMb2NhdGlvblRvQ29tcGlsZWRMb2NhdGlvbihzb3VyY2VVUkwsIHNvdXJjZUxpbmVO dW1iZXIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscyhjb21waWxlZExpbmVO dW1iZXIsIGNvbXBpbGVkTG9jYXRpb24ubGluZU51bWJlcik7CisgICAgICAgIEluc3BlY3RvclRl c3QuYXNzZXJ0RXF1YWxzKGNvbXBpbGVkQ29sdW1uTnVtYmVyLCBjb21waWxlZExvY2F0aW9uLmNv bHVtbk51bWJlcik7CisgICAgfQorCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3VpdGUoWwog ICAgICAgICBmdW5jdGlvbiB0ZXN0U2ltcGxlTWFwcGluZyhuZXh0KQogICAgICAgICB7Ci0gICAg ICAgICAgICAvLyBleGFtcGxlLmpzOgotICAgICAgICAgICAgLy8gMCAgICAgICAgIDEgICAgICAg ICAyICAgICAgICAgMwotICAgICAgICAgICAgLy8gMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2 Nzg5MDEyMzQ1Ci0gICAgICAgICAgICAvLyBmdW5jdGlvbiBhZGQodmFyaWFibGVfeCwgdmFyaWFi bGVfeSkKLSAgICAgICAgICAgIC8vIHsKLSAgICAgICAgICAgIC8vICAgICByZXR1cm4gdmFyaWFi bGVfeCArIHZhcmlhYmxlX3k7Ci0gICAgICAgICAgICAvLyB9Ci0gICAgICAgICAgICAvLyBleGFt cGxlLWNvbXBpbGVkLmpzOgotICAgICAgICAgICAgLy8gMCAgICAgICAgIDEgICAgICAgICAyICAg ICAgICAgMwotICAgICAgICAgICAgLy8gMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEy MzQ1Ci0gICAgICAgICAgICAvLyBmdW5jdGlvbiBhZGQoYSxiKXtyZXR1cm4gYStifTsKKyAgICAg ICAgICAgIC8qCisgICAgICAgICAgICAgICAgZXhhbXBsZS5qczoKKyAgICAgICAgICAgICAgICAw ICAgICAgICAgMSAgICAgICAgIDIgICAgICAgICAzCisgICAgICAgICAgICAgICAgMDEyMzQ1Njc4 OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1CisgICAgICAgICAgICAgICAgZnVuY3Rpb24gYWRk KHZhcmlhYmxlX3gsIHZhcmlhYmxlX3kpCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdmFyaWFibGVfeCArIHZhcmlhYmxlX3k7CisgICAgICAgICAgICAgICAg fQorCisgICAgICAgICAgICAgICAgdmFyIGdsb2JhbCA9ICJmb28iOworICAgICAgICAgICAgICAg IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAg ICBleGFtcGxlLWNvbXBpbGVkLmpzOgorICAgICAgICAgICAgICAgIDAgICAgICAgICAxICAgICAg ICAgMiAgICAgICAgIDMKKyAgICAgICAgICAgICAgICAwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0 NTY3ODkwMTIzNDUKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBhZGQoYSxiKXtyZXR1cm4gYSti fXZhciBnbG9iYWw9ImZvbyI7CisgICAgICAgICAgICAqLwogICAgICAgICAgICAgdmFyIG1hcHBp bmdQYXlsb2FkID0gewotICAgICAgICAgICAgICAgICJtYXBwaW5ncyI6IkFBQVNBLFFBQUFBLElB QUcsQ0FBQ0MsQ0FBRCxDQUFhQyxDQUFiLENBQ1osQ0FDSSxNQUFPRCxFQUFQLENBQW9CQyxDQUR4 QjsiLAorICAgICAgICAgICAgICAgICJtYXBwaW5ncyI6IkFBQVNBLFFBQUFBLElBQUcsQ0FBQ0Ms Q0FBRCxDQUFhQyxDQUFiLENBQ1osQ0FDSSxNQUFPRCxFQUFQLENBQW9CQyxDQUR4QixDQUlBLElB QUlDLE9BQVM7IiwKICAgICAgICAgICAgICAgICAic291cmNlcyI6WyJleGFtcGxlLmpzIl0KICAg ICAgICAgICAgIH07CiAgICAgICAgICAgICB2YXIgbWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3Iu Q2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGluZyhtYXBwaW5nUGF5bG9hZCk7CisKICAgICAgICAg ICAgIGNoZWNrTWFwcGluZygwLCA5LCAiZXhhbXBsZS5qcyIsIDAsIDksIG1hcHBpbmcpOwogICAg ICAgICAgICAgY2hlY2tNYXBwaW5nKDAsIDEzLCAiZXhhbXBsZS5qcyIsIDAsIDEzLCBtYXBwaW5n KTsKICAgICAgICAgICAgIGNoZWNrTWFwcGluZygwLCAxNSwgImV4YW1wbGUuanMiLCAwLCAyNSwg bWFwcGluZyk7CiAgICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgMTgsICJleGFtcGxlLmpzIiwg MiwgNCwgbWFwcGluZyk7CiAgICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgMjUsICJleGFtcGxl LmpzIiwgMiwgMTEsIG1hcHBpbmcpOwogICAgICAgICAgICAgY2hlY2tNYXBwaW5nKDAsIDI3LCAi ZXhhbXBsZS5qcyIsIDIsIDI0LCBtYXBwaW5nKTsKKworICAgICAgICAgICAgY2hlY2tSZXZlcnNl TWFwcGluZygwLCAwLCAiZXhhbXBsZS5qcyIsIDAsIG1hcHBpbmcpOworICAgICAgICAgICAgY2hl Y2tSZXZlcnNlTWFwcGluZygwLCAxNywgImV4YW1wbGUuanMiLCAxLCBtYXBwaW5nKTsKKyAgICAg ICAgICAgIGNoZWNrUmV2ZXJzZU1hcHBpbmcoMCwgMTgsICJleGFtcGxlLmpzIiwgMiwgbWFwcGlu Zyk7CisgICAgICAgICAgICBjaGVja1JldmVyc2VNYXBwaW5nKDAsIDI5LCAiZXhhbXBsZS5qcyIs IDQsIG1hcHBpbmcpOworICAgICAgICAgICAgY2hlY2tSZXZlcnNlTWFwcGluZygwLCAyOSwgImV4 YW1wbGUuanMiLCA1LCBtYXBwaW5nKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 VHJ1ZSghbWFwcGluZy5zb3VyY2VMb2NhdGlvblRvQ29tcGlsZWRMb2NhdGlvbigiZXhhbXBsZS5q cyIsIDYpKTsKKwogICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICB9CiAgICAgXSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggYTA4MWE1ZGFlMjkyZTVjZDJhYTA0YTZhOGQ2YTA1ZWVhZGRiYTc2NS4uNTlhYTc3 MDMxZDczMTJlMGI5YmFhZGNmNDk1MzFiZTE3ZWI1NWRiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE2IEBACisyMDExLTA5LTA5ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGltcGxlbWVudCByZXZlcnNlIG1hcHBpbmcg Zm9yIGNvbXBpbGVyIHNvdXJjZSBtYXBzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Njc4NTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBw aW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBp bmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcu cHJvdG90eXBlLmNvbXBpbGVkTG9jYXRpb25Ub1NvdXJjZUxvY2F0aW9uKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5zb3VyY2VM b2NhdGlvblRvQ29tcGlsZWRMb2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2xvc3Vy ZUNvbXBpbGVyU291cmNlTWFwcGluZy5wcm90b3R5cGUuX3BhcnNlTWFwcGluZ3MpOgorCiAyMDEx LTA5LTA5ICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByOTQ4NDUuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGluZy5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5nLmpz CmluZGV4IDAyNTAzMWZkZTgxM2JiYWU0NDc2MDRlOTZhMzRlYzM5MGZjMzE3ZDkuLjZkOWRjNmQy ZGYwY2YyMGNhNGZiNzQ3ZjQ0MGY2NDYzMTkzMDE0NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5nLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29tcGlsZXJTb3VyY2VNYXBwaW5nLmpz CkBAIC02OCwxOSArNjgsMjggQEAgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1h cHBpbmcgPSBmdW5jdGlvbihwYXlsb2FkKQogICAgIH0KIAogICAgIHRoaXMuX3NvdXJjZXMgPSBw YXlsb2FkLnNvdXJjZXM7Ci0gICAgdGhpcy5fbWFwcGluZ3MgPSB0aGlzLl9wYXJzZVBheWxvYWQo cGF5bG9hZCk7CisgICAgdGhpcy5fbWFwcGluZ3MgPSBbXTsKKyAgICB0aGlzLl9yZXZlcnNlTWFw cGluZ3NCeVNvdXJjZVVSTCA9IHt9OworICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fc291 cmNlcy5sZW5ndGg7ICsraSkKKyAgICAgICAgdGhpcy5fcmV2ZXJzZU1hcHBpbmdzQnlTb3VyY2VV UkxbdGhpcy5fc291cmNlc1tpXV0gPSBbXTsKKyAgICB0aGlzLl9wYXJzZU1hcHBpbmdzKHBheWxv YWQubWFwcGluZ3MpOwogfQogCiBXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNlTWFw cGluZy5wcm90b3R5cGUgPSB7CiAgICAgY29tcGlsZWRMb2NhdGlvblRvU291cmNlTG9jYXRpb246 IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlcikKICAgICB7CiAgICAgICAgIHZhciBt YXBwaW5nID0gdGhpcy5fZmluZE1hcHBpbmcobGluZU51bWJlciwgY29sdW1uTnVtYmVyKTsKLSAg ICAgICAgdmFyIHNvdXJjZVVSTCA9IHRoaXMuX3NvdXJjZXNbbWFwcGluZ1syXV07Ci0gICAgICAg IHJldHVybiB7IHNvdXJjZVVSTDogc291cmNlVVJMLCBsaW5lTnVtYmVyOiBtYXBwaW5nWzNdLCBj b2x1bW5OdW1iZXI6IG1hcHBpbmdbNF0gfTsKKyAgICAgICAgcmV0dXJuIHsgc291cmNlVVJMOiBt YXBwaW5nWzJdLCBsaW5lTnVtYmVyOiBtYXBwaW5nWzNdLCBjb2x1bW5OdW1iZXI6IG1hcHBpbmdb NF0gfTsKICAgICB9LAogCi0gICAgc291cmNlTG9jYXRpb25Ub0NvbXBpbGVkTG9jYXRpb246IGZ1 bmN0aW9uKHNvdXJjZVVSTCwgbGluZU51bWJlciwgY29sdW1uTnVtYmVyKQorICAgIHNvdXJjZUxv Y2F0aW9uVG9Db21waWxlZExvY2F0aW9uOiBmdW5jdGlvbihzb3VyY2VVUkwsIGxpbmVOdW1iZXIp CiAgICAgeworICAgICAgICB2YXIgbWFwcGluZ3MgPSB0aGlzLl9yZXZlcnNlTWFwcGluZ3NCeVNv dXJjZVVSTFtzb3VyY2VVUkxdOworICAgICAgICBmb3IgKCA7IGxpbmVOdW1iZXIgPCBtYXBwaW5n cy5sZW5ndGg7ICsrbGluZU51bWJlcikgeworICAgICAgICAgICAgdmFyIG1hcHBpbmcgPSBtYXBw aW5nc1tsaW5lTnVtYmVyXTsKKyAgICAgICAgICAgIGlmIChtYXBwaW5nKQorICAgICAgICAgICAg ICAgIHJldHVybiB7IGxpbmVOdW1iZXI6IG1hcHBpbmdbMF0sIGNvbHVtbk51bWJlcjogbWFwcGlu Z1sxXSB9OworICAgICAgICB9CiAgICAgfSwKIAogICAgIHNvdXJjZXM6IGZ1bmN0aW9uKCkKQEAg LTEwNiwxMCArMTE1LDkgQEAgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBp bmcucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fbWFwcGluZ3NbZmlyc3RdOwog ICAgIH0sCiAKLSAgICBfcGFyc2VQYXlsb2FkOiBmdW5jdGlvbihwYXlsb2FkKQorICAgIF9wYXJz ZU1hcHBpbmdzOiBmdW5jdGlvbihtYXBwaW5nc1BheWxvYWQpCiAgICAgewotICAgICAgICB2YXIg bWFwcGluZ3MgPSBbXTsKLSAgICAgICAgdmFyIHN0cmluZ0NoYXJJdGVyYXRvciA9IG5ldyBXZWJJ bnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGluZy5TdHJpbmdDaGFySXRlcmF0b3Io cGF5bG9hZC5tYXBwaW5ncyk7CisgICAgICAgIHZhciBzdHJpbmdDaGFySXRlcmF0b3IgPSBuZXcg V2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcuU3RyaW5nQ2hhckl0ZXJh dG9yKG1hcHBpbmdzUGF5bG9hZCk7CiAKICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSAwOwogICAg ICAgICB2YXIgY29sdW1uTnVtYmVyID0gMDsKQEAgLTExNywyNSArMTI1LDM0IEBAIFdlYkluc3Bl Y3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAg dmFyIHNvdXJjZUxpbmVOdW1iZXIgPSAwOwogICAgICAgICB2YXIgc291cmNlQ29sdW1uTnVtYmVy ID0gMDsKICAgICAgICAgdmFyIG5hbWVJbmRleCA9IDA7CisKKyAgICAgICAgdmFyIHNvdXJjZVVS TCA9IHRoaXMuX3NvdXJjZXNbMF07CisgICAgICAgIHZhciByZXZlcnNlTWFwcGluZ3MgPSB0aGlz Ll9yZXZlcnNlTWFwcGluZ3NCeVNvdXJjZVVSTFtzb3VyY2VVUkxdOworCiAgICAgICAgIGRvIHsK ICAgICAgICAgICAgIGNvbHVtbk51bWJlciArPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hhckl0 ZXJhdG9yKTsKICAgICAgICAgICAgIGlmICh0aGlzLl9pc1NlcGFyYXRvcihzdHJpbmdDaGFySXRl cmF0b3IucGVlaygpKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIHNv dXJjZUluZGV4ICs9IHRoaXMuX2RlY29kZVZMUShzdHJpbmdDaGFySXRlcmF0b3IpOworICAgICAg ICAgICAgdmFyIHNvdXJjZUluZGV4RGVsdGEgPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hhckl0 ZXJhdG9yKTsKKyAgICAgICAgICAgIGlmIChzb3VyY2VJbmRleERlbHRhKSB7CisgICAgICAgICAg ICAgICAgc291cmNlSW5kZXggKz0gc291cmNlSW5kZXhEZWx0YTsKKyAgICAgICAgICAgICAgICBz b3VyY2VVUkwgPSB0aGlzLl9zb3VyY2VzW3NvdXJjZUluZGV4XTsKKyAgICAgICAgICAgICAgICBy ZXZlcnNlTWFwcGluZ3MgPSB0aGlzLl9yZXZlcnNlTWFwcGluZ3NCeVNvdXJjZVVSTFtzb3VyY2VV UkxdOworICAgICAgICAgICAgfQogICAgICAgICAgICAgc291cmNlTGluZU51bWJlciArPSB0aGlz Ll9kZWNvZGVWTFEoc3RyaW5nQ2hhckl0ZXJhdG9yKTsKICAgICAgICAgICAgIHNvdXJjZUNvbHVt bk51bWJlciArPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hhckl0ZXJhdG9yKTsKLSAgICAgICAg ICAgIHZhciBtYXBwaW5nID0gW2xpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgc291cmNlSW5kZXgs IHNvdXJjZUxpbmVOdW1iZXIsIHNvdXJjZUNvbHVtbk51bWJlcl07Ci0gICAgICAgICAgICBpZiAo IXRoaXMuX2lzU2VwYXJhdG9yKHN0cmluZ0NoYXJJdGVyYXRvci5wZWVrKCkpKSB7CisgICAgICAg ICAgICBpZiAoIXRoaXMuX2lzU2VwYXJhdG9yKHN0cmluZ0NoYXJJdGVyYXRvci5wZWVrKCkpKQog ICAgICAgICAgICAgICAgIG5hbWVJbmRleCArPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hhckl0 ZXJhdG9yKTsKLSAgICAgICAgICAgICAgICBtYXBwaW5nLnB1c2gobmFtZUluZGV4KTsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgICAgIG1hcHBpbmdzLnB1c2gobWFwcGluZyk7CisKKyAgICAgICAg ICAgIHRoaXMuX21hcHBpbmdzLnB1c2goW2xpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgc291cmNl VVJMLCBzb3VyY2VMaW5lTnVtYmVyLCBzb3VyY2VDb2x1bW5OdW1iZXJdKTsKKyAgICAgICAgICAg IGlmICghcmV2ZXJzZU1hcHBpbmdzW3NvdXJjZUxpbmVOdW1iZXJdKQorICAgICAgICAgICAgICAg IHJldmVyc2VNYXBwaW5nc1tzb3VyY2VMaW5lTnVtYmVyXSA9IFtsaW5lTnVtYmVyLCBjb2x1bW5O dW1iZXJdOworCiAgICAgICAgICAgICBpZiAoc3RyaW5nQ2hhckl0ZXJhdG9yLm5leHQoKSA9PT0g IjsiKSB7CiAgICAgICAgICAgICAgICAgbGluZU51bWJlciArPSAxOwogICAgICAgICAgICAgICAg IGNvbHVtbk51bWJlciA9IDA7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gd2hpbGUoc3RyaW5n Q2hhckl0ZXJhdG9yLmhhc05leHQoKSk7Ci0gICAgICAgIHJldHVybiBtYXBwaW5nczsKICAgICB9 LAogCiAgICAgX2lzU2VwYXJhdG9yOiBmdW5jdGlvbihjaGFyKQo= 107834 2011-09-19 05:03:42 -0700 2011-09-19 08:24:43 -0700 Patch bug-67850-20110919160340.patch text/plain 9234 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ4NTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA4N2RlMzYwM2JkNWZmZjYyMGQyMTgx YzgzYWQ2MjExODZhMjdlMDkwLi5lOWYzYmM2ZmViM2ZhZDQ4NDM3NDY5ZTkxMzljYThhMDEyMDg5 ODdjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMDktMDkgIFBhdmVsIFBvZGl2aWxvdiAg PHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaW1wbGVt ZW50IHJldmVyc2UgbWFwcGluZyBmb3IgY29tcGlsZXIgc291cmNlIG1hcHMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Nzg1MAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2RlYnVnZ2Vy L2NvbXBpbGVyLXNvdXJjZS1tYXBwaW5nLmh0bWw6CisKIDIwMTEtMDktMDkgIENhcnkgQ2xhcmsg IDxjYXJ5Y2xhcmtAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkOyBuZXcgYmFzZWxp bmVzIChTa2lhIG9uIE1hYywgR1BVIGVkaXRpb24pCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZGVidWdnZXIvY29tcGlsZXItc291cmNlLW1hcHBpbmcuaHRtbCBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCmluZGV4 IDRhNDVmNzAyMjZhM2Y4NjEzYjNlZGE5NjJjNDBjMjZjOTQ2YmIwM2UuLjVlNTY0ODY0NmMyYTIy YzRiM2NjMmI2N2VkMjVjNGZkNTA5NTg2NjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9kZWJ1Z2dlci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCisrKyBiL0xheW91dFRl c3RzL2luc3BlY3Rvci9kZWJ1Z2dlci9jb21waWxlci1zb3VyY2UtbWFwcGluZy5odG1sCkBAIC0x NCwzMSArMTQsNTIgQEAgZnVuY3Rpb24gdGVzdCgpCiAgICAgICAgIEluc3BlY3RvclRlc3QuYXNz ZXJ0RXF1YWxzKHNvdXJjZUNvbHVtbk51bWJlciwgc291cmNlTG9jYXRpb24uY29sdW1uTnVtYmVy KTsKICAgICB9CiAKKyAgICBmdW5jdGlvbiBjaGVja1JldmVyc2VNYXBwaW5nKGNvbXBpbGVkTGlu ZU51bWJlciwgY29tcGlsZWRDb2x1bW5OdW1iZXIsIHNvdXJjZVVSTCwgc291cmNlTGluZU51bWJl ciwgbWFwcGluZykKKyAgICB7CisgICAgICAgIHZhciBjb21waWxlZExvY2F0aW9uID0gbWFwcGlu Zy5zb3VyY2VMb2NhdGlvblRvQ29tcGlsZWRMb2NhdGlvbihzb3VyY2VVUkwsIHNvdXJjZUxpbmVO dW1iZXIpOworICAgICAgICBJbnNwZWN0b3JUZXN0LmFzc2VydEVxdWFscyhjb21waWxlZExpbmVO dW1iZXIsIGNvbXBpbGVkTG9jYXRpb24ubGluZU51bWJlcik7CisgICAgICAgIEluc3BlY3RvclRl c3QuYXNzZXJ0RXF1YWxzKGNvbXBpbGVkQ29sdW1uTnVtYmVyLCBjb21waWxlZExvY2F0aW9uLmNv bHVtbk51bWJlcik7CisgICAgfQorCiAgICAgSW5zcGVjdG9yVGVzdC5ydW5UZXN0U3VpdGUoWwog ICAgICAgICBmdW5jdGlvbiB0ZXN0U2ltcGxlTWFwcGluZyhuZXh0KQogICAgICAgICB7Ci0gICAg ICAgICAgICAvLyBleGFtcGxlLmpzOgotICAgICAgICAgICAgLy8gMCAgICAgICAgIDEgICAgICAg ICAyICAgICAgICAgMwotICAgICAgICAgICAgLy8gMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2 Nzg5MDEyMzQ1Ci0gICAgICAgICAgICAvLyBmdW5jdGlvbiBhZGQodmFyaWFibGVfeCwgdmFyaWFi bGVfeSkKLSAgICAgICAgICAgIC8vIHsKLSAgICAgICAgICAgIC8vICAgICByZXR1cm4gdmFyaWFi bGVfeCArIHZhcmlhYmxlX3k7Ci0gICAgICAgICAgICAvLyB9Ci0gICAgICAgICAgICAvLyBleGFt cGxlLWNvbXBpbGVkLmpzOgotICAgICAgICAgICAgLy8gMCAgICAgICAgIDEgICAgICAgICAyICAg ICAgICAgMwotICAgICAgICAgICAgLy8gMDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEy MzQ1Ci0gICAgICAgICAgICAvLyBmdW5jdGlvbiBhZGQoYSxiKXtyZXR1cm4gYStifTsKKyAgICAg ICAgICAgIC8qCisgICAgICAgICAgICAgICAgZXhhbXBsZS5qczoKKyAgICAgICAgICAgICAgICAw ICAgICAgICAgMSAgICAgICAgIDIgICAgICAgICAzCisgICAgICAgICAgICAgICAgMDEyMzQ1Njc4 OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyMzQ1CisgICAgICAgICAgICAgICAgZnVuY3Rpb24gYWRk KHZhcmlhYmxlX3gsIHZhcmlhYmxlX3kpCisgICAgICAgICAgICAgICAgeworICAgICAgICAgICAg ICAgICAgICByZXR1cm4gdmFyaWFibGVfeCArIHZhcmlhYmxlX3k7CisgICAgICAgICAgICAgICAg fQorCisgICAgICAgICAgICAgICAgdmFyIGdsb2JhbCA9ICJmb28iOworICAgICAgICAgICAgICAg IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKyAgICAgICAgICAgICAg ICBleGFtcGxlLWNvbXBpbGVkLmpzOgorICAgICAgICAgICAgICAgIDAgICAgICAgICAxICAgICAg ICAgMiAgICAgICAgIDMKKyAgICAgICAgICAgICAgICAwMTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0 NTY3ODkwMTIzNDUKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBhZGQoYSxiKXtyZXR1cm4gYSti fXZhciBnbG9iYWw9ImZvbyI7CisgICAgICAgICAgICAqLwogICAgICAgICAgICAgdmFyIG1hcHBp bmdQYXlsb2FkID0gewotICAgICAgICAgICAgICAgICJtYXBwaW5ncyI6IkFBQVNBLFFBQUFBLElB QUcsQ0FBQ0MsQ0FBRCxDQUFhQyxDQUFiLENBQ1osQ0FDSSxNQUFPRCxFQUFQLENBQW9CQyxDQUR4 QjsiLAorICAgICAgICAgICAgICAgICJtYXBwaW5ncyI6IkFBQVNBLFFBQUFBLElBQUcsQ0FBQ0Ms Q0FBRCxDQUFhQyxDQUFiLENBQ1osQ0FDSSxNQUFPRCxFQUFQLENBQW9CQyxDQUR4QixDQUlBLElB QUlDLE9BQVM7IiwKICAgICAgICAgICAgICAgICAic291cmNlcyI6WyJleGFtcGxlLmpzIl0KICAg ICAgICAgICAgIH07CiAgICAgICAgICAgICB2YXIgbWFwcGluZyA9IG5ldyBXZWJJbnNwZWN0b3Iu Q2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGluZyhtYXBwaW5nUGF5bG9hZCk7CisKICAgICAgICAg ICAgIGNoZWNrTWFwcGluZygwLCA5LCAiZXhhbXBsZS5qcyIsIDAsIDksIG1hcHBpbmcpOwogICAg ICAgICAgICAgY2hlY2tNYXBwaW5nKDAsIDEzLCAiZXhhbXBsZS5qcyIsIDAsIDEzLCBtYXBwaW5n KTsKICAgICAgICAgICAgIGNoZWNrTWFwcGluZygwLCAxNSwgImV4YW1wbGUuanMiLCAwLCAyNSwg bWFwcGluZyk7CiAgICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgMTgsICJleGFtcGxlLmpzIiwg MiwgNCwgbWFwcGluZyk7CiAgICAgICAgICAgICBjaGVja01hcHBpbmcoMCwgMjUsICJleGFtcGxl LmpzIiwgMiwgMTEsIG1hcHBpbmcpOwogICAgICAgICAgICAgY2hlY2tNYXBwaW5nKDAsIDI3LCAi ZXhhbXBsZS5qcyIsIDIsIDI0LCBtYXBwaW5nKTsKKworICAgICAgICAgICAgY2hlY2tSZXZlcnNl TWFwcGluZygwLCAwLCAiZXhhbXBsZS5qcyIsIDAsIG1hcHBpbmcpOworICAgICAgICAgICAgY2hl Y2tSZXZlcnNlTWFwcGluZygwLCAxNywgImV4YW1wbGUuanMiLCAxLCBtYXBwaW5nKTsKKyAgICAg ICAgICAgIGNoZWNrUmV2ZXJzZU1hcHBpbmcoMCwgMTgsICJleGFtcGxlLmpzIiwgMiwgbWFwcGlu Zyk7CisgICAgICAgICAgICBjaGVja1JldmVyc2VNYXBwaW5nKDAsIDI5LCAiZXhhbXBsZS5qcyIs IDQsIG1hcHBpbmcpOworICAgICAgICAgICAgY2hlY2tSZXZlcnNlTWFwcGluZygwLCAyOSwgImV4 YW1wbGUuanMiLCA1LCBtYXBwaW5nKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 VHJ1ZSghbWFwcGluZy5zb3VyY2VMb2NhdGlvblRvQ29tcGlsZWRMb2NhdGlvbigiZXhhbXBsZS5q cyIsIDYpKTsKKwogICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICB9CiAgICAgXSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggYTA4MWE1ZGFlMjkyZTVjZDJhYTA0YTZhOGQ2YTA1ZWVhZGRiYTc2NS4uYTRiODYy NGUwYzIzNjI5ZDhkNWFhNGMwMDJkMzk2YmRmZGYxMzM5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE5IEBACisyMDExLTA5LTA5ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGltcGxlbWVudCByZXZlcnNlIG1hcHBpbmcg Zm9yIGNvbXBpbGVyIHNvdXJjZSBtYXBzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Njc4NTAKKworICAgICAgICBJbXBsZW1lbnQgdGhlIG1hcHBpbmcg ZnJvbSBzb3VyY2UgY29kZSB0byBjb21waWxlZCBjb2RlLiBJdCB3aWxsIGJlIHVzZWQgZm9yCisg ICAgICAgIHNldHRpbmcgYnJlYWtwb2ludHMgb24gc291cmNlIGNvZGUuCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0NvbXBpbGVyU291cmNlTWFwcGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DbG9zdXJl Q29tcGlsZXJTb3VyY2VNYXBwaW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DbG9zdXJlQ29t cGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZS5jb21waWxlZExvY2F0aW9uVG9Tb3VyY2VMb2Nh dGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGlu Zy5wcm90b3R5cGUuc291cmNlTG9jYXRpb25Ub0NvbXBpbGVkTG9jYXRpb24pOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcucHJvdG90eXBlLl9wYXJz ZU1hcHBpbmdzKToKKwogMjAxMS0wOS0wOSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjk0ODQ1Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db21waWxlclNv dXJjZU1hcHBpbmcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBp bGVyU291cmNlTWFwcGluZy5qcwppbmRleCAwMjUwMzFmZGU4MTNiYmFlNDQ3NjA0ZTk2YTM0ZWMz OTBmYzMxN2Q5Li42ZDlkYzZkMmRmMGNmMjBjYTRmYjc0N2Y0NDBmNjQ2MzE5MzAxNDU3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBpbGVyU291cmNl TWFwcGluZy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbXBp bGVyU291cmNlTWFwcGluZy5qcwpAQCAtNjgsMTkgKzY4LDI4IEBAIFdlYkluc3BlY3Rvci5DbG9z dXJlQ29tcGlsZXJTb3VyY2VNYXBwaW5nID0gZnVuY3Rpb24ocGF5bG9hZCkKICAgICB9CiAKICAg ICB0aGlzLl9zb3VyY2VzID0gcGF5bG9hZC5zb3VyY2VzOwotICAgIHRoaXMuX21hcHBpbmdzID0g dGhpcy5fcGFyc2VQYXlsb2FkKHBheWxvYWQpOworICAgIHRoaXMuX21hcHBpbmdzID0gW107Cisg ICAgdGhpcy5fcmV2ZXJzZU1hcHBpbmdzQnlTb3VyY2VVUkwgPSB7fTsKKyAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHRoaXMuX3NvdXJjZXMubGVuZ3RoOyArK2kpCisgICAgICAgIHRoaXMuX3JldmVy c2VNYXBwaW5nc0J5U291cmNlVVJMW3RoaXMuX3NvdXJjZXNbaV1dID0gW107CisgICAgdGhpcy5f cGFyc2VNYXBwaW5ncyhwYXlsb2FkLm1hcHBpbmdzKTsKIH0KIAogV2ViSW5zcGVjdG9yLkNsb3N1 cmVDb21waWxlclNvdXJjZU1hcHBpbmcucHJvdG90eXBlID0gewogICAgIGNvbXBpbGVkTG9jYXRp b25Ub1NvdXJjZUxvY2F0aW9uOiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCiAg ICAgewogICAgICAgICB2YXIgbWFwcGluZyA9IHRoaXMuX2ZpbmRNYXBwaW5nKGxpbmVOdW1iZXIs IGNvbHVtbk51bWJlcik7Ci0gICAgICAgIHZhciBzb3VyY2VVUkwgPSB0aGlzLl9zb3VyY2VzW21h cHBpbmdbMl1dOwotICAgICAgICByZXR1cm4geyBzb3VyY2VVUkw6IHNvdXJjZVVSTCwgbGluZU51 bWJlcjogbWFwcGluZ1szXSwgY29sdW1uTnVtYmVyOiBtYXBwaW5nWzRdIH07CisgICAgICAgIHJl dHVybiB7IHNvdXJjZVVSTDogbWFwcGluZ1syXSwgbGluZU51bWJlcjogbWFwcGluZ1szXSwgY29s dW1uTnVtYmVyOiBtYXBwaW5nWzRdIH07CiAgICAgfSwKIAotICAgIHNvdXJjZUxvY2F0aW9uVG9D b21waWxlZExvY2F0aW9uOiBmdW5jdGlvbihzb3VyY2VVUkwsIGxpbmVOdW1iZXIsIGNvbHVtbk51 bWJlcikKKyAgICBzb3VyY2VMb2NhdGlvblRvQ29tcGlsZWRMb2NhdGlvbjogZnVuY3Rpb24oc291 cmNlVVJMLCBsaW5lTnVtYmVyKQogICAgIHsKKyAgICAgICAgdmFyIG1hcHBpbmdzID0gdGhpcy5f cmV2ZXJzZU1hcHBpbmdzQnlTb3VyY2VVUkxbc291cmNlVVJMXTsKKyAgICAgICAgZm9yICggOyBs aW5lTnVtYmVyIDwgbWFwcGluZ3MubGVuZ3RoOyArK2xpbmVOdW1iZXIpIHsKKyAgICAgICAgICAg IHZhciBtYXBwaW5nID0gbWFwcGluZ3NbbGluZU51bWJlcl07CisgICAgICAgICAgICBpZiAobWFw cGluZykKKyAgICAgICAgICAgICAgICByZXR1cm4geyBsaW5lTnVtYmVyOiBtYXBwaW5nWzBdLCBj b2x1bW5OdW1iZXI6IG1hcHBpbmdbMV0gfTsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBzb3Vy Y2VzOiBmdW5jdGlvbigpCkBAIC0xMDYsMTAgKzExNSw5IEBAIFdlYkluc3BlY3Rvci5DbG9zdXJl Q29tcGlsZXJTb3VyY2VNYXBwaW5nLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMu X21hcHBpbmdzW2ZpcnN0XTsKICAgICB9LAogCi0gICAgX3BhcnNlUGF5bG9hZDogZnVuY3Rpb24o cGF5bG9hZCkKKyAgICBfcGFyc2VNYXBwaW5nczogZnVuY3Rpb24obWFwcGluZ3NQYXlsb2FkKQog ICAgIHsKLSAgICAgICAgdmFyIG1hcHBpbmdzID0gW107Ci0gICAgICAgIHZhciBzdHJpbmdDaGFy SXRlcmF0b3IgPSBuZXcgV2ViSW5zcGVjdG9yLkNsb3N1cmVDb21waWxlclNvdXJjZU1hcHBpbmcu U3RyaW5nQ2hhckl0ZXJhdG9yKHBheWxvYWQubWFwcGluZ3MpOworICAgICAgICB2YXIgc3RyaW5n Q2hhckl0ZXJhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5DbG9zdXJlQ29tcGlsZXJTb3VyY2VNYXBw aW5nLlN0cmluZ0NoYXJJdGVyYXRvcihtYXBwaW5nc1BheWxvYWQpOwogCiAgICAgICAgIHZhciBs aW5lTnVtYmVyID0gMDsKICAgICAgICAgdmFyIGNvbHVtbk51bWJlciA9IDA7CkBAIC0xMTcsMjUg KzEyNSwzNCBAQCBXZWJJbnNwZWN0b3IuQ2xvc3VyZUNvbXBpbGVyU291cmNlTWFwcGluZy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHZhciBzb3VyY2VMaW5lTnVtYmVyID0gMDsKICAgICAgICAgdmFy IHNvdXJjZUNvbHVtbk51bWJlciA9IDA7CiAgICAgICAgIHZhciBuYW1lSW5kZXggPSAwOworCisg ICAgICAgIHZhciBzb3VyY2VVUkwgPSB0aGlzLl9zb3VyY2VzWzBdOworICAgICAgICB2YXIgcmV2 ZXJzZU1hcHBpbmdzID0gdGhpcy5fcmV2ZXJzZU1hcHBpbmdzQnlTb3VyY2VVUkxbc291cmNlVVJM XTsKKwogICAgICAgICBkbyB7CiAgICAgICAgICAgICBjb2x1bW5OdW1iZXIgKz0gdGhpcy5fZGVj b2RlVkxRKHN0cmluZ0NoYXJJdGVyYXRvcik7CiAgICAgICAgICAgICBpZiAodGhpcy5faXNTZXBh cmF0b3Ioc3RyaW5nQ2hhckl0ZXJhdG9yLnBlZWsoKSkpCiAgICAgICAgICAgICAgICAgY29udGlu dWU7Ci0gICAgICAgICAgICBzb3VyY2VJbmRleCArPSB0aGlzLl9kZWNvZGVWTFEoc3RyaW5nQ2hh ckl0ZXJhdG9yKTsKKyAgICAgICAgICAgIHZhciBzb3VyY2VJbmRleERlbHRhID0gdGhpcy5fZGVj b2RlVkxRKHN0cmluZ0NoYXJJdGVyYXRvcik7CisgICAgICAgICAgICBpZiAoc291cmNlSW5kZXhE ZWx0YSkgeworICAgICAgICAgICAgICAgIHNvdXJjZUluZGV4ICs9IHNvdXJjZUluZGV4RGVsdGE7 CisgICAgICAgICAgICAgICAgc291cmNlVVJMID0gdGhpcy5fc291cmNlc1tzb3VyY2VJbmRleF07 CisgICAgICAgICAgICAgICAgcmV2ZXJzZU1hcHBpbmdzID0gdGhpcy5fcmV2ZXJzZU1hcHBpbmdz QnlTb3VyY2VVUkxbc291cmNlVVJMXTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIHNvdXJj ZUxpbmVOdW1iZXIgKz0gdGhpcy5fZGVjb2RlVkxRKHN0cmluZ0NoYXJJdGVyYXRvcik7CiAgICAg ICAgICAgICBzb3VyY2VDb2x1bW5OdW1iZXIgKz0gdGhpcy5fZGVjb2RlVkxRKHN0cmluZ0NoYXJJ dGVyYXRvcik7Ci0gICAgICAgICAgICB2YXIgbWFwcGluZyA9IFtsaW5lTnVtYmVyLCBjb2x1bW5O dW1iZXIsIHNvdXJjZUluZGV4LCBzb3VyY2VMaW5lTnVtYmVyLCBzb3VyY2VDb2x1bW5OdW1iZXJd OwotICAgICAgICAgICAgaWYgKCF0aGlzLl9pc1NlcGFyYXRvcihzdHJpbmdDaGFySXRlcmF0b3Iu cGVlaygpKSkgeworICAgICAgICAgICAgaWYgKCF0aGlzLl9pc1NlcGFyYXRvcihzdHJpbmdDaGFy SXRlcmF0b3IucGVlaygpKSkKICAgICAgICAgICAgICAgICBuYW1lSW5kZXggKz0gdGhpcy5fZGVj b2RlVkxRKHN0cmluZ0NoYXJJdGVyYXRvcik7Ci0gICAgICAgICAgICAgICAgbWFwcGluZy5wdXNo KG5hbWVJbmRleCk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBtYXBwaW5ncy5wdXNoKG1h cHBpbmcpOworCisgICAgICAgICAgICB0aGlzLl9tYXBwaW5ncy5wdXNoKFtsaW5lTnVtYmVyLCBj b2x1bW5OdW1iZXIsIHNvdXJjZVVSTCwgc291cmNlTGluZU51bWJlciwgc291cmNlQ29sdW1uTnVt YmVyXSk7CisgICAgICAgICAgICBpZiAoIXJldmVyc2VNYXBwaW5nc1tzb3VyY2VMaW5lTnVtYmVy XSkKKyAgICAgICAgICAgICAgICByZXZlcnNlTWFwcGluZ3Nbc291cmNlTGluZU51bWJlcl0gPSBb bGluZU51bWJlciwgY29sdW1uTnVtYmVyXTsKKwogICAgICAgICAgICAgaWYgKHN0cmluZ0NoYXJJ dGVyYXRvci5uZXh0KCkgPT09ICI7IikgewogICAgICAgICAgICAgICAgIGxpbmVOdW1iZXIgKz0g MTsKICAgICAgICAgICAgICAgICBjb2x1bW5OdW1iZXIgPSAwOwogICAgICAgICAgICAgfQogICAg ICAgICB9IHdoaWxlKHN0cmluZ0NoYXJJdGVyYXRvci5oYXNOZXh0KCkpOwotICAgICAgICByZXR1 cm4gbWFwcGluZ3M7CiAgICAgfSwKIAogICAgIF9pc1NlcGFyYXRvcjogZnVuY3Rpb24oY2hhcikK