112321 2013-03-13 23:02:39 -0700 Web Inspector: [Network] Sort columns context menu items alphabetically. 2013-03-15 01:31:15 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 854976 0 eustas 2013-03-13 23:02:39 -0700 Columns are presented in "natural" order -> it is hard to find specific item. 854978 1 193068 eustas 2013-03-13 23:12:09 -0700 Created attachment 193068 Patch 854993 2 193068 pfeldman 2013-03-13 23:36:51 -0700 Comment on attachment 193068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193068&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:996 > + var title1 = columns[id1].name || columns[id1].title || ""; You should sort by title, not name. 855099 3 193068 eustas 2013-03-14 02:53:03 -0700 Comment on attachment 193068 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193068&action=review >> Source/WebCore/inspector/front-end/NetworkPanel.js:996 >> + var title1 = columns[id1].name || columns[id1].title || ""; > > You should sort by title, not name. Objection. We should sort by item title user see in menu. Menu item title is "column.name || column.title". This is because title could be presented with titleDOMFragment. 855157 4 193114 eustas 2013-03-14 06:23:47 -0700 Created attachment 193114 Patch 855801 5 eustas 2013-03-15 01:31:15 -0700 Committed r145886: <http://trac.webkit.org/changeset/145886> 193068 2013-03-13 23:12:09 -0700 2013-03-14 06:23:43 -0700 Patch bug-112321-20130314100805.patch text/plain 2956 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1Nzg1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVjMGI4MjAzZDQyYWFi Y2M1NDJmM2M1N2FmYjI2N2Y3NmM1ZTYxOS4uYzBjNDRmYzYwNzMwZGU2M2UwZDhmZjI3M2QyM2Jj NWQ3ZDJhODkxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTEzICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBTb3J0IGNvbHVtbnMgY29udGV4dCBtZW51IGl0ZW1zIGFscGhhYmV0 aWNhbGx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEyMzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UHJvYmxlbTogY29sdW1ucyBhcmUgcHJlc2VudGVkIGluICJuYXR1cmFsIiBvcmRlciwKKyAgICAg ICAgc28gaXQgaXMgaGFyZCB0byBmaW5kIHNwZWNpZmljIGl0ZW0uCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrTG9nVmlldy5wcm90b3R5cGUuX2dldENvbmZpZ3VyYWJsZUNvbHVtbklEcyk6CisgICAg ICAgIEdlbmVyYXRlIGxpc3Qgb2YgY29sdW1uIElEcyBzb3J0ZWQgYWxwaGFiZXRpY2FsbHkuCisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlLl9jb250ZXh0TWVu dSk6CisgICAgICAgIFVzZSBhbHBoYWJldGljYWxseSBzb3J0ZWQgbGlzdCBvZiBjb2x1bW4gSURz LgorCiAyMDEzLTAzLTEzICBCcnVubyBkZSBPbGl2ZWlyYSBBYmluYWRlciAgPGJydW5vLmFiaW5h ZGVyQGJhc3lza29tLmNvbT4KIAogICAgICAgICBbY3NzMy10ZXh0XSBBZGQgc3VwcG9ydCBmb3Ig dGV4dC1kZWNvcmF0aW9uLWNvbG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDdmYTJmYTA0MjMzZjcxZmQ4NmQ5YzY0N2E5 ZjI4MmE5MGI2ZDcwODQuLjQyNDMyYjM0MjJkOWMzM2UxZDIzNmU3NmUwZjNmMmY3OGZjYTRjODQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1Bh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1Bh bmVsLmpzCkBAIC05ODIsMTMgKzk4MiwzNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVDb2x1bW5zKCk7CiAgICAgfSwKIAor ICAgIC8qKgorICAgICAqIEByZXR1cm4geyFBcnJheS48c3RyaW5nPn0KKyAgICAgKi8KKyAgICBf Z2V0Q29uZmlndXJhYmxlQ29sdW1uSURzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fY29uZmlndXJhYmxlQ29sdW1uSURzKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2Nv bmZpZ3VyYWJsZUNvbHVtbklEczsKKworICAgICAgICB2YXIgY29sdW1ucyA9IHRoaXMuX2RhdGFH cmlkLmNvbHVtbnM7CisgICAgICAgIGZ1bmN0aW9uIGNvbXBhcmUoaWQxLCBpZDIpCisgICAgICAg IHsKKyAgICAgICAgICAgIHZhciB0aXRsZTEgPSBjb2x1bW5zW2lkMV0ubmFtZSB8fCBjb2x1bW5z W2lkMV0udGl0bGUgfHwgIiI7CisgICAgICAgICAgICB2YXIgdGl0bGUyID0gY29sdW1uc1tpZDJd Lm5hbWUgfHwgY29sdW1uc1tpZDJdLnRpdGxlIHx8ICIiOworICAgICAgICAgICAgcmV0dXJuIHRp dGxlMS5jb21wYXJlVG8odGl0bGUyKTsKKyAgICAgICAgfQorCisgICAgICAgIHZhciBjb2x1bW5J RHMgPSBPYmplY3Qua2V5cyh0aGlzLl9jb3VsbW5zVmlzaWJpbGl0eVNldHRpbmcuZ2V0KCkpOwor ICAgICAgICB0aGlzLl9jb25maWd1cmFibGVDb2x1bW5JRHMgPSBjb2x1bW5JRHMuc29ydChjb21w YXJlKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NvbmZpZ3VyYWJsZUNvbHVtbklEczsKKyAgICB9 LAorCiAgICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZh ciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoZXZlbnQpOwogCiAg ICAgICAgIGlmICh0aGlzLl9kZXRhaWxlZE1vZGUgJiYgZXZlbnQudGFyZ2V0LmlzU2VsZk9yRGVz Y2VuZGFudCh0aGlzLl9kYXRhR3JpZC5oZWFkZXJUYWJsZUJvZHkpKSB7CiAgICAgICAgICAgICB2 YXIgY29sdW1uc1Zpc2liaWxpdHkgPSB0aGlzLl9jb3VsbW5zVmlzaWJpbGl0eVNldHRpbmcuZ2V0 KCk7Ci0gICAgICAgICAgICBmb3IgKHZhciBjb2x1bW5JZGVudGlmaWVyIGluIGNvbHVtbnNWaXNp YmlsaXR5KSB7CisgICAgICAgICAgICB2YXIgY29sdW1uSURzID0gdGhpcy5fZ2V0Q29uZmlndXJh YmxlQ29sdW1uSURzKCk7CisgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGNvbHVtbklE cy5sZW5ndGg7ICsraSkgeworICAgICAgICAgICAgICAgIHZhciBjb2x1bW5JZGVudGlmaWVyID0g Y29sdW1uSURzW2ldOwogICAgICAgICAgICAgICAgIHZhciBjb2x1bW4gPSB0aGlzLl9kYXRhR3Jp ZC5jb2x1bW5zW2NvbHVtbklkZW50aWZpZXJdOwogICAgICAgICAgICAgICAgIGNvbnRleHRNZW51 LmFwcGVuZENoZWNrYm94SXRlbShjb2x1bW4ubmFtZSB8fCBjb2x1bW4udGl0bGUsIHRoaXMuX3Rv Z2dsZUNvbHVtblZpc2liaWxpdHkuYmluZCh0aGlzLCBjb2x1bW5JZGVudGlmaWVyKSwgISFjb2x1 bW5zVmlzaWJpbGl0eVtjb2x1bW5JZGVudGlmaWVyXSk7CiAgICAgICAgICAgICB9Cg== 193114 2013-03-14 06:23:47 -0700 2013-03-14 12:40:58 -0700 Patch bug-112321-20130314171943.patch text/plain 5305 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWRiOWE2MmM4MmMwOTUx NGQ4MDJiYjBjZWIzZTA1MGIyZDM3YTI0OC4uZDQ1ZGJkOTY3NGY2NWFmNjYwMTY3MmE2ZWEzOTU3 NWRkMTAxYWFiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTEzICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBTb3J0IGNvbHVtbnMgY29udGV4dCBtZW51IGl0ZW1zIGFscGhhYmV0 aWNhbGx5LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTEyMzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UHJvYmxlbTogY29sdW1ucyBhcmUgcHJlc2VudGVkIGluICJuYXR1cmFsIiBvcmRlciwKKyAgICAg ICAgc28gaXQgaXMgaGFyZCB0byBmaW5kIHNwZWNpZmljIGl0ZW0uCisKKyAgICAgICAgKiBpbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5O ZXR3b3JrTG9nVmlldy5wcm90b3R5cGUuX2dldENvbmZpZ3VyYWJsZUNvbHVtbklEcyk6CisgICAg ICAgIEdlbmVyYXRlIGxpc3Qgb2YgY29sdW1uIElEcyBzb3J0ZWQgYWxwaGFiZXRpY2FsbHkuCisg ICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlLl9jb250ZXh0TWVu dSk6CisgICAgICAgIFVzZSBhbHBoYWJldGljYWxseSBzb3J0ZWQgbGlzdCBvZiBjb2x1bW4gSURz LgorCiAyMDEzLTAzLTE0ICBNYXJqYSBIw7ZsdHTDpCAgPG1hcmphQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBbVjhdIFN0b3JlIG1haW4gd29ybGQgYW5kIG5vbi1tYWluIHdvcmxkIHRlbXBsYXRl cyBzZXBhcmF0ZWx5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtQYW5lbC5qcwppbmRleCA3ZmEyZmEwNDIzM2Y3MWZkODZkOWM2NDdhOWYyODJhOTBi NmQ3MDg0Li5hMjQxMzYxNTg2ZDBiZjg2MGM1ODBkN2VhMDA3NzFhYzgyZmI1ZjEwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpA QCAtMTYwLDcgKzE2MCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUg PSB7CiAgICAgICAgIHZhciBjb2x1bW5zID0ge25hbWU6IHt9LCBtZXRob2Q6IHt9LCBzdGF0dXM6 IHt9LCBkb21haW46IHt9LCB0eXBlOiB7fSwgaW5pdGlhdG9yOiB7fSwgY29va2llczoge30sIHNl dENvb2tpZXM6IHt9LCBzaXplOiB7fSwgdGltZToge30sIHRpbWVsaW5lOiB7fX07CiAKICAgICAg ICAgY29sdW1ucy5uYW1lLnRpdGxlRE9NRnJhZ21lbnQgPSB0aGlzLl9tYWtlSGVhZGVyRnJhZ21l bnQoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIiksIFdlYkluc3BlY3Rvci5VSVN0cmluZygi UGF0aCIpKTsKLSAgICAgICAgY29sdW1ucy5uYW1lLm5hbWUgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIk5hbWUiKTsKKyAgICAgICAgY29sdW1ucy5uYW1lLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJOYW1lIik7CiAgICAgICAgIGNvbHVtbnMubmFtZS5zb3J0YWJsZSA9IHRydWU7CiAg ICAgICAgIGNvbHVtbnMubmFtZS53ZWlnaHQgPSAyMDsKICAgICAgICAgY29sdW1ucy5uYW1lLmRp c2Nsb3N1cmUgPSB0cnVlOwpAQCAtMTcwLDcgKzE3MCw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr TG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGNvbHVtbnMubWV0aG9kLndlaWdodCA9IDY7 CiAKICAgICAgICAgY29sdW1ucy5zdGF0dXMudGl0bGVET01GcmFnbWVudCA9IHRoaXMuX21ha2VI ZWFkZXJGcmFnbWVudChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0YXR1cyIpLCBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlRleHQiKSk7Ci0gICAgICAgIGNvbHVtbnMuc3RhdHVzLm5hbWUgPSBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlN0YXR1cyIpOworICAgICAgICBjb2x1bW5zLnN0YXR1cy50aXRs ZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhdHVzIik7CiAgICAgICAgIGNvbHVtbnMuc3Rh dHVzLnNvcnRhYmxlID0gdHJ1ZTsKICAgICAgICAgY29sdW1ucy5zdGF0dXMud2VpZ2h0ID0gNjsK IApAQCAtMTk3LDE5ICsxOTcsMTkgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3Rv dHlwZSA9IHsKICAgICAgICAgY29sdW1ucy5zZXRDb29raWVzLmFsaWduZWQgPSAicmlnaHQiOwog CiAgICAgICAgIGNvbHVtbnMuc2l6ZS50aXRsZURPTUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRl ckZyYWdtZW50KFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2l6ZSIpLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkNvbnRlbnQiKSk7Ci0gICAgICAgIGNvbHVtbnMuc2l6ZS5uYW1lID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJTaXplIik7CisgICAgICAgIGNvbHVtbnMuc2l6ZS50aXRsZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiU2l6ZSIpOwogICAgICAgICBjb2x1bW5zLnNpemUuc29ydGFibGUg PSB0cnVlOwogICAgICAgICBjb2x1bW5zLnNpemUud2VpZ2h0ID0gNjsKICAgICAgICAgY29sdW1u cy5zaXplLmFsaWduZWQgPSAicmlnaHQiOwogCiAgICAgICAgIGNvbHVtbnMudGltZS50aXRsZURP TUZyYWdtZW50ID0gdGhpcy5fbWFrZUhlYWRlckZyYWdtZW50KFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiVGltZSIpLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxhdGVuY3kiKSk7Ci0gICAgICAgIGNv bHVtbnMudGltZS5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lIik7CisgICAgICAg IGNvbHVtbnMudGltZS50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZSIpOwogICAg ICAgICBjb2x1bW5zLnRpbWUuc29ydGFibGUgPSB0cnVlOwogICAgICAgICBjb2x1bW5zLnRpbWUu d2VpZ2h0ID0gNjsKICAgICAgICAgY29sdW1ucy50aW1lLmFsaWduZWQgPSAicmlnaHQiOwogCi0g ICAgICAgIGNvbHVtbnMudGltZWxpbmUudGl0bGUgPSAiIjsKLSAgICAgICAgY29sdW1ucy50aW1l bGluZS5uYW1lID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZSIpOworICAgICAgICBj b2x1bW5zLnRpbWVsaW5lLnRpdGxlRE9NRnJhZ21lbnQgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVu dEZyYWdtZW50KCk7CisgICAgICAgIGNvbHVtbnMudGltZWxpbmUudGl0bGUgPSBXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlRpbWVsaW5lIik7CiAgICAgICAgIGNvbHVtbnMudGltZWxpbmUuc29ydGFi bGUgPSBmYWxzZTsKICAgICAgICAgY29sdW1ucy50aW1lbGluZS53ZWlnaHQgPSA0MDsKICAgICAg ICAgY29sdW1ucy50aW1lbGluZS5zb3J0ID0gImFzY2VuZGluZyI7CkBAIC05ODIsMTUgKzk4Miwz NiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl91cGRhdGVDb2x1bW5zKCk7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEByZXR1cm4g eyFBcnJheS48c3RyaW5nPn0KKyAgICAgKi8KKyAgICBfZ2V0Q29uZmlndXJhYmxlQ29sdW1uSURz OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAodGhpcy5fY29uZmlndXJhYmxlQ29sdW1u SURzKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2NvbmZpZ3VyYWJsZUNvbHVtbklEczsKKwor ICAgICAgICB2YXIgY29sdW1ucyA9IHRoaXMuX2RhdGFHcmlkLmNvbHVtbnM7CisgICAgICAgIGZ1 bmN0aW9uIGNvbXBhcmUoaWQxLCBpZDIpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiBj b2x1bW5zW2lkMV0udGl0bGUuY29tcGFyZVRvKGNvbHVtbnNbaWQyXS50aXRsZSk7CisgICAgICAg IH0KKworICAgICAgICB2YXIgY29sdW1uSURzID0gT2JqZWN0LmtleXModGhpcy5fY291bG1uc1Zp c2liaWxpdHlTZXR0aW5nLmdldCgpKTsKKyAgICAgICAgdGhpcy5fY29uZmlndXJhYmxlQ29sdW1u SURzID0gY29sdW1uSURzLnNvcnQoY29tcGFyZSk7CisgICAgICAgIHJldHVybiB0aGlzLl9jb25m aWd1cmFibGVDb2x1bW5JRHM7CisgICAgfSwKKwogICAgIF9jb250ZXh0TWVudTogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9y LkNvbnRleHRNZW51KGV2ZW50KTsKIAogICAgICAgICBpZiAodGhpcy5fZGV0YWlsZWRNb2RlICYm IGV2ZW50LnRhcmdldC5pc1NlbGZPckRlc2NlbmRhbnQodGhpcy5fZGF0YUdyaWQuaGVhZGVyVGFi bGVCb2R5KSkgewogICAgICAgICAgICAgdmFyIGNvbHVtbnNWaXNpYmlsaXR5ID0gdGhpcy5fY291 bG1uc1Zpc2liaWxpdHlTZXR0aW5nLmdldCgpOwotICAgICAgICAgICAgZm9yICh2YXIgY29sdW1u SWRlbnRpZmllciBpbiBjb2x1bW5zVmlzaWJpbGl0eSkgeworICAgICAgICAgICAgdmFyIGNvbHVt bklEcyA9IHRoaXMuX2dldENvbmZpZ3VyYWJsZUNvbHVtbklEcygpOworICAgICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBjb2x1bW5JRHMubGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgICAg ICB2YXIgY29sdW1uSWRlbnRpZmllciA9IGNvbHVtbklEc1tpXTsKICAgICAgICAgICAgICAgICB2 YXIgY29sdW1uID0gdGhpcy5fZGF0YUdyaWQuY29sdW1uc1tjb2x1bW5JZGVudGlmaWVyXTsKLSAg ICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRDaGVja2JveEl0ZW0oY29sdW1uLm5hbWUg fHwgY29sdW1uLnRpdGxlLCB0aGlzLl90b2dnbGVDb2x1bW5WaXNpYmlsaXR5LmJpbmQodGhpcywg Y29sdW1uSWRlbnRpZmllciksICEhY29sdW1uc1Zpc2liaWxpdHlbY29sdW1uSWRlbnRpZmllcl0p OworICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZENoZWNrYm94SXRlbShjb2x1bW4u dGl0bGUsIHRoaXMuX3RvZ2dsZUNvbHVtblZpc2liaWxpdHkuYmluZCh0aGlzLCBjb2x1bW5JZGVu dGlmaWVyKSwgISFjb2x1bW5zVmlzaWJpbGl0eVtjb2x1bW5JZGVudGlmaWVyXSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBjb250ZXh0TWVudS5zaG93KCk7CiAgICAgICAgICAgICByZXR1 cm47Cg==