127145 2014-01-16 14:43:51 -0800 Web Inspector: Improve TimelineOverview by not putting TimelineRuler in a scroll area 2014-01-20 19:04:50 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy graouts joepeck timothy webkit-bug-importer oldest_to_newest 968946 0 timothy 2014-01-16 14:43:51 -0800 Separate the TimelineRuler and the scrolling. This keep long running or highly zoomed recordings fast by not having a super wide elements in a scroll container. 968952 1 timothy 2014-01-16 14:51:57 -0800 <rdar://problem/15839667> 968956 2 221417 timothy 2014-01-16 14:56:39 -0800 Created attachment 221417 Patch 969206 3 221417 joepeck 2014-01-17 12:22:45 -0800 Comment on attachment 221417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221417&action=review r=me > Source/WebInspectorUI/UserInterface/TimelineOverview.js:178 > + this.scrollStartTime = marker.time - (this.visibleDuration / 2); Maybe in the future we can be a bit smarter here and reveal the entire marker if it fits in the overview with some padding. Currently this attempts to center the marker? That sounds like a good default. > Source/WebInspectorUI/UserInterface/TimelineOverview.js:266 > + if (Math.abs(event.deltaX) >= Math.abs(event.deltaY) * 0.5) { > + // Clone the event to dispatch it on the scroll container. Mark it as cloned so we don't get into a loop. > + var newWheelEvent = new event.constructor(event.type, event); > + newWheelEvent.__cloned = true; Clever! 969364 4 221417 timothy 2014-01-17 19:48:58 -0800 Comment on attachment 221417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221417&action=review >> Source/WebInspectorUI/UserInterface/TimelineOverview.js:178 >> + this.scrollStartTime = marker.time - (this.visibleDuration / 2); > > Maybe in the future we can be a bit smarter here and reveal the entire marker if it fits in the overview with some padding. Currently this attempts to center the marker? That sounds like a good default. Yeah it tries to center. In practice it is on;y used for the current time marker, and that pins to the right because it is always the end time. 970132 5 timothy 2014-01-20 19:04:50 -0800 https://trac.webkit.org/changeset/162417 221417 2014-01-16 14:56:39 -0800 2014-01-17 19:48:58 -0800 Patch bug-127145-20140116145638.patch text/plain 12517 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz N2YwMmZhOTdmZDM5NzJmMWI2YmJmOWUxMTZkZmM4YzJiOTQxZjQ4Li5jMmRhOTUyOGVkMjNiNTUy ZDBmMDMzMTEwZWJjNGM4MWI5ZWQxMjhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxNC0wMS0xNiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgSW1wcm92ZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyBieSBu b3QgcHV0dGluZyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlciBpbiBhIHNjcm9sbCBhcmVhLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcxNDUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVGltZWxpbmVPdmVydmlldy5jc3M6CisgICAgICAgICgudGltZWxpbmUtb3ZlcnZp ZXcgPiAuc2Nyb2xsLWNvbnRhaW5lcik6CisgICAgICAgICgudGltZWxpbmUtb3ZlcnZpZXcgPiAu dGltZWxpbmUtcnVsZXIpOgorICAgICAgICAoLnRpbWVsaW5lLW92ZXJ2aWV3ID4gLnNjcm9sbC1j b250YWluZXIgPiAuc2Nyb2xsLXdpZHRoLXNpemVyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1RpbWVsaW5lT3ZlcnZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUu Z2V0IHN0YXJ0VGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5w cm90b3R5cGUuc2V0IHN0YXJ0VGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVP dmVydmlldy5wcm90b3R5cGUuZ2V0IHNlY29uZHNQZXJQaXhlbCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuc2V0IHNlY29uZHNQZXJQaXhlbCk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuZ2V0IHNjcm9s bFN0YXJ0VGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90 b3R5cGUuc2V0IHNjcm9sbFN0YXJ0VGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVPdmVydmlldy5wcm90b3R5cGUuZ2V0IHZpc2libGVEdXJhdGlvbik6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUucmV2ZWFsTWFya2VyKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS51cGRhdGVMYXlvdXQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLl9oYW5k bGVTY3JvbGxFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldy5w cm90b3R5cGUuX2hhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGlt ZWxpbmVSdWxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLk1pbmlt dW1TZWxlY3Rpb25UaW1lUmFuZ2UpOiBSZWR1Y2UgdG8gMTBtcyBub3cgdGhhdCBzdXBlciB6b29t IGhhcyBubyBwZXJmb3JtYW5jZSBpbXBhY3QuCisKIDIwMTQtMDEtMTUgIFRpbW90aHkgSGF0Y2hl ciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCB0aGUgZGlzY3JldGUg U2NyaXB0IGFuZCBMYXlvdXQgdGltZWxpbmUgdmlld3MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZU92ZXJ2aWV3LmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCmluZGV4IGQw ZWJhNjFmYjJhZTY3Yjg5ZmU1YjM4NmVlMzBhN2E4MjRhZTA5MzAuLjEwN2Q4NTE3MDA2MDY5ZmJm NWNjMjhhOTM1ZTI4MTFmZDNkY2VkNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCkBAIC0yNSwxOSArMjUs MjcgQEAKIAogLnRpbWVsaW5lLW92ZXJ2aWV3ID4gLnNjcm9sbC1jb250YWluZXIgewogICAgIHBv c2l0aW9uOiBhYnNvbHV0ZTsKLSAgICB0b3A6IDA7CiAgICAgbGVmdDogMDsKICAgICByaWdodDog MDsKICAgICBib3R0b206IDA7CisgICAgaGVpZ2h0OiAxNnB4OwogICAgIG92ZXJmbG93LXg6IGF1 dG87CiAgICAgb3ZlcmZsb3cteTogaGlkZGVuOwogfQogCi0udGltZWxpbmUtb3ZlcnZpZXcgPiAu c2Nyb2xsLWNvbnRhaW5lciA+IC50aW1lbGluZS1ydWxlciB7CisudGltZWxpbmUtb3ZlcnZpZXcg PiAudGltZWxpbmUtcnVsZXIgewogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKICAgICB0b3A6IDA7 CiAgICAgbGVmdDogMDsKICAgICBib3R0b206IDA7Ci0gICAgbWluLXdpZHRoOiAxMDAlOwotICAg IG92ZXJmbG93OiBoaWRkZW47CisgICAgcmlnaHQ6IDA7Cit9CisKKy50aW1lbGluZS1vdmVydmll dyA+IC5zY3JvbGwtY29udGFpbmVyID4gLnNjcm9sbC13aWR0aC1zaXplciB7CisgICAgcG9zaXRp b246IGFic29sdXRlOworICAgIHRvcDogMDsKKyAgICBsZWZ0OiAwOworICAgIGhlaWdodDogMXB4 OworICAgIHZpc2liaWxpdHk6IGhpZGRlbjsKKyAgICBwb2ludGVyLWV2ZW50czogbm9uZTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5l T3ZlcnZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGlu ZU92ZXJ2aWV3LmpzCmluZGV4IGMzMDkwMjU1NjgxZTZkMjdmNThiNzRhMmMzYjRkOWUwMjk5YWVm MTkuLmQ2NjcxNDQyOGQ5MDgyYmJhNmQ2MDg1MzQwZTA0NWRhZjBjYThjMDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lT3ZlcnZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVPdmVydmll dy5qcwpAQCAtMjksMjkgKzI5LDM2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3ID0g ZnVuY3Rpb24oKQogCiAgICAgdGhpcy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo ImRpdiIpOwogICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVs aW5lT3ZlcnZpZXcuU3R5bGVDbGFzc05hbWU7Ci0KICAgICB0aGlzLl9lbGVtZW50LmFkZEV2ZW50 TGlzdGVuZXIoIndoZWVsIiwgdGhpcy5faGFuZGxlV2hlZWxFdmVudC5iaW5kKHRoaXMpKTsKIAot ICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lciA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwotICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lci5jbGFzc05hbWUgPSBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVPdmVydmlldy5TY3JvbGxDb250YWluZXJTdHlsZUNsYXNzTmFtZTsKLSAgICB0aGlzLl9l bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3Njcm9sbENvbnRhaW5lcik7Ci0KICAgICB0aGlzLl90 aW1lbGluZVJ1bGVyID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyOwogICAgIHRoaXMu X3RpbWVsaW5lUnVsZXIuYWxsb3dzQ2xpcHBlZExhYmVscyA9IHRydWU7CiAgICAgdGhpcy5fdGlt ZWxpbmVSdWxlci5hbGxvd3NUaW1lUmFuZ2VTZWxlY3Rpb24gPSB0cnVlOwogICAgIHRoaXMuX3Rp bWVsaW5lUnVsZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5F dmVudC5UaW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl90aW1lUmFuZ2VTZWxlY3Rpb25D aGFuZ2VkLCB0aGlzKTsKLSAgICB0aGlzLl9zY3JvbGxDb250YWluZXIuYXBwZW5kQ2hpbGQodGhp cy5fdGltZWxpbmVSdWxlci5lbGVtZW50KTsKKyAgICB0aGlzLl9lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX3RpbWVsaW5lUnVsZXIuZWxlbWVudCk7CisKKyAgICB0aGlzLl9zY3JvbGxDb250YWlu ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLl9zY3JvbGxDb250 YWluZXIuY2xhc3NOYW1lID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Nyb2xsQ29u dGFpbmVyU3R5bGVDbGFzc05hbWU7CisgICAgdGhpcy5fc2Nyb2xsQ29udGFpbmVyLmFkZEV2ZW50 TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMuX2hhbmRsZVNjcm9sbEV2ZW50LmJpbmQodGhpcykpOwor ICAgIHRoaXMuX2VsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fc2Nyb2xsQ29udGFpbmVyKTsKIAor ICAgIHRoaXMuX3Njcm9sbFdpZHRoU2l6ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYi KTsKKyAgICB0aGlzLl9zY3JvbGxXaWR0aFNpemVyLmNsYXNzTmFtZSA9IFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3LlNjcm9sbFdpZHRoU2l6ZXJTdHlsZUNsYXNzTmFtZTsKKyAgICB0aGlz Ll9zY3JvbGxDb250YWluZXIuYXBwZW5kQ2hpbGQodGhpcy5fc2Nyb2xsV2lkdGhTaXplcik7CisK KyAgICB0aGlzLl9zdGFydFRpbWUgPSAwOwogICAgIHRoaXMuX2VuZFRpbWUgPSAwOworICAgIHRo aXMuX3NlY29uZHNQZXJQaXhlbCA9IDAuMDAyNTsKKyAgICB0aGlzLl9zY3JvbGxTdGFydFRpbWUg PSAwOwogCi0gICAgdGhpcy5zdGFydFRpbWUgPSAwOwotICAgIHRoaXMuc2Vjb25kc1BlclBpeGVs ID0gMC4wMDI1OworICAgIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lID0gMDsKICAgICB0aGlzLnNl bGVjdGlvbkR1cmF0aW9uID0gMzsKIH07CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 LlN0eWxlQ2xhc3NOYW1lID0gInRpbWVsaW5lLW92ZXJ2aWV3IjsKIFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3LlNjcm9sbENvbnRhaW5lclN0eWxlQ2xhc3NOYW1lID0gInNjcm9sbC1jb250 YWluZXIiOwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuTWluaW11bVNlY29uZHNQZXJQ aXhlbCA9IDAuMDAxOworV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Nyb2xsV2lkdGhT aXplclN0eWxlQ2xhc3NOYW1lID0gInNjcm9sbC13aWR0aC1zaXplciI7CitXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlldy5NaW5pbXVtU2Vjb25kc1BlclBpeGVsID0gMC4wMDAxOwogV2ViSW5z cGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcuU2Vjb25kc1BlclNjcm9sbERlbHRhID0gMC4wMDAwMDU7 CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LkV2ZW50ID0gewpAQCAtNzEsMzEgKzc4 LDMyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKIAogICAg IGdldCBzdGFydFRpbWUoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX3RpbWVsaW5lUnVs ZXIuc3RhcnRUaW1lOworICAgICAgICByZXR1cm4gdGhpcy5fc3RhcnRUaW1lOwogICAgIH0sCiAK ICAgICBzZXQgc3RhcnRUaW1lKHgpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fdGltZWxpbmVS dWxlci5zdGFydFRpbWUgPT09IHgpCisgICAgICAgIGlmICh0aGlzLl9zdGFydFRpbWUgPT09IHgp CiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci56ZXJv VGltZSA9IHg7Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuc3RhcnRUaW1lID0geDsKKyAg ICAgICAgdGhpcy5fc3RhcnRUaW1lID0geDsKIAogICAgICAgICB0aGlzLl9uZWVkc0xheW91dCgp OwogICAgIH0sCiAKICAgICBnZXQgc2Vjb25kc1BlclBpeGVsKCkKICAgICB7Ci0gICAgICAgIHJl dHVybiB0aGlzLl90aW1lbGluZVJ1bGVyLnNlY29uZHNQZXJQaXhlbDsKKyAgICAgICAgcmV0dXJu IHRoaXMuX3NlY29uZHNQZXJQaXhlbDsKICAgICB9LAogCiAgICAgc2V0IHNlY29uZHNQZXJQaXhl bCh4KQogICAgIHsKLSAgICAgICAgaWYgKHRoaXMuX3RpbWVsaW5lUnVsZXIuc2Vjb25kc1BlclBp eGVsID09PSB4KQorICAgICAgICB4ID0gTWF0aC5tYXgoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3Zl cnZpZXcuTWluaW11bVNlY29uZHNQZXJQaXhlbCwgeCk7CisKKyAgICAgICAgaWYgKHRoaXMuX3Nl Y29uZHNQZXJQaXhlbCA9PT0geCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlz Ll90aW1lbGluZVJ1bGVyLnNlY29uZHNQZXJQaXhlbCA9IE1hdGgubWF4KFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3Lk1pbmltdW1TZWNvbmRzUGVyUGl4ZWwsIHgpOworICAgICAgICB0aGlz Ll9zZWNvbmRzUGVyUGl4ZWwgPSB4OwogCiAgICAgICAgIHRoaXMuX25lZWRzTGF5b3V0KCk7CiAg ICAgfSwKQEAgLTExNSw2ICsxMjMsMjYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXcu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9uZWVkc0xheW91dCgpOwogICAgIH0sCiAKKyAg ICBnZXQgc2Nyb2xsU3RhcnRUaW1lKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9zY3Jv bGxTdGFydFRpbWU7CisgICAgfSwKKworICAgIHNldCBzY3JvbGxTdGFydFRpbWUoeCkKKyAgICB7 CisgICAgICAgIGlmICh0aGlzLl9zY3JvbGxTdGFydFRpbWUgPT09IHgpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgdGhpcy5fc2Nyb2xsU3RhcnRUaW1lID0geCB8fCAwOworCisgICAg ICAgIHRoaXMuX25lZWRzTGF5b3V0KCk7CisgICAgfSwKKworICAgIGdldCB2aXNpYmxlRHVyYXRp b24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Njcm9sbENvbnRhaW5lci5vZmZzZXRX aWR0aCAqIHRoaXMuX3NlY29uZHNQZXJQaXhlbDsKKyAgICB9LAorCiAgICAgZ2V0IHNlbGVjdGlv blN0YXJ0VGltZSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fdGltZWxpbmVSdWxlci5z ZWxlY3Rpb25TdGFydFRpbWU7CkBAIC0xNDcsMTAgKzE3NSw3IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZU92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKIAogICAgIHJldmVhbE1hcmtlcjogZnVuY3Rpb24o bWFya2VyKQogICAgIHsKLSAgICAgICAgdmFyIG1hcmtlckVsZW1lbnQgPSB0aGlzLl90aW1lbGlu ZVJ1bGVyLmVsZW1lbnRGb3JNYXJrZXIobWFya2VyKTsKLSAgICAgICAgaWYgKCFtYXJrZXJFbGVt ZW50KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBtYXJrZXJFbGVtZW50LnNjcm9sbElu dG9WaWV3SWZOZWVkZWQodHJ1ZSk7CisgICAgICAgIHRoaXMuc2Nyb2xsU3RhcnRUaW1lID0gbWFy a2VyLnRpbWUgLSAodGhpcy52aXNpYmxlRHVyYXRpb24gLyAyKTsKICAgICB9LAogCiAgICAgdXBk YXRlTGF5b3V0OiBmdW5jdGlvbigpCkBAIC0xNjEsMTEgKzE4NiwyNCBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBD YWxjdWxhdGUgdGhlIHJlcXVpcmVkIHdpZHRoIGJhc2VkIG9uIHRoZSBkdXJhdGlvbiBhbmQgc2Vj b25kcyBwZXIgcGl4ZWwuCi0gICAgICAgIHZhciBkdXJhdGlvbiA9IHRoaXMuZW5kVGltZSAtIHRo aXMuc3RhcnRUaW1lOwotICAgICAgICB2YXIgbmV3V2lkdGggPSBNYXRoLmNlaWwoZHVyYXRpb24g LyB0aGlzLnNlY29uZHNQZXJQaXhlbCk7CisgICAgICAgIHZhciBkdXJhdGlvbiA9IHRoaXMuX2Vu ZFRpbWUgLSB0aGlzLl9zdGFydFRpbWU7CisgICAgICAgIHZhciBuZXdXaWR0aCA9IE1hdGguY2Vp bChkdXJhdGlvbiAvIHRoaXMuX3NlY29uZHNQZXJQaXhlbCk7CiAKICAgICAgICAgLy8gVXBkYXRl IGFsbCByZWxldmFudCBlbGVtZW50cyB0byB0aGUgbmV3IHJlcXVpcmVkIHdpZHRoLgotICAgICAg ICB0aGlzLl91cGRhdGVFbGVtZW50V2lkdGgodGhpcy5fdGltZWxpbmVSdWxlci5lbGVtZW50LCBu ZXdXaWR0aCk7CisgICAgICAgIHRoaXMuX3VwZGF0ZUVsZW1lbnRXaWR0aCh0aGlzLl9zY3JvbGxX aWR0aFNpemVyLCBuZXdXaWR0aCk7CisKKyAgICAgICAgLy8gQ2xhbXAgdGhlIHNjcm9sbCBzdGFy dCB0aW1lIHRvIG1hdGNoIHdoYXQgdGhlIHNjcm9sbCBiYXIgd291bGQgYWxsb3cuCisgICAgICAg IHZhciBzY3JvbGxTdGFydFRpbWUgPSBNYXRoLm1pbih0aGlzLl9zY3JvbGxTdGFydFRpbWUsIHRo aXMuX2VuZFRpbWUgLSB0aGlzLnZpc2libGVEdXJhdGlvbik7CisgICAgICAgIHNjcm9sbFN0YXJ0 VGltZSA9IE1hdGgubWF4KHRoaXMuX3N0YXJ0VGltZSwgc2Nyb2xsU3RhcnRUaW1lKTsKKworICAg ICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnplcm9UaW1lID0gdGhpcy5fc3RhcnRUaW1lOworICAg ICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnN0YXJ0VGltZSA9IHNjcm9sbFN0YXJ0VGltZTsKKyAg ICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5zZWNvbmRzUGVyUGl4ZWwgPSB0aGlzLl9zZWNvbmRz UGVyUGl4ZWw7CisKKyAgICAgICAgaWYgKCF0aGlzLl9kb250VXBkYXRlU2Nyb2xsTGVmdCkgewor ICAgICAgICAgICAgdGhpcy5faWdub3JlTmV4dFNjcm9sbEV2ZW50ID0gdHJ1ZTsKKyAgICAgICAg ICAgIHRoaXMuX3Njcm9sbENvbnRhaW5lci5zY3JvbGxMZWZ0ID0gTWF0aC5jZWlsKChzY3JvbGxT dGFydFRpbWUgLSB0aGlzLl9zdGFydFRpbWUpIC8gdGhpcy5fc2Vjb25kc1BlclBpeGVsKTsKKyAg ICAgICAgfQogCiAgICAgICAgIC8vIFVwZGF0ZSB0aGUgdGltZSBydWxlciBsYXlvdXQgbm93IHRo YXQgaXRzIHdpZHRoIGhhcyBjaGFuZ2VkLgogICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLnVw ZGF0ZUxheW91dCgpOwpAQCAtMTk2LDI2ICsyMzQsNTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9zY2hlZHVsZWRMYXlvdXRVcGRh dGVJZGVudGlmaWVyID0gcmVxdWVzdEFuaW1hdGlvbkZyYW1lKHRoaXMudXBkYXRlTGF5b3V0LmJp bmQodGhpcykpOwogICAgIH0sCiAKKyAgICBfaGFuZGxlU2Nyb2xsRXZlbnQ6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2lnbm9yZU5leHRTY3JvbGxFdmVudCkgewor ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2lnbm9yZU5leHRTY3JvbGxFdmVudDsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX2RvbnRVcGRhdGVTY3JvbGxM ZWZ0ID0gdHJ1ZTsKKworICAgICAgICB2YXIgc2Nyb2xsT2Zmc2V0ID0gdGhpcy5fc2Nyb2xsQ29u dGFpbmVyLnNjcm9sbExlZnQ7CisgICAgICAgIHRoaXMuc2Nyb2xsU3RhcnRUaW1lID0gdGhpcy5f c3RhcnRUaW1lICsgKHNjcm9sbE9mZnNldCAqIHRoaXMuX3NlY29uZHNQZXJQaXhlbCk7CisKKyAg ICAgICAgLy8gRm9yY2UgbGF5b3V0IHNvIHdlIGNhbiB1cGRhdGUgd2l0aCB0aGUgc2Nyb2xsIHBv c2l0aW9uIHN5bmNocm9ub3VzbHkuCisgICAgICAgIHRoaXMudXBkYXRlTGF5b3V0SWZOZWVkZWQo KTsKKworICAgICAgICBkZWxldGUgdGhpcy5fZG9udFVwZGF0ZVNjcm9sbExlZnQ7CisgICAgfSwK KwogICAgIF9oYW5kbGVXaGVlbEV2ZW50OiBmdW5jdGlvbihldmVudCkKICAgICB7CisgICAgICAg IC8vIElnbm9yZSBjbG9uZWQgZXZlbnRzIHRoYXQgY29tZSBvdXIgd2F5LCB3ZSBhbHJlYWR5IGhh bmRsZWQgdGhlIG9yaWdpbmFsLgorICAgICAgICBpZiAoZXZlbnQuX19jbG9uZWQpCisgICAgICAg ICAgICByZXR1cm47CisKICAgICAgICAgLy8gUmVxdWlyZSB0d2ljZSB0aGUgdmVydGljYWwgZGVs dGEgdG8gb3ZlcmNvbWUgaG9yaXpvbnRhbCBzY3JvbGxpbmcuIFRoaXMgcHJldmVudHMgbW9zdAog ICAgICAgICAvLyBjYXNlcyBvZiBpbmFkdmVydGVudCB6b29taW5nIGZvciBzbGlnaHRseSBkaWFn b25hbCBzY3JvbGxzLgotICAgICAgICBpZiAoTWF0aC5hYnMoZXZlbnQuZGVsdGFYKSA+PSBNYXRo LmFicyhldmVudC5kZWx0YVkpICogMC41KQorICAgICAgICBpZiAoTWF0aC5hYnMoZXZlbnQuZGVs dGFYKSA+PSBNYXRoLmFicyhldmVudC5kZWx0YVkpICogMC41KSB7CisgICAgICAgICAgICAvLyBD bG9uZSB0aGUgZXZlbnQgdG8gZGlzcGF0Y2ggaXQgb24gdGhlIHNjcm9sbCBjb250YWluZXIuIE1h cmsgaXQgYXMgY2xvbmVkIHNvIHdlIGRvbid0IGdldCBpbnRvIGEgbG9vcC4KKyAgICAgICAgICAg IHZhciBuZXdXaGVlbEV2ZW50ID0gbmV3IGV2ZW50LmNvbnN0cnVjdG9yKGV2ZW50LnR5cGUsIGV2 ZW50KTsKKyAgICAgICAgICAgIG5ld1doZWVsRXZlbnQuX19jbG9uZWQgPSB0cnVlOworCisgICAg ICAgICAgICB0aGlzLl9zY3JvbGxDb250YWluZXIuZGlzcGF0Y2hFdmVudChuZXdXaGVlbEV2ZW50 KTsKICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogCiAgICAgICAgIC8vIFJlbWVtYmVy IHRoZSBtb3VzZSBwb3NpdGlvbiBpbiB0aW1lLgotICAgICAgICB2YXIgbW91c2VPZmZzZXQgPSBl dmVudC5wYWdlWCAtIHRoaXMuX3Njcm9sbENvbnRhaW5lci50b3RhbE9mZnNldExlZnQ7Ci0gICAg ICAgIHZhciBzY3JvbGxPZmZzZXQgPSB0aGlzLl9zY3JvbGxDb250YWluZXIuc2Nyb2xsTGVmdDsK LSAgICAgICAgdmFyIG1vdXNlUG9zaXRpb25UaW1lID0gKHNjcm9sbE9mZnNldCArIG1vdXNlT2Zm c2V0KSAqIHRoaXMuc2Vjb25kc1BlclBpeGVsOworICAgICAgICB2YXIgbW91c2VPZmZzZXQgPSBl dmVudC5wYWdlWCAtIHRoaXMuX2VsZW1lbnQudG90YWxPZmZzZXRMZWZ0OworICAgICAgICB2YXIg bW91c2VQb3NpdGlvblRpbWUgPSB0aGlzLl9zY3JvbGxTdGFydFRpbWUgKyAobW91c2VPZmZzZXQg KiB0aGlzLl9zZWNvbmRzUGVyUGl4ZWwpOwogICAgICAgICB2YXIgZGV2aWNlRGlyZWN0aW9uID0g ZXZlbnQud2Via2l0RGlyZWN0aW9uSW52ZXJ0ZWRGcm9tRGV2aWNlID8gMSA6IC0xOwogCiAgICAg ICAgIHRoaXMuc2Vjb25kc1BlclBpeGVsICs9IGV2ZW50LmRlbHRhWSAqIFdlYkluc3BlY3Rvci5U aW1lbGluZU92ZXJ2aWV3LlNlY29uZHNQZXJTY3JvbGxEZWx0YSAqIGRldmljZURpcmVjdGlvbjsK IAotICAgICAgICAvLyBGb3JjZSBsYXlvdXQgc28gd2UgY2FuIHVwZGF0ZSB0aGUgc2Nyb2xsIHBv c2l0aW9uIHN5bmNocm9ub3VzbHkuCi0gICAgICAgIHRoaXMudXBkYXRlTGF5b3V0SWZOZWVkZWQo KTsKLQogICAgICAgICAvLyBDZW50ZXIgdGhlIHpvb20gYXJvdW5kIHRoZSBtb3VzZSBiYXNlZCBv biB0aGUgcmVtZW1iZXJlZCBtb3VzZSBwb3NpdGlvbiB0aW1lLgotICAgICAgICB0aGlzLl9zY3Jv bGxDb250YWluZXIuc2Nyb2xsTGVmdCA9IE1hdGgubWF4KDAsIE1hdGgucm91bmQoKG1vdXNlUG9z aXRpb25UaW1lIC8gdGhpcy5zZWNvbmRzUGVyUGl4ZWwpIC0gbW91c2VPZmZzZXQpKTsKKyAgICAg ICAgdGhpcy5zY3JvbGxTdGFydFRpbWUgPSBtb3VzZVBvc2l0aW9uVGltZSAtIChtb3VzZU9mZnNl dCAqIHRoaXMuX3NlY29uZHNQZXJQaXhlbCk7CiAKICAgICAgICAgZXZlbnQucHJldmVudERlZmF1 bHQoKTsKICAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJ1bGVyLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVSdWxlci5qcwppbmRleCAzNDdl YWU4YjRiY2YwOWRjZWFhYThiZDgyYWIzMjc0ZWRkMDljNjA5Li4xMjBjMGRmYzdkNGYzMDJjYzI3 YjBmNjVhYWE2M2YxYmFmMzUxNzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9UaW1lbGluZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lUnVsZXIuanMKQEAgLTY4LDcgKzY4LDcgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUnVsZXIuU2VsZWN0aW9uRHJhZ0VsZW1lbnRTdHlsZUNsYXNzTmFtZSA9 ICJzZWxlY3Rpb24tZHJhZyIKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLlNlbGVjdGlvbkhh bmRsZUVsZW1lbnRTdHlsZUNsYXNzTmFtZSA9ICJzZWxlY3Rpb24taGFuZGxlIjsKIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJ1bGVyLkxlZnRTZWxlY3Rpb25FbGVtZW50U3R5bGVDbGFzc05hbWUgPSAi bGVmdCI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5SaWdodFNlbGVjdGlvbkVsZW1lbnRT dHlsZUNsYXNzTmFtZSA9ICJyaWdodCI7Ci1XZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5NaW5p bXVtU2VsZWN0aW9uVGltZVJhbmdlID0gMC4xOworV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIu TWluaW11bVNlbGVjdGlvblRpbWVSYW5nZSA9IDAuMDE7CiAKIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJ1bGVyLkV2ZW50ID0gewogICAgIFRpbWVSYW5nZVNlbGVjdGlvbkNoYW5nZWQ6ICJ0aW1lLXJ1 bGVyLXRpbWUtcmFuZ2Utc2VsZWN0aW9uLWNoYW5nZWQiCg==