82304 2012-03-27 01:07:07 -0700 Web Inspector: remove remains of path finder in heap profiler front-end 2012-05-09 21:59:05 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 588627 0 yurys 2012-03-27 01:07:07 -0700 With the new hierarchical retainers view we don't need the path finder and the code should be removed. 588628 1 133995 yurys 2012-03-27 01:08:30 -0700 Created attachment 133995 Patch 588629 2 133996 yurys 2012-03-27 01:13:30 -0700 Created attachment 133996 Patch 588634 3 yurys 2012-03-27 01:18:45 -0700 Committed r112222: <http://trac.webkit.org/changeset/112222> 133995 2012-03-27 01:08:30 -0700 2012-03-27 01:13:23 -0700 Patch bug-82304-20120327120829.patch text/plain 8493 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmM4OTk3Zjg0ZDFhNzgw MGY1MWQxYzZhYjg4ZjI5Mzg4MDBhZmJkZi4uY2ZiYmFiZDc2MzBmNWYwNjAwZjBjMGQwNmNiZDUz Zjc2MmVlYzAyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAzLTI3ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSByZW1haW5zIG9mIHBhdGggZmluZGVyIGluIGhlYXAgcHJvZmlsZXIgZnJvbnQt ZW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjMw NAorCisgICAgICAgIFJlbW92ZWQgcmVtYWluZGVycyBvZiBoZWFwIHBhdGggZmluZGVyIGFzIHRo aXMgY29kZSBpcyBub3QgdXNlZCBhbnltb3JlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3Qu anM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qczoK KwogMjAxMi0wMy0yNiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExMjE5OS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMKaW5kZXggN2Uz YjRkNmQ5N2YwOTE0NzAwMDY4ODRkOTJlMDc4MWQ5YmNiNThkYi4uYTM5OTljY2QxN2I4NmJhYzU1 MjQ0ODYwOGVmZTZhOWRiZWY3Zjc2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMKQEAgLTE0NzAsMTEgKzE0NzAsNiBAQCBXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZXNQcm92aWRlcih0aGlzLCB0aGlzLl9wYXJzZUZp bHRlcihmaWx0ZXIpLCB0aGlzLl9kb21pbmF0ZWROb2Rlc09mTm9kZShub2RlKSk7CiAgICAgfSwK IAotICAgIGNyZWF0ZVBhdGhGaW5kZXI6IGZ1bmN0aW9uKHRhcmdldE5vZGVJbmRleCwgc2tpcEhp ZGRlbikKLSAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFBhdGhGaW5kZXIodGhpcywgdGFyZ2V0Tm9kZUluZGV4LCBza2lwSGlkZGVuKTsKLSAgICB9LAot CiAgICAgdXBkYXRlU3RhdGljRGF0YTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJu IHtub2RlQ291bnQ6IHRoaXMubm9kZUNvdW50LCByb290Tm9kZUluZGV4OiB0aGlzLl9yb290Tm9k ZUluZGV4LCB0b3RhbFNpemU6IHRoaXMudG90YWxTaXplLCB1aWQ6IHRoaXMudWlkLCBub2RlRmxh Z3M6IHRoaXMuX25vZGVGbGFncywgbWF4Tm9kZUlkOiB0aGlzLm1heE5vZGVJZH07CkBAIC0xNzUz LDE5MCArMTc0OCw2IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3ROb2Rlc1Byb3ZpZGVyLnBy b3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE5vZGVzUHJvdmlkZXIucHJv dG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RGaWx0ZXJlZE9yZGVy ZWRJdGVyYXRvci5wcm90b3R5cGU7CiAKLVdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQYXRoRmlu ZGVyID0gZnVuY3Rpb24oc25hcHNob3QsIHRhcmdldE5vZGVJbmRleCwgc2tpcEhpZGRlbikKLXsK LSAgICB0aGlzLl9zbmFwc2hvdCA9IHNuYXBzaG90OwotICAgIHRoaXMuX21heExlbmd0aCA9IDE7 Ci0gICAgdGhpcy5fbGVuZ3RoTGltaXQgPSAxNTsKLSAgICB0aGlzLl90YXJnZXROb2RlSW5kZXgg PSB0YXJnZXROb2RlSW5kZXg7Ci0gICAgdGhpcy5fY3VycmVudFBhdGggPSBudWxsOwotICAgIHRo aXMuX3NraXBIaWRkZW4gPSBza2lwSGlkZGVuOwotICAgIHRoaXMuX3Jvb3RDaGlsZHJlbiA9IHRo aXMuX2ZpbGxSb290Q2hpbGRyZW4oKTsKLX0KLQotV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFBh dGhGaW5kZXIucHJvdG90eXBlID0gewotICAgIGZpbmROZXh0OiBmdW5jdGlvbigpCi0gICAgewot ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IDEwMDAwMDsgKytpKSB7Ci0gICAgICAgICAgICBp ZiAoIXRoaXMuX2J1aWxkTmV4dFBhdGgoKSkgewotICAgICAgICAgICAgICAgIGlmICgrK3RoaXMu X21heExlbmd0aCA+PSB0aGlzLl9sZW5ndGhMaW1pdCkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIG51bGw7Ci0gICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFBhdGggPSBudWxsOwotICAg ICAgICAgICAgICAgIGlmICghdGhpcy5fYnVpbGROZXh0UGF0aCgpKQotICAgICAgICAgICAgICAg ICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmICh0aGlzLl9p c1BhdGhGb3VuZCgpKQotICAgICAgICAgICAgICAgIHJldHVybiB7cGF0aDp0aGlzLl9wYXRoVG9T dHJpbmcodGhpcy5fY3VycmVudFBhdGgpLCByb3V0ZTp0aGlzLl9wYXRoVG9Sb3V0ZSh0aGlzLl9j dXJyZW50UGF0aCksIGxlbjp0aGlzLl9jdXJyZW50UGF0aC5sZW5ndGh9OwotICAgICAgICB9Ci0K LSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0sCi0KLSAgICB1cGRhdGVSb290czogZnVuY3Rp b24oZmlsdGVyKQotICAgIHsKLSAgICAgICAgaWYgKGZpbHRlcikKLSAgICAgICAgICAgIGZpbHRl ciA9IGV2YWwoIihmdW5jdGlvbigpe3JldHVybiAiICsgZmlsdGVyICsgIn0pKCkiKTsKLSAgICAg ICAgdGhpcy5fcm9vdENoaWxkcmVuID0gdGhpcy5fZmlsbFJvb3RDaGlsZHJlbihmaWx0ZXIpOwot ICAgICAgICB0aGlzLl9yZXNldCgpOwotICAgIH0sCi0KLSAgICBfcmVzZXQ6IGZ1bmN0aW9uKCkK LSAgICB7Ci0gICAgICAgIHRoaXMuX21heExlbmd0aCA9IDE7Ci0gICAgICAgIHRoaXMuX2N1cnJl bnRQYXRoID0gbnVsbDsKLSAgICB9LAotCi0gICAgX2ZpbGxSb290Q2hpbGRyZW46IGZ1bmN0aW9u KGZpbHRlcikKLSAgICB7Ci0gICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICAgICAgZm9yICh2 YXIgaXRlciA9IHRoaXMuX3NuYXBzaG90LnJvb3ROb2RlLmVkZ2VzOyBpdGVyLmhhc05leHQoKTsg aXRlci5uZXh0KCkpIHsKLSAgICAgICAgICAgIGlmICghZmlsdGVyKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKCFpdGVyLmVkZ2UuaXNTaG9ydGN1dCkKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0 W2l0ZXIuZWRnZS5ub2RlSW5kZXhdID0gdHJ1ZTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoZmls dGVyKGl0ZXIuZWRnZS5ub2RlKSkgewotICAgICAgICAgICAgICAgIHJlc3VsdFtpdGVyLmVkZ2Uu bm9kZUluZGV4XSA9IHRydWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIHJlc3VsdDsKLSAgICB9LAotCi0gICAgX2FwcGVuZFRvQ3VycmVudFBhdGg6IGZ1bmN0aW9u KGl0ZXIpCi0gICAgewotICAgICAgICB0aGlzLl9jdXJyZW50UGF0aC5fY2FjaGVbdGhpcy5fbGFz dEVkZ2Uubm9kZUluZGV4XSA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2N1cnJlbnRQYXRoLnB1c2go aXRlcik7Ci0gICAgfSwKLQotICAgIF9yZW1vdmVMYXN0RnJvbUN1cnJlbnRQYXRoOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICB0aGlzLl9jdXJyZW50UGF0aC5wb3AoKTsKLSAgICAgICAgZGVs ZXRlIHRoaXMuX2N1cnJlbnRQYXRoLl9jYWNoZVt0aGlzLl9sYXN0RWRnZS5ub2RlSW5kZXhdOwot ICAgIH0sCi0KLSAgICBfaGFzSW5QYXRoOiBmdW5jdGlvbihub2RlSW5kZXgpCi0gICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fdGFyZ2V0Tm9kZUluZGV4ID09PSBub2RlSW5kZXgKLSAgICAgICAg ICAgIHx8ICEhdGhpcy5fY3VycmVudFBhdGguX2NhY2hlW25vZGVJbmRleF07Ci0gICAgfSwKLQot ICAgIF9pc1BhdGhGb3VuZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu X2N1cnJlbnRQYXRoLmxlbmd0aCA9PT0gdGhpcy5fbWF4TGVuZ3RoCi0gICAgICAgICAgICAmJiB0 aGlzLl9sYXN0RWRnZS5ub2RlSW5kZXggaW4gdGhpcy5fcm9vdENoaWxkcmVuOwotICAgIH0sCi0K LSAgICBnZXQgX2xhc3RFZGdlSXRlcigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fY3Vy cmVudFBhdGhbdGhpcy5fY3VycmVudFBhdGgubGVuZ3RoIC0gMV07Ci0gICAgfSwKLQotICAgIGdl dCBfbGFzdEVkZ2UoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2xhc3RFZGdlSXRlci5p dGVtOwotICAgIH0sCi0KLSAgICBfc2tpcEVkZ2U6IGZ1bmN0aW9uKGVkZ2UpCi0gICAgewotICAg ICAgICByZXR1cm4gZWRnZS5pc0ludmlzaWJsZQotICAgICAgICAgICAgfHwgKHRoaXMuX3NraXBI aWRkZW4gJiYgKGVkZ2UuaXNIaWRkZW4gfHwgZWRnZS5ub2RlLmlzSGlkZGVuKSkKLSAgICAgICAg ICAgIHx8IGVkZ2UuaXNXZWFrCi0gICAgICAgICAgICB8fCB0aGlzLl9oYXNJblBhdGgoZWRnZS5u b2RlSW5kZXgpOwotICAgIH0sCi0KLSAgICBfbmV4dEVkZ2VJdGVyOiBmdW5jdGlvbigpCi0gICAg ewotICAgICAgICB2YXIgaXRlciA9IHRoaXMuX2xhc3RFZGdlSXRlcjsKLSAgICAgICAgd2hpbGUg KGl0ZXIuaGFzTmV4dCgpICYmIHRoaXMuX3NraXBFZGdlKGl0ZXIuaXRlbSkpCi0gICAgICAgICAg ICBpdGVyLm5leHQoKTsKLSAgICAgICAgcmV0dXJuIGl0ZXI7Ci0gICAgfSwKLQotICAgIF9idWls ZE5leHRQYXRoOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fY3VycmVudFBh dGggIT09IG51bGwpIHsKLSAgICAgICAgICAgIHZhciBpdGVyID0gdGhpcy5fbGFzdEVkZ2VJdGVy OwotICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgICAgICAgICBpdGVyLm5leHQo KTsKLSAgICAgICAgICAgICAgICBpdGVyID0gdGhpcy5fbmV4dEVkZ2VJdGVyKCk7Ci0gICAgICAg ICAgICAgICAgaWYgKGl0ZXIuaGFzTmV4dCgpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAgICAgICAg ICBpZiAodGhpcy5fY3VycmVudFBhdGgubGVuZ3RoID4gMSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgdGhpcy5fcmVtb3ZlTGFzdEZyb21DdXJyZW50UGF0aCgpOwotICAgICAgICAgICAgICAg ICAgICAgICAgaXRlciA9IHRoaXMuX2xhc3RFZGdlSXRlcjsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGl0ZXIubmV4dCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgaXRlciA9IHRoaXMuX25l eHRFZGdlSXRlcigpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGl0ZXIuaGFzTmV4dCgp KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgd2hpbGUgKHRoaXMuX2N1cnJlbnRQYXRo Lmxlbmd0aCA8IHRoaXMuX21heExlbmd0aCkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpdGVyID0gdGhpcy5fbmV4dEVkZ2VJdGVyKCk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChpdGVyLmhhc05leHQoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRoaXMuX2FwcGVuZFRvQ3VycmVudFBhdGgoaXRlci5pdGVtLm5vZGUucmV0YWlu ZXJzKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAg ICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgbm9kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZSh0aGlzLl9zbmFwc2hvdCwgdGhpcy5fdGFyZ2V0 Tm9kZUluZGV4KTsKLSAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRQYXRoID0gW25vZGUucmV0YWlu ZXJzXTsKLSAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRQYXRoLl9jYWNoZSA9IHt9OwotICAgICAg ICAgICAgd2hpbGUgKHRoaXMuX2N1cnJlbnRQYXRoLmxlbmd0aCA8IHRoaXMuX21heExlbmd0aCkg ewotICAgICAgICAgICAgICAgIHZhciBpdGVyID0gdGhpcy5fbmV4dEVkZ2VJdGVyKCk7Ci0gICAg ICAgICAgICAgICAgaWYgKGl0ZXIuaGFzTmV4dCgpKQotICAgICAgICAgICAgICAgICAgICB0aGlz Ll9hcHBlbmRUb0N1cnJlbnRQYXRoKGl0ZXIuaXRlbS5ub2RlLnJldGFpbmVycyk7Ci0gICAgICAg ICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9Ci0gICAgfSwKLQotICAgIF9ub2Rl VG9TdHJpbmc6IGZ1bmN0aW9uKG5vZGUpCi0gICAgewotICAgICAgICBpZiAobm9kZS5pZCA9PT0g MSkKLSAgICAgICAgICAgIHJldHVybiBub2RlLm5hbWU7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHJldHVybiBub2RlLm5hbWUgKyAiQCIgKyBub2RlLmlkOwotICAgIH0sCi0KLSAgICBfcGF0 aFRvU3RyaW5nOiBmdW5jdGlvbihwYXRoKQotICAgIHsKLSAgICAgICAgaWYgKCFwYXRoKQotICAg ICAgICAgICAgcmV0dXJuICIiOwotICAgICAgICB2YXIgc1BhdGggPSBbXTsKLSAgICAgICAgZm9y ICh2YXIgaiA9IDA7IGogPCBwYXRoLmxlbmd0aDsgKytqKQotICAgICAgICAgICAgc1BhdGgucHVz aChwYXRoW2pdLml0ZW0udG9TdHJpbmcoKSk7Ci0gICAgICAgIHNQYXRoLnB1c2godGhpcy5fbm9k ZVRvU3RyaW5nKHBhdGhbcGF0aC5sZW5ndGggLSAxXS5pdGVtLm5vZGUpKTsKLSAgICAgICAgc1Bh dGgucmV2ZXJzZSgpOwotICAgICAgICByZXR1cm4gc1BhdGguam9pbigiIik7Ci0gICAgfSwKLQot ICAgIF9wYXRoVG9Sb3V0ZTogZnVuY3Rpb24ocGF0aCkKLSAgICB7Ci0gICAgICAgIGlmICghcGF0 aCkKLSAgICAgICAgICAgcmV0dXJuIFtdOwotICAgICAgICB2YXIgcm91dGUgPSBbXTsKLSAgICAg ICAgcm91dGUucHVzaCh0aGlzLl90YXJnZXROb2RlSW5kZXgpOwotICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHBhdGgubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICByb3V0ZS5wdXNoKHBhdGhb aV0uaXRlbS5ub2RlSW5kZXgpOwotICAgICAgICByb3V0ZS5yZXZlcnNlKCk7Ci0gICAgICAgIHJl dHVybiByb3V0ZTsKLSAgICB9Ci19OwotCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90c0RpZmYg PSBmdW5jdGlvbihzbmFwc2hvdCwgY2xhc3NOYW1lKQogewogICAgIHRoaXMuX3NuYXBzaG90ID0g c25hcHNob3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdFByb3h5LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9IZWFwU25hcHNob3RQcm94eS5qcwppbmRleCBlZDZlMGE4MWQ5NGY1NmMxNTY0OGE4YzUxMzYw NGNmMTViMjllZTc1Li42YzJjYjQxOGJhOWUzNDBhZjg4YzU5MzJkNTE4MmYwMmQwODgxODk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hv dFByb3h5LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNu YXBzaG90UHJveHkuanMKQEAgLTM1NCwxMSArMzU0LDYgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdFByb3h5LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuY2FsbEZhY3RvcnlN ZXRob2QobnVsbCwgImNyZWF0ZU5vZGVzUHJvdmlkZXJGb3JEb21pbmF0b3IiLCAiV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFByb3ZpZGVyUHJveHkiLCBub2RlSW5kZXgsIGZpbHRlcik7CiAgICAg fSwKIAotICAgIGNyZWF0ZVBhdGhGaW5kZXI6IGZ1bmN0aW9uKHRhcmdldE5vZGVJbmRleCwgc2tp cEhpZGRlbikKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLmNhbGxGYWN0b3J5TWV0aG9kKG51 bGwsICJjcmVhdGVQYXRoRmluZGVyIiwgIldlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQYXRoRmlu ZGVyUHJveHkiLCB0YXJnZXROb2RlSW5kZXgsIHNraXBIaWRkZW4pOwotICAgIH0sCi0KICAgICBk aXNwb3NlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLmRpc3Bvc2VXb3JrZXIoKTsK 133996 2012-03-27 01:13:30 -0700 2012-03-27 01:14:09 -0700 Patch bug-82304-20120327121328.patch text/plain 11506 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmM4OTk3Zjg0ZDFhNzgw MGY1MWQxYzZhYjg4ZjI5Mzg4MDBhZmJkZi4uY2ZiYmFiZDc2MzBmNWYwNjAwZjBjMGQwNmNiZDUz Zjc2MmVlYzAyMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAzLTI3ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSByZW1haW5zIG9mIHBhdGggZmluZGVyIGluIGhlYXAgcHJvZmlsZXIgZnJvbnQt ZW5kCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjMw NAorCisgICAgICAgIFJlbW92ZWQgcmVtYWluZGVycyBvZiBoZWFwIHBhdGggZmluZGVyIGFzIHRo aXMgY29kZSBpcyBub3QgdXNlZCBhbnltb3JlLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3Qu anM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3RQcm94eS5qczoK KwogMjAxMi0wMy0yNiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExMjE5OS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNuYXBzaG90LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMKaW5kZXggN2Uz YjRkNmQ5N2YwOTE0NzAwMDY4ODRkOTJlMDc4MWQ5YmNiNThkYi4uYTM5OTljY2QxN2I4NmJhYzU1 MjQ0ODYwOGVmZTZhOWRiZWY3Zjc2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9IZWFwU25hcHNob3QuanMKQEAgLTE0NzAsMTEgKzE0NzAsNiBAQCBXZWJJ bnNwZWN0b3IuSGVhcFNuYXBzaG90LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZXNQcm92aWRlcih0aGlzLCB0aGlzLl9wYXJzZUZp bHRlcihmaWx0ZXIpLCB0aGlzLl9kb21pbmF0ZWROb2Rlc09mTm9kZShub2RlKSk7CiAgICAgfSwK IAotICAgIGNyZWF0ZVBhdGhGaW5kZXI6IGZ1bmN0aW9uKHRhcmdldE5vZGVJbmRleCwgc2tpcEhp ZGRlbikKLSAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hv dFBhdGhGaW5kZXIodGhpcywgdGFyZ2V0Tm9kZUluZGV4LCBza2lwSGlkZGVuKTsKLSAgICB9LAot CiAgICAgdXBkYXRlU3RhdGljRGF0YTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJu IHtub2RlQ291bnQ6IHRoaXMubm9kZUNvdW50LCByb290Tm9kZUluZGV4OiB0aGlzLl9yb290Tm9k ZUluZGV4LCB0b3RhbFNpemU6IHRoaXMudG90YWxTaXplLCB1aWQ6IHRoaXMudWlkLCBub2RlRmxh Z3M6IHRoaXMuX25vZGVGbGFncywgbWF4Tm9kZUlkOiB0aGlzLm1heE5vZGVJZH07CkBAIC0xNzUz LDE5MCArMTc0OCw2IEBAIFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3ROb2Rlc1Byb3ZpZGVyLnBy b3RvdHlwZSA9IHsKIAogV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdE5vZGVzUHJvdmlkZXIucHJv dG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RGaWx0ZXJlZE9yZGVy ZWRJdGVyYXRvci5wcm90b3R5cGU7CiAKLVdlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQYXRoRmlu ZGVyID0gZnVuY3Rpb24oc25hcHNob3QsIHRhcmdldE5vZGVJbmRleCwgc2tpcEhpZGRlbikKLXsK LSAgICB0aGlzLl9zbmFwc2hvdCA9IHNuYXBzaG90OwotICAgIHRoaXMuX21heExlbmd0aCA9IDE7 Ci0gICAgdGhpcy5fbGVuZ3RoTGltaXQgPSAxNTsKLSAgICB0aGlzLl90YXJnZXROb2RlSW5kZXgg PSB0YXJnZXROb2RlSW5kZXg7Ci0gICAgdGhpcy5fY3VycmVudFBhdGggPSBudWxsOwotICAgIHRo aXMuX3NraXBIaWRkZW4gPSBza2lwSGlkZGVuOwotICAgIHRoaXMuX3Jvb3RDaGlsZHJlbiA9IHRo aXMuX2ZpbGxSb290Q2hpbGRyZW4oKTsKLX0KLQotV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdFBh dGhGaW5kZXIucHJvdG90eXBlID0gewotICAgIGZpbmROZXh0OiBmdW5jdGlvbigpCi0gICAgewot ICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IDEwMDAwMDsgKytpKSB7Ci0gICAgICAgICAgICBp ZiAoIXRoaXMuX2J1aWxkTmV4dFBhdGgoKSkgewotICAgICAgICAgICAgICAgIGlmICgrK3RoaXMu X21heExlbmd0aCA+PSB0aGlzLl9sZW5ndGhMaW1pdCkKLSAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIG51bGw7Ci0gICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFBhdGggPSBudWxsOwotICAg ICAgICAgICAgICAgIGlmICghdGhpcy5fYnVpbGROZXh0UGF0aCgpKQotICAgICAgICAgICAgICAg ICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmICh0aGlzLl9p c1BhdGhGb3VuZCgpKQotICAgICAgICAgICAgICAgIHJldHVybiB7cGF0aDp0aGlzLl9wYXRoVG9T dHJpbmcodGhpcy5fY3VycmVudFBhdGgpLCByb3V0ZTp0aGlzLl9wYXRoVG9Sb3V0ZSh0aGlzLl9j dXJyZW50UGF0aCksIGxlbjp0aGlzLl9jdXJyZW50UGF0aC5sZW5ndGh9OwotICAgICAgICB9Ci0K LSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0sCi0KLSAgICB1cGRhdGVSb290czogZnVuY3Rp b24oZmlsdGVyKQotICAgIHsKLSAgICAgICAgaWYgKGZpbHRlcikKLSAgICAgICAgICAgIGZpbHRl ciA9IGV2YWwoIihmdW5jdGlvbigpe3JldHVybiAiICsgZmlsdGVyICsgIn0pKCkiKTsKLSAgICAg ICAgdGhpcy5fcm9vdENoaWxkcmVuID0gdGhpcy5fZmlsbFJvb3RDaGlsZHJlbihmaWx0ZXIpOwot ICAgICAgICB0aGlzLl9yZXNldCgpOwotICAgIH0sCi0KLSAgICBfcmVzZXQ6IGZ1bmN0aW9uKCkK LSAgICB7Ci0gICAgICAgIHRoaXMuX21heExlbmd0aCA9IDE7Ci0gICAgICAgIHRoaXMuX2N1cnJl bnRQYXRoID0gbnVsbDsKLSAgICB9LAotCi0gICAgX2ZpbGxSb290Q2hpbGRyZW46IGZ1bmN0aW9u KGZpbHRlcikKLSAgICB7Ci0gICAgICAgIHZhciByZXN1bHQgPSBbXTsKLSAgICAgICAgZm9yICh2 YXIgaXRlciA9IHRoaXMuX3NuYXBzaG90LnJvb3ROb2RlLmVkZ2VzOyBpdGVyLmhhc05leHQoKTsg aXRlci5uZXh0KCkpIHsKLSAgICAgICAgICAgIGlmICghZmlsdGVyKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKCFpdGVyLmVkZ2UuaXNTaG9ydGN1dCkKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0 W2l0ZXIuZWRnZS5ub2RlSW5kZXhdID0gdHJ1ZTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAoZmls dGVyKGl0ZXIuZWRnZS5ub2RlKSkgewotICAgICAgICAgICAgICAgIHJlc3VsdFtpdGVyLmVkZ2Uu bm9kZUluZGV4XSA9IHRydWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgcmV0 dXJuIHJlc3VsdDsKLSAgICB9LAotCi0gICAgX2FwcGVuZFRvQ3VycmVudFBhdGg6IGZ1bmN0aW9u KGl0ZXIpCi0gICAgewotICAgICAgICB0aGlzLl9jdXJyZW50UGF0aC5fY2FjaGVbdGhpcy5fbGFz dEVkZ2Uubm9kZUluZGV4XSA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2N1cnJlbnRQYXRoLnB1c2go aXRlcik7Ci0gICAgfSwKLQotICAgIF9yZW1vdmVMYXN0RnJvbUN1cnJlbnRQYXRoOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICB0aGlzLl9jdXJyZW50UGF0aC5wb3AoKTsKLSAgICAgICAgZGVs ZXRlIHRoaXMuX2N1cnJlbnRQYXRoLl9jYWNoZVt0aGlzLl9sYXN0RWRnZS5ub2RlSW5kZXhdOwot ICAgIH0sCi0KLSAgICBfaGFzSW5QYXRoOiBmdW5jdGlvbihub2RlSW5kZXgpCi0gICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fdGFyZ2V0Tm9kZUluZGV4ID09PSBub2RlSW5kZXgKLSAgICAgICAg ICAgIHx8ICEhdGhpcy5fY3VycmVudFBhdGguX2NhY2hlW25vZGVJbmRleF07Ci0gICAgfSwKLQot ICAgIF9pc1BhdGhGb3VuZDogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu X2N1cnJlbnRQYXRoLmxlbmd0aCA9PT0gdGhpcy5fbWF4TGVuZ3RoCi0gICAgICAgICAgICAmJiB0 aGlzLl9sYXN0RWRnZS5ub2RlSW5kZXggaW4gdGhpcy5fcm9vdENoaWxkcmVuOwotICAgIH0sCi0K LSAgICBnZXQgX2xhc3RFZGdlSXRlcigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fY3Vy cmVudFBhdGhbdGhpcy5fY3VycmVudFBhdGgubGVuZ3RoIC0gMV07Ci0gICAgfSwKLQotICAgIGdl dCBfbGFzdEVkZ2UoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2xhc3RFZGdlSXRlci5p dGVtOwotICAgIH0sCi0KLSAgICBfc2tpcEVkZ2U6IGZ1bmN0aW9uKGVkZ2UpCi0gICAgewotICAg ICAgICByZXR1cm4gZWRnZS5pc0ludmlzaWJsZQotICAgICAgICAgICAgfHwgKHRoaXMuX3NraXBI aWRkZW4gJiYgKGVkZ2UuaXNIaWRkZW4gfHwgZWRnZS5ub2RlLmlzSGlkZGVuKSkKLSAgICAgICAg ICAgIHx8IGVkZ2UuaXNXZWFrCi0gICAgICAgICAgICB8fCB0aGlzLl9oYXNJblBhdGgoZWRnZS5u b2RlSW5kZXgpOwotICAgIH0sCi0KLSAgICBfbmV4dEVkZ2VJdGVyOiBmdW5jdGlvbigpCi0gICAg ewotICAgICAgICB2YXIgaXRlciA9IHRoaXMuX2xhc3RFZGdlSXRlcjsKLSAgICAgICAgd2hpbGUg KGl0ZXIuaGFzTmV4dCgpICYmIHRoaXMuX3NraXBFZGdlKGl0ZXIuaXRlbSkpCi0gICAgICAgICAg ICBpdGVyLm5leHQoKTsKLSAgICAgICAgcmV0dXJuIGl0ZXI7Ci0gICAgfSwKLQotICAgIF9idWls ZE5leHRQYXRoOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fY3VycmVudFBh dGggIT09IG51bGwpIHsKLSAgICAgICAgICAgIHZhciBpdGVyID0gdGhpcy5fbGFzdEVkZ2VJdGVy OwotICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgICAgICAgICBpdGVyLm5leHQo KTsKLSAgICAgICAgICAgICAgICBpdGVyID0gdGhpcy5fbmV4dEVkZ2VJdGVyKCk7Ci0gICAgICAg ICAgICAgICAgaWYgKGl0ZXIuaGFzTmV4dCgpKQotICAgICAgICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewotICAgICAgICAgICAgICAgICAg ICBpZiAodGhpcy5fY3VycmVudFBhdGgubGVuZ3RoID4gMSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgdGhpcy5fcmVtb3ZlTGFzdEZyb21DdXJyZW50UGF0aCgpOwotICAgICAgICAgICAgICAg ICAgICAgICAgaXRlciA9IHRoaXMuX2xhc3RFZGdlSXRlcjsKLSAgICAgICAgICAgICAgICAgICAg ICAgIGl0ZXIubmV4dCgpOwotICAgICAgICAgICAgICAgICAgICAgICAgaXRlciA9IHRoaXMuX25l eHRFZGdlSXRlcigpOwotICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGl0ZXIuaGFzTmV4dCgp KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgd2hpbGUgKHRoaXMuX2N1cnJlbnRQYXRo Lmxlbmd0aCA8IHRoaXMuX21heExlbmd0aCkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpdGVyID0gdGhpcy5fbmV4dEVkZ2VJdGVyKCk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChpdGVyLmhhc05leHQoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHRoaXMuX2FwcGVuZFRvQ3VycmVudFBhdGgoaXRlci5pdGVtLm5vZGUucmV0YWlu ZXJzKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAg ICAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICB2YXIgbm9kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90Tm9kZSh0aGlzLl9zbmFwc2hvdCwgdGhpcy5fdGFyZ2V0 Tm9kZUluZGV4KTsKLSAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRQYXRoID0gW25vZGUucmV0YWlu ZXJzXTsKLSAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRQYXRoLl9jYWNoZSA9IHt9OwotICAgICAg ICAgICAgd2hpbGUgKHRoaXMuX2N1cnJlbnRQYXRoLmxlbmd0aCA8IHRoaXMuX21heExlbmd0aCkg ewotICAgICAgICAgICAgICAgIHZhciBpdGVyID0gdGhpcy5fbmV4dEVkZ2VJdGVyKCk7Ci0gICAg ICAgICAgICAgICAgaWYgKGl0ZXIuaGFzTmV4dCgpKQotICAgICAgICAgICAgICAgICAgICB0aGlz Ll9hcHBlbmRUb0N1cnJlbnRQYXRoKGl0ZXIuaXRlbS5ub2RlLnJldGFpbmVycyk7Ci0gICAgICAg ICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0K LSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9Ci0gICAgfSwKLQotICAgIF9ub2Rl VG9TdHJpbmc6IGZ1bmN0aW9uKG5vZGUpCi0gICAgewotICAgICAgICBpZiAobm9kZS5pZCA9PT0g MSkKLSAgICAgICAgICAgIHJldHVybiBub2RlLm5hbWU7Ci0gICAgICAgIGVsc2UKLSAgICAgICAg ICAgIHJldHVybiBub2RlLm5hbWUgKyAiQCIgKyBub2RlLmlkOwotICAgIH0sCi0KLSAgICBfcGF0 aFRvU3RyaW5nOiBmdW5jdGlvbihwYXRoKQotICAgIHsKLSAgICAgICAgaWYgKCFwYXRoKQotICAg ICAgICAgICAgcmV0dXJuICIiOwotICAgICAgICB2YXIgc1BhdGggPSBbXTsKLSAgICAgICAgZm9y ICh2YXIgaiA9IDA7IGogPCBwYXRoLmxlbmd0aDsgKytqKQotICAgICAgICAgICAgc1BhdGgucHVz aChwYXRoW2pdLml0ZW0udG9TdHJpbmcoKSk7Ci0gICAgICAgIHNQYXRoLnB1c2godGhpcy5fbm9k ZVRvU3RyaW5nKHBhdGhbcGF0aC5sZW5ndGggLSAxXS5pdGVtLm5vZGUpKTsKLSAgICAgICAgc1Bh dGgucmV2ZXJzZSgpOwotICAgICAgICByZXR1cm4gc1BhdGguam9pbigiIik7Ci0gICAgfSwKLQot ICAgIF9wYXRoVG9Sb3V0ZTogZnVuY3Rpb24ocGF0aCkKLSAgICB7Ci0gICAgICAgIGlmICghcGF0 aCkKLSAgICAgICAgICAgcmV0dXJuIFtdOwotICAgICAgICB2YXIgcm91dGUgPSBbXTsKLSAgICAg ICAgcm91dGUucHVzaCh0aGlzLl90YXJnZXROb2RlSW5kZXgpOwotICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHBhdGgubGVuZ3RoOyArK2kpCi0gICAgICAgICAgICByb3V0ZS5wdXNoKHBhdGhb aV0uaXRlbS5ub2RlSW5kZXgpOwotICAgICAgICByb3V0ZS5yZXZlcnNlKCk7Ci0gICAgICAgIHJl dHVybiByb3V0ZTsKLSAgICB9Ci19OwotCiBXZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90c0RpZmYg PSBmdW5jdGlvbihzbmFwc2hvdCwgY2xhc3NOYW1lKQogewogICAgIHRoaXMuX3NuYXBzaG90ID0g c25hcHNob3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0hlYXBTbmFwc2hvdFByb3h5LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9IZWFwU25hcHNob3RQcm94eS5qcwppbmRleCBlZDZlMGE4MWQ5NGY1NmMxNTY0OGE4YzUxMzYw NGNmMTViMjllZTc1Li42YzJjYjQxOGJhOWUzNDBhZjg4YzU5MzJkNTE4MmYwMmQwODgxODk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hlYXBTbmFwc2hv dFByb3h5LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSGVhcFNu YXBzaG90UHJveHkuanMKQEAgLTM1NCwxMSArMzU0LDYgQEAgV2ViSW5zcGVjdG9yLkhlYXBTbmFw c2hvdFByb3h5LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuY2FsbEZhY3RvcnlN ZXRob2QobnVsbCwgImNyZWF0ZU5vZGVzUHJvdmlkZXJGb3JEb21pbmF0b3IiLCAiV2ViSW5zcGVj dG9yLkhlYXBTbmFwc2hvdFByb3ZpZGVyUHJveHkiLCBub2RlSW5kZXgsIGZpbHRlcik7CiAgICAg fSwKIAotICAgIGNyZWF0ZVBhdGhGaW5kZXI6IGZ1bmN0aW9uKHRhcmdldE5vZGVJbmRleCwgc2tp cEhpZGRlbikKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLmNhbGxGYWN0b3J5TWV0aG9kKG51 bGwsICJjcmVhdGVQYXRoRmluZGVyIiwgIldlYkluc3BlY3Rvci5IZWFwU25hcHNob3RQYXRoRmlu ZGVyUHJveHkiLCB0YXJnZXROb2RlSW5kZXgsIHNraXBIaWRkZW4pOwotICAgIH0sCi0KICAgICBk aXNwb3NlOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLmRpc3Bvc2VXb3JrZXIoKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3ZjgzMjU0NDJmMTBhODFkODczMjdjMGY2MTM2NDI2ZmYyODY2NzgwLi4zMWMxNTE5 OTVjZjVhZWQ1MmFiZGEwNjFiNzhjNWUzZWMxOGYzNzAxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTItMDMtMjcgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHJlbWFpbnMgb2YgcGF0aCBmaW5kZXIgaW4gaGVh cCBwcm9maWxlciBmcm9udC1lbmQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgyMzA0CisKKyAgICAgICAgUmVtb3ZlZCByZW1haW5kZXJzIG9mIGhlYXAg cGF0aCBmaW5kZXIgYXMgdGhpcyBjb2RlIGlzIG5vdCB1c2VkIGFueW1vcmUuCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvZmls ZXIvaGVhcC1zbmFwc2hvdC1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL3Byb2Zp bGVyL2hlYXAtc25hcHNob3QuaHRtbDoKKwogMjAxMi0wMy0yNiAgUGF2ZWwgRmVsZG1hbiAgPHBm ZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBOb3QgcmV2aWV3ZWQ6IG1hcmtpbmcgZmFz dC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVudC0qIGFzIGZsYWt5IG9uIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QtZXhwZWN0ZWQu dHh0CmluZGV4IGE1MDVkMTcxMDkzYzI5MWVhZDliY2EzMzc4ZmEyNmJhZmY0NjI2MTAuLjAzMzMx MWExMmE4OTFiZDE2YWE0NzQ1MThhM2ZmMDA4ZWJlOTM3OGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2luc3BlY3Rvci9wcm9maWxlci9oZWFwLXNuYXBzaG90LWV4cGVjdGVkLnR4dAorKysgYi9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hvdC1leHBlY3RlZC50eHQK QEAgLTIzLDUgKzIzLDMgQEAgUnVubmluZzogaGVhcFNuYXBzaG90Tm9kZXNQcm92aWRlclRlc3QK IAogUnVubmluZzogaGVhcFNuYXBzaG90RWRnZXNQcm92aWRlclRlc3QKIAotUnVubmluZzogaGVh cFNuYXBzaG90UGF0aEZpbmRlclRlc3QKLQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNob3QuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9w cm9maWxlci9oZWFwLXNuYXBzaG90Lmh0bWwKaW5kZXggNjcyNzFlYzc1MTE1OWQwMTYwYmMxYWJl NDQ5OWE3YzBkOGFjYjE4Ni4uMmEzMTU4OGU0ZjI3NmVjNGEwYjEzZThhMmFmNjdjODlmZWVkOTZj MSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3Byb2ZpbGVyL2hlYXAtc25hcHNo b3QuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvZmlsZXIvaGVhcC1zbmFwc2hv dC5odG1sCkBAIC0yMTEsMzQgKzIxMSw2IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAg ICAgIG5hbWVzLnB1c2gocHJvdmlkZXIuaXRlbS5uYW1lKTsKICAgICAgICAgICAgIEluc3BlY3Rv clRlc3QuYXNzZXJ0RXF1YWxzKCJiIiwgbmFtZXMuam9pbigiLCIpLCAiZWRnZXMgcHJvdmlkZXIg bmFtZXMiKTsKICAgICAgICAgICAgIG5leHQoKTsKLSAgICAgICAgfSwKLQotICAgICAgICBmdW5j dGlvbiBoZWFwU25hcHNob3RQYXRoRmluZGVyVGVzdChuZXh0KQotICAgICAgICB7Ci0gICAgICAg ICAgICB2YXIgc25hcHNob3QgPSBuZXcgV2ViSW5zcGVjdG9yLkhlYXBTbmFwc2hvdChJbnNwZWN0 b3JUZXN0LmNyZWF0ZUhlYXBTbmFwc2hvdE1vY2soKSk7Ci0gICAgICAgICAgICB2YXIgZXhwZWN0 ZWRQYXRocyA9IHsKLSAgICAgICAgICAgICAgICAgMTogW10sCi0gICAgICAgICAgICAgICAgMTQ6 IFtdLAotICAgICAgICAgICAgICAgIDI3OiBbIkFAMlsxXSJdLAotICAgICAgICAgICAgICAgIDQw OiBbIkFAMi5hYyIsICJBQDJbMV0uYmMiLCAiQkAzLmJjIl0sCi0gICAgICAgICAgICAgICAgNTA6 IFsiQUAyWzFdLmJkIiwgIkJAMy5iZCJdLAotICAgICAgICAgICAgICAgIDU3OiBbIkFAMi5hYy5j ZSIsICJBQDJbMV0uYmMuY2UiLCAiQkAzLmJjLmNlIl0KLSAgICAgICAgICAgIH07Ci0gICAgICAg ICAgICBmb3IgKHZhciBub2RlcyA9IHNuYXBzaG90Ll9hbGxOb2Rlczsgbm9kZXMuaGFzTmV4dCgp OyBub2Rlcy5uZXh0KCkpIHsKLSAgICAgICAgICAgICAgICB2YXIgcGF0aEZpbmRlciA9IG5ldyBX ZWJJbnNwZWN0b3IuSGVhcFNuYXBzaG90UGF0aEZpbmRlcihzbmFwc2hvdCwgbm9kZXMuaW5kZXgp OwotICAgICAgICAgICAgICAgIHZhciBwYXRocyA9IFtdOwotICAgICAgICAgICAgICAgIHZhciBw YXRoOwotICAgICAgICAgICAgICAgIHdoaWxlICh0cnVlKSB7Ci0gICAgICAgICAgICAgICAgICAg IHBhdGggPSBwYXRoRmluZGVyLmZpbmROZXh0KCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChw YXRoID09PSBudWxsKQotICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAg ICAgICAgICAgIGVsc2UgaWYgKHBhdGggIT09IGZhbHNlKQotICAgICAgICAgICAgICAgICAgICAg ICAgcGF0aHMucHVzaChwYXRoLnBhdGgpOwotICAgICAgICAgICAgICAgIH0gCi0gICAgICAgICAg ICAgICAgcGF0aHMuc29ydCgpOwotICAgICAgICAgICAgICAgIEluc3BlY3RvclRlc3QuYXNzZXJ0 RXF1YWxzKGV4cGVjdGVkUGF0aHNbbm9kZXMuaW5kZXhdLmpvaW4oIjsiKSwgcGF0aHMuam9pbigi OyIpLCAicGF0aHMgdG8gXCIiICsgbm9kZXMuaXRlbS5uYW1lICsgIlwiIik7IAotICAgICAgICAg ICAgfQotICAgICAgICAgICAgbmV4dCgpOwogICAgICAgICB9CiAgICAgXSk7CiB9Cg==