147094 2015-07-19 14:48:47 -0700 Web Inspector: wrong cursor shown when selecting time interval from timeline overview 2015-07-23 07:01:25 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 burg mattbaker commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1110520 0 burg 2015-07-19 14:48:47 -0700 STEPS TO REPRODUCE: 1. Recording some stuff in a timeline 2. Mouse down in the bars area 3. Mouse move to select an interval 4. Mouse up to finish selecting For the entirety of step 3, the cursor should change to the vertical resizer >|<. It does this correctly for the grabbers, but not when directly selecting an interval. 1110521 1 webkit-bug-importer 2015-07-19 14:48:58 -0700 <rdar://problem/21892844> 1111538 2 257325 mattbaker 2015-07-22 19:39:36 -0700 Created attachment 257325 [Patch] Proposed Fix 1111566 3 257325 timothy 2015-07-22 20:46:28 -0700 Comment on attachment 257325 [Patch] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=257325&action=review > Source/WebInspectorUI/UserInterface/Views/TimelineRuler.js:718 > + if (!this._element.classList.contains(WebInspector.TimelineRuler.CreatingSelectionStyleClassName)) You can just call add. It won't add it multiple times. 1111578 4 257336 mattbaker 2015-07-22 21:46:47 -0700 Created attachment 257336 [Patch] Proposed Fix 1111636 5 257336 commit-queue 2015-07-23 07:01:21 -0700 Comment on attachment 257336 [Patch] Proposed Fix Clearing flags on attachment: 257336 Committed r187227: <http://trac.webkit.org/changeset/187227> 1111637 6 commit-queue 2015-07-23 07:01:25 -0700 All reviewed patches have been landed. Closing bug. 257325 2015-07-22 19:39:36 -0700 2015-07-22 21:46:45 -0700 [Patch] Proposed Fix bug-147094-20150722193821.patch text/plain 5363 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MjA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBi YmM3NTEwNTdiZDgzYzE2Mzg4NzcxNzc1MDgzYThjNzM0NzdkMmZjLi5hMWM3NDQyNmM2YTkzYjVk OWJmZTc5ODA3MTg4ZDgxMTg1M2YwZmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxNS0wNy0yMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogd3JvbmcgY3Vyc29yIHNob3duIHdoZW4gc2VsZWN0 aW5nIHRpbWUgaW50ZXJ2YWwgZnJvbSB0aW1lbGluZSBvdmVydmlldworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDk0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lUnVsZXIuY3NzOgorICAgICAgICAoLnRpbWVsaW5lLXJ1bGVyLmFsbG93cy10aW1lLXJh bmdlLXNlbGVjdGlvbi5jcmVhdGluZy1zZWxlY3Rpb24pOgorICAgICAgICBOZXcgY3Vyc29yIHN0 eWxlIGZvciBlbnRpcmUgcnVsZXIgZWxlbWVudC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1 bGVyLnByb3RvdHlwZS5faGFuZGxlTW91c2VNb3ZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZVJ1bGVyLnByb3RvdHlwZS5faGFuZGxlTW91c2VVcCk6CisgICAgICAgIFRvZ2dsZSBj dXJzb3Igc3R5bGUgd2hlbiBkcmFnZ2luZyB0byBjcmVhdGUgYSBuZXcgc2VsZWN0aW9uIGluIHRo ZSBvdmVydmlldy4KKwogMjAxNS0wNy0yMiAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5j b20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVTU0lPTiAoU2FmYXJpIDcpOiBQc2V1 ZG8gZWxlbWVudCBydWxlcyBhcmUgbm90IGxhYmVsbGVkIHdpdGggbWVkaWEgcXVlcmllcyBpbiBT dHlsZXMgcGFuZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5jc3MKaW5kZXggZTYzNTZlM2Y1NmI3N2I3ZTQw NTI2MjEyYzQ4ZWI5NzkwYWUzZTFhMS4uOThlMTVjNDFkMTAwZTdhYTU4OWFkYzA1MDBjNDBmYmU3 NGUxMzhiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5jc3MKQEAgLTMzLDYgKzMzLDEwIEBACiAgICAg cG9pbnRlci1ldmVudHM6IGFsbDsKIH0KIAorLnRpbWVsaW5lLXJ1bGVyLmFsbG93cy10aW1lLXJh bmdlLXNlbGVjdGlvbi5jcmVhdGluZy1zZWxlY3Rpb24geworICAgIGN1cnNvcjogY29sLXJlc2l6 ZTsKK30KKwogLnRpbWVsaW5lLXJ1bGVyID4gKiB7CiAgICAgcG9pbnRlci1ldmVudHM6IG5vbmU7 CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5qcwppbmRleCA5MzQwMjYwYzcxMTNiZjAwZDFhYWZmOGFlZWI1 NDE4N2VjZjA5MzI3Li4yMWI0OTk0NGVmNWI2MWEwOWIxODQzZDkxMDYyNmQ4MDY5YzJhYjhjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUnVsZXIuanMKQEAgLTU5LDYgKzU5LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUnVsZXIuTWluaW11bUxlZnREaXZpZGVyU3BhY2luZyA9IDQ4OwogV2ViSW5zcGVjdG9yLlRp bWVsaW5lUnVsZXIuTWluaW11bURpdmlkZXJTcGFjaW5nID0gNjQ7CiAKIFdlYkluc3BlY3Rvci5U aW1lbGluZVJ1bGVyLkFsbG93c1RpbWVSYW5nZVNlbGVjdGlvblN0eWxlQ2xhc3NOYW1lID0gImFs bG93cy10aW1lLXJhbmdlLXNlbGVjdGlvbiI7CitXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5D cmVhdGluZ1NlbGVjdGlvblN0eWxlQ2xhc3NOYW1lID0gImNyZWF0aW5nLXNlbGVjdGlvbiI7CiBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5EaXZpZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0g ImRpdmlkZXIiOwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuRGl2aWRlckxhYmVsRWxlbWVu dFN0eWxlQ2xhc3NOYW1lID0gImxhYmVsIjsKIApAQCAtNzEyLDYgKzcxMywxMCBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgIHRoaXMuc2Vs ZWN0aW9uU3RhcnRUaW1lID0gTWF0aC5tYXgodGhpcy5zdGFydFRpbWUsIHRoaXMuc3RhcnRUaW1l ICsgKE1hdGgubWluKGN1cnJlbnRNb3VzZVBvc2l0aW9uLCB0aGlzLl9tb3VzZURvd25Qb3NpdGlv bikgKiB0aGlzLnNlY29uZHNQZXJQaXhlbCkpOwogICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25F bmRUaW1lID0gTWF0aC5taW4odGhpcy5zdGFydFRpbWUgKyAoTWF0aC5tYXgoY3VycmVudE1vdXNl UG9zaXRpb24sIHRoaXMuX21vdXNlRG93blBvc2l0aW9uKSAqIHRoaXMuc2Vjb25kc1BlclBpeGVs KSwgdGhpcy5lbmRUaW1lKTsKKworICAgICAgICAgICAgLy8gVHVybiBvbiBjb2wtcmVzaXplIGN1 cnNvciBzdHlsZSBvbmNlIGRyYWdnaW5nIGJlZ2lucywgcmF0aGVyIHRoYW4gb24gdGhlIGluaXRp YWwgbW91c2UgZG93bi4KKyAgICAgICAgICAgIGlmICghdGhpcy5fZWxlbWVudC5jbGFzc0xpc3Qu Y29udGFpbnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuQ3JlYXRpbmdTZWxlY3Rpb25TdHls ZUNsYXNzTmFtZSkpCisgICAgICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRk KFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkNyZWF0aW5nU2VsZWN0aW9uU3R5bGVDbGFzc05h bWUpOwogICAgICAgICB9CiAKICAgICAgICAgdGhpcy5fdXBkYXRlU2VsZWN0aW9uKHRoaXMuX2Vs ZW1lbnQuY2xpZW50V2lkdGgsIHRoaXMuZHVyYXRpb24pOwpAQCAtNzI0LDE1ICs3MjksMTkgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAg Y29uc29sZS5hc3NlcnQoZXZlbnQuYnV0dG9uID09PSAwKTsKIAotICAgICAgICBpZiAoIXRoaXMu X3NlbGVjdGlvbklzTW92ZSAmJiB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLnNlbGVjdGlv blN0YXJ0VGltZSA8IHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uKSB7Ci0gICAgICAgICAg ICAvLyBUaGUgc2VjdGlvbiBpcyBzbWFsbGVyIHRoYW4gYWxsb3dlZCwgZ3JvdyBpbiB0aGUgZGly ZWN0aW9uIG9mIHRoZSBkcmFnIHRvIG1lZXQgdGhlIG1pbnVtdW0uCi0gICAgICAgICAgICB2YXIg Y3VycmVudE1vdXNlUG9zaXRpb24gPSBldmVudC5wYWdlWCAtIHRoaXMuX3J1bGVyQm91bmRpbmdD bGllbnRSZWN0LmxlZnQ7Ci0gICAgICAgICAgICBpZiAoY3VycmVudE1vdXNlUG9zaXRpb24gPiB0 aGlzLl9tb3VzZURvd25Qb3NpdGlvbikgewotICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9u RW5kVGltZSA9IE1hdGgubWluKHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5taW5pbXVt U2VsZWN0aW9uRHVyYXRpb24sIHRoaXMuZW5kVGltZSk7Ci0gICAgICAgICAgICAgICAgdGhpcy5z ZWxlY3Rpb25TdGFydFRpbWUgPSB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLm1pbmltdW1T ZWxlY3Rpb25EdXJhdGlvbjsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAg dGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgPSBNYXRoLm1heCh0aGlzLnN0YXJ0VGltZSwgdGhpcy5z ZWxlY3Rpb25FbmRUaW1lIC0gdGhpcy5taW5pbXVtU2VsZWN0aW9uRHVyYXRpb24pOwotICAgICAg ICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGltZSA9IHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1l ICsgdGhpcy5taW5pbXVtU2VsZWN0aW9uRHVyYXRpb247CisgICAgICAgIGlmICghdGhpcy5fc2Vs ZWN0aW9uSXNNb3ZlKSB7CisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5yZW1v dmUoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuQ3JlYXRpbmdTZWxlY3Rpb25TdHlsZUNsYXNz TmFtZSk7CisKKyAgICAgICAgICAgIGlmICh0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLnNl bGVjdGlvblN0YXJ0VGltZSA8IHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uKSB7CisgICAg ICAgICAgICAgICAgLy8gVGhlIHNlY3Rpb24gaXMgc21hbGxlciB0aGFuIGFsbG93ZWQsIGdyb3cg aW4gdGhlIGRpcmVjdGlvbiBvZiB0aGUgZHJhZyB0byBtZWV0IHRoZSBtaW51bXVtLgorICAgICAg ICAgICAgICAgIHZhciBjdXJyZW50TW91c2VQb3NpdGlvbiA9IGV2ZW50LnBhZ2VYIC0gdGhpcy5f cnVsZXJCb3VuZGluZ0NsaWVudFJlY3QubGVmdDsKKyAgICAgICAgICAgICAgICBpZiAoY3VycmVu dE1vdXNlUG9zaXRpb24gPiB0aGlzLl9tb3VzZURvd25Qb3NpdGlvbikgeworICAgICAgICAgICAg ICAgICAgICB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgPSBNYXRoLm1pbih0aGlzLnNlbGVjdGlvblN0 YXJ0VGltZSArIHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uLCB0aGlzLmVuZFRpbWUpOwor ICAgICAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9IHRoaXMuc2VsZWN0 aW9uRW5kVGltZSAtIHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uOworICAgICAgICAgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1l ID0gTWF0aC5tYXgodGhpcy5zdGFydFRpbWUsIHRoaXMuc2VsZWN0aW9uRW5kVGltZSAtIHRoaXMu bWluaW11bVNlbGVjdGlvbkR1cmF0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5zZWxl Y3Rpb25FbmRUaW1lID0gdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLm1pbmltdW1TZWxl Y3Rpb25EdXJhdGlvbjsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KIAo= 257336 2015-07-22 21:46:47 -0700 2015-07-23 07:01:21 -0700 [Patch] Proposed Fix bug-147094-20150722214533.patch text/plain 5294 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw MGVmMjgyMDZmYmI0OTczMDczNzc5MTkzNzBjYzhmZjNiN2FmZTFlLi5jMzQwZWYxZGFiNzVmMDBm ZTBmZDI1OTE0Mjk2ZTBmN2ViOTI4NmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxNS0wNy0yMiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogd3JvbmcgY3Vyc29yIHNob3duIHdoZW4gc2VsZWN0 aW5nIHRpbWUgaW50ZXJ2YWwgZnJvbSB0aW1lbGluZSBvdmVydmlldworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ3MDk0CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lUnVsZXIuY3NzOgorICAgICAgICAoLnRpbWVsaW5lLXJ1bGVyLmFsbG93cy10aW1lLXJh bmdlLXNlbGVjdGlvbi5jcmVhdGluZy1zZWxlY3Rpb24pOgorICAgICAgICBOZXcgY3Vyc29yIHN0 eWxlIGZvciBlbnRpcmUgcnVsZXIgZWxlbWVudC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1 bGVyLnByb3RvdHlwZS5faGFuZGxlTW91c2VNb3ZlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZVJ1bGVyLnByb3RvdHlwZS5faGFuZGxlTW91c2VVcCk6CisgICAgICAgIFRvZ2dsZSBj dXJzb3Igc3R5bGUgd2hlbiBkcmFnZ2luZyB0byBjcmVhdGUgYSBuZXcgc2VsZWN0aW9uIGluIHRo ZSBvdmVydmlldy4KKwogMjAxNS0wNy0yMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lJ3MgQ3VycmVudCBUaW1l IGRvZXMgbm90IGp1bXAgZm9yd2FyZCB0byBuZXcgc3RhcnQgdGltZSB3aGVuIHN0YXJ0aW5nIGEg bmV3IHJlY29yZGluZywgY2F1c2VzIHRpbWVsaW5lIHRvIGFwcGVhciBkZWxheWVkIGFuZCBicm9r ZW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUnVsZXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5jc3MKaW5kZXggZTYzNTZlM2Y1NmI3N2I3ZTQwNTI2MjEyYzQ4 ZWI5NzkwYWUzZTFhMS4uOThlMTVjNDFkMTAwZTdhYTU4OWFkYzA1MDBjNDBmYmU3NGUxMzhiZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSdWxlci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5jc3MKQEAgLTMzLDYgKzMzLDEwIEBACiAgICAgcG9pbnRlci1l dmVudHM6IGFsbDsKIH0KIAorLnRpbWVsaW5lLXJ1bGVyLmFsbG93cy10aW1lLXJhbmdlLXNlbGVj dGlvbi5jcmVhdGluZy1zZWxlY3Rpb24geworICAgIGN1cnNvcjogY29sLXJlc2l6ZTsKK30KKwog LnRpbWVsaW5lLXJ1bGVyID4gKiB7CiAgICAgcG9pbnRlci1ldmVudHM6IG5vbmU7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSdWxlci5qcwppbmRleCBmMDRmOTY1NTcxY2M2MDRhNTQzYzA1ZjkxYjZlZWFmNmU1ZGVh Mzk2Li5kMmFkNWNlMmY0ODUyZWRjNmI4Y2I4MTc3NTg4MmYzNGY5YTY1NzkxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVy LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUnVsZXIuanMKQEAgLTYxLDYgKzYxLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIu TWluaW11bUxlZnREaXZpZGVyU3BhY2luZyA9IDQ4OwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVs ZXIuTWluaW11bURpdmlkZXJTcGFjaW5nID0gNjQ7CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1 bGVyLkFsbG93c1RpbWVSYW5nZVNlbGVjdGlvblN0eWxlQ2xhc3NOYW1lID0gImFsbG93cy10aW1l LXJhbmdlLXNlbGVjdGlvbiI7CitXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5DcmVhdGluZ1Nl bGVjdGlvblN0eWxlQ2xhc3NOYW1lID0gImNyZWF0aW5nLXNlbGVjdGlvbiI7CiBXZWJJbnNwZWN0 b3IuVGltZWxpbmVSdWxlci5EaXZpZGVyRWxlbWVudFN0eWxlQ2xhc3NOYW1lID0gImRpdmlkZXIi OwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIuRGl2aWRlckxhYmVsRWxlbWVudFN0eWxlQ2xh c3NOYW1lID0gImxhYmVsIjsKIApAQCAtNzE5LDYgKzcyMCw5IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZVJ1bGVyLnByb3RvdHlwZSA9IHsKIAogICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25TdGFy dFRpbWUgPSBNYXRoLm1heCh0aGlzLnN0YXJ0VGltZSwgdGhpcy5zdGFydFRpbWUgKyAoTWF0aC5t aW4oY3VycmVudE1vdXNlUG9zaXRpb24sIHRoaXMuX21vdXNlRG93blBvc2l0aW9uKSAqIHRoaXMu c2Vjb25kc1BlclBpeGVsKSk7CiAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgPSBN YXRoLm1pbih0aGlzLnN0YXJ0VGltZSArIChNYXRoLm1heChjdXJyZW50TW91c2VQb3NpdGlvbiwg dGhpcy5fbW91c2VEb3duUG9zaXRpb24pICogdGhpcy5zZWNvbmRzUGVyUGl4ZWwpLCB0aGlzLmVu ZFRpbWUpOworCisgICAgICAgICAgICAvLyBUdXJuIG9uIGNvbC1yZXNpemUgY3Vyc29yIHN0eWxl IG9uY2UgZHJhZ2dpbmcgYmVnaW5zLCByYXRoZXIgdGhhbiBvbiB0aGUgaW5pdGlhbCBtb3VzZSBk b3duLgorICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rv ci5UaW1lbGluZVJ1bGVyLkNyZWF0aW5nU2VsZWN0aW9uU3R5bGVDbGFzc05hbWUpOwogICAgICAg ICB9CiAKICAgICAgICAgdGhpcy5fdXBkYXRlU2VsZWN0aW9uKHRoaXMuX2VsZW1lbnQuY2xpZW50 V2lkdGgsIHRoaXMuZHVyYXRpb24pOwpAQCAtNzMxLDE1ICs3MzUsMTkgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUnVsZXIucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgY29uc29sZS5hc3Nl cnQoZXZlbnQuYnV0dG9uID09PSAwKTsKIAotICAgICAgICBpZiAoIXRoaXMuX3NlbGVjdGlvbklz TW92ZSAmJiB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA8 IHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uKSB7Ci0gICAgICAgICAgICAvLyBUaGUgc2Vj dGlvbiBpcyBzbWFsbGVyIHRoYW4gYWxsb3dlZCwgZ3JvdyBpbiB0aGUgZGlyZWN0aW9uIG9mIHRo ZSBkcmFnIHRvIG1lZXQgdGhlIG1pbnVtdW0uCi0gICAgICAgICAgICB2YXIgY3VycmVudE1vdXNl UG9zaXRpb24gPSBldmVudC5wYWdlWCAtIHRoaXMuX3J1bGVyQm91bmRpbmdDbGllbnRSZWN0Lmxl ZnQ7Ci0gICAgICAgICAgICBpZiAoY3VycmVudE1vdXNlUG9zaXRpb24gPiB0aGlzLl9tb3VzZURv d25Qb3NpdGlvbikgewotICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRW5kVGltZSA9IE1h dGgubWluKHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5taW5pbXVtU2VsZWN0aW9uRHVy YXRpb24sIHRoaXMuZW5kVGltZSk7Ci0gICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25TdGFy dFRpbWUgPSB0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLm1pbmltdW1TZWxlY3Rpb25EdXJh dGlvbjsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rp b25TdGFydFRpbWUgPSBNYXRoLm1heCh0aGlzLnN0YXJ0VGltZSwgdGhpcy5zZWxlY3Rpb25FbmRU aW1lIC0gdGhpcy5taW5pbXVtU2VsZWN0aW9uRHVyYXRpb24pOwotICAgICAgICAgICAgICAgIHRo aXMuc2VsZWN0aW9uRW5kVGltZSA9IHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5taW5p bXVtU2VsZWN0aW9uRHVyYXRpb247CisgICAgICAgIGlmICghdGhpcy5fc2VsZWN0aW9uSXNNb3Zl KSB7CisgICAgICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIuQ3JlYXRpbmdTZWxlY3Rpb25TdHlsZUNsYXNzTmFtZSk7CisKKyAg ICAgICAgICAgIGlmICh0aGlzLnNlbGVjdGlvbkVuZFRpbWUgLSB0aGlzLnNlbGVjdGlvblN0YXJ0 VGltZSA8IHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uKSB7CisgICAgICAgICAgICAgICAg Ly8gVGhlIHNlY3Rpb24gaXMgc21hbGxlciB0aGFuIGFsbG93ZWQsIGdyb3cgaW4gdGhlIGRpcmVj dGlvbiBvZiB0aGUgZHJhZyB0byBtZWV0IHRoZSBtaW51bXVtLgorICAgICAgICAgICAgICAgIHZh ciBjdXJyZW50TW91c2VQb3NpdGlvbiA9IGV2ZW50LnBhZ2VYIC0gdGhpcy5fcnVsZXJCb3VuZGlu Z0NsaWVudFJlY3QubGVmdDsKKyAgICAgICAgICAgICAgICBpZiAoY3VycmVudE1vdXNlUG9zaXRp b24gPiB0aGlzLl9tb3VzZURvd25Qb3NpdGlvbikgeworICAgICAgICAgICAgICAgICAgICB0aGlz LnNlbGVjdGlvbkVuZFRpbWUgPSBNYXRoLm1pbih0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSArIHRo aXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uLCB0aGlzLmVuZFRpbWUpOworICAgICAgICAgICAg ICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9IHRoaXMuc2VsZWN0aW9uRW5kVGltZSAt IHRoaXMubWluaW11bVNlbGVjdGlvbkR1cmF0aW9uOworICAgICAgICAgICAgICAgIH0gZWxzZSB7 CisgICAgICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lID0gTWF0aC5tYXgo dGhpcy5zdGFydFRpbWUsIHRoaXMuc2VsZWN0aW9uRW5kVGltZSAtIHRoaXMubWluaW11bVNlbGVj dGlvbkR1cmF0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25FbmRUaW1l ID0gdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlzLm1pbmltdW1TZWxlY3Rpb25EdXJhdGlv bjsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAo=