69526 2011-10-06 06:53:22 -0700 Web Inspector: add all Resource panel views to the compilation. 2011-10-06 09:11:15 -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 479134 0 pfeldman 2011-10-06 06:53:22 -0700 Patch to follow. 479136 1 109958 pfeldman 2011-10-06 06:56:49 -0700 Created attachment 109958 Patch 479189 2 109958 yurys 2011-10-06 09:02:18 -0700 Comment on attachment 109958 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109958&action=review > Source/WebCore/inspector/front-end/ResourcesPanel.js:-578 > - _sortDataGrid: function(dataGrid) Kill the method above. 479193 3 pfeldman 2011-10-06 09:11:15 -0700 Committed r96815: <http://trac.webkit.org/changeset/96815> 109958 2011-10-06 06:56:49 -0700 2011-10-06 09:02:18 -0700 Patch bug-69526-20111006175647.patch text/plain 17862 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY4MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiYWJhZDViNDY3OGQzN2Mw YzQ3ZDI0YjJhODU1ZTdiZWRkNjBhZDI2Li41MDFlYzU5YjQ2Yjc5MWMxODhkYzJkMWZhZTM3YjZk OWY5NGY0ZWY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMTAtMDYgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGFkZCBhbGwgUmVzb3VyY2UgcGFuZWwgdmlld3MgdG8gdGhlIGNvbXBpbGF0aW9uLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Njk1MjYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9jb21w aWxlLWZyb250LWVuZC5zaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZUl0 ZW1zVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90 eXBlLl9jb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2llcy5jb29raWVN YXRjaGVzUmVzb3VyY2VVUkwpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29va2ll c1RhYmxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZXNUYWJsZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuQ29va2llc1RhYmxlLnByb3RvdHlwZS5fb25EZWxldGVGcm9tR3JpZCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VJdGVtc1ZpZXcucHJvdG90eXBlLl9kYXRh R3JpZEZvckRPTVN0b3JhZ2VFbnRyaWVzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L0RhdGFHcmlkLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRh YmxlRGF0YUdyaWQuc29ydERhdGFHcmlkLmNvbXBhcmF0b3IpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQuc29ydERhdGFHcmlkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5EYXRhR3JpZC5jcmVhdGVTb3J0YWJsZURhdGFHcmlkKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LnByb3RvdHlwZS5fcXVlcnlGaW5pc2hlZCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRhYmxlVmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlVmlldy5wcm90b3R5cGUuX3F1ZXJ5Rmlu aXNoZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlLnJlc2V0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUuc2hvd0RhdGFi YXNlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanM6CisKIDIw MTEtMTAtMDUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IGFkZCAxMCBtb3JlIGZyb250LWVuZCBjbGFzc2VzIHRvIHRoZSBjb21w aWxhdGlvbiBwcm9jZXNzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Nv bXBpbGUtZnJvbnQtZW5kLnNoIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJv bnQtZW5kLnNoCmluZGV4IGE2MzIxNjdmNDU1MWEyMWQ2YTJlMTU0NjA1MDlmOGEyMDRmNzJhZjUu LjdiZGVjNDI3MmI5ZjI5MGJjYjMzNmQ3MDlhNTU2ZDJmMjcwYTU2YzcgMTAwNzU1Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKQEAgLTEwNyw5ICsxMDcsMTMg QEAgamF2YSAtamFyIH4vY2xvc3VyZS9jb21waWxlci5qYXIgLS1jb21waWxhdGlvbl9sZXZlbCBT SU1QTEVfT1BUSU1JWkFUSU9OUyAtLXdhcm4KICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9XZWxjb21lVmlldy5qcyBcCi0gICAgLS1tb2R1bGUg anNtb2R1bGVfaW5zcGVjdG9yOjIwOmpzbW9kdWxlX3Nkayxqc21vZHVsZV91aSBcCisgICAgLS1t b2R1bGUganNtb2R1bGVfaW5zcGVjdG9yOjI0OmpzbW9kdWxlX3Nkayxqc21vZHVsZV91aSBcCiAg ICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVz c2FnZS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db25zb2xlVmlldy5qcyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcuanMgXAorICAgICAgICAt LWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VUYWJsZVZpZXcu anMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9N U3RvcmFnZUl0ZW1zVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIFwKICAgICAgICAgLS1qcyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ZvbnRWaWV3LmpzIFwKICAgICAgICAgLS1q cyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0ltYWdlVmlldy5qcyBcCkBAIC0x MzksMTAgKzE0Myw2IEBAIGphdmEgLWphciB+L2Nsb3N1cmUvY29tcGlsZXIuamFyIC0tY29tcGls YXRpb25fbGV2ZWwgU0lNUExFX09QVElNSVpBVElPTlMgLS13YXJuCiAjIFN0eWxlc1NpZGViYXJQ YW5lCiAjCiAjIFtSZXNvdXJjZXNdCi0jIENvb2tpZUl0ZW1zVmlldwotIyBEYXRhYmFzZVF1ZXJ5 VmlldwotIyBEYXRhYmFzZVRhYmxlVmlldwotIyBET01TdG9yYWdlSXRlbXNWaWV3CiAjIFJlc291 cmNlc1BhbmVsCiAjIAogIyBbTmV0d29ya10KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvQ29va2llSXRlbXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKaW5kZXggNTE5YjRlNTdhMTA0YmIz YWNhN2YzOWNjYjg4NTVhNWQxNThmYTQwZC4uMGNiZjZlYTg5MDU2Yzg4NDE1MDRiMDA4Zjg5Nzdk YWI2MTlkNmFjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Db29raWVJdGVtc1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9Db29raWVJdGVtc1ZpZXcuanMKQEAgLTI3LDYgKzI3LDEwIEBACiAgKiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog ICovCiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlZp ZXd9CisgKi8KIFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcgPSBmdW5jdGlvbih0cmVlRWxl bWVudCwgY29va2llRG9tYWluKQogewogICAgIFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7 CkBAIC0xNTUsNyArMTU5LDcgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZUl0ZW1zVmlldy5wcm90b3R5 cGUgPSB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZSgpOwogICAgIH0sCiAKLSAgICBfY29udGV4dE1l bnU6IGZ1bmN0aW9uKCkKKyAgICBfY29udGV4dE1lbnU6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsK ICAgICAgICAgaWYgKCF0aGlzLl9jb29raWVzLmxlbmd0aCkgewogICAgICAgICAgICAgdmFyIGNv bnRleHRNZW51ID0gbmV3IFdlYkluc3BlY3Rvci5Db250ZXh0TWVudSgpOwpAQCAtMTY3LDYgKzE3 MSw5IEBAIFdlYkluc3BlY3Rvci5Db29raWVJdGVtc1ZpZXcucHJvdG90eXBlID0gewogCiBXZWJJ bnNwZWN0b3IuQ29va2llSXRlbXNWaWV3LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0 b3IuVmlldy5wcm90b3R5cGU7CiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKi8KIFdlYkluc3Bl Y3Rvci5TaW1wbGVDb29raWVzVGFibGUgPSBmdW5jdGlvbigpCiB7CiAgICAgdGhpcy5lbGVtZW50 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CkBAIC0yNDksNyArMjU2LDcgQEAgV2Vi SW5zcGVjdG9yLkNvb2tpZXMuYnVpbGRDb29raWVzRnJvbVN0cmluZyA9IGZ1bmN0aW9uKHJhd0Nv b2tpZVN0cmluZykKIFdlYkluc3BlY3Rvci5Db29raWVzLmNvb2tpZU1hdGNoZXNSZXNvdXJjZVVS TCA9IGZ1bmN0aW9uKGNvb2tpZSwgcmVzb3VyY2VVUkwpCiB7CiAgICAgdmFyIHVybCA9IHJlc291 cmNlVVJMLmFzUGFyc2VkVVJMKCk7Ci0gICAgaWYgKCF1cmwgfHwgIXRoaXMuY29va2llRG9tYWlu TWF0Y2hlc1Jlc291cmNlRG9tYWluKGNvb2tpZS5kb21haW4sIHVybC5ob3N0KSkKKyAgICBpZiAo IXVybCB8fCAhV2ViSW5zcGVjdG9yLkNvb2tpZXMuY29va2llRG9tYWluTWF0Y2hlc1Jlc291cmNl RG9tYWluKGNvb2tpZS5kb21haW4sIHVybC5ob3N0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIHJldHVybiAodXJsLnBhdGguaW5kZXhPZihjb29raWUucGF0aCkgPT09IDAKICAgICAgICAg JiYgKCFjb29raWUucG9ydCB8fCB1cmwucG9ydCA9PSBjb29raWUucG9ydCkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29va2llc1RhYmxlLmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKaW5kZXggM2Vm MmM4YjU0ZWIxZWU1NTk3ZjI2YTU5MWMyZjA0MGU3NWU0Mjk3Yi4uNzFmZGJmNzY5ZGMyZWZjNTkw YTUyMmI0YmVjYjAwNDFlOTVjYTI3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMKQEAgLTY3LDEzICs2NywxMiBAQCBXZWJJbnNw ZWN0b3IuQ29va2llc1RhYmxlID0gZnVuY3Rpb24oY29va2llRG9tYWluLCBleHBhbmRhYmxlLCBk ZWxldGVDYWxsYmFjaywgcgogICAgIGNvbHVtbnNbN10uc29ydGFibGUgPSB0cnVlOwogICAgIGNv bHVtbnNbN10ud2lkdGggPSAiNyUiOwogCi0gICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5z cGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIG51bGwsIGRlbGV0ZUNhbGxiYWNrID8gdGhpcy5fb25E ZWxldGVGcm9tR3JpZC5iaW5kKHRoaXMpIDogbnVsbCk7CisgICAgdGhpcy5fZGF0YUdyaWQgPSBu ZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIHVuZGVmaW5lZCwgZGVsZXRlQ2FsbGJh Y2sgPyB0aGlzLl9vbkRlbGV0ZUZyb21HcmlkLmJpbmQodGhpcywgZGVsZXRlQ2FsbGJhY2spIDog dW5kZWZpbmVkKTsKICAgICB0aGlzLl9kYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKCJzb3J0aW5n IGNoYW5nZWQiLCB0aGlzLl9yZWJ1aWxkVGFibGUsIHRoaXMpOwogICAgIHRoaXMuX2RhdGFHcmlk LnJlZnJlc2hDYWxsYmFjayA9IHJlZnJlc2hDYWxsYmFjazsKIAogICAgIHRoaXMuZWxlbWVudCA9 IHRoaXMuX2RhdGFHcmlkLmVsZW1lbnQ7CiAgICAgdGhpcy5fZGF0YSA9IFtdOwotICAgIHRoaXMu X2RlbGV0ZUNhbGxiYWNrID0gZGVsZXRlQ2FsbGJhY2s7CiB9CiAKIFdlYkluc3BlY3Rvci5Db29r aWVzVGFibGUucHJvdG90eXBlID0gewpAQCAtMjA3LDggKzIwNiw4IEBAIFdlYkluc3BlY3Rvci5D b29raWVzVGFibGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gbm9kZTsKICAgICB9LAog Ci0gICAgX29uRGVsZXRlRnJvbUdyaWQ6IGZ1bmN0aW9uKG5vZGUpCisgICAgX29uRGVsZXRlRnJv bUdyaWQ6IGZ1bmN0aW9uKGRlbGV0ZUNhbGxiYWNrLCBub2RlKQogICAgIHsKLSAgICAgICAgdGhp cy5fZGVsZXRlQ2FsbGJhY2sobm9kZS5jb29raWUpOworICAgICAgICBkZWxldGVDYWxsYmFjayhu b2RlLmNvb2tpZSk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9ET01TdG9yYWdlSXRlbXNWaWV3LmpzCmluZGV4IDk1ZTRhMTNlZGMy MWIxYmRkOWM4ZjhkYzMwM2YzODE5MDlkZWEwZDEuLjg4ZTlhMDQ5NTMwNGU4MWY0OGMzOWQzMzBl NTc1ZDA3NDEyZjVhNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRE9NU3RvcmFnZUl0ZW1zVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RPTVN0b3JhZ2VJdGVtc1ZpZXcuanMKQEAgLTIzLDYgKzIzLDEwIEBACiAg KiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7 V2ViSW5zcGVjdG9yLlZpZXd9CisgKi8KIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3 ID0gZnVuY3Rpb24oZG9tU3RvcmFnZSkKIHsKICAgICBXZWJJbnNwZWN0b3IuVmlldy5jYWxsKHRo aXMpOwpAQCAtMTA3LDcgKzExMSw3IEBAIFdlYkluc3BlY3Rvci5ET01TdG9yYWdlSXRlbXNWaWV3 LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHZhciBkYXRhR3JpZCA9IG5ldyBX ZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29sdW1ucywgdGhpcy5fZWRpdGluZ0NhbGxiYWNrLmJpbmQo dGhpcyksIHRoaXMuX2RlbGV0ZUNhbGxiYWNrLmJpbmQodGhpcykpOwotICAgICAgICB2YXIgbGVu Z3RoID0gbm9kZXMubGVuZ3RoOworICAgICAgICBsZW5ndGggPSBub2Rlcy5sZW5ndGg7CiAgICAg ICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCiAgICAgICAgICAgICBkYXRhR3Jp ZC5hcHBlbmRDaGlsZChub2Rlc1tpXSk7CiAgICAgICAgIGRhdGFHcmlkLmFkZENyZWF0aW9uTm9k ZShmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RhdGFHcmlkLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhR3Jp ZC5qcwppbmRleCA0ZTRhMTI5YWEwNWU2YTMyYTdlMTkxYmM2MzViOWE0MDJkZDFjYTAzLi5hYTlj NGRmYTFhZDcyMmRiMTEwOWRkZDM4NTU0Y2FmNmEzZDFhZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YUdyaWQuanMKQEAgLTI2LDYgKzI2LDggQEAKIC8q KgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KKyAq IEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZSwgbnVtYmVyLCBzdHJp bmcsIHN0cmluZyk9fSBlZGl0Q2FsbGJhY2sKKyAqIEBwYXJhbSB7ZnVuY3Rpb24oV2ViSW5zcGVj dG9yLkRhdGFHcmlkTm9kZSk9fSBkZWxldGVDYWxsYmFjawogICovCiBXZWJJbnNwZWN0b3IuRGF0 YUdyaWQgPSBmdW5jdGlvbihjb2x1bW5zLCBlZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrKQog ewpAQCAtMTU4LDYgKzE2MCw4MiBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQgPSBmdW5jdGlvbihj b2x1bW5zLCBlZGl0Q2FsbGJhY2ssIGRlbGV0ZUNhbGxiYWNrKQogICAgIHRoaXMuX2NvbHVtbldp ZHRoc0luaXRpYWxpemVkID0gZmFsc2U7CiB9CiAKKy8qKgorICogQHBhcmFtIHtBcnJheS48c3Ry aW5nPn0gY29sdW1uTmFtZXMKKyAqIEBwYXJhbSB7QXJyYXkuPHN0cmluZz59IHZhbHVlcworICov CitXZWJJbnNwZWN0b3IuRGF0YUdyaWQuY3JlYXRlU29ydGFibGVEYXRhR3JpZCA9IGZ1bmN0aW9u KGNvbHVtbk5hbWVzLCB2YWx1ZXMpCit7CisgICAgdmFyIG51bUNvbHVtbnMgPSBjb2x1bW5OYW1l cy5sZW5ndGg7CisgICAgaWYgKCFudW1Db2x1bW5zKQorICAgICAgICByZXR1cm4gbnVsbDsKKwor ICAgIHZhciBjb2x1bW5zID0ge307CisKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNvbHVtbk5h bWVzLmxlbmd0aDsgKytpKSB7CisgICAgICAgIHZhciBjb2x1bW4gPSB7fTsKKyAgICAgICAgY29s dW1uLndpZHRoID0gY29sdW1uTmFtZXNbaV0ubGVuZ3RoOworICAgICAgICBjb2x1bW4udGl0bGUg PSBjb2x1bW5OYW1lc1tpXTsKKyAgICAgICAgY29sdW1uLnNvcnRhYmxlID0gdHJ1ZTsKKworICAg ICAgICBjb2x1bW5zW2NvbHVtbk5hbWVzW2ldXSA9IGNvbHVtbjsKKyAgICB9CisKKyAgICB2YXIg bm9kZXMgPSBbXTsKKyAgICBmb3IgKHZhciBpID0gMDsgaSA8IHZhbHVlcy5sZW5ndGggLyBudW1D b2x1bW5zOyArK2kpIHsKKyAgICAgICAgdmFyIGRhdGEgPSB7fTsKKyAgICAgICAgZm9yICh2YXIg aiA9IDA7IGogPCBjb2x1bW5OYW1lcy5sZW5ndGg7ICsraikKKyAgICAgICAgICAgIGRhdGFbY29s dW1uTmFtZXNbal1dID0gdmFsdWVzW251bUNvbHVtbnMgKiBpICsgal07CisKKyAgICAgICAgdmFy IG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkTm9kZShkYXRhLCBmYWxzZSk7CisgICAg ICAgIG5vZGUuc2VsZWN0YWJsZSA9IGZhbHNlOworICAgICAgICBub2Rlcy5wdXNoKG5vZGUpOwor ICAgIH0KKworICAgIHZhciBkYXRhR3JpZCA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWQoY29s dW1ucyk7CisgICAgdmFyIGxlbmd0aCA9IG5vZGVzLmxlbmd0aDsKKyAgICBmb3IgKHZhciBpID0g MDsgaSA8IGxlbmd0aDsgKytpKQorICAgICAgICBkYXRhR3JpZC5hcHBlbmRDaGlsZChub2Rlc1tp XSk7CisKKyAgICBkYXRhR3JpZC5hZGRFdmVudExpc3RlbmVyKCJzb3J0aW5nIGNoYW5nZWQiLCBz b3J0RGF0YUdyaWQsIHRoaXMpOworCisgICAgZnVuY3Rpb24gc29ydERhdGFHcmlkKCkKKyAgICB7 CisgICAgICAgIHZhciBub2RlcyA9IGRhdGFHcmlkLmNoaWxkcmVuLnNsaWNlKCk7CisgICAgICAg IHZhciBzb3J0Q29sdW1uSWRlbnRpZmllciA9IGRhdGFHcmlkLnNvcnRDb2x1bW5JZGVudGlmaWVy OworICAgICAgICB2YXIgc29ydERpcmVjdGlvbiA9IGRhdGFHcmlkLnNvcnRPcmRlciA9PT0gImFz Y2VuZGluZyIgPyAxIDogLTE7CisgICAgICAgIHZhciBjb2x1bW5Jc051bWVyaWMgPSB0cnVlOwor CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgbm9kZXMubGVuZ3RoOyBpKyspIHsKKyAgICAg ICAgICAgIGlmIChpc05hTihOdW1iZXIobm9kZXNbaV0uZGF0YVtzb3J0Q29sdW1uSWRlbnRpZmll cl0pKSkKKyAgICAgICAgICAgICAgICBjb2x1bW5Jc051bWVyaWMgPSBmYWxzZTsKKyAgICAgICAg fQorCisgICAgICAgIGZ1bmN0aW9uIGNvbXBhcmF0b3IoZGF0YUdyaWROb2RlMSwgZGF0YUdyaWRO b2RlMikKKyAgICAgICAgeworICAgICAgICAgICAgdmFyIGl0ZW0xID0gZGF0YUdyaWROb2RlMS5k YXRhW3NvcnRDb2x1bW5JZGVudGlmaWVyXTsKKyAgICAgICAgICAgIHZhciBpdGVtMiA9IGRhdGFH cmlkTm9kZTIuZGF0YVtzb3J0Q29sdW1uSWRlbnRpZmllcl07CisKKyAgICAgICAgICAgIHZhciBj b21wYXJpc29uOworICAgICAgICAgICAgaWYgKGNvbHVtbklzTnVtZXJpYykgeworICAgICAgICAg ICAgICAgIC8vIFNvcnQgbnVtYmVycyBiYXNlZCBvbiBjb21wYXJpbmcgdGhlaXIgdmFsdWVzIHJh dGhlciB0aGFuIGEgbGV4aWNvZ3JhcGhpY2FsIGNvbXBhcmlzb24uCisgICAgICAgICAgICAgICAg dmFyIG51bWJlcjEgPSBwYXJzZUZsb2F0KGl0ZW0xKTsKKyAgICAgICAgICAgICAgICB2YXIgbnVt YmVyMiA9IHBhcnNlRmxvYXQoaXRlbTIpOworICAgICAgICAgICAgICAgIGNvbXBhcmlzb24gPSBu dW1iZXIxIDwgbnVtYmVyMiA/IC0xIDogKG51bWJlcjEgPiBudW1iZXIyID8gMSA6IDApOworICAg ICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgY29tcGFyaXNvbiA9IGl0ZW0xIDwgaXRl bTIgPyAtMSA6IChpdGVtMSA+IGl0ZW0yID8gMSA6IDApOworCisgICAgICAgICAgICByZXR1cm4g c29ydERpcmVjdGlvbiAqIGNvbXBhcmlzb247CisgICAgICAgIH0KKworICAgICAgICBub2Rlcy5z b3J0KGNvbXBhcmF0b3IpOworICAgICAgICBkYXRhR3JpZC5yZW1vdmVDaGlsZHJlbigpOworICAg ICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5vZGVzLmxlbmd0aDsgaSsrKQorICAgICAgICAgICAg ZGF0YUdyaWQuYXBwZW5kQ2hpbGQobm9kZXNbaV0pOworICAgIH0KKyAgICByZXR1cm4gZGF0YUdy aWQ7Cit9CisKIFdlYkluc3BlY3Rvci5EYXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgZ2V0IHJl ZnJlc2hDYWxsYmFjaygpCiAgICAgewpAQCAtMzM0LDYgKzQxMiw5IEBAIFdlYkluc3BlY3Rvci5E YXRhR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9kYXRhVGFibGVCb2R5 OwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge251bWJlcj19IG1heERlc2NlbnRM ZXZlbAorICAgICAqLwogICAgIGF1dG9TaXplQ29sdW1uczogZnVuY3Rpb24obWluUGVyY2VudCwg bWF4UGVyY2VudCwgbWF4RGVzY2VudExldmVsKQogICAgIHsKICAgICAgICAgaWYgKG1pblBlcmNl bnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFi YXNlUXVlcnlWaWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRh YmFzZVF1ZXJ5Vmlldy5qcwppbmRleCA5MmVjYzY3ZDkwODNjYjU2ZjQ5OTI1NmIzMjk4NzRhZTI3 YzU1YTI1Li42OTIwN2NmNzY5OTk5M2QxZmEwZTAwMmFhMjY1NmRhOThjYzQ1ZGNlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVy eVZpZXcuanMKQEAgLTIzLDYgKzIzLDEwIEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8qKgor ICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlZpZXd9CisgKi8KIFdl Ykluc3BlY3Rvci5EYXRhYmFzZVF1ZXJ5VmlldyA9IGZ1bmN0aW9uKGRhdGFiYXNlKQogewogICAg IFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7CkBAIC00NSw2ICs0OSwxMCBAQCBXZWJJbnNw ZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcgPSBmdW5jdGlvbihkYXRhYmFzZSkKICAgICB0aGlzLnBy b21wdCA9IG5ldyBXZWJJbnNwZWN0b3IuVGV4dFByb21wdCh0aGlzLnByb21wdEVsZW1lbnQsIHRo aXMuY29tcGxldGlvbnMuYmluZCh0aGlzKSwgIiAiKTsKIH0KIAorV2ViSW5zcGVjdG9yLkRhdGFi YXNlUXVlcnlWaWV3LkV2ZW50cyA9IHsKKyAgICBTY2hlbWFVcGRhdGVkOiAiU2NoZW1hVXBkYXRl ZCIKK30KKwogV2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LnByb3RvdHlwZSA9IHsKICAg ICBzaG93OiBmdW5jdGlvbihwYXJlbnRFbGVtZW50KQogICAgIHsKQEAgLTEzOSw3ICsxNDcsNyBA QCBXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3F1 ZXJ5RmluaXNoZWQ6IGZ1bmN0aW9uKHF1ZXJ5LCBjb2x1bW5OYW1lcywgdmFsdWVzKQogICAgIHsK LSAgICAgICAgdmFyIGRhdGFHcmlkID0gV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuZGF0 YUdyaWRGb3JSZXN1bHQoY29sdW1uTmFtZXMsIHZhbHVlcyk7CisgICAgICAgIHZhciBkYXRhR3Jp ZCA9IFdlYkluc3BlY3Rvci5EYXRhR3JpZC5jcmVhdGVTb3J0YWJsZURhdGFHcmlkKGNvbHVtbk5h bWVzLCB2YWx1ZXMpOwogICAgICAgICB2YXIgdHJpbW1lZFF1ZXJ5ID0gcXVlcnkudHJpbSgpOwog CiAgICAgICAgIGlmIChkYXRhR3JpZCkgewpAQCAtMTQ5LDcgKzE1Nyw3IEBAIFdlYkluc3BlY3Rv ci5EYXRhYmFzZVF1ZXJ5Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBp ZiAodHJpbW1lZFF1ZXJ5Lm1hdGNoKC9eY3JlYXRlIC9pKSB8fCB0cmltbWVkUXVlcnkubWF0Y2go L15kcm9wIHRhYmxlIC9pKSkKLSAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3Vy Y2VzLnVwZGF0ZURhdGFiYXNlVGFibGVzKHRoaXMuZGF0YWJhc2UpOworICAgICAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3 LkV2ZW50cy5TY2hlbWFVcGRhdGVkLCB0aGlzLmRhdGFiYXNlKTsKICAgICB9LAogCiAgICAgX3F1 ZXJ5RXJyb3I6IGZ1bmN0aW9uKHF1ZXJ5LCBlcnJvcikKQEAgLTE2NCw2ICsxNzIsOSBAQCBXZWJJ bnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9h cHBlbmRRdWVyeVJlc3VsdChxdWVyeSwgbWVzc2FnZSwgImVycm9yIik7CiAgICAgfSwKIAorICAg IC8qKgorICAgICAqIEBwYXJhbSB7c3RyaW5nPX0gcmVzdWx0Q2xhc3NOYW1lCisgICAgICovCiAg ICAgX2FwcGVuZFF1ZXJ5UmVzdWx0OiBmdW5jdGlvbihxdWVyeSwgcmVzdWx0LCByZXN1bHRDbGFz c05hbWUpCiAgICAgewogICAgICAgICB2YXIgZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9EYXRhYmFzZVRhYmxlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvRGF0YWJhc2VUYWJsZVZpZXcuanMKaW5kZXggODQzYzExYTI4ZWVjN2ExMDAyNjFiYjIyZWNi N2I5ZTk5ZjBjZDQ1MS4uYmFkNjEzN2RjZGRmMDc3MjBkNmNkNGZhN2Q2MTA0NmQ2OWE0MjNkMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVRh YmxlVmlldy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFi YXNlVGFibGVWaWV3LmpzCkBAIC0yMyw2ICsyMywxMCBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwg RVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog CisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5WaWV3fQor ICovCiBXZWJJbnNwZWN0b3IuRGF0YWJhc2VUYWJsZVZpZXcgPSBmdW5jdGlvbihkYXRhYmFzZSwg dGFibGVOYW1lKQogewogICAgIFdlYkluc3BlY3Rvci5WaWV3LmNhbGwodGhpcyk7CkBAIC01OCw3 ICs2Miw3IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVRhYmxlVmlldy5wcm90b3R5cGUgPSB7CiAg ICAgewogICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKIAotICAgICAgICB2 YXIgZGF0YUdyaWQgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnJlc291cmNlcy5kYXRhR3JpZEZvclJl c3VsdChjb2x1bW5OYW1lcywgdmFsdWVzKTsKKyAgICAgICAgdmFyIGRhdGFHcmlkID0gV2ViSW5z cGVjdG9yLkRhdGFHcmlkLmNyZWF0ZVNvcnRhYmxlRGF0YUdyaWQoY29sdW1uTmFtZXMsIHZhbHVl cyk7CiAgICAgICAgIGlmICghZGF0YUdyaWQpIHsKICAgICAgICAgICAgIHRoaXMuX2VtcHR5Vmll dyA9IG5ldyBXZWJJbnNwZWN0b3IuRW1wdHlWaWV3KFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGhl IOKAnCVz4oCdXG50YWJsZSBpcyBlbXB0eS4iLCB0aGlzLnRhYmxlTmFtZSkpOwogICAgICAgICAg ICAgdGhpcy5fZW1wdHlWaWV3LnNob3codGhpcy5lbGVtZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlc1BhbmVsLmpzCmluZGV4IDJjYTlk MDFjOWQzNzYxNzRjNzQ2ZTBjZjBmMWRhZDUzNTA1N2Y1NTMuLjY0ZjQzMTJhZDk0MDQzMTU5Mjc2 Mzg3ZjFhMGFhNGEwYWFmNGU5NTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcwpAQCAtMTM4LDYgKzEzOCw4IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgdGhpcy5fZGF0YWJhc2VzLmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICB2YXIg ZGF0YWJhc2UgPSB0aGlzLl9kYXRhYmFzZXNbaV07CiAgICAgICAgICAgICBkZWxldGUgZGF0YWJh c2UuX3RhYmxlVmlld3M7CisgICAgICAgICAgICBpZiAoZGF0YWJhc2UuX3F1ZXJ5VmlldykKKyAg ICAgICAgICAgICAgICBkYXRhYmFzZS5fcXVlcnlWaWV3LnJlbW92ZUV2ZW50TGlzdGVuZXIoV2Vi SW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LkV2ZW50cy5TY2hlbWFVcGRhdGVkLCB0aGlzLl91 cGRhdGVEYXRhYmFzZVRhYmxlcywgdGhpcyk7CiAgICAgICAgICAgICBkZWxldGUgZGF0YWJhc2Uu X3F1ZXJ5VmlldzsKICAgICAgICAgfQogICAgICAgICB0aGlzLl9kYXRhYmFzZXMgPSBbXTsKQEAg LTQzMiw2ICs0MzQsNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICAgICAgaWYgKCF2aWV3KSB7CiAgICAgICAgICAgICAgICAgdmlldyA9IG5ldyBX ZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcoZGF0YWJhc2UpOwogICAgICAgICAgICAgICAg IGRhdGFiYXNlLl9xdWVyeVZpZXcgPSB2aWV3OworICAgICAgICAgICAgICAgIHZpZXcuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcuRXZlbnRzLlNjaGVtYVVw ZGF0ZWQsIHRoaXMuX3VwZGF0ZURhdGFiYXNlVGFibGVzLCB0aGlzKTsKICAgICAgICAgICAgIH0K ICAgICAgICAgfQogCkBAIC01MDksOCArNTEyLDEwIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLnZpc2libGVWaWV3OwogICAg IH0sCiAKLSAgICB1cGRhdGVEYXRhYmFzZVRhYmxlczogZnVuY3Rpb24oZGF0YWJhc2UpCisgICAg X3VwZGF0ZURhdGFiYXNlVGFibGVzOiBmdW5jdGlvbihldmVudCkKICAgICB7CisgICAgICAgIHZh ciBkYXRhYmFzZSA9IGV2ZW50LmRhdGE7CisKICAgICAgICAgaWYgKCFkYXRhYmFzZSB8fCAhZGF0 YWJhc2UuX2RhdGFiYXNlc1RyZWVFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC01 NzUsNDEgKzU4MCw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZXNQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHJldHVybiBkYXRhR3JpZDsKICAgICB9LAogCi0gICAgX3NvcnREYXRhR3JpZDog ZnVuY3Rpb24oZGF0YUdyaWQpCi0gICAgewotICAgICAgICB2YXIgbm9kZXMgPSBkYXRhR3JpZC5j aGlsZHJlbi5zbGljZSgpOwotICAgICAgICB2YXIgc29ydENvbHVtbklkZW50aWZpZXIgPSBkYXRh R3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllcjsKLSAgICAgICAgdmFyIHNvcnREaXJlY3Rpb24gPSBk YXRhR3JpZC5zb3J0T3JkZXIgPT09ICJhc2NlbmRpbmciID8gMSA6IC0xOwotICAgICAgICB2YXIg Y29sdW1uSXNOdW1lcmljID0gdHJ1ZTsKLQotICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG5v ZGVzLmxlbmd0aDsgaSsrKSB7Ci0gICAgICAgICAgICBpZiAoaXNOYU4oTnVtYmVyKG5vZGVzW2ld LmRhdGFbc29ydENvbHVtbklkZW50aWZpZXJdKSkpCi0gICAgICAgICAgICAgICAgY29sdW1uSXNO dW1lcmljID0gZmFsc2U7Ci0gICAgICAgIH0KLQotICAgICAgICBmdW5jdGlvbiBjb21wYXJhdG9y KGRhdGFHcmlkTm9kZTEsIGRhdGFHcmlkTm9kZTIpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHZh ciBpdGVtMSA9IGRhdGFHcmlkTm9kZTEuZGF0YVtzb3J0Q29sdW1uSWRlbnRpZmllcl07Ci0gICAg ICAgICAgICB2YXIgaXRlbTIgPSBkYXRhR3JpZE5vZGUyLmRhdGFbc29ydENvbHVtbklkZW50aWZp ZXJdOwotCi0gICAgICAgICAgICB2YXIgY29tcGFyaXNvbjsKLSAgICAgICAgICAgIGlmIChjb2x1 bW5Jc051bWVyaWMpIHsKLSAgICAgICAgICAgICAgICAvLyBTb3J0IG51bWJlcnMgYmFzZWQgb24g Y29tcGFyaW5nIHRoZWlyIHZhbHVlcyByYXRoZXIgdGhhbiBhIGxleGljb2dyYXBoaWNhbCBjb21w YXJpc29uLgotICAgICAgICAgICAgICAgIHZhciBudW1iZXIxID0gcGFyc2VGbG9hdChpdGVtMSk7 Ci0gICAgICAgICAgICAgICAgdmFyIG51bWJlcjIgPSBwYXJzZUZsb2F0KGl0ZW0yKTsKLSAgICAg ICAgICAgICAgICBjb21wYXJpc29uID0gbnVtYmVyMSA8IG51bWJlcjIgPyAtMSA6IChudW1iZXIx ID4gbnVtYmVyMiA/IDEgOiAwKTsKLSAgICAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgICAg IGNvbXBhcmlzb24gPSBpdGVtMSA8IGl0ZW0yID8gLTEgOiAoaXRlbTEgPiBpdGVtMiA/IDEgOiAw KTsKLQotICAgICAgICAgICAgcmV0dXJuIHNvcnREaXJlY3Rpb24gKiBjb21wYXJpc29uOwotICAg ICAgICB9Ci0KLSAgICAgICAgbm9kZXMuc29ydChjb21wYXJhdG9yKTsKLSAgICAgICAgZGF0YUdy aWQucmVtb3ZlQ2hpbGRyZW4oKTsKLSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBub2Rlcy5s ZW5ndGg7IGkrKykKLSAgICAgICAgICAgIGRhdGFHcmlkLmFwcGVuZENoaWxkKG5vZGVzW2ldKTsK LSAgICB9LAotCiAgICAgdXBkYXRlRE9NU3RvcmFnZTogZnVuY3Rpb24oc3RvcmFnZUlkKQogICAg IHsKICAgICAgICAgdmFyIGRvbVN0b3JhZ2UgPSB0aGlzLl9kb21TdG9yYWdlRm9ySWQoc3RvcmFn ZUlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4 dFByb21wdC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFByb21w dC5qcwppbmRleCBhYmMwMzFiZjgxZjFkMjc1ZjRjMjAxOTFjODY4YjQxNjgzMGYyYzA4Li5mZDBk YmIwZDYwMTY5MzY4OWJjOGMwYWZlYmI5YjlhNzA0NGMyM2QzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRQcm9tcHQuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0UHJvbXB0LmpzCkBAIC0xNTEsNiArMTUxLDkg QEAgV2ViSW5zcGVjdG9yLlRleHRQcm9tcHQucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtib29sZWFuPX0gaW5jbHVk ZVRpbWVvdXQKKyAgICAgKi8KICAgICBjbGVhckF1dG9Db21wbGV0ZTogZnVuY3Rpb24oaW5jbHVk ZVRpbWVvdXQpCiAgICAgewogICAgICAgICBpZiAoaW5jbHVkZVRpbWVvdXQgJiYgIl9jb21wbGV0 ZVRpbWVvdXQiIGluIHRoaXMpIHsK