216423 2020-09-11 16:19:33 -0700 Web Inspector: Timelines: remove "stop requested" marker 2020-09-21 15:37:52 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 216416 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1687845 0 pangle 2020-09-11 16:19:33 -0700 After b216416 lands, the "stop requested" marker will be redundant now that the recording head stops at the moment the user requests recording to stop. We should clean up behind that change and remove this marker and its associated logic. 1689987 1 webkit-bug-importer 2020-09-18 16:20:15 -0700 <rdar://problem/69181504> 1690323 2 409278 pangle 2020-09-21 09:17:37 -0700 Created attachment 409278 Patch 1690398 3 409278 hi 2020-09-21 12:07:20 -0700 Comment on attachment 409278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=409278&action=review r=me, awesome > Source/WebInspectorUI/UserInterface/Models/TimelineMarker.js:-86 > - StoppingTime: "stopping-time", please also remove the CSS inside `Source/WebInspectorUI/UserInterface/Views/TimelineRuler.css` :) 1690444 4 409302 pangle 2020-09-21 12:46:10 -0700 Created attachment 409302 Patch 1690466 5 ews-feeder 2020-09-21 13:08:58 -0700 Committed r267360: <https://trac.webkit.org/changeset/267360> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409302. 409278 2020-09-21 09:17:37 -0700 2020-09-21 12:46:08 -0700 Patch bug-216423-20200921121736.patch text/plain 5182 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh OTI0NzNlYmU4MTZlNzRhNDA4NzkwNWRiOGYwMzlhOTgwYTMzNzU5Li5lNmQwNTgwN2M3YTQyYWJm MGNkOWUwNjA1MjhlOWE5ZjFlNWRmOTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAyMC0wOS0yMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVzOiByZW1vdmUgInN0b3AgcmVxdWVz dGVkIiBtYXJrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxNjQyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFJlbW92ZWQgdGhlICJTdG9wIFJlcXVlc3RlZCIgdGltZWxpbmUgbWFya2VyLCB3aGljaCB3 YXMgbWFkZSB1bm5lY2Nlc2FyeSBpbiByMjY3MDM4IHdoaWNoIG1ha2VzIHRoZSByZWNvcmRpbmcK KyAgICAgICAgaGVhZCBtYXJrZXIgc3RvcCBhdCB0aGUgbW9tZW50IHRoZSBzdG9wIHdhcyByZXF1 ZXN0ZWQsIGV2ZW4gaWYgbW9yZSB0aW1lIGlzIHJlcXVpcmVkIHRvIGNvbXBsZXRlIHRoZSBwcm9j ZXNzaW5nCisgICAgICAgIG9mIGluY29taW5nIGRhdGEuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL01vZGVscy9UaW1lbGluZU1hcmtlci5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanM6CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3KToK KyAgICAgICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXcucHJvdG90eXBlLl9yZWNvcmRpbmdSZXNldCk6 CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5faGFuZGxlVGltZWxpbmVD YXB0dXJpbmdTdGF0ZUNoYW5nZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSdWxlci5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lUnVsZXIucHJvdG90eXBlLmFkZE1h cmtlcik6CisKIDIwMjAtMDktMTQgIFBhdHJpY2sgQW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0b3AgUmVjb3JkaW5nIGluIFRpbWVsaW5lcyB0YWIg ZG9lc24ndCB3b3JrIHJlbGlhYmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVNYXJrZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVNYXJrZXIuanMKaW5kZXggMDFkYWRj MTA2NWZmMjVlMWFhNzAwN2I2N2ZhZjBmNjg0Yzc2Y2I3My4uZGQ0N2EzNjViYmZjYWUxYjE4ZTA1 ZGEzMjRlODQxZDUzYWNlZGNkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lTWFya2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZU1hcmtlci5qcwpAQCAtODMsNyAr ODMsNiBAQCBXSS5UaW1lbGluZU1hcmtlci5FdmVudCA9IHsKIH07CiAKIFdJLlRpbWVsaW5lTWFy a2VyLlR5cGUgPSB7Ci0gICAgU3RvcHBpbmdUaW1lOiAic3RvcHBpbmctdGltZSIsCiAgICAgQ3Vy cmVudFRpbWU6ICJjdXJyZW50LXRpbWUiLAogICAgIExvYWRFdmVudDogImxvYWQtZXZlbnQiLAog ICAgIERPTUNvbnRlbnRFdmVudDogImRvbS1jb250ZW50LWV2ZW50IiwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92 ZXJ2aWV3LmpzCmluZGV4IGI2NjM3YzZiNmZlNGIyM2IzNmQ3NDUzZTk5NGFlNDFhOGIwNWMwM2Eu LmJmZjEyN2JhYjRlYjQ2YWIwNWM2NTdiYzk4ZGE3ZjNhOTkwMzQ0OWIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVPdmVydmlldy5qcwpAQCAtODMsNyArODMsNiBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xh c3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5fdGltZWxp bmVSdWxlci5hZGRFdmVudExpc3RlbmVyKFdJLlRpbWVsaW5lUnVsZXIuRXZlbnQuVGltZVJhbmdl U2VsZWN0aW9uQ2hhbmdlZCwgdGhpcy5fdGltZVJhbmdlU2VsZWN0aW9uQ2hhbmdlZCwgdGhpcyk7 CiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl90aW1lbGluZVJ1bGVyKTsKIAotICAgICAg ICB0aGlzLl9zdG9wcGluZ1RpbWVNYXJrZXIgPSBudWxsOwogICAgICAgICB0aGlzLl9jdXJyZW50 VGltZU1hcmtlciA9IG5ldyBXSS5UaW1lbGluZU1hcmtlcigwLCBXSS5UaW1lbGluZU1hcmtlci5U eXBlLkN1cnJlbnRUaW1lKTsKICAgICAgICAgdGhpcy5fdGltZWxpbmVSdWxlci5hZGRNYXJrZXIo dGhpcy5fY3VycmVudFRpbWVNYXJrZXIpOwogCkBAIC04MTYsMTEgKzgxNSw2IEBAIFdJLlRpbWVs aW5lT3ZlcnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0kuVmlldwogICAg ICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLmNsZWFyTWFya2VycygpOwogCiAgICAgICAgIHRoaXMu X3RpbWVsaW5lUnVsZXIuYWRkTWFya2VyKHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyKTsKLQotICAg ICAgICBpZiAodGhpcy5fc3RvcHBpbmdUaW1lTWFya2VyKSB7Ci0gICAgICAgICAgICB0aGlzLl9z dG9wcGluZ1RpbWVNYXJrZXIudGltZSA9IC0xOyAvLyBIaWRlIHRoZSBtYXJrZXIuCi0gICAgICAg ICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLmFkZE1hcmtlcih0aGlzLl9zdG9wcGluZ1RpbWVNYXJr ZXIpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgX2NhblNob3dUaW1lbGluZVR5cGUodHlwZSkK QEAgLTEwMzQsMjQgKzEwMjgsMTEgQEAgV0kuVGltZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVs aW5lT3ZlcnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgX2hhbmRsZVRpbWVsaW5lQ2FwdHVyaW5n U3RhdGVDaGFuZ2VkKGV2ZW50KQogICAgIHsKICAgICAgICAgc3dpdGNoIChXSS50aW1lbGluZU1h bmFnZXIuY2FwdHVyaW5nU3RhdGUpIHsKLSAgICAgICAgY2FzZSBXSS5UaW1lbGluZU1hbmFnZXIu Q2FwdHVyaW5nU3RhdGUuU3RhcnRpbmc6Ci0gICAgICAgICAgICBpZiAodGhpcy5fc3RvcHBpbmdU aW1lTWFya2VyKQotICAgICAgICAgICAgICAgIHRoaXMuX3N0b3BwaW5nVGltZU1hcmtlci50aW1l ID0gLTE7IC8vIEhpZGUgdGhlIG1hcmtlciB3aGVuIGNhcHR1cmluZyByZXN1bWVzLgotICAgICAg ICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2FzZSBXSS5UaW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5n U3RhdGUuQWN0aXZlOgogICAgICAgICAgICAgdGhpcy5fZWRpdEluc3RydW1lbnRzQnV0dG9uLmVu YWJsZWQgPSBmYWxzZTsKICAgICAgICAgICAgIHRoaXMuX3N0b3BFZGl0aW5nSW5zdHJ1bWVudHMo KTsKICAgICAgICAgICAgIGJyZWFrOwogCi0gICAgICAgIGNhc2UgV0kuVGltZWxpbmVNYW5hZ2Vy LkNhcHR1cmluZ1N0YXRlLlN0b3BwaW5nOgotICAgICAgICAgICAgaWYgKCF0aGlzLl9zdG9wcGlu Z1RpbWVNYXJrZXIpIHsKLSAgICAgICAgICAgICAgICB0aGlzLl9zdG9wcGluZ1RpbWVNYXJrZXIg PSBuZXcgV0kuVGltZWxpbmVNYXJrZXIodGhpcy5fY3VycmVudFRpbWUsIFdJLlRpbWVsaW5lTWFy a2VyLlR5cGUuU3RvcHBpbmdUaW1lKTsKLSAgICAgICAgICAgICAgICB0aGlzLl90aW1lbGluZVJ1 bGVyLmFkZE1hcmtlcih0aGlzLl9zdG9wcGluZ1RpbWVNYXJrZXIpOwotICAgICAgICAgICAgfSBl bHNlCi0gICAgICAgICAgICAgICAgdGhpcy5fc3RvcHBpbmdUaW1lTWFya2VyLnRpbWUgPSB0aGlz Ll9jdXJyZW50VGltZTsKLSAgICAgICAgICAgIGJyZWFrOwotCiAgICAgICAgIGNhc2UgV0kuVGlt ZWxpbmVNYW5hZ2VyLkNhcHR1cmluZ1N0YXRlLkluYWN0aXZlOgogICAgICAgICAgICAgdGhpcy5f ZWRpdEluc3RydW1lbnRzQnV0dG9uLmVuYWJsZWQgPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVSdWxlci5qcwppbmRleCA5Y2ZjODIxMTRjMmE3ZTNiNjdmYzZjNzg4NmYwZDBh OTA2OWEwZTVhLi5hYTI1NGI0NTRiZTQyYzZiMDQwNmQyZjJhNDg3NzgzNTNkNDdjMWJmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUnVsZXIuanMKQEAgLTM0OCw5ICszNDgsNiBAQCBXSS5UaW1lbGluZVJ1bGVyID0g Y2xhc3MgVGltZWxpbmVSdWxlciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgbWFya2VyRWxlbWVu dC5jbGFzc0xpc3QuYWRkKG1hcmtlci50eXBlLCAibWFya2VyIik7CiAKICAgICAgICAgc3dpdGNo IChtYXJrZXIudHlwZSkgewotICAgICAgICBjYXNlIFdJLlRpbWVsaW5lTWFya2VyLlR5cGUuU3Rv cHBpbmdUaW1lOgotICAgICAgICAgICAgbWFya2VyRWxlbWVudC50aXRsZSA9IFdJLlVJU3RyaW5n KCJSZWNvcmRpbmcgc3RvcCByZXF1ZXN0ZWQgXHUyMDE0ICVzIikuZm9ybWF0KE51bWJlci5zZWNv bmRzVG9TdHJpbmcobWFya2VyVGltZSkpOwotICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNh c2UgV0kuVGltZWxpbmVNYXJrZXIuVHlwZS5Mb2FkRXZlbnQ6CiAgICAgICAgICAgICBtYXJrZXJF bGVtZW50LnRpdGxlID0gV0kuVUlTdHJpbmcoIkxvYWQgXHUyMDE0ICVzIikuZm9ybWF0KE51bWJl ci5zZWNvbmRzVG9TdHJpbmcobWFya2VyVGltZSkpOwogICAgICAgICAgICAgYnJlYWs7Cg== 409302 2020-09-21 12:46:10 -0700 2020-09-21 15:37:52 -0700 Patch bug-216423-20200921154609.patch text/plain 6926 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh OTI0NzNlYmU4MTZlNzRhNDA4NzkwNWRiOGYwMzlhOTgwYTMzNzU5Li5jMWZjMzVmZDkyNzkwM2E5 ZGE3Y2I4YmYyYTBhZmE5NDhiOWE5NmNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAyMC0wOS0yMSAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxpbmVzOiByZW1vdmUgInN0b3AgcmVxdWVz dGVkIiBtYXJrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxNjQyMworCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAg ICBSZW1vdmVkIHRoZSAiU3RvcCBSZXF1ZXN0ZWQiIHRpbWVsaW5lIG1hcmtlciwgd2hpY2ggd2Fz IG1hZGUgdW5uZWNjZXNhcnkgaW4gcjI2NzAzOCB3aGljaCBtYWtlcyB0aGUgcmVjb3JkaW5nCisg ICAgICAgIGhlYWQgbWFya2VyIHN0b3AgYXQgdGhlIG1vbWVudCB0aGUgc3RvcCB3YXMgcmVxdWVz dGVkLCBldmVuIGlmIG1vcmUgdGltZSBpcyByZXF1aXJlZCB0byBjb21wbGV0ZSB0aGUgcHJvY2Vz c2luZworICAgICAgICBvZiBpbmNvbWluZyBkYXRhLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9Nb2RlbHMvVGltZWxpbmVNYXJrZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlldyk6Cisg ICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5fcmVjb3JkaW5nUmVzZXQpOgor ICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX2hhbmRsZVRpbWVsaW5lQ2Fw dHVyaW5nU3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUnVsZXIuY3NzOgorICAgICAgICAoLnRpbWVsaW5lLXJ1bGVyID4gLm1hcmtlcnMgPiAubWFy a2VyLmN1cnJlbnQtdGltZTo6YWZ0ZXIpOgorICAgICAgICAoLnRpbWVsaW5lLXJ1bGVyID4gLm1h cmtlcnMgPiAubWFya2VyLnN0b3BwaW5nLXRpbWUpOiBEZWxldGVkLgorICAgICAgICAoLnRpbWVs aW5lLXJ1bGVyID4gLm1hcmtlcnMgPiAubWFya2VyOm1hdGNoZXMoLnN0b3BwaW5nLXRpbWUsIC5j dXJyZW50LXRpbWUpOjphZnRlcik6IERlbGV0ZWQuCisgICAgICAgIChAbWVkaWEgKHByZWZlcnMt Y29sb3Itc2NoZW1lOiBkYXJrKSAudGltZWxpbmUtcnVsZXIgPiAubWFya2VycyA+IC5tYXJrZXIu c3RvcHBpbmctdGltZSk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZVJ1bGVyLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVSdWxlci5wcm90b3R5cGUuYWRk TWFya2VyKToKKwogMjAyMC0wOS0xNCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogU3RvcCBSZWNvcmRpbmcgaW4gVGltZWxpbmVzIHRh YiBkb2Vzbid0IHdvcmsgcmVsaWFibHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZU1hcmtlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZU1hcmtlci5qcwppbmRleCAwMWRh ZGMxMDY1ZmYyNWUxYWE3MDA3YjY3ZmFmMGY2ODRjNzZjYjczLi5kZDQ3YTM2NWJiZmNhZTFiMThl MDVkYTMyNGU4NDFkNTNhY2VkY2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVNYXJrZXIuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lTWFya2VyLmpzCkBAIC04Myw3 ICs4Myw2IEBAIFdJLlRpbWVsaW5lTWFya2VyLkV2ZW50ID0gewogfTsKIAogV0kuVGltZWxpbmVN YXJrZXIuVHlwZSA9IHsKLSAgICBTdG9wcGluZ1RpbWU6ICJzdG9wcGluZy10aW1lIiwKICAgICBD dXJyZW50VGltZTogImN1cnJlbnQtdGltZSIsCiAgICAgTG9hZEV2ZW50OiAibG9hZC1ldmVudCIs CiAgICAgRE9NQ29udGVudEV2ZW50OiAiZG9tLWNvbnRlbnQtZXZlbnQiLApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l T3ZlcnZpZXcuanMKaW5kZXggYjY2MzdjNmI2ZmU0YjIzYjM2ZDc0NTNlOTk0YWU0MWE4YjA1YzAz YS4uYmZmMTI3YmFiNGViNDZhYjA1YzY1N2JjOThkYTdmM2E5OTAzNDQ5YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZU92ZXJ2aWV3LmpzCkBAIC04Myw3ICs4Myw2IEBAIFdJLlRpbWVsaW5lT3ZlcnZpZXcgPSBj bGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLl90aW1l bGluZVJ1bGVyLmFkZEV2ZW50TGlzdGVuZXIoV0kuVGltZWxpbmVSdWxlci5FdmVudC5UaW1lUmFu Z2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl90aW1lUmFuZ2VTZWxlY3Rpb25DaGFuZ2VkLCB0aGlz KTsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX3RpbWVsaW5lUnVsZXIpOwogCi0gICAg ICAgIHRoaXMuX3N0b3BwaW5nVGltZU1hcmtlciA9IG51bGw7CiAgICAgICAgIHRoaXMuX2N1cnJl bnRUaW1lTWFya2VyID0gbmV3IFdJLlRpbWVsaW5lTWFya2VyKDAsIFdJLlRpbWVsaW5lTWFya2Vy LlR5cGUuQ3VycmVudFRpbWUpOwogICAgICAgICB0aGlzLl90aW1lbGluZVJ1bGVyLmFkZE1hcmtl cih0aGlzLl9jdXJyZW50VGltZU1hcmtlcik7CiAKQEAgLTgxNiwxMSArODE1LDYgQEAgV0kuVGlt ZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAg ICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuY2xlYXJNYXJrZXJzKCk7CiAKICAgICAgICAgdGhp cy5fdGltZWxpbmVSdWxlci5hZGRNYXJrZXIodGhpcy5fY3VycmVudFRpbWVNYXJrZXIpOwotCi0g ICAgICAgIGlmICh0aGlzLl9zdG9wcGluZ1RpbWVNYXJrZXIpIHsKLSAgICAgICAgICAgIHRoaXMu X3N0b3BwaW5nVGltZU1hcmtlci50aW1lID0gLTE7IC8vIEhpZGUgdGhlIG1hcmtlci4KLSAgICAg ICAgICAgIHRoaXMuX3RpbWVsaW5lUnVsZXIuYWRkTWFya2VyKHRoaXMuX3N0b3BwaW5nVGltZU1h cmtlcik7Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBfY2FuU2hvd1RpbWVsaW5lVHlwZSh0eXBl KQpAQCAtMTAzNCwyNCArMTAyOCwxMSBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGlt ZWxpbmVPdmVydmlldyBleHRlbmRzIFdJLlZpZXcKICAgICBfaGFuZGxlVGltZWxpbmVDYXB0dXJp bmdTdGF0ZUNoYW5nZWQoZXZlbnQpCiAgICAgewogICAgICAgICBzd2l0Y2ggKFdJLnRpbWVsaW5l TWFuYWdlci5jYXB0dXJpbmdTdGF0ZSkgewotICAgICAgICBjYXNlIFdJLlRpbWVsaW5lTWFuYWdl ci5DYXB0dXJpbmdTdGF0ZS5TdGFydGluZzoKLSAgICAgICAgICAgIGlmICh0aGlzLl9zdG9wcGlu Z1RpbWVNYXJrZXIpCi0gICAgICAgICAgICAgICAgdGhpcy5fc3RvcHBpbmdUaW1lTWFya2VyLnRp bWUgPSAtMTsgLy8gSGlkZSB0aGUgbWFya2VyIHdoZW4gY2FwdHVyaW5nIHJlc3VtZXMuCi0gICAg ICAgICAgICBicmVhazsKLQogICAgICAgICBjYXNlIFdJLlRpbWVsaW5lTWFuYWdlci5DYXB0dXJp bmdTdGF0ZS5BY3RpdmU6CiAgICAgICAgICAgICB0aGlzLl9lZGl0SW5zdHJ1bWVudHNCdXR0b24u ZW5hYmxlZCA9IGZhbHNlOwogICAgICAgICAgICAgdGhpcy5fc3RvcEVkaXRpbmdJbnN0cnVtZW50 cygpOwogICAgICAgICAgICAgYnJlYWs7CiAKLSAgICAgICAgY2FzZSBXSS5UaW1lbGluZU1hbmFn ZXIuQ2FwdHVyaW5nU3RhdGUuU3RvcHBpbmc6Ci0gICAgICAgICAgICBpZiAoIXRoaXMuX3N0b3Bw aW5nVGltZU1hcmtlcikgewotICAgICAgICAgICAgICAgIHRoaXMuX3N0b3BwaW5nVGltZU1hcmtl ciA9IG5ldyBXSS5UaW1lbGluZU1hcmtlcih0aGlzLl9jdXJyZW50VGltZSwgV0kuVGltZWxpbmVN YXJrZXIuVHlwZS5TdG9wcGluZ1RpbWUpOwotICAgICAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5l UnVsZXIuYWRkTWFya2VyKHRoaXMuX3N0b3BwaW5nVGltZU1hcmtlcik7Ci0gICAgICAgICAgICB9 IGVsc2UKLSAgICAgICAgICAgICAgICB0aGlzLl9zdG9wcGluZ1RpbWVNYXJrZXIudGltZSA9IHRo aXMuX2N1cnJlbnRUaW1lOwotICAgICAgICAgICAgYnJlYWs7Ci0KICAgICAgICAgY2FzZSBXSS5U aW1lbGluZU1hbmFnZXIuQ2FwdHVyaW5nU3RhdGUuSW5hY3RpdmU6CiAgICAgICAgICAgICB0aGlz Ll9lZGl0SW5zdHJ1bWVudHNCdXR0b24uZW5hYmxlZCA9IHRydWU7CiAgICAgICAgICAgICBicmVh azsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUnVsZXIuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5jc3MKaW5kZXggNDU2OGU1NGQyMWJjMmQ2NjNkMzk1NzI3NTkz NzU2N2FjMTkwM2M2Zi4uNjIxNGE5Yjc2NzY0ZmQ4Mjc2ZGEyMzQ3NDIyOTJjY2VmZmViYjhiMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSdWxlci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVGltZWxpbmVSdWxlci5jc3MKQEAgLTE3NCwxNiArMTc0LDEyIEBAIGJvZHlbZGlyPXJ0 bF0gLnRpbWVsaW5lLXJ1bGVyID4gLm1hcmtlcnMgPiAubWFya2VyOjphZnRlciB7CiAgICAgcmln aHQ6IHZhcigtLXRpbWVsaW5lLXJ1bGVyLW1hcmtlci1hZnRlci1vZmZzZXQpOwogfQogCi0udGlt ZWxpbmUtcnVsZXIgPiAubWFya2VycyA+IC5tYXJrZXIuc3RvcHBpbmctdGltZSB7Ci0gICAgY29s b3I6IGhzbCgwLCAwJSwgNzUlKTsKLX0KLQogLnRpbWVsaW5lLXJ1bGVyID4gLm1hcmtlcnMgPiAu bWFya2VyLmN1cnJlbnQtdGltZSB7CiAgICAgei1pbmRleDogdmFyKC0tdGltZWxpbmUtY3VycmVu dC10aW1lLXotaW5kZXgpOwogICAgIGNvbG9yOiByZWQ7CiB9CiAKLS50aW1lbGluZS1ydWxlciA+ IC5tYXJrZXJzID4gLm1hcmtlcjptYXRjaGVzKC5zdG9wcGluZy10aW1lLCAuY3VycmVudC10aW1l KTo6YWZ0ZXIgeworLnRpbWVsaW5lLXJ1bGVyID4gLm1hcmtlcnMgPiAubWFya2VyLmN1cnJlbnQt dGltZTo6YWZ0ZXIgewogICAgIHRvcDogdmFyKC0tdGltZWxpbmUtcnVsZXItbWFya2VyLWFmdGVy LW9mZnNldCk7CiAgICAgd2lkdGg6IHZhcigtLXRpbWVsaW5lLXJ1bGVyLW1hcmtlci1hZnRlci1z aXplKTsKICAgICBoZWlnaHQ6IHZhcigtLXRpbWVsaW5lLXJ1bGVyLW1hcmtlci1hZnRlci1zaXpl KTsKQEAgLTI5NCwxMCArMjkwLDYgQEAgYm9keVtkaXI9cnRsXSAudGltZWxpbmUtcnVsZXIgPiAu c2hhZGVkLWFyZWEubGVmdCB7CiB9CiAKIEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRh cmspIHsKLSAgICAudGltZWxpbmUtcnVsZXIgPiAubWFya2VycyA+IC5tYXJrZXIuc3RvcHBpbmct dGltZSB7Ci0gICAgICAgIGNvbG9yOiBsaWdodGdyZXk7Ci0gICAgfQotCiAgICAgLnRpbWVsaW5l LXJ1bGVyID4gLm1hcmtlcnMgPiAubWFya2VyLmRvbS1jb250ZW50LWV2ZW50IHsKICAgICAgICAg Y29sb3I6IGhzbCgyNDAsIDEwMCUsIDcwJSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMKaW5k ZXggOWNmYzgyMTE0YzJhN2UzYjY3ZmM2Yzc4ODZmMGQwYTkwNjlhMGU1YS4uYWEyNTRiNDU0YmU0 MmM2YjA0MDZkMmYyYTQ4Nzc4MzUzZDQ3YzFiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzCkBAIC0z NDgsOSArMzQ4LDYgQEAgV0kuVGltZWxpbmVSdWxlciA9IGNsYXNzIFRpbWVsaW5lUnVsZXIgZXh0 ZW5kcyBXSS5WaWV3CiAgICAgICAgIG1hcmtlckVsZW1lbnQuY2xhc3NMaXN0LmFkZChtYXJrZXIu dHlwZSwgIm1hcmtlciIpOwogCiAgICAgICAgIHN3aXRjaCAobWFya2VyLnR5cGUpIHsKLSAgICAg ICAgY2FzZSBXSS5UaW1lbGluZU1hcmtlci5UeXBlLlN0b3BwaW5nVGltZToKLSAgICAgICAgICAg IG1hcmtlckVsZW1lbnQudGl0bGUgPSBXSS5VSVN0cmluZygiUmVjb3JkaW5nIHN0b3AgcmVxdWVz dGVkIFx1MjAxNCAlcyIpLmZvcm1hdChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKG1hcmtlclRpbWUp KTsKLSAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFdJLlRpbWVsaW5lTWFya2VyLlR5 cGUuTG9hZEV2ZW50OgogICAgICAgICAgICAgbWFya2VyRWxlbWVudC50aXRsZSA9IFdJLlVJU3Ry aW5nKCJMb2FkIFx1MjAxNCAlcyIpLmZvcm1hdChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKG1hcmtl clRpbWUpKTsKICAgICAgICAgICAgIGJyZWFrOwo=