50100 2010-11-25 23:15:41 -0800 Web Inspector: UI polish for Network and Resources panels. 2010-11-26 14:36:40 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman abarth apavlov bweinstein eric joepeck keishi loislo ossy pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 313911 0 pfeldman 2010-11-25 23:15:41 -0800 Patch to follow. 313912 1 74905 pfeldman 2010-11-25 23:18:59 -0800 Created attachment 74905 [PATCH] Proposed change 313962 2 74905 yurys 2010-11-26 04:44:01 -0800 Comment on attachment 74905 [PATCH] Proposed change View in context: https://bugs.webkit.org/attachment.cgi?id=74905&action=review > WebCore/ChangeLog:5 > + Web Inspector: UI polish for Network and Resources panels. Could you add at least short descriptions for the changes made? > WebCore/inspector/front-end/Popover.js:-195 > - const toolTipDelay = isMouseDown ? 0 : (this._popup ? 600 : 1000); 1.2 -> 0.6 313964 3 pfeldman 2010-11-26 04:51:43 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/front-end/NetworkPanel.js M WebCore/inspector/front-end/Popover.js M WebCore/inspector/front-end/Resource.js M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/ResourcesPanel.js M WebCore/inspector/front-end/networkPanel.css Committed r72758 313995 4 ossy 2010-11-26 06:27:15 -0800 It broke many tests on all platform. Could you fix it? 313997 5 74905 ossy 2010-11-26 06:27:40 -0800 Comment on attachment 74905 [PATCH] Proposed change remove r+ from landed patch 314018 6 webkit.review.bot 2010-11-26 07:38:49 -0800 http://trac.webkit.org/changeset/72758 might have broken GTK Linux 32-bit Debug The following tests are not passing: inspector/debugger-pause-on-debugger-statement.html 314096 7 ossy 2010-11-26 14:36:40 -0800 fix landed in http://trac.webkit.org/changeset/72759 74905 2010-11-25 23:18:59 -0800 2010-11-26 06:27:40 -0800 [PATCH] Proposed change network_polish text/plain 13570 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDdjNWU3Mi4uYWIyMWRkMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMC0xMS0yNSAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBVSSBwb2xpc2ggZm9yIE5ldHdvcmsg YW5kIFJlc291cmNlcyBwYW5lbHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01MDEwMAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlLl90b2dnbGVHcmlkTW9kZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuY3Jl YXRlQ2VsbHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJv dG90eXBlLnNlbGVjdCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9k ZS5wcm90b3R5cGUuZ2V0IHNlbGVjdGFibGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdv cmtEYXRhR3JpZE5vZGUucHJvdG90eXBlLl9jcmVhdGVUaW1lbGluZUNlbGwpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlLnJlZnJlc2hHcmFwaCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuX3Jl ZnJlc2hMYWJlbFBvc2l0aW9ucyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3Bv dmVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlLnNldFRpbWVvdXQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlLl9tb3VzZU1vdmUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlLl9oYW5kbGVNb3VzZUFj dGlvbik6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IHJlc3BvbnNlUmVjZWl2ZWRU aW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUuc2V0IGVuZFRp bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZS5zZXQgdGltaW5n KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLmRpZFJlY2VpdmVS ZXNwb25zZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlw ZS5kaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lUmVzb3VyY2VUcmVlRWxl bWVudC5wcm90b3R5cGUuX29uZHJhZ3N0YXJ0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL25ldHdvcmtQYW5lbC5jc3M6CisgICAgICAgICgubmV0d29yay1zaWRlYmFyIC5kYXRhLWdy aWQgdGQ6bm90KC5uZXR3b3JrLXN1bW1hcnkpKToKKyAgICAgICAgKC5uZXR3b3JrLXNpZGViYXIg LmRhdGEtZ3JpZCB0ZC5uYW1lLWNvbHVtbik6CisgICAgICAgICgubmV0d29yay5wYW5lbDpub3Qo LnZpZXdpbmctcmVzb3VyY2UpIC5uZXR3b3JrLXNpZGViYXIgdGQubmFtZS1jb2x1bW46aG92ZXIp OgorICAgICAgICAoLm5ldHdvcmstdGltaW5nLXJvdyk6CisgICAgICAgICgubmV0d29yay10aW1p bmctYmFyKToKKyAgICAgICAgKC5uZXR3b3JrLXRpbWluZy1iYXItdGl0bGUpOgorICAgICAgICAo LnJlc291cmNlLXRpbWluZy12aWV3KToKKwogMjAxMC0xMS0yNSAgS2VuaWNoaSBJc2hpYmFzaGkg IDxiYXNoaUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbnQgVGFtdXJhLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBi L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggNzUzNTBj YS4uOGYzY2ZkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVs LmpzCkBAIC03Miw2ICs3Miw4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwgPSBmdW5jdGlv bigpCiAgICAgICAgIHRoaXMuX3NldExhcmdlclJlc291cmNlcyhXZWJJbnNwZWN0b3Iuc2V0dGlu Z3MucmVzb3VyY2VzTGFyZ2VSb3dzKTsKIAogICAgIHRoaXMuX3BvcG92ZXJIZWxwZXIgPSBuZXcg V2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxwZXIodGhpcy5lbGVtZW50LCB0aGlzLl9nZXRQb3BvdmVy QW5jaG9yLmJpbmQodGhpcyksIHRoaXMuX3Nob3dQb3BvdmVyLmJpbmQodGhpcyksIHRydWUpOwor ICAgIC8vIEVuYWJsZSBmYXN0ZXIgaGludC4KKyAgICB0aGlzLl9wb3BvdmVySGVscGVyLnNldFRp bWVvdXQoMTAwKTsKIAogICAgIHRoaXMuY2FsY3VsYXRvciA9IG5ldyBXZWJJbnNwZWN0b3IuTmV0 d29ya1RyYW5zZmVyVGltZUNhbGN1bGF0b3IoKTsKICAgICB0aGlzLl9maWx0ZXIodGhpcy5fZmls dGVyQWxsRWxlbWVudCwgZmFsc2UpOwpAQCAtOTAzLDYgKzkwNSw4IEBAIFdlYkluc3BlY3Rvci5O ZXR3b3JrUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVu dC5zdHlsZS5yaWdodCA9IDA7CiAgICAgICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LnN0eWxl LnJlbW92ZVByb3BlcnR5KCJ3aWR0aCIpOwogICAgICAgICAgICAgdGhpcy5fc3VtbWFyeUJhckVs ZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoIndpZHRoIik7CisgICAgICAgICAgICBpZiAodGhp cy5fZGF0YUdyaWQuc2VsZWN0ZWROb2RlKQorICAgICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlk LnNlbGVjdGVkTm9kZS5zZWxlY3RlZCA9IGZhbHNlOwogICAgICAgICB9CiAKICAgICAgICAgaWYg KHRoaXMuX2JyaWVmR3JpZCkgewpAQCAtMTI3MiwxNiArMTI3NiwxOSBAQCBXZWJJbnNwZWN0b3Iu TmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3NpemVDZWxs ID0gdGhpcy5fY3JlYXRlRGl2SW5URCgic2l6ZSIpOwogICAgICAgICB0aGlzLl90aW1lQ2VsbCA9 IHRoaXMuX2NyZWF0ZURpdkluVEQoInRpbWUiKTsKICAgICAgICAgdGhpcy5fY3JlYXRlVGltZWxp bmVDZWxsKCk7CisgICAgICAgIHRoaXMuX25hbWVDZWxsLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNr IiwgdGhpcy5zZWxlY3QuYmluZCh0aGlzKSwgZmFsc2UpOwogICAgIH0sCiAKICAgICBzZWxlY3Q6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUucHJv dG90eXBlLnNlbGVjdC5hcHBseSh0aGlzLCBhcmd1bWVudHMpOwogICAgICAgICB0aGlzLl9wYW5l bC5fc2hvd1Jlc291cmNlKHRoaXMuX3Jlc291cmNlKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLkRh dGFHcmlkTm9kZS5wcm90b3R5cGUuc2VsZWN0LmFwcGx5KHRoaXMsIGFyZ3VtZW50cyk7CiAgICAg fSwKIAogICAgIGdldCBzZWxlY3RhYmxlKCkKICAgICB7CisgICAgICAgIGlmICghdGhpcy5fcGFu ZWwuX3ZpZXdpbmdSZXNvdXJjZU1vZGUpCisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIGlmICghdGhpcy5fcGFuZWwuX2hpZGRlbkNhdGVnb3JpZXMuYWxsKQogICAgICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgICAgIGlmICh0aGlzLl9wYW5lbC5faGlkZGVuQ2F0ZWdvcmllc1t0 aGlzLl9yZXNvdXJjZS5jYXRlZ29yeS5uYW1lXSkKQEAgLTEzMDMsNyArMTMxMCw2IEBAIFdlYklu c3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAg IHRoaXMuX2dyYXBoRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAg ICAgICB0aGlzLl9ncmFwaEVsZW1lbnQuY2xhc3NOYW1lID0gIm5ldHdvcmstZ3JhcGgtc2lkZSI7 Ci0gICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW92ZXIi LCB0aGlzLl9yZWZyZXNoTGFiZWxQb3NpdGlvbnMuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAg ICAgIHRoaXMuX2JhckFyZWFFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CiAgICAgICAgIC8vICAgIHRoaXMuX2JhckFyZWFFbGVtZW50LmNsYXNzTmFtZSA9ICJuZXR3b3Jr LWdyYXBoLWJhci1hcmVhIGhpZGRlbiI7CkBAIC0xMzE5LDYgKzEzMjUsNyBAQCBXZWJJbnNwZWN0 b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2JhclJp Z2h0RWxlbWVudC5jbGFzc05hbWUgPSAibmV0d29yay1ncmFwaC1iYXIiOwogICAgICAgICB0aGlz Ll9iYXJBcmVhRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9iYXJSaWdodEVsZW1lbnQpOwogCisK ICAgICAgICAgdGhpcy5fbGFiZWxMZWZ0RWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwogICAgICAgICB0aGlzLl9sYWJlbExlZnRFbGVtZW50LmNsYXNzTmFtZSA9ICJuZXR3 b3JrLWdyYXBoLWxhYmVsIHdhaXRpbmciOwogICAgICAgICB0aGlzLl9iYXJBcmVhRWxlbWVudC5h cHBlbmRDaGlsZCh0aGlzLl9sYWJlbExlZnRFbGVtZW50KTsKQEAgLTEzMjcsNiArMTMzNCw4IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5fbGFiZWxSaWdodEVsZW1lbnQuY2xhc3NOYW1lID0gIm5ldHdvcmstZ3JhcGgtbGFiZWwi OwogICAgICAgICB0aGlzLl9iYXJBcmVhRWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9sYWJlbFJp Z2h0RWxlbWVudCk7CiAKKyAgICAgICAgdGhpcy5fZ3JhcGhFbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlb3ZlciIsIHRoaXMuX3JlZnJlc2hMYWJlbFBvc2l0aW9ucy5iaW5kKHRoaXMpLCBm YWxzZSk7CisKICAgICAgICAgdGhpcy5fdGltZWxpbmVDZWxsID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgidGQiKTsKICAgICAgICAgdGhpcy5fdGltZWxpbmVDZWxsLmNsYXNzTmFtZSA9ICJ0aW1l bGluZS1jb2x1bW4iOwogICAgICAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3Rp bWVsaW5lQ2VsbCk7CkBAIC0xNDY5LDggKzE0NzgsNiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0Rh dGFHcmlkTm9kZS5wcm90b3R5cGUgPSB7CiAgICAgcmVmcmVzaEdyYXBoOiBmdW5jdGlvbihjYWxj dWxhdG9yKQogICAgIHsKICAgICAgICAgdmFyIHBlcmNlbnRhZ2VzID0gY2FsY3VsYXRvci5jb21w dXRlQmFyR3JhcGhQZXJjZW50YWdlcyh0aGlzLl9yZXNvdXJjZSk7Ci0gICAgICAgIHZhciBsYWJl bHMgPSBjYWxjdWxhdG9yLmNvbXB1dGVCYXJHcmFwaExhYmVscyh0aGlzLl9yZXNvdXJjZSk7Ci0K ICAgICAgICAgdGhpcy5fcGVyY2VudGFnZXMgPSBwZXJjZW50YWdlczsKIAogICAgICAgICB0aGlz Ll9iYXJBcmVhRWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKQEAgLTE0ODYsNiAr MTQ5Myw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5fYmFyTGVmdEVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoInJpZ2h0Iiwg KDEwMCAtIHBlcmNlbnRhZ2VzLmVuZCkgKyAiJSIpOwogICAgICAgICB0aGlzLl9iYXJSaWdodEVs ZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImxlZnQiLCBwZXJjZW50YWdlcy5taWRkbGUgKyAiJSIp OwogCisgICAgICAgIHZhciBsYWJlbHMgPSBjYWxjdWxhdG9yLmNvbXB1dGVCYXJHcmFwaExhYmVs cyh0aGlzLl9yZXNvdXJjZSk7CiAgICAgICAgIHRoaXMuX2xhYmVsTGVmdEVsZW1lbnQudGV4dENv bnRlbnQgPSBsYWJlbHMubGVmdDsKICAgICAgICAgdGhpcy5fbGFiZWxSaWdodEVsZW1lbnQudGV4 dENvbnRlbnQgPSBsYWJlbHMucmlnaHQ7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Qb3BvdmVyLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92 ZXIuanMKaW5kZXggNTliNDhmOS4uNjIxMzhiZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1BvcG92ZXIuanMKQEAgLTE1NSw5ICsxNTUsMTUgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxw ZXIgPSBmdW5jdGlvbihwYW5lbEVsZW1lbnQsIGdldEFuY2hvciwgc2hvd1BvcHVwLCBzaG93T24K ICAgICB0aGlzLl9vbkhpZGUgPSBvbkhpZGU7CiAgICAgcGFuZWxFbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21vdXNlRG93bi5iaW5kKHRoaXMpLCBmYWxzZSk7CiAg ICAgcGFuZWxFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlbW92ZSIsIHRoaXMuX21vdXNl TW92ZS5iaW5kKHRoaXMpLCBmYWxzZSk7CisgICAgdGhpcy5zZXRUaW1lb3V0KDEwMDApOwogfQog CiBXZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CisgICAgc2V0VGltZW91 dDogZnVuY3Rpb24odGltZW91dCkKKyAgICB7CisgICAgICAgICB0aGlzLl90aW1lb3V0ID0gdGlt ZW91dDsKKyAgICB9LAorCiAgICAgX21vdXNlRG93bjogZnVuY3Rpb24oZXZlbnQpCiAgICAgewog ICAgICAgICB0aGlzLl9raWxsSGlkZVBvcHVwVGltZXIoKTsKQEAgLTE3MCw3ICsxNzYsNyBAQCBX ZWJJbnNwZWN0b3IuUG9wb3ZlckhlbHBlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICh0aGlz Ll9ob3ZlckVsZW1lbnQgPT09IGV2ZW50LnRhcmdldCB8fCAodGhpcy5faG92ZXJFbGVtZW50ICYm IHRoaXMuX2hvdmVyRWxlbWVudC5pc0FuY2VzdG9yKGV2ZW50LnRhcmdldCkpKQogICAgICAgICAg ICAgcmV0dXJuOwogCi0gICAgICAgIC8vIFVzZXIgaGFzIDUwMG1zIHRvIHJlYWNoIHRoZSBwb3B1 cC4KKyAgICAgICAgLy8gVXNlciBoYXMgNTAwbXMgKHRoaXMuX3RpbWVvdXQgLyAyKSB0byByZWFj aCB0aGUgcG9wdXAuCiAgICAgICAgIGlmICh0aGlzLl9wb3B1cCAmJiAhdGhpcy5faGlkZVBvcHVw VGltZXIpIHsKICAgICAgICAgICAgIHZhciBzZWxmID0gdGhpczsKICAgICAgICAgICAgIGZ1bmN0 aW9uIGRvSGlkZSgpCkBAIC0xNzgsNyArMTg0LDcgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXJIZWxw ZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHNlbGYuX2hpZGVQb3B1cCgpOwogICAg ICAgICAgICAgICAgIGRlbGV0ZSBzZWxmLl9oaWRlUG9wdXBUaW1lcjsKICAgICAgICAgICAgIH0K LSAgICAgICAgICAgIHRoaXMuX2hpZGVQb3B1cFRpbWVyID0gc2V0VGltZW91dChkb0hpZGUsIDUw MCk7CisgICAgICAgICAgICB0aGlzLl9oaWRlUG9wdXBUaW1lciA9IHNldFRpbWVvdXQoZG9IaWRl LCB0aGlzLl90aW1lb3V0IC8gMik7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl9oYW5kbGVN b3VzZUFjdGlvbihldmVudCk7CkBAIC0xOTIsNyArMTk4LDcgQEAgV2ViSW5zcGVjdG9yLlBvcG92 ZXJIZWxwZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2hvdmVyRWxlbWVudCkK ICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBjb25zdCB0b29sVGlwRGVsYXkgPSBpc01v dXNlRG93biA/IDAgOiAodGhpcy5fcG9wdXAgPyA2MDAgOiAxMDAwKTsKKyAgICAgICAgY29uc3Qg dG9vbFRpcERlbGF5ID0gaXNNb3VzZURvd24gPyAwIDogKHRoaXMuX3BvcHVwID8gdGhpcy5fdGlt ZW91dCAqIDEuMiA6IHRoaXMuX3RpbWVvdXQpOwogICAgICAgICB0aGlzLl9ob3ZlclRpbWVyID0g c2V0VGltZW91dCh0aGlzLl9tb3VzZUhvdmVyLmJpbmQodGhpcywgdGhpcy5faG92ZXJFbGVtZW50 KSwgdG9vbFRpcERlbGF5KTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2UuanMKaW5kZXggZDAzNDZhMi4uNDIxN2NkNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qcwpAQCAtMTYzLDExICsxNjMsNiBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHJlc3BvbnNlUmVjZWl2ZWRUaW1lKCkKICAgICB7 Ci0gICAgICAgIGlmICh0aGlzLnRpbWluZyAmJiB0aGlzLnRpbWluZy5yZXF1ZXN0VGltZSkgewot ICAgICAgICAgICAgLy8gQ2FsY3VsYXRlIHJlc3BvbnNlUmVjZWl2ZWRUaW1lIGZyb20gdGltaW5n IGRhdGEgZm9yIGJldHRlciBhY2N1cmFjeS4KLSAgICAgICAgICAgIC8vIFRpbWluZydzIHJlcXVl c3RUaW1lIGlzIGEgYmFzZWxpbmUgaW4gc2Vjb25kcywgcmVzdCBvZiB0aGUgbnVtYmVycyB0aGVy ZSBhcmUgdGlja3MgaW4gbWlsbGlzLgotICAgICAgICAgICAgcmV0dXJuIHRoaXMudGltaW5nLnJl cXVlc3RUaW1lICsgdGhpcy50aW1pbmcucmVjZWl2ZUhlYWRlcnNFbmQgLyAxMDAwLjA7Ci0gICAg ICAgIH0KICAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc3BvbnNlUmVjZWl2ZWRUaW1lIHx8IC0xOwog ICAgIH0sCiAKQEAgLTE4MywxMyArMTc4LDE1IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90 b3R5cGUgPSB7CiAKICAgICBzZXQgZW5kVGltZSh4KQogICAgIHsKLSAgICAgICAgLy8gSW4gY2Fz ZSBvZiBmYXN0IGxvYWQgKG9yIGluIGNhc2Ugb2YgY2FjaGVkIHJlc291cmNlcyksIGVuZFRpbWUg b24gbmV0d29yayBzdGFjawotICAgICAgICAvLyBjYW4gYmUgbGVzcyB0aGVuIG1fcmVzcG9uc2VS ZWNlaXZlZFRpbWUgbWVhc3VyZWQgaW4gV2ViQ29yZS4gTm9ybWFsaXplIGl0IGhlcmUsCi0gICAg ICAgIC8vIHByZWZlciBhY3R1YWxFbmRUaW1lIHRvIG1fcmVzcG9uc2VSZWNlaXZlZFRpbWUuCi0g ICAgICAgIGlmICh4IDwgdGhpcy5yZXNwb25zZVJlY2VpdmVkVGltZSkKLSAgICAgICAgICAgIHRo aXMucmVzcG9uc2VSZWNlaXZlZFRpbWUgPSB4OwotCi0gICAgICAgIHRoaXMuX2VuZFRpbWUgPSB4 OworICAgICAgICBpZiAodGhpcy50aW1pbmcgJiYgdGhpcy50aW1pbmcucmVxdWVzdFRpbWUpIHsK KyAgICAgICAgICAgIC8vIENoZWNrIGFnYWluc3QgYWNjdXJhdGUgcmVzcG9uc2VSZWNlaXZlZFRp bWUuCisgICAgICAgICAgICB0aGlzLl9lbmRUaW1lID0gTWF0aC5tYXgoeCwgdGhpcy5yZXNwb25z ZVJlY2VpdmVkVGltZSk7CisgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAvLyBQcmVmZXIg ZW5kVGltZSBzaW5jZSBpdCBtaWdodCBiZSBmcm9tIHRoZSBuZXR3b3JrIHN0YWNrLgorICAgICAg ICAgICAgdGhpcy5fZW5kVGltZSA9IHg7CisgICAgICAgICAgICBpZiAodGhpcy5fcmVzcG9uc2VS ZWNlaXZlZFRpbWUgPiB4KQorICAgICAgICAgICAgICAgIHRoaXMuX3Jlc3BvbnNlUmVjZWl2ZWRU aW1lID0geDsKKyAgICAgICAgfQogICAgIH0sCiAKICAgICBnZXQgZHVyYXRpb24oKQpAQCAtMzAw LDYgKzI5NywxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIHNl dCB0aW1pbmcoeCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fY2FjaGVkKSB7CisgICAgICAg ICAgICAvLyBUYWtlIHN0YXJ0VGltZSBhbmQgcmVzcG9uc2VSZWNlaXZlZFRpbWUgZnJvbSB0aW1p bmcgZGF0YSBmb3IgYmV0dGVyIGFjY3VyYWN5LgorICAgICAgICAgICAgLy8gVGltaW5nJ3MgcmVx dWVzdFRpbWUgaXMgYSBiYXNlbGluZSBpbiBzZWNvbmRzLCByZXN0IG9mIHRoZSBudW1iZXJzIHRo ZXJlIGFyZSB0aWNrcyBpbiBtaWxsaXMuCisgICAgICAgICAgICB0aGlzLl9zdGFydFRpbWUgPSB4 LnJlcXVlc3RUaW1lOworICAgICAgICAgICAgdGhpcy5fcmVzcG9uc2VSZWNlaXZlZFRpbWUgPSB4 LnJlcXVlc3RUaW1lICsgeC5yZWNlaXZlSGVhZGVyc0VuZCAvIDEwMDAuMDsKKwogICAgICAgICAg ICAgdGhpcy5fdGltaW5nID0geDsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlz dGVuZXJzKCJ0aW1pbmcgY2hhbmdlZCIpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzIGIvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcwppbmRleCA1NTE0N2Q3Li4wNTZiZThjIDEw MDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpz CisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFnZXIuanMKQEAg LTE0MSw5ICsxNDEsMTEgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUg PSB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Jlc291cmNlc0J5SWRbaWRlbnRpZmll cl07CiAgICAgICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IHRoaXMuX3VwZGF0ZVJlc291cmNlV2l0aFJlc3BvbnNlKHJlc291cmNlLCByZXNwb25zZSk7Ci0g ICAgICAgIHJlc291cmNlLnR5cGUgPSBXZWJJbnNwZWN0b3IuUmVzb3VyY2UuVHlwZVtyZXNvdXJj ZVR5cGVdOworCiAgICAgICAgIHJlc291cmNlLnJlc3BvbnNlUmVjZWl2ZWRUaW1lID0gdGltZTsK KyAgICAgICAgcmVzb3VyY2UudHlwZSA9IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlW3Jlc291 cmNlVHlwZV07CisKKyAgICAgICAgdGhpcy5fdXBkYXRlUmVzb3VyY2VXaXRoUmVzcG9uc2UocmVz b3VyY2UsIHJlc3BvbnNlKTsKIAogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsu cmVmcmVzaFJlc291cmNlKHJlc291cmNlKTsKICAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9k ZWwuYWRkUmVzb3VyY2VUb0ZyYW1lKHJlc291cmNlLmxvYWRlci5mcmFtZUlkLCByZXNvdXJjZSk7 CkBAIC0xOTgsOCArMjAwLDggQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICghcmVzb3VyY2UpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAg ICAgICAgcmVzb3VyY2UuZmluaXNoZWQgPSB0cnVlOwogICAgICAgICByZXNvdXJjZS5lbmRUaW1l ID0gZmluaXNoVGltZTsKKyAgICAgICAgcmVzb3VyY2UuZmluaXNoZWQgPSB0cnVlOwogCiAgICAg ICAgIFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5yZWZyZXNoUmVzb3VyY2UocmVzb3VyY2Up OwogICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLmF1ZGl0cy5yZXNvdXJjZUZpbmlzaGVkKHJl c291cmNlKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5q cwppbmRleCBmZjk5ZWJjLi41YzVjNWQ2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1Jlc291cmNlc1BhbmVsLmpzCkBAIC0xMDIzLDggKzEwMjMsNyBAQCBXZWJJbnNwZWN0b3Iu RnJhbWVSZXNvdXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgIF9vbmRyYWdzdGFy dDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuc2V0 RGF0YSgidGV4dC9wbGFpbiIsIHRoaXMuX3Jlc291cmNlLnVybCk7Ci0gICAgICAgIGV2ZW50LmRh dGFUcmFuc2Zlci5zZXREYXRhKCJ0ZXh0L3VyaS1saXN0IiwgdGhpcy5fcmVzb3VyY2UudXJsICsg IlxyXG4iKTsKKyAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLnNldERhdGEoInRleHQvcGxhaW4i LCB0aGlzLl9yZXNvdXJjZS5jb250ZW50KTsKICAgICAgICAgZXZlbnQuZGF0YVRyYW5zZmVyLmVm ZmVjdEFsbG93ZWQgPSAiY29weSI7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCmRpZmYg LS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvbmV0d29ya1BhbmVsLmNzcyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrUGFuZWwuY3NzCmluZGV4IDRjYjQ2ZjAu LjcwZWJlNTYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3Jr UGFuZWwuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9uZXR3b3JrUGFuZWwu Y3NzCkBAIC0yNiw3ICsyNiw2IEBACiAgICAgbGluZS1oZWlnaHQ6IDE3cHg7CiAgICAgaGVpZ2h0 OiAzN3B4OwogICAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkIHJnYigyMTAsIDIxMCwgMjEwKTsK LSAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwogICAgIHZlcnRpY2FsLWFsaWduOiBtaWRk bGU7CiB9CiAKQEAgLTcyLDYgKzcxLDExIEBACiAKIC5uZXR3b3JrLXNpZGViYXIgLmRhdGEtZ3Jp ZCB0ZC5uYW1lLWNvbHVtbiB7CiAgICAgZm9udC13ZWlnaHQ6IGJvbGQ7CisgICAgY3Vyc29yOiBw b2ludGVyOworfQorCisubmV0d29yay5wYW5lbDpub3QoLnZpZXdpbmctcmVzb3VyY2UpIC5uZXR3 b3JrLXNpZGViYXIgdGQubmFtZS1jb2x1bW46aG92ZXIgeworICAgIHRleHQtZGVjb3JhdGlvbjog dW5kZXJsaW5lOwogfQogCiAubmV0d29yay1zaWRlYmFyIC5kYXRhLWdyaWQgdGQubWV0aG9kLWNv bHVtbiwKQEAgLTM2Niw3ICszNzAsNyBAQAogCiAubmV0d29yay10aW1pbmctcm93IHsKICAgICBw b3NpdGlvbjogcmVsYXRpdmU7Ci0gICAgaGVpZ2h0OiAxMnB4OworICAgIGhlaWdodDogMTZweDsK IH0KIAogLm5ldHdvcmstdGltaW5nLWJhciB7CkBAIC0zNzQsMTAgKzM3OCwxNCBAQAogICAgIGJh Y2tncm91bmQtY29sb3I6IHJlZDsKICAgICBib3JkZXItbGVmdDogMXB4IHNvbGlkIHJlZDsKICAg ICBvcGFjaXR5OiAwLjQ7CisgICAgdG9wOiAwOworICAgIGJvdHRvbTogMDsKIH0KIAogLm5ldHdv cmstdGltaW5nLWJhci10aXRsZSB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGNvbG9y OiBibGFjazsKKyAgICB0b3A6IDFweDsKIH0KIAogLm5ldHdvcmstZGltLWNlbGwgewpAQCAtNzU5 LDcgKzc2Nyw3IEBACiAgICAgcGFkZGluZzogNnB4OwogICAgIGZvbnQtd2VpZ2h0OiBib2xkOwog ICAgIGZvbnQtc2l6ZTogMTFweDsKLSAgICBjb2xvcjogcmdiKDMwLCAzMCwgMzApOworICAgIGNv bG9yOiByZ2IoMzAlLCAzMCUsIDMwJSk7CiB9CiAKIC5yZXNvdXJjZS10aW1pbmctdmlldyB0YWJs ZSB7Cg==