170792 2017-04-12 15:10:14 -0700 Web Inspector: Add titles to Network grid items for easier reading when text overflows 2017-04-21 13:06:14 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 1 hi hi bburg commit-queue inspector-bugzilla-changes joepeck oldest_to_newest 1296856 0 hi 2017-04-12 15:10:14 -0700 It is often really annoying to not be able to get the value of a particular item without expanding the size of that column. I usually dock to the right, so there is MUCH less space for all of the columns in the Network data grid. 1296859 1 306944 hi 2017-04-12 15:13:20 -0700 Created attachment 306944 Patch 1296866 2 306944 joepeck 2017-04-12 15:27:30 -0700 Comment on attachment 306944 Patch I think a better goal will be to reduce the size and default columns in this table (and fix saving the shown/hidden columns) so that ...s happen far less frequently so that users don't need to hover to get values (which can't be copied that way). 1299674 3 306944 bburg 2017-04-21 10:28:37 -0700 Comment on attachment 306944 Patch r=me, but Joe's comment is still good. This is fine until then. 1299748 4 joepeck 2017-04-21 11:59:29 -0700 > (and fix saving the shown/hidden columns) Note: I fixed this the other day. 1299810 5 306944 commit-queue 2017-04-21 13:06:12 -0700 Comment on attachment 306944 Patch Clearing flags on attachment: 306944 Committed r215631: <http://trac.webkit.org/changeset/215631> 1299811 6 commit-queue 2017-04-21 13:06:14 -0700 All reviewed patches have been landed. Closing bug. 306944 2017-04-12 15:13:20 -0700 2017-04-21 13:06:12 -0700 Patch bug-170792-20170412151353.patch text/plain 8424 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDg3ZDlkMjJiNDFiN2UwZjhkNGQ2M2NlY2ZkNWNl ZWMxNDA0YmMzNzYuLjg0ZDcxMjk5YTNjN2YzNDdjN2E1OTYxZTY3NWZhMmI1MDA5ZDY1MGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE3LTA0LTEyICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IEFkZCB0aXRsZXMgdG8gTmV0d29yayBncmlkIGl0ZW1zIGZvciBlYXNpZXIgcmVhZGluZyB3 aGVuIHRleHQgb3ZlcmZsb3dzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzA3OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3KToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5wcm90 b3R5cGUuY3JlYXRlQ2VsbENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNl VGltZWxpbmVEYXRhR3JpZE5vZGUucHJvdG90eXBlLl9jYWNoZWRDZWxsQ29udGVudCk6CisgICAg ICAgIERvIG5vdCBhZGQgYSB0aXRsZSBpZiB0aGUgdGV4dCBpcyBhbiBlbS1kYXNoLCBhcyB0aGF0 IHRpdGxlIHdpbGwgbm90IGNvbnZleSBhbnkgaW5mb3JtYXRpb24uCisKIDIwMTctMDQtMTEgIE1h dHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IGNoZWNrYm94ZXMgaW4gU2V0dGluZ3Mgc2NyZWVuIHVzZSBpbmFwcHJvcHJpYXRlIGxheW91dApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya0dyaWRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKaW5kZXggMjJlNmMxMGU4ZDMzZWQy MDhhN2QyNmFlNTk5YjA3OTA5ZDdlNTkwOS4uNGRmYWE0NzgxNjY1ZWM2Y2YxMGI0MTFmZGQ5MzM5 YWFjNzkyNjAyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCkBAIC00 MSw1OCArNDEsNTggQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFz cyBOZXR3b3JrR3JpZENvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KIAogICAgICAgICBsZXQgY29s dW1ucyA9IHtkb21haW46IHt9LCB0eXBlOiB7fSwgbWV0aG9kOiB7fSwgc2NoZW1lOiB7fSwgc3Rh dHVzQ29kZToge30sIGNhY2hlZDoge30sIHByb3RvY29sOiB7fSwgcHJpb3JpdHk6IHt9LCByZW1v dGVBZGRyZXNzOiB7fSwgY29ubmVjdGlvbklkZW50aWZpZXI6IHt9LCBzaXplOiB7fSwgdHJhbnNm ZXJTaXplOiB7fSwgcmVxdWVzdFNlbnQ6IHt9LCBsYXRlbmN5OiB7fSwgZHVyYXRpb246IHt9LCBn cmFwaDoge319OwogCi0gICAgICAgIGNvbHVtbnMuZG9tYWluLnRpdGxlID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJEb21haW4iKTsKKyAgICAgICAgY29sdW1ucy5kb21haW4udGl0bGUgPSBjb2x1 bW5zLmRvbWFpbi50b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJEb21haW4iKTsKICAg ICAgICAgY29sdW1ucy5kb21haW4ud2lkdGggPSAiMTAlIjsKIAotICAgICAgICBjb2x1bW5zLnR5 cGUudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlR5cGUiKTsKKyAgICAgICAgY29sdW1u cy50eXBlLnRpdGxlID0gY29sdW1ucy50eXBlLnRvb2x0aXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlR5cGUiKTsKICAgICAgICAgY29sdW1ucy50eXBlLndpZHRoID0gIjYlIjsKIAotICAgICAg ICBjb2x1bW5zLm1ldGhvZC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTWV0aG9kIik7 CisgICAgICAgIGNvbHVtbnMubWV0aG9kLnRpdGxlID0gY29sdW1ucy5tZXRob2QudG9vbHRpcCA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTWV0aG9kIik7CiAgICAgICAgIGNvbHVtbnMubWV0aG9k LndpZHRoID0gIjUlIjsKIAotICAgICAgICBjb2x1bW5zLnNjaGVtZS50aXRsZSA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiU2NoZW1lIik7CisgICAgICAgIGNvbHVtbnMuc2NoZW1lLnRpdGxlID0g Y29sdW1ucy5zY2hlbWUudG9vbHRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NoZW1lIik7 CiAgICAgICAgIGNvbHVtbnMuc2NoZW1lLndpZHRoID0gIjUlIjsKIAotICAgICAgICBjb2x1bW5z LnN0YXR1c0NvZGUudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0YXR1cyIpOworICAg ICAgICBjb2x1bW5zLnN0YXR1c0NvZGUudGl0bGUgPSBjb2x1bW5zLnN0YXR1c0NvZGUudG9vbHRp cCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhdHVzIik7CiAgICAgICAgIGNvbHVtbnMuc3Rh dHVzQ29kZS53aWR0aCA9ICI1JSI7CiAKLSAgICAgICAgY29sdW1ucy5jYWNoZWQudGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhY2hlZCIpOworICAgICAgICBjb2x1bW5zLmNhY2hlZC50 aXRsZSA9IGNvbHVtbnMuY2FjaGVkLnRvb2x0aXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNh Y2hlZCIpOwogICAgICAgICBjb2x1bW5zLmNhY2hlZC53aWR0aCA9ICI4JSI7CiAKLSAgICAgICAg Y29sdW1ucy5wcm90b2NvbC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJvdG9jb2wi KTsKKyAgICAgICAgY29sdW1ucy5wcm90b2NvbC50aXRsZSA9IGNvbHVtbnMucHJvdG9jb2wudG9v bHRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUHJvdG9jb2wiKTsKICAgICAgICAgY29sdW1u cy5wcm90b2NvbC53aWR0aCA9ICI1JSI7CiAgICAgICAgIGNvbHVtbnMucHJvdG9jb2wuaGlkZGVu ID0gdHJ1ZTsKIAotICAgICAgICBjb2x1bW5zLnByaW9yaXR5LnRpdGxlID0gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJQcmlvcml0eSIpOworICAgICAgICBjb2x1bW5zLnByaW9yaXR5LnRpdGxlID0g Y29sdW1ucy5wcmlvcml0eS50b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJQcmlvcml0 eSIpOwogICAgICAgICBjb2x1bW5zLnByaW9yaXR5LndpZHRoID0gIjUlIjsKICAgICAgICAgY29s dW1ucy5wcmlvcml0eS5oaWRkZW4gPSB0cnVlOwogCi0gICAgICAgIGNvbHVtbnMucmVtb3RlQWRk cmVzcy50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSVAgQWRkcmVzcyIpOworICAgICAg ICBjb2x1bW5zLnJlbW90ZUFkZHJlc3MudGl0bGUgPSBjb2x1bW5zLnJlbW90ZUFkZHJlc3MudG9v bHRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSVAgQWRkcmVzcyIpOwogICAgICAgICBjb2x1 bW5zLnJlbW90ZUFkZHJlc3Mud2lkdGggPSAiOCUiOwogICAgICAgICBjb2x1bW5zLnJlbW90ZUFk ZHJlc3MuaGlkZGVuID0gdHJ1ZTsKIAotICAgICAgICBjb2x1bW5zLmNvbm5lY3Rpb25JZGVudGlm aWVyLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb25uZWN0aW9uIElEIik7CisgICAg ICAgIGNvbHVtbnMuY29ubmVjdGlvbklkZW50aWZpZXIudGl0bGUgPSBjb2x1bW5zLmNvbm5lY3Rp b25JZGVudGlmaWVyLnRvb2x0aXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbm5lY3Rpb24g SUQiKTsKICAgICAgICAgY29sdW1ucy5jb25uZWN0aW9uSWRlbnRpZmllci53aWR0aCA9ICI1JSI7 CiAgICAgICAgIGNvbHVtbnMuY29ubmVjdGlvbklkZW50aWZpZXIuaGlkZGVuID0gdHJ1ZTsKICAg ICAgICAgY29sdW1ucy5jb25uZWN0aW9uSWRlbnRpZmllci5hbGlnbmVkID0gInJpZ2h0IjsKIAot ICAgICAgICBjb2x1bW5zLnNpemUudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNpemUi KTsKKyAgICAgICAgY29sdW1ucy5zaXplLnRpdGxlID0gY29sdW1ucy5zaXplLnRvb2x0aXAgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNpemUiKTsKICAgICAgICAgY29sdW1ucy5zaXplLndpZHRo ID0gIjYlIjsKICAgICAgICAgY29sdW1ucy5zaXplLmFsaWduZWQgPSAicmlnaHQiOwogCi0gICAg ICAgIGNvbHVtbnMudHJhbnNmZXJTaXplLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJU cmFuc2ZlcnJlZCIpOworICAgICAgICBjb2x1bW5zLnRyYW5zZmVyU2l6ZS50aXRsZSA9IGNvbHVt bnMudHJhbnNmZXJTaXplLnRvb2x0aXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRyYW5zZmVy cmVkIik7CiAgICAgICAgIGNvbHVtbnMudHJhbnNmZXJTaXplLndpZHRoID0gIjglIjsKICAgICAg ICAgY29sdW1ucy50cmFuc2ZlclNpemUuYWxpZ25lZCA9ICJyaWdodCI7CiAKLSAgICAgICAgY29s dW1ucy5yZXF1ZXN0U2VudC50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQgVGlt ZSIpOworICAgICAgICBjb2x1bW5zLnJlcXVlc3RTZW50LnRpdGxlID0gY29sdW1ucy5yZXF1ZXN0 U2VudC50b29sdGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGFydCBUaW1lIik7CiAgICAg ICAgIGNvbHVtbnMucmVxdWVzdFNlbnQud2lkdGggPSAiOSUiOwogICAgICAgICBjb2x1bW5zLnJl cXVlc3RTZW50LmFsaWduZWQgPSAicmlnaHQiOwogCi0gICAgICAgIGNvbHVtbnMubGF0ZW5jeS50 aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTGF0ZW5jeSIpOworICAgICAgICBjb2x1bW5z LmxhdGVuY3kudGl0bGUgPSBjb2x1bW5zLmxhdGVuY3kudG9vbHRpcCA9IFdlYkluc3BlY3Rvci5V SVN0cmluZygiTGF0ZW5jeSIpOwogICAgICAgICBjb2x1bW5zLmxhdGVuY3kud2lkdGggPSAiOSUi OwogICAgICAgICBjb2x1bW5zLmxhdGVuY3kuYWxpZ25lZCA9ICJyaWdodCI7CiAKLSAgICAgICAg Y29sdW1ucy5kdXJhdGlvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRHVyYXRpb24i KTsKKyAgICAgICAgY29sdW1ucy5kdXJhdGlvbi50aXRsZSA9IGNvbHVtbnMuZHVyYXRpb24udG9v bHRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRHVyYXRpb24iKTsKICAgICAgICAgY29sdW1u cy5kdXJhdGlvbi53aWR0aCA9ICI5JSI7CiAgICAgICAgIGNvbHVtbnMuZHVyYXRpb24uYWxpZ25l ZCA9ICJyaWdodCI7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVRpbWVsaW5lRGF0YUdyaWRO b2RlLmpzCmluZGV4IGJmNmViMThkMmU4MmFmY2VjNzI3NTkyNDJjYzNhZWUwZTJjY2IzZDguLmYw ZGRmZWZmMWRkNDcwMjFiNWRlZThkNjNjZTdlOGU5Y2JlODk5YjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltZWxpbmVEYXRh R3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZS5qcwpAQCAtMTA5LDM0ICsxMDksNTMgQEAg V2ViSW5zcGVjdG9yLlJlc291cmNlVGltZWxpbmVEYXRhR3JpZE5vZGUgPSBjbGFzcyBSZXNvdXJj ZVRpbWVsaW5lRGF0YUdyaWROb2RlIGUKICAgICAgICAgICAgIHJldHVybiB0aGlzLl9jcmVhdGVO YW1lQ2VsbERvY3VtZW50RnJhZ21lbnQoKTsKIAogICAgICAgICBjYXNlICJ0eXBlIjoKLSAgICAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuZGlzcGxheU5hbWVGb3JUeXBlKHZh bHVlKTsKKyAgICAgICAgICAgIHZhciB0ZXh0ID0gV2ViSW5zcGVjdG9yLlJlc291cmNlLmRpc3Bs YXlOYW1lRm9yVHlwZSh2YWx1ZSk7CisgICAgICAgICAgICBjZWxsLnRpdGxlID0gdGV4dDsKKyAg ICAgICAgICAgIHJldHVybiB0ZXh0OwogCiAgICAgICAgIGNhc2UgInN0YXR1c0NvZGUiOgogICAg ICAgICAgICAgY2VsbC50aXRsZSA9IHJlc291cmNlLnN0YXR1c1RleHQgfHwgIiI7CiAgICAgICAg ICAgICByZXR1cm4gdmFsdWUgfHwgZW1EYXNoOwogCiAgICAgICAgIGNhc2UgImNhY2hlZCI6Ci0g ICAgICAgICAgICByZXR1cm4gdGhpcy5fY2FjaGVkQ2VsbENvbnRlbnQoKTsKLQotICAgICAgICBj YXNlICJkb21haW4iOgotICAgICAgICAgICAgcmV0dXJuIHZhbHVlIHx8IGVtRGFzaDsKKyAgICAg ICAgICAgIHZhciBmcmFnbWVudCA9IHRoaXMuX2NhY2hlZENlbGxDb250ZW50KCk7CisgICAgICAg ICAgICBjZWxsLnRpdGxlID0gZnJhZ21lbnQudGV4dENvbnRlbnQ7CisgICAgICAgICAgICByZXR1 cm4gZnJhZ21lbnQ7CiAKICAgICAgICAgY2FzZSAic2l6ZSI6CiAgICAgICAgIGNhc2UgInRyYW5z ZmVyU2l6ZSI6Ci0gICAgICAgICAgICByZXR1cm4gaXNOYU4odmFsdWUpID8gZW1EYXNoIDogTnVt YmVyLmJ5dGVzVG9TdHJpbmcodmFsdWUsIHRydWUpOworICAgICAgICAgICAgdmFyIHRleHQgPSBl bURhc2g7CisgICAgICAgICAgICBpZiAoIWlzTmFOKHZhbHVlKSkgeworICAgICAgICAgICAgICAg IHRleHQgPSBOdW1iZXIuYnl0ZXNUb1N0cmluZyh2YWx1ZSwgdHJ1ZSk7CisgICAgICAgICAgICAg ICAgY2VsbC50aXRsZSA9IHRleHQ7CisgICAgICAgICAgICB9CisgICAgICAgICAgICByZXR1cm4g dGV4dDsKIAogICAgICAgICBjYXNlICJyZXF1ZXN0U2VudCI6CiAgICAgICAgIGNhc2UgImxhdGVu Y3kiOgogICAgICAgICBjYXNlICJkdXJhdGlvbiI6Ci0gICAgICAgICAgICByZXR1cm4gaXNOYU4o dmFsdWUpID8gZW1EYXNoIDogTnVtYmVyLnNlY29uZHNUb1N0cmluZyh2YWx1ZSwgdHJ1ZSk7Cisg ICAgICAgICAgICB2YXIgdGV4dCA9IGVtRGFzaDsKKyAgICAgICAgICAgIGlmICghaXNOYU4odmFs dWUpKSB7CisgICAgICAgICAgICAgICAgdGV4dCA9IE51bWJlci5zZWNvbmRzVG9TdHJpbmcodmFs dWUsIHRydWUpOworICAgICAgICAgICAgICAgIGNlbGwudGl0bGUgPSB0ZXh0OworICAgICAgICAg ICAgfQorICAgICAgICAgICAgcmV0dXJuIHRleHQ7CiAKKyAgICAgICAgY2FzZSAiZG9tYWluIjoK KyAgICAgICAgY2FzZSAibWV0aG9kIjoKKyAgICAgICAgY2FzZSAic2NoZW1lIjoKICAgICAgICAg Y2FzZSAicHJvdG9jb2wiOgogICAgICAgICBjYXNlICJyZW1vdGVBZGRyZXNzIjoKICAgICAgICAg Y2FzZSAiY29ubmVjdGlvbklkZW50aWZpZXIiOgorICAgICAgICAgICAgaWYgKHZhbHVlKQorICAg ICAgICAgICAgICAgIGNlbGwudGl0bGUgPSB2YWx1ZTsKICAgICAgICAgICAgIHJldHVybiB2YWx1 ZSB8fCBlbURhc2g7CiAKICAgICAgICAgY2FzZSAicHJpb3JpdHkiOgotICAgICAgICAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5kaXNwbGF5TmFtZUZvclByaW9yaXR5KHZhbHVlKSB8 fCBlbURhc2g7CisgICAgICAgICAgICB2YXIgdGl0bGUgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu ZGlzcGxheU5hbWVGb3JQcmlvcml0eSh2YWx1ZSk7CisgICAgICAgICAgICBpZiAodGl0bGUpCisg ICAgICAgICAgICAgICAgY2VsbC50aXRsZSA9IHRpdGxlOworICAgICAgICAgICAgcmV0dXJuIHRp dGxlIHx8IGVtRGFzaDsKICAgICAgICAgfQogCiAgICAgICAgIHJldHVybiBzdXBlci5jcmVhdGVD ZWxsQ29udGVudChjb2x1bW5JZGVudGlmaWVyLCBjZWxsKTsKQEAgLTI0Nyw3ICsyNjYsOSBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VUaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIFJlc291cmNl VGltZWxpbmVEYXRhR3JpZE5vZGUgZQogICAgICAgICAgICAgcmV0dXJuIHNwYW47CiAgICAgICAg IH0KIAotICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2UuY2FjaGVkID8gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJZZXMiKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTm8iKTsKKyAgICAgICAg bGV0IGZyYWdtZW50ID0gZG9jdW1lbnQuY3JlYXRlRG9jdW1lbnRGcmFnbWVudCgpOworICAgICAg ICBmcmFnbWVudC5hcHBlbmQodGhpcy5fcmVzb3VyY2UuY2FjaGVkID8gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJZZXMiKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiTm8iKSk7CisgICAgICAgIHJl dHVybiBmcmFnbWVudDsKICAgICB9CiAKICAgICBfbmVlZHNSZWZyZXNoKCkK