146944 2015-07-14 15:02:47 -0700 Web Inspector: TimelineRuler minimum selection time range should be configurable 2015-07-14 16:39:18 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 mattbaker mattbaker commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1109476 0 mattbaker 2015-07-14 15:02:47 -0700 * SUMMARY TimelineRuler minimum selection time range should be configurable. The rendering frames overview uses a non-time horizontal axis, and should specify a minimum selection of one frame. 1109477 1 webkit-bug-importer 2015-07-14 15:03:06 -0700 <rdar://problem/21822720> 1109485 2 256799 mattbaker 2015-07-14 15:13:18 -0700 Created attachment 256799 [Patch] Proposed Fix 1109493 3 256799 joepeck 2015-07-14 15:26:42 -0700 Comment on attachment 256799 [Patch] Proposed Fix r=me! Perhaps we should also make it that clicking without any drag selects the frame where you clicked. Right now you have to drag at least a tiny bit for the selection to trigger. But this does feel much better. 1109499 4 mattbaker 2015-07-14 15:47:00 -0700 (In reply to comment #3) > Comment on attachment 256799 [details] > [Patch] Proposed Fix > > r=me! > > Perhaps we should also make it that clicking without any drag selects the > frame where you clicked. Right now you have to drag at least a tiny bit for > the selection to trigger. But this does feel much better. This is already being done as part of rdar://problem/2122352, when the user clicks a single frame outside the current selection. :) 1109500 5 mattbaker 2015-07-14 15:47:54 -0700 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 256799 [details] > > [Patch] Proposed Fix > > > > r=me! > > > > Perhaps we should also make it that clicking without any drag selects the > > frame where you clicked. Right now you have to drag at least a tiny bit for > > the selection to trigger. But this does feel much better. > > This is already being done as part of rdar://problem/2122352, when the user > clicks a single frame outside the current selection. :) But we could always break it out as a stand-alone patch. 1109513 6 256799 commit-queue 2015-07-14 16:39:15 -0700 Comment on attachment 256799 [Patch] Proposed Fix Clearing flags on attachment: 256799 Committed r186824: <http://trac.webkit.org/changeset/186824> 1109514 7 commit-queue 2015-07-14 16:39:18 -0700 All reviewed patches have been landed. Closing bug. 256799 2015-07-14 15:13:18 -0700 2015-07-14 16:39:15 -0700 [Patch] Proposed Fix bug-146944-20150714151212.patch text/plain 8856 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2ODE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz MDlhMWY5NWRiNTNkYzFmMjdmYmJmNWZkMjM4N2U2YmNkNDEzM2E4Li40YTdkOTk5NmI5N2RmYTY1 YjgzYjE5Mzc0Y2RmM2ExYjI3YzlmZDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNS0wNy0xNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVSdWxlciBtaW5pbXVtIHNlbGVjdGlv biB0aW1lIHJhbmdlIHNob3VsZCBiZSBjb25maWd1cmFibGUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Njk0NAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJp bmdGcmFtZVRpbWVsaW5lT3ZlcnZpZXcuanM6CisgICAgICAgIFNldCBtaW5pbXVtIHNlbGVjdGlv biB0byAxIGZyYW1lLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92 ZXJ2aWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90 eXBlLnNldCBzZWxlY3Rpb25EdXJhdGlvbik6CisgICAgICAgIFVzZSBydWxlcidzIG1pbmltdW0g ZHVyYXRpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlcik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUuZ2V0IG1pbmltdW1TZWxlY3Rpb25EdXJh dGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUuc2V0 IG1pbmltdW1TZWxlY3Rpb25EdXJhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVSdWxlci5wcm90b3R5cGUuX2hhbmRsZU1vdXNlVXApOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLl9oYW5kbGVTZWxlY3Rpb25IYW5kbGVNb3VzZU1vdmUp OgorICAgICAgICBBZGRlZCBwcm9wZXJ0eSBmb3Igc2V0dGluZyBtaW5pbXVtIHNlbGVjdGlvbiBk dXJhdGlvbi4gRGVmYXVsdCBtaW5pbXVtIGR1cmF0aW9uIGlzIDAuMDEsIHdoaWNoIGlzCisgICAg ICAgIGVxdWFsIHRvIHRoZSBvbGQgaGFyZC1jb2RlZCBtaW5pbXVtIHNlbGVjdGlvbiB0aW1lIHJh bmdlLgorCiAyMDE1LTA3LTEzICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogVW5jYXVnaHQgZXhjZXB0aW9uIGluIGluc3BlY3Rv ciBmb3Igc29tZSBDb25zb2xlTWVzc2FnZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVPdmVydmlldy5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0Zy YW1lVGltZWxpbmVPdmVydmlldy5qcwppbmRleCBjMDc0NzI1NmU2MWZmZGFmYTUzM2E4YzU2YTVl OTM5ZTZkNDhlYTMzLi44MmY0ZjIwZWUwOTY5ZDk1ODQ1MzU5MmZhZDY5ZTIxODhlZWY5NzIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5k ZXJpbmdGcmFtZVRpbWVsaW5lT3ZlcnZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZU92ZXJ2aWV3LmpzCkBA IC0zOCw2ICszOCw3IEBAIFdlYkluc3BlY3Rvci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lT3ZlcnZp ZXcgPSBmdW5jdGlvbih0aW1lbGluZVJlY29yZGluZykKICAgICBXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldy5jYWxsKHRoaXMsICJmcmFtZXMiLCB0aW1lbGluZVJlY29yZGluZywgbWluaW11 bUR1cmF0aW9uUGVyUGl4ZWwsIG1heGltdW1EdXJhdGlvblBlclBpeGVsLCBkZWZhdWx0U2V0dGlu Z3NWYWx1ZXMpOwogCiAgICAgdGhpcy5waXhlbEFsaWduRHVyYXRpb24gPSB0cnVlOworICAgIHRo aXMudGltZWxpbmVSdWxlci5taW5pbXVtU2VsZWN0aW9uRHVyYXRpb24gPSAxOwogICAgIHRoaXMu dGltZWxpbmVSdWxlci5zbmFwSW50ZXJ2YWwgPSAxOwogICAgIHRoaXMudGltZWxpbmVSdWxlci5m b3JtYXRMYWJlbENhbGxiYWNrID0gZnVuY3Rpb24odmFsdWUpIHsKICAgICAgICAgcmV0dXJuIHZh bHVlLnRvRml4ZWQoMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwppbmRleCBiYzc4Nzc5YzYz NzlmMjAzMTYwMWY5YmJmYTlmNWFiMjhlMDVkY2JlLi40MGI2NTNkNTYxZWQ4YzRlZTMwNjNlMWQ5 Y2VhODM3MDJiMDk1Y2M4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKQEAgLTIzNyw3ICsy MzcsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUgPSB7CiAKICAg ICBzZXQgc2VsZWN0aW9uRHVyYXRpb24oeCkKICAgICB7Ci0gICAgICAgIHggPSBNYXRoLm1heChX ZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5pbXVtU2VsZWN0aW9uVGltZVJhbmdlLCB4KTsK KyAgICAgICAgeCA9IE1hdGgubWF4KHRoaXMuX3RpbWVsaW5lUnVsZXIubWluaW11bVNlbGVjdGlv bkR1cmF0aW9uLCB4KTsKIAogICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnNlbGVjdGlvbkVu ZFRpbWUgPSB0aGlzLl90aW1lbGluZVJ1bGVyLnNlbGVjdGlvblN0YXJ0VGltZSArIHg7CiAgICAg fSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUnVsZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZVJ1bGVyLmpzCmluZGV4IDE5MTliNWI4ZDEzMjA5MTEyOTQxNWJmNjc2Mjhj ZWQ4MGFkMGFhZGYuLjI0NWJkMmZmZmZkODI0ZDg1MDg0MmRiZmMzY2YyYmQ1ZjU4MzA3ZmMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUnVsZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVSdWxlci5qcwpAQCAtNDksNiArNDksNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVSdWxlciA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9lbmRUaW1lUGlubmVkID0gZmFsc2U7CiAg ICAgdGhpcy5fYWxsb3dzQ2xpcHBlZExhYmVscyA9IGZhbHNlOwogICAgIHRoaXMuX2FsbG93c1Rp bWVSYW5nZVNlbGVjdGlvbiA9IGZhbHNlOworICAgIHRoaXMuX21pbmltdW1TZWxlY3Rpb25EdXJh dGlvbiA9IDAuMDE7CiAgICAgdGhpcy5fZm9ybWF0TGFiZWxDYWxsYmFjayA9IG51bGw7CiAKICAg ICB0aGlzLl9tYXJrZXJFbGVtZW50TWFwID0gbmV3IE1hcDsKQEAgLTYxLDggKzYyLDYgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuQWxsb3dzVGltZVJhbmdlU2VsZWN0aW9uU3R5bGVDbGFz c05hbWUgPSAiYWxsb3dzLXRpbWUKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkRpdmlkZXJF bGVtZW50U3R5bGVDbGFzc05hbWUgPSAiZGl2aWRlciI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVS dWxlci5EaXZpZGVyTGFiZWxFbGVtZW50U3R5bGVDbGFzc05hbWUgPSAibGFiZWwiOwogCi1XZWJJ bnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5pbXVtU2VsZWN0aW9uVGltZVJhbmdlID0gMC4wMTsK LQogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuRXZlbnQgPSB7CiAgICAgVGltZVJhbmdlU2Vs ZWN0aW9uQ2hhbmdlZDogInRpbWUtcnVsZXItdGltZS1yYW5nZS1zZWxlY3Rpb24tY2hhbmdlZCIK IH07CkBAIC0xNjAsNiArMTU5LDE2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLnByb3Rv dHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKKyAgICBnZXQgbWluaW11bVNlbGVjdGlvbkR1 cmF0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9taW5pbXVtU2VsZWN0aW9uRHVy YXRpb247CisgICAgfSwKKworICAgIHNldCBtaW5pbXVtU2VsZWN0aW9uRHVyYXRpb24oeCkKKyAg ICB7CisgICAgICAgIHRoaXMuX21pbmltdW1TZWxlY3Rpb25EdXJhdGlvbiA9IHg7CisgICAgfSwK KwogICAgIGdldCB6ZXJvVGltZSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5femVyb1Rp bWU7CkBAIC03MTUsMTUgKzcyNCwxNSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90 b3R5cGUgPSB7CiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChldmVudC5idXR0b24gPT09 IDApOwogCi0gICAgICAgIGlmICghdGhpcy5fc2VsZWN0aW9uSXNNb3ZlICYmIHRoaXMuc2VsZWN0 aW9uRW5kVGltZSAtIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lIDwgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUnVsZXIuTWluaW11bVNlbGVjdGlvblRpbWVSYW5nZSkgeworICAgICAgICBpZiAoIXRoaXMu X3NlbGVjdGlvbklzTW92ZSAmJiB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLnNlbGVjdGlv blN0YXJ0VGltZSA8IHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uKSB7CiAgICAgICAgICAg ICAvLyBUaGUgc2VjdGlvbiBpcyBzbWFsbGVyIHRoYW4gYWxsb3dlZCwgZ3JvdyBpbiB0aGUgZGly ZWN0aW9uIG9mIHRoZSBkcmFnIHRvIG1lZXQgdGhlIG1pbnVtdW0uCiAgICAgICAgICAgICB2YXIg Y3VycmVudE1vdXNlUG9zaXRpb24gPSBldmVudC5wYWdlWCAtIHRoaXMuX3J1bGVyQm91bmRpbmdD bGllbnRSZWN0LmxlZnQ7CiAgICAgICAgICAgICBpZiAoY3VycmVudE1vdXNlUG9zaXRpb24gPiB0 aGlzLl9tb3VzZURvd25Qb3NpdGlvbikgewotICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9u RW5kVGltZSA9IE1hdGgubWluKHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUnVsZXIuTWluaW11bVNlbGVjdGlvblRpbWVSYW5nZSwgdGhpcy5lbmRUaW1lKTsK LSAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9IHRoaXMuc2VsZWN0aW9u RW5kVGltZSAtIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLk1pbmltdW1TZWxlY3Rpb25UaW1l UmFuZ2U7CisgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25FbmRUaW1lID0gTWF0aC5taW4o dGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLm1pbmltdW1TZWxlY3Rpb25EdXJhdGlvbiwg dGhpcy5lbmRUaW1lKTsKKyAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9 IHRoaXMuc2VsZWN0aW9uRW5kVGltZSAtIHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uOwog ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0 VGltZSA9IE1hdGgubWF4KHRoaXMuc3RhcnRUaW1lLCB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5pbXVtU2VsZWN0aW9uVGltZVJhbmdlKTsKLSAg ICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgPSB0aGlzLnNlbGVjdGlvblN0YXJ0 VGltZSArIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLk1pbmltdW1TZWxlY3Rpb25UaW1lUmFu Z2U7CisgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgPSBNYXRoLm1heCh0 aGlzLnN0YXJ0VGltZSwgdGhpcy5zZWxlY3Rpb25FbmRUaW1lIC0gdGhpcy5taW5pbXVtU2VsZWN0 aW9uRHVyYXRpb24pOworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGltZSA9IHRo aXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5taW5pbXVtU2VsZWN0aW9uRHVyYXRpb247CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0KIApAQCAtNzc4LDE5ICs3ODcsMTkgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgLy8gUmVzaXplIHRo ZSBzZWxlY3Rpb24gb24gYm90aCBzaWRlcyB3aGVuIHRoZSBPcHRpb24ga2V5cyBpcyBoZWxkIGRv d24uCiAgICAgICAgICAgICBpZiAodGhpcy5fZHJhZ0hhbmRsZUlzU3RhcnRUaW1lKSB7CiAgICAg ICAgICAgICAgICAgdmFyIHRpbWVEaWZmZXJlbmNlID0gY3VycmVudFRpbWUgLSB0aGlzLnNlbGVj dGlvblN0YXJ0VGltZTsKLSAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9 IE1hdGgubWF4KHRoaXMuc3RhcnRUaW1lLCBNYXRoLm1pbihjdXJyZW50VGltZSwgdGhpcy5zZWxl Y3Rpb25FbmRUaW1lIC0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuTWluaW11bVNlbGVjdGlv blRpbWVSYW5nZSkpOwotICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGltZSA9IE1h dGgubWluKE1hdGgubWF4KHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUnVsZXIuTWluaW11bVNlbGVjdGlvblRpbWVSYW5nZSwgdGhpcy5zZWxlY3Rpb25FbmRU aW1lIC0gdGltZURpZmZlcmVuY2UpLCB0aGlzLmVuZFRpbWUpOworICAgICAgICAgICAgICAgIHRo aXMuc2VsZWN0aW9uU3RhcnRUaW1lID0gTWF0aC5tYXgodGhpcy5zdGFydFRpbWUsIE1hdGgubWlu KGN1cnJlbnRUaW1lLCB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLm1pbmltdW1TZWxlY3Rp b25EdXJhdGlvbikpOworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGltZSA9IE1h dGgubWluKE1hdGgubWF4KHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5taW5pbXVtU2Vs ZWN0aW9uRHVyYXRpb24sIHRoaXMuc2VsZWN0aW9uRW5kVGltZSAtIHRpbWVEaWZmZXJlbmNlKSwg dGhpcy5lbmRUaW1lKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgdmFy IHRpbWVEaWZmZXJlbmNlID0gY3VycmVudFRpbWUgLSB0aGlzLnNlbGVjdGlvbkVuZFRpbWU7Ci0g ICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25FbmRUaW1lID0gTWF0aC5taW4oTWF0aC5tYXgo dGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5p bXVtU2VsZWN0aW9uVGltZVJhbmdlLCBjdXJyZW50VGltZSksIHRoaXMuZW5kVGltZSk7Ci0gICAg ICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgPSBNYXRoLm1heCh0aGlzLnN0YXJ0 VGltZSwgTWF0aC5taW4odGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgLSB0aW1lRGlmZmVyZW5jZSwg dGhpcy5zZWxlY3Rpb25FbmRUaW1lIC0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuTWluaW11 bVNlbGVjdGlvblRpbWVSYW5nZSkpOworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5k VGltZSA9IE1hdGgubWluKE1hdGgubWF4KHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5t aW5pbXVtU2VsZWN0aW9uRHVyYXRpb24sIGN1cnJlbnRUaW1lKSwgdGhpcy5lbmRUaW1lKTsKKyAg ICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9IE1hdGgubWF4KHRoaXMuc3Rh cnRUaW1lLCBNYXRoLm1pbih0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSAtIHRpbWVEaWZmZXJlbmNl LCB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLm1pbmltdW1TZWxlY3Rpb25EdXJhdGlvbikp OwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gUmVzaXpl IHRoZSBzZWxlY3Rpb24gb24gc2lkZSBiZWluZyBkcmFnZ2VkLgogICAgICAgICAgICAgaWYgKHRo aXMuX2RyYWdIYW5kbGVJc1N0YXJ0VGltZSkKLSAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlv blN0YXJ0VGltZSA9IE1hdGgubWF4KHRoaXMuc3RhcnRUaW1lLCBNYXRoLm1pbihjdXJyZW50VGlt ZSwgdGhpcy5zZWxlY3Rpb25FbmRUaW1lIC0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuTWlu aW11bVNlbGVjdGlvblRpbWVSYW5nZSkpOworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9u U3RhcnRUaW1lID0gTWF0aC5tYXgodGhpcy5zdGFydFRpbWUsIE1hdGgubWluKGN1cnJlbnRUaW1l LCB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLm1pbmltdW1TZWxlY3Rpb25EdXJhdGlvbikp OwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGlt ZSA9IE1hdGgubWluKE1hdGgubWF4KHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIuTWluaW11bVNlbGVjdGlvblRpbWVSYW5nZSwgY3VycmVudFRpbWUp LCB0aGlzLmVuZFRpbWUpOworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGltZSA9 IE1hdGgubWluKE1hdGgubWF4KHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5taW5pbXVt U2VsZWN0aW9uRHVyYXRpb24sIGN1cnJlbnRUaW1lKSwgdGhpcy5lbmRUaW1lKTsKICAgICAgICAg fQogCiAgICAgICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbih0aGlzLl9lbGVtZW50LmNsaWVudFdp ZHRoLCB0aGlzLmR1cmF0aW9uKTsK