127157 2014-01-16 19:47:29 -0800 Web Inspector: Clean up some new Timeline code 2014-01-20 19:05:06 -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 969020 0 timothy 2014-01-16 19:47:29 -0800 Use ES6 and better object access practices. 969021 1 webkit-bug-importer 2014-01-16 19:47:44 -0800 <rdar://problem/15842444> 969022 2 221435 timothy 2014-01-16 19:51:00 -0800 Created attachment 221435 Patch 969312 3 221435 joepeck 2014-01-17 16:24:52 -0800 Comment on attachment 221435 Patch r=me 970133 4 timothy 2014-01-20 19:05:06 -0800 https://trac.webkit.org/changeset/162418 221435 2014-01-16 19:51:00 -0800 2014-01-17 16:24:52 -0800 Patch bug-127157-20140116195059.patch text/plain 23209 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBj MmRhOTUyOGVkMjNiNTUyZDBmMDMzMTEwZWJjNGM4MWI5ZWQxMjhjLi5jYmI0YTkzNGI2ZTA3NTZj ODhiMzViNWU1ZDJjM2Q1MjliMWEzM2U0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzOSBAQAogMjAxNC0wMS0xNiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgQ2xlYW4gdXAgVGltZWxpbmVzIGNvZGUgYnkgdXNpbmcgRVM2IGZlYXR1 cmVzIGFuZCBsZXNzIGdsb2JhbCBhY2Nlc3Mgb2YgVGltZWxpbmVSZWNvcmRpbmcuCisgICAgICAg IEFsc28gZG9uJ3QgcmVjcmVhdGUgVGltZWxpbmUgb2JqZWN0cyB3aGVuIFRpbWVsaW5lUmVjb3Jk aW5nIGlzIHJlc2V0LCByZXNldCB0aGVtIGluc3RlYWQuCisKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzE1NworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9MYXlvdXRUaW1lbGlu ZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTGF5b3V0VGltZWxpbmVWaWV3LnByb3Rv dHlwZS5yZXNldCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9OZXR3b3JrVGltZWxpbmUuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrVGltZWxpbmUucHJvdG90eXBlLnJlc2V0KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL05ldHdvcmtUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu TmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUucmVzZXQpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuT3Zl cnZpZXdUaW1lbGluZVZpZXcucHJvdG90eXBlLl9uZXR3b3JrVGltZWxpbmVSZWNvcmRBZGRlZCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9TY3JpcHRUaW1lbGluZVZpZXcuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZS5yZXNldCk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmUucHJvdG90eXBlLnJlc2V0 KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5zZXQgY3JlYXRlUGF0aENvbXBv bmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5zZXQgdmFy KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5z aG93T3ZlcnZpZXdUaW1lbGluZVZpZXcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l Q29udGVudFZpZXcucHJvdG90eXBlLnNob3dUaW1lbGluZVZpZXcpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlLl9zaG93VGltZWxpbmVWaWV3KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fdXBk YXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5fcmVjb3JkaW5nUmVzZXQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGltZWxpbmVSZWNv cmRpbmcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcucHJvdG90 eXBlLnJlc2V0KToKKworMjAxNC0wMS0xNiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBs ZS5jb20+CisKICAgICAgICAgSW1wcm92ZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlldyBi eSBub3QgcHV0dGluZyBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlciBpbiBhIHNjcm9sbCBhcmVh LgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcx NDUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xheW91 dFRpbWVsaW5lVmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0xh eW91dFRpbWVsaW5lVmlldy5qcwppbmRleCBiNDg3MGVkMmVlZjNmZWVkOGI1Mzk0YWFlN2U1ODY1 MzZiZTQxOGRlLi5mZjE0ZTcwZjgzZWE0YTdiZTEwMzMyZDc4OGNkYTkxYTE2ZDM1NGIxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9MYXlvdXRUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTGF5b3V0 VGltZWxpbmVWaWV3LmpzCkBAIC0yMyw3ICsyMyw3IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldyA9IGZ1 bmN0aW9uKCkKK1dlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcgPSBmdW5jdGlvbihyZWNv cmRpbmcpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5jYWxsKHRoaXMpOwogCkBA IC02Nyw2ICs2Nyw5IEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcgPSBmdW5jdGlv bigpCiAKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuTGF5b3V0 VGltZWxpbmVWaWV3LlN0eWxlQ2xhc3NOYW1lKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hp bGQodGhpcy5fZGF0YUdyaWQuZWxlbWVudCk7CisKKyAgICB2YXIgbGF5b3V0VGltZWxpbmUgPSBy ZWNvcmRpbmcudGltZWxpbmVzLmdldChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5M YXlvdXQpOworICAgIGxheW91dFRpbWVsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9y LlRpbWVsaW5lLkV2ZW50LlJlY29yZEFkZGVkLCB0aGlzLl9sYXlvdXRUaW1lbGluZVJlY29yZEFk ZGVkLCB0aGlzKTsKIH07CiAKIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGluZVZpZXcuU3R5bGVD bGFzc05hbWUgPSAibGF5b3V0IjsKQEAgLTExMCwxNCArMTEzLDYgQEAgV2ViSW5zcGVjdG9yLkxh eW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5UaW1l bGluZVZpZXcucHJvdG90eXBlLnJlc2V0LmNhbGwodGhpcyk7CiAKICAgICAgICAgdGhpcy5fZGF0 YUdyaWQucmVzZXQoKTsKLQotICAgICAgICBpZiAodGhpcy5fbGF5b3V0VGltZWxpbmUpCi0gICAg ICAgICAgICB0aGlzLl9sYXlvdXRUaW1lbGluZS5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51 bGwsIHRoaXMpOwotCi0gICAgICAgIHRoaXMuX2xheW91dFRpbWVsaW5lID0gV2ViSW5zcGVjdG9y LnRpbWVsaW5lTWFuYWdlci5yZWNvcmRpbmcudGltZWxpbmVzLmdldChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQpOwotICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9s YXlvdXRUaW1lbGluZSk7Ci0KLSAgICAgICAgdGhpcy5fbGF5b3V0VGltZWxpbmUuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmUuRXZlbnQuUmVjb3JkQWRkZWQsIHRoaXMuX2xh eW91dFRpbWVsaW5lUmVjb3JkQWRkZWQsIHRoaXMpOwogICAgIH0sCiAKICAgICAvLyBQcml2YXRl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OZXR3b3Jr VGltZWxpbmUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OZXR3b3Jr VGltZWxpbmUuanMKaW5kZXggMzg1ZTYwZTM0MDFiYzI5MWRmNDFkNTljZTg4MGRjMzkwNDI2YTU2 Zi4uOWNjZTY0MWZjZDQ0OTMxNzhkN2VlNzNmMzkwM2RmNzU1NjY1NmM4YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmV0d29ya1RpbWVsaW5lLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05ldHdvcmtUaW1lbGluZS5q cwpAQCAtMjYsOCArMjYsNiBAQAogV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZSA9IGZ1bmN0 aW9uKCkKIHsKICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmUuY2FsbCh0aGlzKTsKLQotICAgIHRo aXMuX3Jlc291cmNlUmVjb3JkTWFwID0gbmV3IE1hcDsKIH07CiAKIFdlYkluc3BlY3Rvci5OZXR3 b3JrVGltZWxpbmUucHJvdG90eXBlID0gewpAQCAtNDMsNiArNDEsMTMgQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtUaW1lbGluZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZXNv dXJjZVJlY29yZE1hcC5nZXQocmVzb3VyY2UpIHx8IG51bGw7CiAgICAgfSwKIAorICAgIHJlc2V0 OiBmdW5jdGlvbihzdXBwcmVzc0V2ZW50cykKKyAgICB7CisgICAgICAgIHRoaXMuX3Jlc291cmNl UmVjb3JkTWFwID0gbmV3IE1hcDsKKworICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmUucHJv dG90eXBlLnJlc2V0LmNhbGwodGhpcywgc3VwcHJlc3NFdmVudHMpOworICAgIH0sCisKICAgICBh ZGRSZWNvcmQ6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHJlY29yZCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRpbWVsaW5lUmVjb3JkKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05ldHdvcmtU aW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OZXR3 b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IGNiYjRkY2ViNDA1ZTZjNTExMmNhZWY4Yzk5MzE2YzBj Nzc4ZmViZDIuLjQwNzQ1M2E1MmRkYjMzODQ1YTJhZjI1N2UzMTQyMDQ1NjAyMmMxMGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05ldHdvcmtUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmV0d29y a1RpbWVsaW5lVmlldy5qcwpAQCAtMjMsNyArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3ID0g ZnVuY3Rpb24oKQorV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcgPSBmdW5jdGlvbihy ZWNvcmRpbmcpCiB7CiAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5jYWxsKHRoaXMpOwog CkBAIC04MSw2ICs4MSw5IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3ID0gZnVu Y3Rpb24oKQogCiAgICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLk5l dHdvcmtUaW1lbGluZVZpZXcuU3R5bGVDbGFzc05hbWUpOwogICAgIHRoaXMuZWxlbWVudC5hcHBl bmRDaGlsZCh0aGlzLl9kYXRhR3JpZC5lbGVtZW50KTsKKworICAgIHZhciBuZXR3b3JrVGltZWxp bmUgPSByZWNvcmRpbmcudGltZWxpbmVzLmdldChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQu VHlwZS5OZXR3b3JrKTsKKyAgICBuZXR3b3JrVGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuVGltZWxpbmUuRXZlbnQuUmVjb3JkQWRkZWQsIHRoaXMuX25ldHdvcmtUaW1lbGlu ZVJlY29yZEFkZGVkLCB0aGlzKTsKIH07CiAKIFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVW aWV3LlN0eWxlQ2xhc3NOYW1lID0gIm5ldHdvcmsiOwpAQCAtMTI0LDE0ICsxMjcsNiBAQCBXZWJJ bnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYklu c3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnJlc2V0LmNhbGwodGhpcyk7CiAKICAgICAg ICAgdGhpcy5fZGF0YUdyaWQucmVzZXQoKTsKLQotICAgICAgICBpZiAodGhpcy5fbmV0d29ya1Rp bWVsaW5lKQotICAgICAgICAgICAgdGhpcy5fbmV0d29ya1RpbWVsaW5lLnJlbW92ZUV2ZW50TGlz dGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7Ci0KLSAgICAgICAgdGhpcy5fbmV0d29ya1RpbWVsaW5l ID0gV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5yZWNvcmRpbmcudGltZWxpbmVzLmdldChX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrKTsKLSAgICAgICAgY29uc29s ZS5hc3NlcnQodGhpcy5fbmV0d29ya1RpbWVsaW5lKTsKLQotICAgICAgICB0aGlzLl9uZXR3b3Jr VGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmUuRXZlbnQuUmVj b3JkQWRkZWQsIHRoaXMuX25ldHdvcmtUaW1lbGluZVJlY29yZEFkZGVkLCB0aGlzKTsKICAgICB9 LAogCiAgICAgLy8gUHJpdmF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9PdmVydmlld1RpbWVsaW5lVmlldy5qcwppbmRleCA5MWY0M2I5OTBi N2I0OGU0ZTJlNDM0MGM0OWU2MGFlOTA2N2QxYTZmLi42M2Q1MzQyZGVjYjIzMTRiYTgyYjAwZTRm MzAxYjNjMmNlOTQ5NzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9PdmVydmlld1RpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9PdmVydmlld1RpbWVsaW5lVmlldy5qcwpAQCAtMjMsMTAgKzIzLDEy IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotV2ViSW5zcGVj dG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24oKQorV2ViSW5zcGVjdG9yLk92ZXJ2 aWV3VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogewogICAgIFdlYkluc3BlY3Rv ci5UaW1lbGluZVZpZXcuY2FsbCh0aGlzKTsKIAorICAgIHRoaXMuX3JlY29yZGluZyA9IHJlY29y ZGluZzsKKwogICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJUcmVlT3V0bGluZS5vbnNlbGVjdCA9 IHRoaXMuX3RyZWVFbGVtZW50U2VsZWN0ZWQuYmluZCh0aGlzKTsKIAogICAgIHZhciBjb2x1bW5z ID0geyJncmFwaCI6IHt3aWR0aDogIjEwMCUifX07CkBAIC00NCw3ICs0NiwxMCBAQCBXZWJJbnNw ZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5lbGVtZW50 LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LlN0eWxlQ2xh c3NOYW1lKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fZGF0YUdyaWQuZWxl bWVudCk7CiAKLSAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnJlY29yZGluZy5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVudC5Tb3VyY2VD b2RlVGltZWxpbmVBZGRlZCwgdGhpcy5fc291cmNlQ29kZVRpbWVsaW5lQWRkZWQsIHRoaXMpOwor ICAgIHRoaXMuX25ldHdvcmtUaW1lbGluZSA9IHJlY29yZGluZy50aW1lbGluZXMuZ2V0KFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdvcmspOworICAgIHRoaXMuX25ldHdvcmtU aW1lbGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5SZWNv cmRBZGRlZCwgdGhpcy5fbmV0d29ya1RpbWVsaW5lUmVjb3JkQWRkZWQsIHRoaXMpOworCisgICAg cmVjb3JkaW5nLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n LkV2ZW50LlNvdXJjZUNvZGVUaW1lbGluZUFkZGVkLCB0aGlzLl9zb3VyY2VDb2RlVGltZWxpbmVB ZGRlZCwgdGhpcyk7CiB9OwogCiBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcuU3R5 bGVDbGFzc05hbWUgPSAib3ZlcnZpZXciOwpAQCAtNjAsMTYgKzY1LDYgQEAgV2ViSW5zcGVjdG9y Lk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5VSVN0cmluZygiVGltZWxpbmUgRXZlbnRzIik7CiAgICAgfSwKIAotICAgIHJlc2V0 OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnBy b3RvdHlwZS5yZXNldC5jYWxsKHRoaXMpOwotCi0gICAgICAgIHRoaXMuX25ldHdvcmtUaW1lbGlu ZSA9IFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIucmVjb3JkaW5nLnRpbWVsaW5lcy5nZXQo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yayk7Ci0gICAgICAgIGNvbnNv bGUuYXNzZXJ0KHRoaXMuX25ldHdvcmtUaW1lbGluZSk7Ci0KLSAgICAgICAgdGhpcy5fbmV0d29y a1RpbWVsaW5lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lLkV2ZW50LlJl Y29yZEFkZGVkLCB0aGlzLl9uZXR3b3JrVGltZWxpbmVSZWNvcmRBZGRlZCwgdGhpcyk7Ci0gICAg fSwKLQogICAgIHNob3duOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB0aGlzLl90cmVlT3V0 bGluZURhdGFHcmlkU3luY2hyb25pemVyLnN5bmNocm9uaXplKCk7CkBAIC0yMTUsNyArMjEwLDcg QEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAg ICAgdGhpcy5fYWRkUmVzb3VyY2VUb1RyZWVJZk5lZWRlZChyZXNvdXJjZVRpbWVsaW5lUmVjb3Jk LnJlc291cmNlKTsKIAogICAgICAgICAvLyBXZSBkb24ndCBleHBlY3QgdG8gaGF2ZSBhbnkgc291 cmNlIGNvZGUgdGltZWxpbmVzIHlldC4gVGhvc2Ugc2hvdWxkIGJlIGFkZGVkIHdpdGggX3NvdXJj ZUNvZGVUaW1lbGluZUFkZGVkLgotICAgICAgICBjb25zb2xlLmFzc2VydCghV2ViSW5zcGVjdG9y LnRpbWVsaW5lTWFuYWdlci5yZWNvcmRpbmcuc291cmNlQ29kZVRpbWVsaW5lc0ZvclNvdXJjZUNv ZGUocmVzb3VyY2VUaW1lbGluZVJlY29yZC5yZXNvdXJjZSkubGVuZ3RoKTsKKyAgICAgICAgY29u c29sZS5hc3NlcnQoIXRoaXMuX3JlY29yZGluZy5zb3VyY2VDb2RlVGltZWxpbmVzRm9yU291cmNl Q29kZShyZXNvdXJjZVRpbWVsaW5lUmVjb3JkLnJlc291cmNlKS5sZW5ndGgpOwogICAgIH0sCiAK ICAgICBfc291cmNlQ29kZVRpbWVsaW5lQWRkZWQ6IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2NyaXB0VGltZWxpbmVWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvU2NyaXB0VGltZWxpbmVW aWV3LmpzCmluZGV4IDRlZWVmZTA4YjVkYWY2ZjIzMTY0MjA2YTY4YmVlYTUyMGM5YzNjMDIuLjhj MmEwMjZiNjY4YjJlNjVkNDJjNzE3NjczZTg2NDY5N2MyYzAyMDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NjcmlwdFRpbWVsaW5lVmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9TY3JpcHRUaW1lbGluZVZpZXcu anMKQEAgLTIzLDcgKzIzLDcgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4K ICAqLwogCi1XZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3ID0gZnVuY3Rpb24oKQorV2Vi SW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldyA9IGZ1bmN0aW9uKHJlY29yZGluZykKIHsKICAg ICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LmNhbGwodGhpcyk7CiAKQEAgLTYxLDYgKzYxLDkg QEAgV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldyA9IGZ1bmN0aW9uKCkKIAogICAgIHRo aXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5TY3JpcHRUaW1lbGluZVZpZXcu U3R5bGVDbGFzc05hbWUpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9kYXRh R3JpZC5lbGVtZW50KTsKKworICAgIHZhciBzY3JpcHRUaW1lbGluZSA9IHJlY29yZGluZy50aW1l bGluZXMuZ2V0KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdCk7CisgICAg c2NyaXB0VGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmUuRXZl bnQuUmVjb3JkQWRkZWQsIHRoaXMuX3NjcmlwdFRpbWVsaW5lUmVjb3JkQWRkZWQsIHRoaXMpOwog fTsKIAogV2ViSW5zcGVjdG9yLlNjcmlwdFRpbWVsaW5lVmlldy5TdHlsZUNsYXNzTmFtZSA9ICJz Y3JpcHQiOwpAQCAtMTA0LDE0ICsxMDcsNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVW aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90 b3R5cGUucmVzZXQuY2FsbCh0aGlzKTsKIAogICAgICAgICB0aGlzLl9kYXRhR3JpZC5yZXNldCgp OwotCi0gICAgICAgIGlmICh0aGlzLl9zY3JpcHRUaW1lbGluZSkKLSAgICAgICAgICAgIHRoaXMu X3NjcmlwdFRpbWVsaW5lLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7Ci0K LSAgICAgICAgdGhpcy5fc2NyaXB0VGltZWxpbmUgPSBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5h Z2VyLnJlY29yZGluZy50aW1lbGluZXMuZ2V0KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5U eXBlLlNjcmlwdCk7Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NjcmlwdFRpbWVsaW5l KTsKLQotICAgICAgICB0aGlzLl9zY3JpcHRUaW1lbGluZS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5UaW1lbGluZS5FdmVudC5SZWNvcmRBZGRlZCwgdGhpcy5fc2NyaXB0VGltZWxpbmVS ZWNvcmRBZGRlZCwgdGhpcyk7CiAgICAgfSwKIAogICAgIC8vIFByaXZhdGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmUuanMKaW5kZXggYWRhODg4YjVk NmVkMWRmNjFhODQ1MGNhYmRmODg2MWZkNmExODg3Ny4uZTJlMjcyOTQ0MGFjNjY3NDU2Y2VlMThm ZjEzYTU5NzFkY2JhNTZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVGltZWxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVGltZWxpbmUuanMKQEAgLTI3LDEyICsyNywxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmUgPSBmdW5jdGlvbigpCiB7CiAgICAgV2ViSW5zcGVjdG9yLk9iamVjdC5jYWxsKHRoaXMpOwog Ci0gICAgdGhpcy5fcmVjb3JkcyA9IFtdOwotICAgIHRoaXMuX3N0YXJ0VGltZSA9IE5hTjsKLSAg ICB0aGlzLl9lbmRUaW1lID0gTmFOOworICAgIHRoaXMucmVzZXQodHJ1ZSk7CiB9OwogCiBXZWJJ bnNwZWN0b3IuVGltZWxpbmUuRXZlbnQgPSB7CisgICAgUmVzZXQ6ICJ0aW1lbGluZS1yZXNldCIs CiAgICAgUmVjb3JkQWRkZWQ6ICJ0aW1lbGluZS1yZWNvcmQtYWRkZWQiLAogICAgIFRpbWVzVXBk YXRlZDogInRpbWVsaW5lLXRpbWVzLXVwZGF0ZWQiCiB9OwpAQCAtNTgsNiArNTcsMTggQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3Jl Y29yZHM7CiAgICAgfSwKIAorICAgIHJlc2V0OiBmdW5jdGlvbihzdXBwcmVzc0V2ZW50cykKKyAg ICB7CisgICAgICAgIHRoaXMuX3JlY29yZHMgPSBbXTsKKyAgICAgICAgdGhpcy5fc3RhcnRUaW1l ID0gTmFOOworICAgICAgICB0aGlzLl9lbmRUaW1lID0gTmFOOworCisgICAgICAgIGlmICghc3Vw cHJlc3NFdmVudHMpIHsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5SZXNldCk7CisgICAgICAgICAgICB0aGlzLmRp c3BhdGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmUuRXZlbnQuVGltZXNV cGRhdGVkKTsKKyAgICAgICAgfQorICAgIH0sCisKICAgICBhZGRSZWNvcmQ6IGZ1bmN0aW9uKHJl Y29yZCkKICAgICB7CiAgICAgICAgIGlmIChyZWNvcmQudXBkYXRlc0R5bmFtaWNhbGx5KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250 ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5l Q29udGVudFZpZXcuanMKaW5kZXggOTdiMjA5ZDVkMjJlZGNlMThmYjYzNTliZmVjNjA2YjMwZjVi YTE0ZC4uMjNmMTdkZDg1ZWYzNjQ2YmI0NzI1ZDNjYTUwNzEwNGMyZDU2YTlkOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZUNv bnRlbnRWaWV3LmpzCkBAIC0yNyw2ICsyNyw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRl bnRWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogewogICAgIFdlYkluc3BlY3Rvci5Db250ZW50 Vmlldy5jYWxsKHRoaXMsIHJlY29yZGluZyk7CiAKKyAgICB0aGlzLl9yZWNvcmRpbmcgPSByZWNv cmRpbmc7CisKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSk7CiAKICAgICB0aGlzLl90aW1lbGluZU92 ZXJ2aWV3ID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3OwpAQCAtNDAsMTIgKzQy LDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVjb3Jk aW5nKQogICAgIHRoaXMuX3ZpZXdDb250YWluZXIuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3Iu VGltZWxpbmVDb250ZW50Vmlldy5WaWV3Q29udGFpbmVyU3R5bGVDbGFzc05hbWUpOwogICAgIHRo aXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl92aWV3Q29udGFpbmVyKTsKIAotICAgIHRoaXMu X292ZXJ2aWV3VGltZWxpbmVWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5l VmlldzsKLSAgICB0aGlzLl9kaXNjcmV0ZVRpbWVsaW5lVmlld01hcCA9IHsKLSAgICAgICAgW1dl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdvcmtdOiBuZXcgV2ViSW5zcGVjdG9y Lk5ldHdvcmtUaW1lbGluZVZpZXcsCi0gICAgICAgIFtXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmQuVHlwZS5MYXlvdXRdOiBuZXcgV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5lVmlldywKLSAg ICAgICAgW1dlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdF06IG5ldyBXZWJJ bnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3Ci0gICAgfTsKKyAgICB0aGlzLl9vdmVydmlld1Rp bWVsaW5lVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcocmVjb3Jk aW5nKTsKKworICAgIHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVWaWV3TWFwID0gbmV3IE1hcDsKKyAg ICB0aGlzLl9kaXNjcmV0ZVRpbWVsaW5lVmlld01hcC5zZXQoV2ViSW5zcGVjdG9yLlRpbWVsaW5l UmVjb3JkLlR5cGUuTmV0d29yaywgbmV3IFdlYkluc3BlY3Rvci5OZXR3b3JrVGltZWxpbmVWaWV3 KHJlY29yZGluZykpOworICAgIHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVWaWV3TWFwLnNldChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQsIG5ldyBXZWJJbnNwZWN0b3IuTGF5 b3V0VGltZWxpbmVWaWV3KHJlY29yZGluZykpOworICAgIHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVW aWV3TWFwLnNldChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQsIG5ldyBX ZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3KHJlY29yZGluZykpOwogCiAgICAgZnVuY3Rp b24gY3JlYXRlUGF0aENvbXBvbmVudChkaXNwbGF5TmFtZSwgY2xhc3NOYW1lLCByZXByZXNlbnRl ZE9iamVjdCkKICAgICB7CkBAIC01NCwyMCArNTYsMjAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l Q29udGVudFZpZXcgPSBmdW5jdGlvbihyZWNvcmRpbmcpCiAgICAgICAgIHJldHVybiBwYXRoQ29t cG9uZW50OwogICAgIH0KIAotICAgIHZhciBuZXR3b3JrUGF0aENvbXBvbmVudCA9IGNyZWF0ZVBh dGhDb21wb25lbnQuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5ldHdvcmsgUmVx dWVzdHMiKSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLk5ldHdvcmtJY29uU3R5 bGVDbGFzcywgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29yayk7Ci0gICAg dmFyIGxheW91dFBhdGhDb21wb25lbnQgPSBjcmVhdGVQYXRoQ29tcG9uZW50LmNhbGwodGhpcywg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXlvdXQgJiBSZW5kZXJpbmciKSwgV2ViSW5zcGVjdG9y LlRpbWVsaW5lU2lkZWJhclBhbmVsLkNvbG9yc0ljb25TdHlsZUNsYXNzLCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQpOwotICAgIHZhciBzY3JpcHRQYXRoQ29tcG9uZW50 ID0gY3JlYXRlUGF0aENvbXBvbmVudC5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi SmF2YVNjcmlwdCAmIEV2ZW50cyIpLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwu U2NyaXB0SWNvblN0eWxlQ2xhc3MsIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNj cmlwdCk7CisgICAgdGhpcy5fcGF0aENvbXBvbmVudE1hcCA9IG5ldyBNYXA7CisgICAgdGhpcy5f cGF0aENvbXBvbmVudE1hcC5zZXQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0 d29yaywgY3JlYXRlUGF0aENvbXBvbmVudC5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiTmV0d29yayBSZXF1ZXN0cyIpLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwu TmV0d29ya0ljb25TdHlsZUNsYXNzLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5O ZXR3b3JrKSk7CisgICAgdGhpcy5fcGF0aENvbXBvbmVudE1hcC5zZXQoV2ViSW5zcGVjdG9yLlRp bWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0LCBjcmVhdGVQYXRoQ29tcG9uZW50LmNhbGwodGhpcywg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMYXlvdXQgJiBSZW5kZXJpbmciKSwgV2ViSW5zcGVjdG9y LlRpbWVsaW5lU2lkZWJhclBhbmVsLkNvbG9yc0ljb25TdHlsZUNsYXNzLCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQpKTsKKyAgICB0aGlzLl9wYXRoQ29tcG9uZW50TWFw LnNldChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQsIGNyZWF0ZVBhdGhD b21wb25lbnQuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkphdmFTY3JpcHQgJiBF dmVudHMiKSwgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlNjcmlwdEljb25TdHls ZUNsYXNzLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQpKTsKIAotICAg IG5ldHdvcmtQYXRoQ29tcG9uZW50Lm5leHRTaWJsaW5nID0gbGF5b3V0UGF0aENvbXBvbmVudDsK LSAgICBsYXlvdXRQYXRoQ29tcG9uZW50LnByZXZpb3VzU2libGluZyA9IG5ldHdvcmtQYXRoQ29t cG9uZW50OwotICAgIGxheW91dFBhdGhDb21wb25lbnQubmV4dFNpYmxpbmcgPSBzY3JpcHRQYXRo Q29tcG9uZW50OwotICAgIHNjcmlwdFBhdGhDb21wb25lbnQucHJldmlvdXNTaWJsaW5nID0gbGF5 b3V0UGF0aENvbXBvbmVudDsKKyAgICB2YXIgcHJldmlvdXNQYXRoQ29tcG9uZW50ID0gbnVsbDsK KyAgICBmb3IgKHZhciBwYXRoQ29tcG9uZW50IG9mIHRoaXMuX3BhdGhDb21wb25lbnRNYXAudmFs dWVzKCkpIHsKKyAgICAgICAgaWYgKHByZXZpb3VzUGF0aENvbXBvbmVudCkgeworICAgICAgICAg ICAgcHJldmlvdXNQYXRoQ29tcG9uZW50Lm5leHRTaWJsaW5nID0gcGF0aENvbXBvbmVudDsKKyAg ICAgICAgICAgIHBhdGhDb21wb25lbnQucHJldmlvdXNTaWJsaW5nID0gcHJldmlvdXNQYXRoQ29t cG9uZW50OworICAgICAgICB9CiAKLSAgICB0aGlzLl9wYXRoQ29tcG9uZW50TWFwID0gewotICAg ICAgICBbV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTmV0d29ya106IG5ldHdvcmtQ YXRoQ29tcG9uZW50LAotICAgICAgICBbV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUu TGF5b3V0XTogbGF5b3V0UGF0aENvbXBvbmVudCwKLSAgICAgICAgW1dlYkluc3BlY3Rvci5UaW1l bGluZVJlY29yZC5UeXBlLlNjcmlwdF06IHNjcmlwdFBhdGhDb21wb25lbnQKLSAgICB9OworICAg ICAgICBwcmV2aW91c1BhdGhDb21wb25lbnQgPSBwYXRoQ29tcG9uZW50OworICAgIH0KIAogICAg IHRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcgPSBudWxsOwogICAgIHRoaXMuX2N1cnJlbnRUaW1l bGluZVZpZXdJZGVudGlmaWVyID0gbnVsbDsKQEAgLTc1LDcgKzc3LDggQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lQ29udGVudFZpZXcgPSBmdW5jdGlvbihyZWNvcmRpbmcpCiAgICAgdGhpcy5fdXBk YXRpbmcgPSBmYWxzZTsKICAgICB0aGlzLl9sYXN0VXBkYXRlVGltZXN0YW1wID0gTmFOOwogCi0g ICAgV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5yZWNvcmRpbmcuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuUmVzZXQsIHRoaXMuX3JlY29y ZGluZ1Jlc2V0LCB0aGlzKTsKKyAgICByZWNvcmRpbmcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuUmVzZXQsIHRoaXMuX3JlY29yZGluZ1Jlc2V0 LCB0aGlzKTsKKwogICAgIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LlJlY29yZGluZ1N0YXJ0ZWQs IHRoaXMuX3JlY29yZGluZ1N0YXJ0ZWQsIHRoaXMpOwogICAgIFdlYkluc3BlY3Rvci50aW1lbGlu ZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2 ZW50LlJlY29yZGluZ1N0b3BwZWQsIHRoaXMuX3JlY29yZGluZ1N0b3BwZWQsIHRoaXMpOwogCkBA IC05OCwxMSArMTAxLDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3Rv dHlwZSA9IHsKIAogICAgIHNob3dUaW1lbGluZVZpZXc6IGZ1bmN0aW9uKGlkZW50aWZpZXIpCiAg ICAgewotICAgICAgICBjb25zb2xlLmFzc2VydChpZGVudGlmaWVyIGluIHRoaXMuX2Rpc2NyZXRl VGltZWxpbmVWaWV3TWFwKTsKLSAgICAgICAgaWYgKCEoaWRlbnRpZmllciBpbiB0aGlzLl9kaXNj cmV0ZVRpbWVsaW5lVmlld01hcCkpCisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2Rpc2Ny ZXRlVGltZWxpbmVWaWV3TWFwLmhhcyhpZGVudGlmaWVyKSk7CisgICAgICAgIGlmICghdGhpcy5f ZGlzY3JldGVUaW1lbGluZVZpZXdNYXAuaGFzKGlkZW50aWZpZXIpKQogICAgICAgICAgICAgcmV0 dXJuOwogCi0gICAgICAgIHRoaXMuX3Nob3dUaW1lbGluZVZpZXcodGhpcy5fZGlzY3JldGVUaW1l bGluZVZpZXdNYXBbaWRlbnRpZmllcl0sIGlkZW50aWZpZXIpOworICAgICAgICB0aGlzLl9zaG93 VGltZWxpbmVWaWV3KHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVWaWV3TWFwLmdldChpZGVudGlmaWVy KSwgaWRlbnRpZmllcik7CiAgICAgfSwKIAogICAgIGdldCBhbGxvd2VkTmF2aWdhdGlvblNpZGVi YXJQYW5lbHMoKQpAQCAtMTIwLDcgKzEyMyw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRl bnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fY3VycmVudFRp bWVsaW5lVmlld0lkZW50aWZpZXIpCiAgICAgICAgICAgICByZXR1cm4gW107Ci0gICAgICAgIHJl dHVybiBbdGhpcy5fcGF0aENvbXBvbmVudE1hcFt0aGlzLl9jdXJyZW50VGltZWxpbmVWaWV3SWRl bnRpZmllcl1dOworICAgICAgICByZXR1cm4gW3RoaXMuX3BhdGhDb21wb25lbnRNYXAuZ2V0KHRo aXMuX2N1cnJlbnRUaW1lbGluZVZpZXdJZGVudGlmaWVyKV07CiAgICAgfSwKIAogICAgIHNob3du OiBmdW5jdGlvbigpCkBAIC0xNTYsNyArMTU5LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29u dGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIHZhciBzdGFydFRpbWUgPSB0aGlzLl90 aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZTsKICAgICAgICAgdmFyIGVuZFRpbWUg PSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZSArIHRoaXMuX3RpbWVs aW5lT3ZlcnZpZXcuc2VsZWN0aW9uRHVyYXRpb247Ci0gICAgICAgIHZhciBjdXJyZW50VGltZSA9 IHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyLnRpbWUgfHwgV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFu YWdlci5yZWNvcmRpbmcuc3RhcnRUaW1lOworICAgICAgICB2YXIgY3VycmVudFRpbWUgPSB0aGlz Ll9jdXJyZW50VGltZU1hcmtlci50aW1lIHx8IHRoaXMuX3JlY29yZGluZy5zdGFydFRpbWU7CiAK ICAgICAgICAgZnVuY3Rpb24gY2hlY2tUaW1lQm91bmRzKGl0ZW1TdGFydFRpbWUsIGl0ZW1FbmRU aW1lKQogICAgICAgICB7CkBAIC0yMzYsOSArMjM5LDkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l Q29udGVudFZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3VwZGF0ZTogZnVuY3Rpb24odGltZXN0 YW1wKQogICAgIHsKLSAgICAgICAgdmFyIHN0YXJ0VGltZSA9IFdlYkluc3BlY3Rvci50aW1lbGlu ZU1hbmFnZXIucmVjb3JkaW5nLnN0YXJ0VGltZTsKKyAgICAgICAgdmFyIHN0YXJ0VGltZSA9IHRo aXMuX3JlY29yZGluZy5zdGFydFRpbWU7CiAgICAgICAgIHZhciBjdXJyZW50VGltZSA9IHRoaXMu X2N1cnJlbnRUaW1lTWFya2VyLnRpbWUgfHwgc3RhcnRUaW1lOwotICAgICAgICB2YXIgZW5kVGlt ZSA9IFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIucmVjb3JkaW5nLmVuZFRpbWU7CisgICAg ICAgIHZhciBlbmRUaW1lID0gdGhpcy5fcmVjb3JkaW5nLmVuZFRpbWU7CiAgICAgICAgIHZhciB0 aW1lc3BhblNpbmNlTGFzdFVwZGF0ZSA9ICh0aW1lc3RhbXAgLSB0aGlzLl9sYXN0VXBkYXRlVGlt ZXN0YW1wKSAvIDEwMDAgfHwgMDsKIAogICAgICAgICBjdXJyZW50VGltZSArPSB0aW1lc3BhblNp bmNlTGFzdFVwZGF0ZTsKQEAgLTI1MCw4ICsyNTMsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVD b250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLl90aW1lbGluZU92ZXJ2 aWV3LnNlbGVjdGlvblN0YXJ0VGltZSA9IHN0YXJ0VGltZSArIHNlbGVjdGlvbk9mZnNldDsKIAog ICAgICAgICAgICAgdGhpcy5fb3ZlcnZpZXdUaW1lbGluZVZpZXcuemVyb1RpbWUgPSBzdGFydFRp bWU7Ci0gICAgICAgICAgICBmb3IgKHZhciBpZGVudGlmaWVyIGluIHRoaXMuX2Rpc2NyZXRlVGlt ZWxpbmVWaWV3TWFwKQotICAgICAgICAgICAgICAgIHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVWaWV3 TWFwW2lkZW50aWZpZXJdLnplcm9UaW1lID0gc3RhcnRUaW1lOworICAgICAgICAgICAgZm9yICh2 YXIgdGltZWxpbmVWaWV3IG9mIHRoaXMuX2Rpc2NyZXRlVGltZWxpbmVWaWV3TWFwLnZhbHVlcygp KQorICAgICAgICAgICAgICAgIHRpbWVsaW5lVmlldy56ZXJvVGltZSA9IHN0YXJ0VGltZTsKIAog ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3N0YXJ0VGltZU5lZWRzUmVzZXQ7CiAgICAgICAgIH0K QEAgLTMxNCw4ICszMTcsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50Vmlldy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lTWFya2VyLnRpbWUgPSAwOwogCiAg ICAgICAgIHRoaXMuX292ZXJ2aWV3VGltZWxpbmVWaWV3LnJlc2V0KCk7Ci0gICAgICAgIGZvciAo dmFyIGlkZW50aWZpZXIgaW4gdGhpcy5fZGlzY3JldGVUaW1lbGluZVZpZXdNYXApCi0gICAgICAg ICAgICB0aGlzLl9kaXNjcmV0ZVRpbWVsaW5lVmlld01hcFtpZGVudGlmaWVyXS5yZXNldCgpOwor ICAgICAgICBmb3IgKHZhciB0aW1lbGluZVZpZXcgb2YgdGhpcy5fZGlzY3JldGVUaW1lbGluZVZp ZXdNYXAudmFsdWVzKCkpCisgICAgICAgICAgICB0aW1lbGluZVZpZXcucmVzZXQoKTsKICAgICB9 LAogCiAgICAgX3RpbWVSYW5nZVNlbGVjdGlvbkNoYW5nZWQ6IGZ1bmN0aW9uKGV2ZW50KQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVSZWNv cmRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJl Y29yZGluZy5qcwppbmRleCBkNTQwYThmNjE4ZTQ0MGRhODZjYzQ0Y2M0OWFlZTJlNjk1MDgwMmYx Li4wNjlhZmI0MzE2MGE5MTgyY2MwMjZhNzEwMDUzNzJjZWViMzY5ZmExIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29yZGluZy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29yZGlu Zy5qcwpAQCAtMjcsNiArMjcsMTQgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nID0g ZnVuY3Rpb24oKQogewogICAgIFdlYkluc3BlY3Rvci5PYmplY3QuY2FsbCh0aGlzKTsKIAorICAg IHRoaXMuX3RpbWVsaW5lcyA9IG5ldyBNYXA7CisgICAgdGhpcy5fdGltZWxpbmVzLnNldChXZWJJ bnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrLCBuZXcgV2ViSW5zcGVjdG9yLk5l dHdvcmtUaW1lbGluZSk7CisgICAgdGhpcy5fdGltZWxpbmVzLnNldChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmQuVHlwZS5TY3JpcHQsIG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmUpOworICAg IHRoaXMuX3RpbWVsaW5lcy5zZXQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5 b3V0LCBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lKTsKKworICAgIGZvciAodmFyIHRpbWVsaW5l IG9mIHRoaXMuX3RpbWVsaW5lcy52YWx1ZXMoKSkKKyAgICAgICAgdGltZWxpbmUuYWRkRXZlbnRM aXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmUuRXZlbnQuVGltZXNVcGRhdGVkLCB0aGlzLl90 aW1lbGluZVRpbWVzVXBkYXRlZCwgdGhpcyk7CisKICAgICB0aGlzLnJlc2V0KHRydWUpOwogfTsK IApAQCAtNTYsMzAgKzY0LDIwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9lbmRUaW1lOwogICAgIH0sCiAKLSAgICBy ZXNldDogZnVuY3Rpb24obmV3T2JqZWN0KQorICAgIHJlc2V0OiBmdW5jdGlvbihzdXBwcmVzc0V2 ZW50cykKICAgICB7Ci0gICAgICAgIGlmICh0aGlzLl90aW1lbGluZXMpIHsKLSAgICAgICAgICAg IHRoaXMuX3RpbWVsaW5lcy5mb3JFYWNoKGZ1bmN0aW9uKHRpbWVsaW5lKSB7Ci0gICAgICAgICAg ICAgICAgdGltZWxpbmUucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKLSAg ICAgICAgICAgIH0sIHRoaXMpOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fdGltZWxpbmVz ID0gbmV3IE1hcDsKLSAgICAgICAgdGhpcy5fdGltZWxpbmVzLnNldChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVSZWNvcmQuVHlwZS5OZXR3b3JrLCBuZXcgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGlu ZSk7Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lcy5zZXQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVj b3JkLlR5cGUuU2NyaXB0LCBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lKTsKLSAgICAgICAgdGhp cy5fdGltZWxpbmVzLnNldChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQuVHlwZS5MYXlvdXQs IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmUpOwotCi0gICAgICAgIHRoaXMuX3RpbWVsaW5lcy5m b3JFYWNoKGZ1bmN0aW9uKHRpbWVsaW5lKSB7Ci0gICAgICAgICAgICB0aW1lbGluZS5hZGRFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5UaW1lc1VwZGF0ZWQsIHRoaXMu X3RpbWVsaW5lVGltZXNVcGRhdGVkLCB0aGlzKTsKLSAgICAgICAgfSwgdGhpcyk7Ci0KICAgICAg ICAgdGhpcy5fc291cmNlQ29kZVRpbWVsaW5lc01hcCA9IG5ldyBNYXA7CiAgICAgICAgIHRoaXMu X2V2ZW50TWFya2VycyA9IFtdOwogICAgICAgICB0aGlzLl9zdGFydFRpbWUgPSBOYU47CiAgICAg ICAgIHRoaXMuX2VuZFRpbWUgPSBOYU47CiAKLSAgICAgICAgaWYgKCFuZXdPYmplY3QpCisgICAg ICAgIGZvciAodmFyIHRpbWVsaW5lIG9mIHRoaXMuX3RpbWVsaW5lcy52YWx1ZXMoKSkKKyAgICAg ICAgICAgIHRpbWVsaW5lLnJlc2V0KHN1cHByZXNzRXZlbnRzKTsKKworICAgICAgICBpZiAoIXN1 cHByZXNzRXZlbnRzKSB7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuUmVzZXQpOworICAgICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVj b3JkaW5nLkV2ZW50LlRpbWVzVXBkYXRlZCk7CisgICAgICAgIH0KICAgICB9LAogCiAgICAgc291 cmNlQ29kZVRpbWVsaW5lc0ZvclNvdXJjZUNvZGU6IGZ1bmN0aW9uKHNvdXJjZUNvZGUpCkBAIC04 NywxNSArODUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcucHJvdG90eXBlID0g ewogICAgICAgICB2YXIgdGltZWxpbmVzID0gdGhpcy5fc291cmNlQ29kZVRpbWVsaW5lc01hcC5n ZXQoc291cmNlQ29kZSk7CiAgICAgICAgIGlmICghdGltZWxpbmVzKQogICAgICAgICAgICAgcmV0 dXJuIFtdOwotCi0gICAgICAgIHZhciByZXN1bHQgPSBbXTsKLQotICAgICAgICAvLyBGSVhNRTog VGhpcyBjb3VsZCB1c2UgYSBmb3IuLm9mIGxvb3Agb25jZSB0aGV5IGFyZSBzdXBwb3J0ZWQgb24g TWFwcy4KLSAgICAgICAgdGltZWxpbmVzLmZvckVhY2goZnVuY3Rpb24oc291cmNlQ29kZVRpbWVs aW5lKSB7Ci0gICAgICAgICAgICByZXN1bHQucHVzaChzb3VyY2VDb2RlVGltZWxpbmUpOwotICAg ICAgICB9KTsKLQotICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICByZXR1cm4gdGltZWxp bmVzLnZhbHVlcygpOwogICAgIH0sCiAKICAgICBhZGRFdmVudE1hcmtlcjogZnVuY3Rpb24oZXZl bnRNYXJrZXIpCg==