162594 2016-09-26 22:26:27 -0700 Extend perf dashboard to support multiple pages. 2016-09-27 14:57:03 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu rniwa oldest_to_newest 1233733 0 dewei_zhu 2016-09-26 22:26:27 -0700 Extend perf dashboard to support multiple pages. 1233735 1 289916 dewei_zhu 2016-09-26 22:28:09 -0700 Created attachment 289916 Patch 1233737 2 289916 rniwa 2016-09-26 22:33:34 -0700 Comment on attachment 289916 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=289916&action=review > Websites/perf.webkit.org/public/v3/main.js:60 > else if (dashboardPages) There is a bug here. We should be checking dashboardPages.length here as well. > Websites/perf.webkit.org/public/v3/pages/summary-page.js:30 > - routeName() { return 'summary'; } > + routeName() { return this._route; } We should use `summary/${this._name}` instead just like we do in DashboardPage. 1234076 3 290007 dewei_zhu 2016-09-27 14:24:50 -0700 Created attachment 290007 Patch for landing 1234080 4 290007 commit-queue 2016-09-27 14:56:59 -0700 Comment on attachment 290007 Patch for landing Clearing flags on attachment: 290007 Committed r206465: <http://trac.webkit.org/changeset/206465> 1234081 5 commit-queue 2016-09-27 14:57:03 -0700 All reviewed patches have been landed. Closing bug. 289916 2016-09-26 22:28:09 -0700 2016-09-27 14:24:46 -0700 Patch bug-162594-20160926222510.patch text/plain 5854 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NDEyCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAzZDlhYjYxOWNjMjVmZTU5OTY2NGU4Mzk0N2QyZjUzNGEyYTA0MDA2Li5jODg2OTlkZTgw MGZhNTMzMDhkMjAzMGY4N2I5OWJmZmYwYmNmZjUzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNi0wOS0yNiAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmQgcGVyZiBkYXNoYm9hcmQgdG8gc3VwcG9ydCBt dWx0aXBsZSBzdW1tYXJ5IHBhZ2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYyNTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3RhcnQgc3VwcG9ydCBtdWx0aXBsZSBzdW1tYXJ5IHBhZ2VzIGluc3Rl YWQgb2Ygb25lLgorICAgICAgICBTcGVjaWZ5ICdzdW1tYXJ5UGFnZXMnIGFzIGtleSB0aGF0IG1h cCB0byBhIGxpc3Qgb2Ygc3VtbWFyaWVzIHdoaWNoIGZvbGxvd3MKKyAgICAgICAgY3VycmVudCAn c3VtbWFyeScgZm9ybWF0IGluICdjb25maWcuanNvbicgYnV0IHdpdGggMiBtb3JlIHByb3BlcnRp ZXM6CisgICAgICAgICAgICduYW1lJzogc3BlY2lmeWluZyB0aGUgbmFtZSBzaG93cyBvbiBwZXJm IGRhc2hib2FyZCwKKyAgICAgICAgICAgJ3JvdXRlJzogc3BlY2lmeWluZyB0aGUgcGF0aCB0byB0 aGlzIHBhZ2UuCisKKyAgICAgICAgKiBwdWJsaWMvaW5jbHVkZS9tYW5pZmVzdC5waHA6CisgICAg ICAgICogcHVibGljL3YzL21haW4uanM6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKG1haW4u KTogRGVsZXRlZC4KKyAgICAgICAgKiBwdWJsaWMvdjMvbW9kZWxzL21hbmlmZXN0LmpzOgorICAg ICAgICAoTWFuaWZlc3QuX2RpZEZldGNoTWFuaWZlc3QpOgorICAgICAgICAoTWFuaWZlc3QpOgor ICAgICAgICAqIHB1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanM6CisgICAgICAgIChTdW1t YXJ5UGFnZSk6CisgICAgICAgIChTdW1tYXJ5UGFnZS5wcm90b3R5cGUucm91dGVOYW1lKToKKwog MjAxNi0wOC0wOSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBE b24ndCBmaWx0ZXIgb3V0IHRoZSBsYXRlc3QgZGF0YSBwb2ludCBpbiBjaGFydCBkYXRhIHNhbXBs aW5nCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUv bWFuaWZlc3QucGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21h bmlmZXN0LnBocAppbmRleCBkOGI4YmU0NTgyMTA0MjllNTRlMmJjNTA0NjNlNjExMWRlZTdkNGQ5 Li5jNzc0NmU0MWZjMTg2YTkxMTIyOGEwZjQwMGY4YjkyNjU2NGQ5ZTBmIDEwMDY0NAotLS0gYS9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwCisrKyBi L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9tYW5pZmVzdC5waHAKQEAg LTQxLDcgKzQxLDcgQEAgY2xhc3MgTWFuaWZlc3RHZW5lcmF0b3IgewogICAgICAgICAgICAgJ2J1 aWxkZXJzJyA9PiAob2JqZWN0KSR0aGlzLT5idWlsZGVycygpLAogICAgICAgICAgICAgJ2J1Z1Ry YWNrZXJzJyA9PiAob2JqZWN0KSR0aGlzLT5idWdfdHJhY2tlcnMoJHJlcG9zaXRvcmllc190YWJs ZSksCiAgICAgICAgICAgICAnZGFzaGJvYXJkcycgPT4gKG9iamVjdCljb25maWcoJ2Rhc2hib2Fy ZHMnKSwKLSAgICAgICAgICAgICdzdW1tYXJ5JyA9PiAob2JqZWN0KWNvbmZpZygnc3VtbWFyeScp LAorICAgICAgICAgICAgJ3N1bW1hcnlQYWdlcycgPT4gKG9iamVjdCljb25maWcoJ3N1bW1hcnlQ YWdlcycpLAogICAgICAgICApOwogCiAgICAgICAgICR0aGlzLT5tYW5pZmVzdFsnZWxhcHNlZFRp bWUnXSA9IChtaWNyb3RpbWUodHJ1ZSkgLSAkc3RhcnRfdGltZSkgKiAxMDAwOwpkaWZmIC0tZ2l0 IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tYWluLmpzIGIvV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tYWluLmpzCmluZGV4IDY0Mjc1MWU1OGQ4OGI1MjVj YTRiYWMzY2MyZjc1M2E3OTJmZThlOTYuLjQ3YzkxZDE2M2RhMWIzYjQ4MzhkZmU1OTc5MGZlZDJm YTRlOTA2ZjEgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMv bWFpbi5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21haW4uanMK QEAgLTIwLDcgKzIwLDEyIEBAIGZ1bmN0aW9uIG1haW4oKSB7CiAgICAgICAgIHZhciByb3V0ZXIg PSBuZXcgUGFnZVJvdXRlcigpOwogICAgICAgICB2YXIgY2hhcnRzVG9vbGJhciA9IG5ldyBDaGFy dHNUb29sYmFyOwogCi0gICAgICAgIHZhciBzdW1tYXJ5UGFnZSA9IG1hbmlmZXN0LnN1bW1hcnkg PyBuZXcgU3VtbWFyeVBhZ2UobWFuaWZlc3Quc3VtbWFyeSkgOiBudWxsOworICAgICAgICB2YXIg c3VtbWFyeVBhZ2VzID0gW107CisgICAgICAgIGlmIChtYW5pZmVzdC5zdW1tYXJ5UGFnZXMpIHsK KyAgICAgICAgICAgIGZvciAodmFyIHN1bW1hcnlQYWdlIG9mIG1hbmlmZXN0LnN1bW1hcnlQYWdl cykKKyAgICAgICAgICAgICAgICBzdW1tYXJ5UGFnZXMucHVzaChuZXcgU3VtbWFyeVBhZ2Uoc3Vt bWFyeVBhZ2UpKTsKKyAgICAgICAgfQorCiAgICAgICAgIHZhciBjaGFydHNQYWdlID0gbmV3IENo YXJ0c1BhZ2UoY2hhcnRzVG9vbGJhcik7CiAgICAgICAgIHZhciBhbmFseXNpc0NhdGVnb3J5UGFn ZSA9IG5ldyBBbmFseXNpc0NhdGVnb3J5UGFnZSgpOwogCkBAIC0zNCwxMyArMzksMTMgQEAgZnVu Y3Rpb24gbWFpbigpIHsKICAgICAgICAgYnVpbGRSZXF1ZXN0UXVldWVQYWdlLnNldFBhcmVudFBh Z2UoYW5hbHlzaXNDYXRlZ29yeVBhZ2UpOwogCiAgICAgICAgIHZhciBoZWFkaW5nID0gbmV3IEhl YWRpbmcobWFuaWZlc3Quc2l0ZVRpdGxlKTsKLSAgICAgICAgaGVhZGluZy5hZGRQYWdlR3JvdXAo W3N1bW1hcnlQYWdlLCBjaGFydHNQYWdlLCBhbmFseXNpc0NhdGVnb3J5UGFnZV0uZmlsdGVyKGZ1 bmN0aW9uIChwYWdlKSB7IHJldHVybiBwYWdlOyB9KSk7CisgICAgICAgIGhlYWRpbmcuYWRkUGFn ZUdyb3VwKHN1bW1hcnlQYWdlcy5jb25jYXQoW2NoYXJ0c1BhZ2UsIGFuYWx5c2lzQ2F0ZWdvcnlQ YWdlXSkpOwogCiAgICAgICAgIGhlYWRpbmcuc2V0VGl0bGUobWFuaWZlc3Quc2l0ZVRpdGxlKTsK ICAgICAgICAgaGVhZGluZy5hZGRQYWdlR3JvdXAoZGFzaGJvYXJkUGFnZXMpOwogCiAgICAgICAg IHZhciByb3V0ZXIgPSBuZXcgUGFnZVJvdXRlcigpOwotICAgICAgICBpZihzdW1tYXJ5UGFnZSkK KyAgICAgICAgZm9yICh2YXIgc3VtbWFyeVBhZ2Ugb2Ygc3VtbWFyeVBhZ2VzKQogICAgICAgICAg ICAgcm91dGVyLmFkZFBhZ2Uoc3VtbWFyeVBhZ2UpOwogICAgICAgICByb3V0ZXIuYWRkUGFnZShj aGFydHNQYWdlKTsKICAgICAgICAgcm91dGVyLmFkZFBhZ2UoY3JlYXRlQW5hbHlzaXNUYXNrUGFn ZSk7CkBAIC01MCw4ICs1NSw4IEBAIGZ1bmN0aW9uIG1haW4oKSB7CiAgICAgICAgIGZvciAodmFy IHBhZ2Ugb2YgZGFzaGJvYXJkUGFnZXMpCiAgICAgICAgICAgICByb3V0ZXIuYWRkUGFnZShwYWdl KTsKIAotICAgICAgICBpZiAoc3VtbWFyeVBhZ2UpCi0gICAgICAgICAgICByb3V0ZXIuc2V0RGVm YXVsdFBhZ2Uoc3VtbWFyeVBhZ2UpOworICAgICAgICBpZiAoc3VtbWFyeVBhZ2VzLmxlbmd0aCkK KyAgICAgICAgICAgIHJvdXRlci5zZXREZWZhdWx0UGFnZShzdW1tYXJ5UGFnZXNbMF0pOwogICAg ICAgICBlbHNlIGlmIChkYXNoYm9hcmRQYWdlcykKICAgICAgICAgICAgIHJvdXRlci5zZXREZWZh dWx0UGFnZShkYXNoYm9hcmRQYWdlc1swXSk7CiAgICAgICAgIGVsc2UKZGlmZiAtLWdpdCBhL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL21hbmlmZXN0LmpzIGIvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvbWFuaWZlc3QuanMKaW5kZXgg YjdhYzg2YzE2ZTNiYjhhNDJkMGZmNTQzZDU3MTU3NTU4MjFlNGM2Mi4uN2RmMDIyZTNjMTdhNzIx OTI4NjZlNWI4MjQ5MzljZWNlZWIwODI3NCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3B1YmxpYy92My9tb2RlbHMvbWFuaWZlc3QuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvbWFuaWZlc3QuanMKQEAgLTQ4LDcgKzQ4LDcgQEAg Y2xhc3MgTWFuaWZlc3QgewogICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgc2l0ZVRpdGxl OiByYXdSZXNwb25zZS5zaXRlVGl0bGUsCiAgICAgICAgICAgICBkYXNoYm9hcmRzOiByYXdSZXNw b25zZS5kYXNoYm9hcmRzLCAvLyBGSVhNRTogQWRkIGFuIGFic3RyYWN0aW9uIGFyb3VuZCBkYXNo Ym9hcmRzLgotICAgICAgICAgICAgc3VtbWFyeTogcmF3UmVzcG9uc2Uuc3VtbWFyeSwKKyAgICAg ICAgICAgIHN1bW1hcnlQYWdlczogcmF3UmVzcG9uc2Uuc3VtbWFyeVBhZ2VzLAogICAgICAgICB9 CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92 My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcwppbmRleCBmNzM2YTVjNzA1ZGEyMDQwMmRiZjdiNzUy NTIwZmFlYzRhYzIyNjkzLi5mMTNmMDQ5N2I5YzI3NWY1OTk2MDIxMWIzMWM0N2JlMjU1NmVlZjA1 IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1 bW1hcnktcGFnZS5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3Bh Z2VzL3N1bW1hcnktcGFnZS5qcwpAQCAtMyw4ICszLDkgQEAgY2xhc3MgU3VtbWFyeVBhZ2UgZXh0 ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogCiAgICAgY29uc3RydWN0b3Ioc3VtbWFyeVNldHRpbmdz KQogICAgIHsKLSAgICAgICAgc3VwZXIoJ1N1bW1hcnknLCBudWxsKTsKKyAgICAgICAgc3VwZXIo c3VtbWFyeVNldHRpbmdzLm5hbWUsIG51bGwpOwogCisgICAgICAgIHRoaXMuX3JvdXRlID0gc3Vt bWFyeVNldHRpbmdzLnJvdXRlOwogICAgICAgICB0aGlzLl90YWJsZSA9IHsKICAgICAgICAgICAg IGhlYWRpbmc6IHN1bW1hcnlTZXR0aW5ncy5wbGF0Zm9ybUdyb3VwcywKICAgICAgICAgICAgIGdy b3VwczogW10sCkBAIC0yNiw3ICsyNyw3IEBAIGNsYXNzIFN1bW1hcnlQYWdlIGV4dGVuZHMgUGFn ZVdpdGhIZWFkaW5nIHsKICAgICAgICAgfQogICAgIH0KIAotICAgIHJvdXRlTmFtZSgpIHsgcmV0 dXJuICdzdW1tYXJ5JzsgfQorICAgIHJvdXRlTmFtZSgpIHsgcmV0dXJuIHRoaXMuX3JvdXRlOyB9 CiAKICAgICBvcGVuKHN0YXRlKQogICAgIHsKQEAgLTM3LDcgKzM4LDcgQEAgY2xhc3MgU3VtbWFy eVBhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogICAgICAgICBmb3IgKHZhciBncm91cCBv ZiB0aGlzLl9jb25maWdHcm91cHMpCiAgICAgICAgICAgICBncm91cC5mZXRjaEFuZENvbXB1dGVT dW1tYXJ5KHRpbWVSYW5nZSkudGhlbih0aGlzLnJlbmRlci5iaW5kKHRoaXMpKTsKICAgICB9Ci0g ICAgCisKICAgICByZW5kZXIoKQogICAgIHsKICAgICAgICAgSW5zdHJ1bWVudGF0aW9uLnN0YXJ0 TWVhc3VyaW5nVGltZSgnU3VtbWFyeVBhZ2UnLCAncmVuZGVyJyk7Cg== 290007 2016-09-27 14:24:50 -0700 2016-09-27 14:56:59 -0700 Patch for landing bug-162594-20160927142152.patch text/plain 5954 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjA2NDY0CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCAzZDlhYjYxOWNjMjVmZTU5OTY2NGU4Mzk0N2QyZjUzNGEyYTA0MDA2Li4zNTUxYTVjYWMw NTRmYzFkNjVmN2QzMTgxMWM2MjM4OTU0MTM5YzEwIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNi0wOS0yNiAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmQgcGVyZiBkYXNoYm9hcmQgdG8gc3VwcG9ydCBt dWx0aXBsZSBzdW1tYXJ5IHBhZ2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYyNTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdh LgorCisgICAgICAgIFN0YXJ0IHN1cHBvcnQgbXVsdGlwbGUgc3VtbWFyeSBwYWdlcyBpbnN0ZWFk IG9mIG9uZS4KKyAgICAgICAgU3BlY2lmeSAnc3VtbWFyeVBhZ2VzJyBhcyBrZXkgdGhhdCBtYXAg dG8gYSBsaXN0IG9mIHN1bW1hcmllcyB3aGljaCBmb2xsb3dzCisgICAgICAgIGN1cnJlbnQgJ3N1 bW1hcnknIGZvcm1hdCBpbiAnY29uZmlnLmpzb24nIGJ1dCB3aXRoIDIgbW9yZSBwcm9wZXJ0aWVz OgorICAgICAgICAgICAnbmFtZSc6IHNwZWNpZnlpbmcgdGhlIG5hbWUgc2hvd3Mgb24gcGVyZiBk YXNoYm9hcmQsCisgICAgICAgICAgICdyb3V0ZSc6IHNwZWNpZnlpbmcgdGhlIHBhdGggdG8gdGhp cyBwYWdlLgorCisgICAgICAgICogcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwOgorICAgICAg ICAqIHB1YmxpYy92My9tYWluLmpzOgorICAgICAgICAobWFpbik6CisgICAgICAgIChtYWluLik6 IERlbGV0ZWQuCisgICAgICAgICogcHVibGljL3YzL21vZGVscy9tYW5pZmVzdC5qczoKKyAgICAg ICAgKE1hbmlmZXN0Ll9kaWRGZXRjaE1hbmlmZXN0KToKKyAgICAgICAgKE1hbmlmZXN0KToKKyAg ICAgICAgKiBwdWJsaWMvdjMvcGFnZXMvc3VtbWFyeS1wYWdlLmpzOgorICAgICAgICAoU3VtbWFy eVBhZ2UpOgorICAgICAgICAoU3VtbWFyeVBhZ2UucHJvdG90eXBlLnJvdXRlTmFtZSk6CisKIDIw MTYtMDgtMDkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRG9u J3QgZmlsdGVyIG91dCB0aGUgbGF0ZXN0IGRhdGEgcG9pbnQgaW4gY2hhcnQgZGF0YSBzYW1wbGlu ZwpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21h bmlmZXN0LnBocCBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5jbHVkZS9tYW5p ZmVzdC5waHAKaW5kZXggZDhiOGJlNDU4MjEwNDI5ZTU0ZTJiYzUwNDYzZTYxMTFkZWU3ZDRkOS4u Yzc3NDZlNDFmYzE4NmE5MTEyMjhhMGY0MDBmOGI5MjY1NjRkOWUwZiAxMDA2NDQKLS0tIGEvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL21hbmlmZXN0LnBocAorKysgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvbWFuaWZlc3QucGhwCkBAIC00 MSw3ICs0MSw3IEBAIGNsYXNzIE1hbmlmZXN0R2VuZXJhdG9yIHsKICAgICAgICAgICAgICdidWls ZGVycycgPT4gKG9iamVjdCkkdGhpcy0+YnVpbGRlcnMoKSwKICAgICAgICAgICAgICdidWdUcmFj a2VycycgPT4gKG9iamVjdCkkdGhpcy0+YnVnX3RyYWNrZXJzKCRyZXBvc2l0b3JpZXNfdGFibGUp LAogICAgICAgICAgICAgJ2Rhc2hib2FyZHMnID0+IChvYmplY3QpY29uZmlnKCdkYXNoYm9hcmRz JyksCi0gICAgICAgICAgICAnc3VtbWFyeScgPT4gKG9iamVjdCljb25maWcoJ3N1bW1hcnknKSwK KyAgICAgICAgICAgICdzdW1tYXJ5UGFnZXMnID0+IChvYmplY3QpY29uZmlnKCdzdW1tYXJ5UGFn ZXMnKSwKICAgICAgICAgKTsKIAogICAgICAgICAkdGhpcy0+bWFuaWZlc3RbJ2VsYXBzZWRUaW1l J10gPSAobWljcm90aW1lKHRydWUpIC0gJHN0YXJ0X3RpbWUpICogMTAwMDsKZGlmZiAtLWdpdCBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbWFpbi5qcyBiL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbWFpbi5qcwppbmRleCA2NDI3NTFlNThkODhiNTI1Y2E0 YmFjM2NjMmY3NTNhNzkyZmU4ZTk2Li5hZTVkZmMyZmFmN2E4NzA0ZmI2NzY2MmNmZjhiY2JhNWZj N2I5ZmNlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21h aW4uanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tYWluLmpzCkBA IC0yMCw3ICsyMCwxMiBAQCBmdW5jdGlvbiBtYWluKCkgewogICAgICAgICB2YXIgcm91dGVyID0g bmV3IFBhZ2VSb3V0ZXIoKTsKICAgICAgICAgdmFyIGNoYXJ0c1Rvb2xiYXIgPSBuZXcgQ2hhcnRz VG9vbGJhcjsKIAotICAgICAgICB2YXIgc3VtbWFyeVBhZ2UgPSBtYW5pZmVzdC5zdW1tYXJ5ID8g bmV3IFN1bW1hcnlQYWdlKG1hbmlmZXN0LnN1bW1hcnkpIDogbnVsbDsKKyAgICAgICAgdmFyIHN1 bW1hcnlQYWdlcyA9IFtdOworICAgICAgICBpZiAobWFuaWZlc3Quc3VtbWFyeVBhZ2VzKSB7Cisg ICAgICAgICAgICBmb3IgKHZhciBzdW1tYXJ5UGFnZSBvZiBtYW5pZmVzdC5zdW1tYXJ5UGFnZXMp CisgICAgICAgICAgICAgICAgc3VtbWFyeVBhZ2VzLnB1c2gobmV3IFN1bW1hcnlQYWdlKHN1bW1h cnlQYWdlKSk7CisgICAgICAgIH0KKwogICAgICAgICB2YXIgY2hhcnRzUGFnZSA9IG5ldyBDaGFy dHNQYWdlKGNoYXJ0c1Rvb2xiYXIpOwogICAgICAgICB2YXIgYW5hbHlzaXNDYXRlZ29yeVBhZ2Ug PSBuZXcgQW5hbHlzaXNDYXRlZ29yeVBhZ2UoKTsKIApAQCAtMzQsMTMgKzM5LDEzIEBAIGZ1bmN0 aW9uIG1haW4oKSB7CiAgICAgICAgIGJ1aWxkUmVxdWVzdFF1ZXVlUGFnZS5zZXRQYXJlbnRQYWdl KGFuYWx5c2lzQ2F0ZWdvcnlQYWdlKTsKIAogICAgICAgICB2YXIgaGVhZGluZyA9IG5ldyBIZWFk aW5nKG1hbmlmZXN0LnNpdGVUaXRsZSk7Ci0gICAgICAgIGhlYWRpbmcuYWRkUGFnZUdyb3VwKFtz dW1tYXJ5UGFnZSwgY2hhcnRzUGFnZSwgYW5hbHlzaXNDYXRlZ29yeVBhZ2VdLmZpbHRlcihmdW5j dGlvbiAocGFnZSkgeyByZXR1cm4gcGFnZTsgfSkpOworICAgICAgICBoZWFkaW5nLmFkZFBhZ2VH cm91cChzdW1tYXJ5UGFnZXMuY29uY2F0KFtjaGFydHNQYWdlLCBhbmFseXNpc0NhdGVnb3J5UGFn ZV0pKTsKIAogICAgICAgICBoZWFkaW5nLnNldFRpdGxlKG1hbmlmZXN0LnNpdGVUaXRsZSk7CiAg ICAgICAgIGhlYWRpbmcuYWRkUGFnZUdyb3VwKGRhc2hib2FyZFBhZ2VzKTsKIAogICAgICAgICB2 YXIgcm91dGVyID0gbmV3IFBhZ2VSb3V0ZXIoKTsKLSAgICAgICAgaWYoc3VtbWFyeVBhZ2UpCisg ICAgICAgIGZvciAodmFyIHN1bW1hcnlQYWdlIG9mIHN1bW1hcnlQYWdlcykKICAgICAgICAgICAg IHJvdXRlci5hZGRQYWdlKHN1bW1hcnlQYWdlKTsKICAgICAgICAgcm91dGVyLmFkZFBhZ2UoY2hh cnRzUGFnZSk7CiAgICAgICAgIHJvdXRlci5hZGRQYWdlKGNyZWF0ZUFuYWx5c2lzVGFza1BhZ2Up OwpAQCAtNTAsOSArNTUsOSBAQCBmdW5jdGlvbiBtYWluKCkgewogICAgICAgICBmb3IgKHZhciBw YWdlIG9mIGRhc2hib2FyZFBhZ2VzKQogICAgICAgICAgICAgcm91dGVyLmFkZFBhZ2UocGFnZSk7 CiAKLSAgICAgICAgaWYgKHN1bW1hcnlQYWdlKQotICAgICAgICAgICAgcm91dGVyLnNldERlZmF1 bHRQYWdlKHN1bW1hcnlQYWdlKTsKLSAgICAgICAgZWxzZSBpZiAoZGFzaGJvYXJkUGFnZXMpCisg ICAgICAgIGlmIChzdW1tYXJ5UGFnZXMubGVuZ3RoKQorICAgICAgICAgICAgcm91dGVyLnNldERl ZmF1bHRQYWdlKHN1bW1hcnlQYWdlc1swXSk7CisgICAgICAgIGVsc2UgaWYgKGRhc2hib2FyZFBh Z2VzLmxlbmd0aCkKICAgICAgICAgICAgIHJvdXRlci5zZXREZWZhdWx0UGFnZShkYXNoYm9hcmRQ YWdlc1swXSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJvdXRlci5zZXREZWZhdWx0UGFn ZShjaGFydHNQYWdlKTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvdjMvbW9kZWxzL21hbmlmZXN0LmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92My9tb2RlbHMvbWFuaWZlc3QuanMKaW5kZXggYjdhYzg2YzE2ZTNiYjhhNDJkMGZmNTQzZDU3 MTU3NTU4MjFlNGM2Mi4uN2RmMDIyZTNjMTdhNzIxOTI4NjZlNWI4MjQ5MzljZWNlZWIwODI3NCAx MDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMvbWFu aWZlc3QuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMv bWFuaWZlc3QuanMKQEAgLTQ4LDcgKzQ4LDcgQEAgY2xhc3MgTWFuaWZlc3QgewogICAgICAgICBy ZXR1cm4gewogICAgICAgICAgICAgc2l0ZVRpdGxlOiByYXdSZXNwb25zZS5zaXRlVGl0bGUsCiAg ICAgICAgICAgICBkYXNoYm9hcmRzOiByYXdSZXNwb25zZS5kYXNoYm9hcmRzLCAvLyBGSVhNRTog QWRkIGFuIGFic3RyYWN0aW9uIGFyb3VuZCBkYXNoYm9hcmRzLgotICAgICAgICAgICAgc3VtbWFy eTogcmF3UmVzcG9uc2Uuc3VtbWFyeSwKKyAgICAgICAgICAgIHN1bW1hcnlQYWdlczogcmF3UmVz cG9uc2Uuc3VtbWFyeVBhZ2VzLAogICAgICAgICB9CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9zdW1tYXJ5LXBhZ2UuanMgYi9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcwpp bmRleCBmNzM2YTVjNzA1ZGEyMDQwMmRiZjdiNzUyNTIwZmFlYzRhYzIyNjkzLi41MjFhNTliYWM0 ZGNmZDg5ZGM5MzZkZDZjYzQwYmZkMzVmM2M1OTNjIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcworKysgYi9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3N1bW1hcnktcGFnZS5qcwpAQCAtMyw4 ICszLDkgQEAgY2xhc3MgU3VtbWFyeVBhZ2UgZXh0ZW5kcyBQYWdlV2l0aEhlYWRpbmcgewogCiAg ICAgY29uc3RydWN0b3Ioc3VtbWFyeVNldHRpbmdzKQogICAgIHsKLSAgICAgICAgc3VwZXIoJ1N1 bW1hcnknLCBudWxsKTsKKyAgICAgICAgc3VwZXIoc3VtbWFyeVNldHRpbmdzLm5hbWUsIG51bGwp OwogCisgICAgICAgIHRoaXMuX3JvdXRlID0gc3VtbWFyeVNldHRpbmdzLnJvdXRlOwogICAgICAg ICB0aGlzLl90YWJsZSA9IHsKICAgICAgICAgICAgIGhlYWRpbmc6IHN1bW1hcnlTZXR0aW5ncy5w bGF0Zm9ybUdyb3VwcywKICAgICAgICAgICAgIGdyb3VwczogW10sCkBAIC0yNiw3ICsyNyw3IEBA IGNsYXNzIFN1bW1hcnlQYWdlIGV4dGVuZHMgUGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgfQog ICAgIH0KIAotICAgIHJvdXRlTmFtZSgpIHsgcmV0dXJuICdzdW1tYXJ5JzsgfQorICAgIHJvdXRl TmFtZSgpIHsgcmV0dXJuIGBzdW1tYXJ5LyR7dGhpcy5fcm91dGV9YDsgfQogCiAgICAgb3Blbihz dGF0ZSkKICAgICB7CkBAIC0zNyw3ICszOCw3IEBAIGNsYXNzIFN1bW1hcnlQYWdlIGV4dGVuZHMg UGFnZVdpdGhIZWFkaW5nIHsKICAgICAgICAgZm9yICh2YXIgZ3JvdXAgb2YgdGhpcy5fY29uZmln R3JvdXBzKQogICAgICAgICAgICAgZ3JvdXAuZmV0Y2hBbmRDb21wdXRlU3VtbWFyeSh0aW1lUmFu Z2UpLnRoZW4odGhpcy5yZW5kZXIuYmluZCh0aGlzKSk7CiAgICAgfQotICAgIAorCiAgICAgcmVu ZGVyKCkKICAgICB7CiAgICAgICAgIEluc3RydW1lbnRhdGlvbi5zdGFydE1lYXN1cmluZ1RpbWUo J1N1bW1hcnlQYWdlJywgJ3JlbmRlcicpOwo=