144520 2015-05-02 03:00:52 -0700 Web Inspector: Allow closing and reopening the Timelines tab 2015-05-04 13:24:21 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 144519 1 timothy timothy commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1091073 0 timothy 2015-05-02 03:00:52 -0700 Simple after the fix for bug 144519. 1091074 1 252227 timothy 2015-05-02 03:10:58 -0700 Created attachment 252227 Patch 1091095 2 252232 timothy 2015-05-02 09:03:42 -0700 Created attachment 252232 Patch 1091483 3 252232 joepeck 2015-05-04 12:35:22 -0700 Comment on attachment 252232 Patch r=me! 1091498 4 252232 commit-queue 2015-05-04 13:24:15 -0700 Comment on attachment 252232 Patch Clearing flags on attachment: 252232 Committed r183764: <http://trac.webkit.org/changeset/183764> 1091499 5 commit-queue 2015-05-04 13:24:21 -0700 All reviewed patches have been landed. Closing bug. 252227 2015-05-02 03:10:58 -0700 2015-05-02 09:03:37 -0700 Patch bug-144520-20150502030945.patch text/plain 17102 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw OTk5ZGY5MTdiZTczNjg3YjM0MWIxYmY4YWRhZTAwODA2NGIzYjc3Li41M2U3ODFiYTA5M2I1MmMw MDVmODExYTBhNGIzMDYyNDkxZTQ5MWVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NCBAQAogMjAxNS0wNS0wMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgY2xvc2luZyBhbmQgcmVvcGVuaW5n IHRoZSBUaW1lbGluZXMgdGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDQ1MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLl91cGRhdGVOZXdUYWJCdXR0b25TdGF0ZSk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVNYW5hZ2VyKTogTm8gbmVlZCBmb3IgYSBkZWxheSBub3cuIENhbGwgcmVzZXQoKS4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnJlc2V0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIuZGVsYXllZFdvcmspOiBEZWxl dGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250 ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRW aWV3LnByb3RvdHlwZS5jbG9zZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5 b3V0VGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l Vmlldy5wcm90b3R5cGUuY2xvc2VkKTogQWRkZWQuIEZpeGVkIGxlYWsuCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBlLmNsb3NlZCk6IEFkZGVkLiBGaXhl ZCBsZWFrLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV3VGFiQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV3VGFiQ29udGVudFZpZXcpOiBBZGRlZCBUaW1l bGluZXMuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5 cGUuY2xvc2VkKTogQWRkZWQuIEZpeGVkIGxlYWsuCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5wcm90b3R5cGUuY2xvc2VkKTogQWRkZWQuIEZp eGVkIGxlYWsuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlw ZS5jbG9zZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoVGFiQ29udGVudFZpZXcucHJv dG90eXBlLmNsb3NlZCk6IERlbGV0ZWQuIE1hZGUgZ2VuZXJpYworICAgICAgICBpbiBDb250ZW50 QnJvd3NlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVTaWRlYmFyUGFuZWwucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVTaWRlYmFyUGFuZWwuX3JlY29yZGluZ0NyZWF0ZWQpOiBDYWxsIF9hZGRSZWNvcmRp bmcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuX2FkZFJlY29y ZGluZyk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRW aWV3KToKKworMjAxNS0wNS0wMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+ CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU3dpdGNoaW5nIHJlY29yZGluZ3MgaW4gdGhlIFRp bWVsaW5lIG5hdmlnYXRpb24gYmFyIGlzIGJyb2tlbgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NTE5CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCAyOGI1NzE1Y2FlNTdkMWM0NWIx MDYwMDY2MGY5Y2Y5YWZjN2NjZTFkLi4xNjc3YWY4Njk5NDVlODdmYzI1MWExMTNjMGI0MzJiYWYz YjVkMDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFz ZS9NYWluLmpzCkBAIC00MzEsNyArNDMxLDggQEAgV2ViSW5zcGVjdG9yLl9yZW1lbWJlck9wZW5U YWJzID0gZnVuY3Rpb24oKQogV2ViSW5zcGVjdG9yLl91cGRhdGVOZXdUYWJCdXR0b25TdGF0ZSA9 IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHZhciBuZXdUYWJBbGxvd2VkID0gdGhpcy5pc05ld1Rh YldpdGhUeXBlQWxsb3dlZChXZWJJbnNwZWN0b3IuQ29uc29sZVRhYkNvbnRlbnRWaWV3LlR5cGUp IHx8IHRoaXMuaXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLkVsZW1lbnRzVGFi Q29udGVudFZpZXcuVHlwZSkKLSAgICAgICAgIHx8IHRoaXMuaXNOZXdUYWJXaXRoVHlwZUFsbG93 ZWQoV2ViSW5zcGVjdG9yLlJlc291cmNlc1RhYkNvbnRlbnRWaWV3LlR5cGUpIHx8IHRoaXMuaXNO ZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLlN0b3JhZ2VUYWJDb250ZW50Vmlldy5U eXBlKTsKKyAgICAgICAgfHwgdGhpcy5pc05ld1RhYldpdGhUeXBlQWxsb3dlZChXZWJJbnNwZWN0 b3IuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcuVHlwZSkgfHwgdGhpcy5pc05ld1RhYldpdGhUeXBl QWxsb3dlZChXZWJJbnNwZWN0b3IuU3RvcmFnZVRhYkNvbnRlbnRWaWV3LlR5cGUpCisgICAgICAg IHx8IHRoaXMuaXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFi Q29udGVudFZpZXcuVHlwZSk7CiAgICAgdGhpcy50YWJCYXIubmV3VGFiSXRlbS5kaXNhYmxlZCA9 ICFuZXdUYWJBbGxvd2VkOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpz CmluZGV4IDMzNWE4NTA2YzE1Yzk5ZDEzYjY2NzdjOGVmM2FjNTA0ZWIzZmYxZmIuLmFjOGYwZGI0 NDFjYWJkNGNjNTNkMWU1MDhhN2ZjNDUyZDRiODhiZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1l bGluZU1hbmFnZXIuanMKQEAgLTMzLDI1ICszMywyNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVN YW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVj dAogICAgICAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWluUmVzb3VyY2VE aWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuUmVzb3VyY2VXYXNBZGRlZCwgdGhpcy5fcmVz b3VyY2VXYXNBZGRlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fcmVjb3JkaW5ncyA9IFtdOwot ICAgICAgICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcgPSBudWxsOwogICAgICAgICB0aGlzLl9pc0Nh cHR1cmluZyA9IGZhbHNlOwotCi0gICAgICAgIHRoaXMuX25leHRSZWNvcmRpbmdJZGVudGlmaWVy ID0gMTsKLQogICAgICAgICB0aGlzLl9ib3VuZFN0b3BDYXB0dXJpbmcgPSB0aGlzLnN0b3BDYXB0 dXJpbmcuYmluZCh0aGlzKTsKIAotICAgICAgICBmdW5jdGlvbiBkZWxheWVkV29yaygpCi0gICAg ICAgIHsKLSAgICAgICAgICAgIHRoaXMuX2xvYWROZXdSZWNvcmRpbmcoKTsKLSAgICAgICAgfQot Ci0gICAgICAgIC8vIEFsbG93IG90aGVyIGNvZGUgdG8gc2V0IHVwIGxpc3RlbmVycyBiZWZvcmUg ZmlyaW5nIHRoZSBpbml0aWFsIFJlY29yZGluZ0xvYWRlZCBldmVudC4KLSAgICAgICAgc2V0VGlt ZW91dChkZWxheWVkV29yay5iaW5kKHRoaXMpLCAwKTsKKyAgICAgICAgdGhpcy5yZXNldCgpOwog ICAgIH0KIAogICAgIC8vIFB1YmxpYwogCisgICAgcmVzZXQoKQorICAgIHsKKyAgICAgICAgaWYg KHRoaXMuX2lzQ2FwdHVyaW5nKQorICAgICAgICAgICAgdGhpcy5zdG9wQ2FwdHVyaW5nKCk7CisK KyAgICAgICAgdGhpcy5fcmVjb3JkaW5ncyA9IFtdOworICAgICAgICB0aGlzLl9hY3RpdmVSZWNv cmRpbmcgPSBudWxsOworICAgICAgICB0aGlzLl9uZXh0UmVjb3JkaW5nSWRlbnRpZmllciA9IDE7 CisKKyAgICAgICAgdGhpcy5fbG9hZE5ld1JlY29yZGluZygpOworICAgIH0KKwogICAgIC8vIFRo ZSBjdXJyZW50IHJlY29yZGluZyB0aGF0IG5ldyB0aW1lbGluZSByZWNvcmRzIHdpbGwgYmUgYXBw ZW5kZWQgdG8sIGlmIGFueS4KICAgICBnZXQgYWN0aXZlUmVjb3JkaW5nKCkKICAgICB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwppbmRleCA0NmVkNzY3 OWFmN2JkNjU2Y2VkOTJlMWQ5YjlhZDY2ODk5YjZjMmQ0Li5hMWYwMGM1NzFmZGM4YjAzOTQ4ODI4 MDRjYjk0NWU2NTQ3MGNlNTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFi Q29udGVudFZpZXcuanMKQEAgLTQxLDYgKzQxLDEwIEBAIFdlYkluc3BlY3Rvci5Db250ZW50QnJv d3NlclRhYkNvbnRlbnRWaWV3ID0gZnVuY3Rpb24oaWRlbnRpZmllciwgc3R5bGVDbGFzc05hbWVz CiAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu Q29udGVudEJyb3dzZXIuRXZlbnQuQ3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0RpZENoYW5nZSwg dGhpcy5zaG93RGV0YWlsc1NpZGViYXJQYW5lbHMsIHRoaXMpOwogICAgIHRoaXMuX2NvbnRlbnRC cm93c2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLkV2ZW50 LkN1cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZSwgdGhpcy5fY29udGVudEJyb3dzZXJDdXJyZW50 Q29udGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMpOwogCisgICAgLy8gSWYgYW55IGNvbnRlbnQgdmll d3Mgd2VyZSBzaG93biBkdXJpbmcgc2lkZWJhciBjb25zdHJ1Y3Rpb24sIGNvbnRlbnRCcm93c2Vy VHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdCgpIHdvdWxkIGhhdmUgcmV0dXJuZWQgbnVs bC4KKyAgICAvLyBFeHBsaWNpdGx5IHVwZGF0ZSB0aGUgcGF0aCBmb3IgdGhlIG5hdmlnYXRpb24g YmFyIHRvIHByZXZlbnQgaXQgZnJvbSBzaG93aW5nIHVwIGFzIGJsYW5rLgorICAgIHRoaXMuX2Nv bnRlbnRCcm93c2VyLnVwZGF0ZUhpZXJhcmNoaWNhbFBhdGhGb3JDdXJyZW50Q29udGVudFZpZXco KTsKKwogICAgIGlmIChuYXZpZ2F0aW9uU2lkZWJhclBhbmVsKSB7CiAgICAgICAgIHZhciBzaG93 VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyB0aGUgbmF2aWdhdGlvbiBzaWRl YmFyICglcykiKS5mb3JtYXQoV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyS2V5Ym9hcmRT aG9ydGN1dC5kaXNwbGF5TmFtZSk7CiAgICAgICAgIHZhciBoaWRlVG9vbFRpcCA9IFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcykiKS5mb3JtYXQo V2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFt ZSk7CkBAIC0xMTEsNiArMTE1LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29u dGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IubmF2aWdhdGlvblNp ZGViYXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKICAgICAgICAgV2Vi SW5zcGVjdG9yLmRldGFpbHNTaWRlYmFyLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwg dGhpcyk7CiAKKyAgICAgICAgaWYgKHR5cGVvZiB0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwu Y2xvc2VkID09PSAiZnVuY3Rpb24iKQorICAgICAgICAgICAgdGhpcy5uYXZpZ2F0aW9uU2lkZWJh clBhbmVsLmNsb3NlZCgpOworCiAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLmNvbnRlbnRW aWV3Q29udGFpbmVyLmNsb3NlQWxsQ29udGVudFZpZXdzKCk7CiAgICAgfSwKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxp bmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5 b3V0VGltZWxpbmVWaWV3LmpzCmluZGV4IGFiN2U0NTQ1N2I0YWUwMGY0Y2UzYmU4NDJlODU2N2Q1 MDE4MjJmMmMuLmZhMmZiNzhhZTk4ZTk5YjI4ODYzN2UwMWY5YmRiM2RhMTJlZTgxMDkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRp bWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMKQEAgLTEyMyw2ICsxMjMsMTIgQEAgV2ViSW5zcGVj dG9yLkxheW91dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rv ci5Db250ZW50Vmlldy5wcm90b3R5cGUuaGlkZGVuLmNhbGwodGhpcyk7CiAgICAgfSwKIAorICAg IGNsb3NlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5y ZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZSk7CisgICAg ICAgIHRoaXMucmVwcmVzZW50ZWRPYmplY3QucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxs LCB0aGlzKTsKKyAgICB9LAorCiAgICAgZmlsdGVyRGlkQ2hhbmdlOiBmdW5jdGlvbigpCiAgICAg ewogICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS5maWx0ZXJEaWRD aGFuZ2UuY2FsbCh0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCmluZGV4IDI5 OTc3NDllOGRkZjQ3Y2E0ODJkMWNlZjFhODhmYWJiNzk1YmY0MDcuLmRjNDhlYzEyYjIyOGQ5MmRi NzI3MDViMTE3YTY3ZjcxOGU2ZTY5NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5q cwpAQCAtMTI1LDYgKzEyNSwxMiBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1RpbWVsaW5lVmlldy5w cm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5Db250ZW50Vmlldy5wcm90b3R5cGUu aGlkZGVuLmNhbGwodGhpcyk7CiAgICAgfSwKIAorICAgIGNsb3NlZDogZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5yZXByZXNlbnRlZE9iamVjdCBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZSk7CisgICAgICAgIHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKKyAgICB9LAorCiAgICAg dXBkYXRlTGF5b3V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVWaWV3LnByb3RvdHlwZS51cGRhdGVMYXlvdXQuY2FsbCh0aGlzKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ld1RhYkNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV3VGFi Q29udGVudFZpZXcuanMKaW5kZXggZmYzZThmODVmMzJiY2RkYTM3MmFjMWEwMDdmZWJhNjE1MTIy ZWUzYy4uOTkyNzMxZDlmNTgyOTFiYmFiMDkwYTBmZjc5MDRlMDgzZDA0YmJhNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV3VGFiQ29udGVu dFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV3VGFiQ29udGVudFZpZXcuanMKQEAgLTMyLDYgKzMyLDcgQEAgV2ViSW5zcGVjdG9yLk5ld1Rh YkNvbnRlbnRWaWV3ID0gZnVuY3Rpb24oaWRlbnRpZmllcikKICAgICB2YXIgYWxsb3dlZE5ld1Rh YnMgPSBbCiAgICAgICAgIHtpbWFnZTogIkltYWdlcy9FbGVtZW50cy5zdmciLCB0aXRsZTogV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJFbGVtZW50cyIpLCB0eXBlOiBXZWJJbnNwZWN0b3IuRWxlbWVu dHNUYWJDb250ZW50Vmlldy5UeXBlfSwKICAgICAgICAge2ltYWdlOiAiSW1hZ2VzL1Jlc291cmNl cy5zdmciLCB0aXRsZTogV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZXMiKSwgdHlwZTog V2ViSW5zcGVjdG9yLlJlc291cmNlc1RhYkNvbnRlbnRWaWV3LlR5cGV9LAorICAgICAgICB7aW1h Z2U6ICJJbWFnZXMvVGltZWxpbmUuc3ZnIiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi VGltZWxpbmVzIiksIHR5cGU6IFdlYkluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3LlR5 cGV9LAogICAgICAgICB7aW1hZ2U6ICJJbWFnZXMvU3RvcmFnZS5zdmciLCB0aXRsZTogV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJTdG9yYWdlIiksIHR5cGU6IFdlYkluc3BlY3Rvci5TdG9yYWdlVGFi Q29udGVudFZpZXcuVHlwZX0sCiAgICAgICAgIHtpbWFnZTogIkltYWdlcy9Db25zb2xlLnN2ZyIs IHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnNvbGUiKSwgdHlwZTogV2ViSW5zcGVj dG9yLkNvbnNvbGVUYWJDb250ZW50Vmlldy5UeXBlfQogICAgIF07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmll dy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3 VGltZWxpbmVWaWV3LmpzCmluZGV4IDhiNTlhNmRiNmQ2MjlhNDZiMTczMzYzODM4ZGVjOTEyOTk1 NjViZmYuLmQ5NGJjYjY3NTkwNDU4ZTY1YmY2MmVlODIzMDkxYjVkMTk5MWUxMmIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL092ZXJ2aWV3VGlt ZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzCkBAIC04OCw2ICs4OCwxMiBAQCBXZWJJbnNwZWN0 b3IuT3ZlcnZpZXdUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl90cmVl T3V0bGluZURhdGFHcmlkU3luY2hyb25pemVyLnN5bmNocm9uaXplKCk7CiAgICAgfSwKIAorICAg IGNsb3NlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fbmV0d29ya1RpbWVsaW5l LnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CisgICAgICAgIHRoaXMuX3Jl Y29yZGluZy5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworICAgIH0sCisK ICAgICB1cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rv ci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnVwZGF0ZUxheW91dC5jYWxsKHRoaXMpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5n RnJhbWVUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcwppbmRleCBjNGI0M2NhYjdjZDA4 NmY0NmZjMWNhNjE5MDlkOGFhYTBjNDk0OWUxLi44ZTIxZTM1OWE5NWU1NjNiMTcxZGM0YWJmYzA0 NDEyMjQxMTM3YzJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmll dy5qcwpAQCAtMTAwLDYgKzEwMCwxMiBAQCBXZWJJbnNwZWN0b3IuUmVuZGVyaW5nRnJhbWVUaW1l bGluZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcu cHJvdG90eXBlLmhpZGRlbi5jYWxsKHRoaXMpOwogICAgIH0sCiAKKyAgICBjbG9zZWQ6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMucmVwcmVzZW50ZWRPYmpl Y3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmUpOworICAgICAgICB0aGlzLnJlcHJl c2VudGVkT2JqZWN0LnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CisgICAg fSwKKwogICAgIHVwZGF0ZUxheW91dDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUudXBkYXRlTGF5b3V0LmNhbGwodGhpcyk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3Jp cHRUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9TY3JpcHRUaW1lbGluZVZpZXcuanMKaW5kZXggN2M4YWRhZDU2OWYyYmNiMTdhMDYyYjhi NjY0YjI1ZDE0OGJlZTllZS4uNzM4NTlkNWFlMjBmODFiZjJiZDA0Zjc4NWVlM2NlMGRhZjU3NjVl OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv U2NyaXB0VGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmlldy5qcwpAQCAtMTAxLDYgKzEwMSwxMiBAQCBX ZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgV2Vi SW5zcGVjdG9yLkNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4uY2FsbCh0aGlzKTsKICAgICB9 LAogCisgICAgY2xvc2VkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBjb25zb2xlLmFzc2Vy dCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5l KTsKKyAgICAgICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1vdmVFdmVudExpc3RlbmVyKG51 bGwsIG51bGwsIHRoaXMpOworICAgIH0sCisKICAgICB1cGRhdGVMYXlvdXQ6IGZ1bmN0aW9uKCkK ICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZpZXcucHJvdG90eXBlLnVwZGF0 ZUxheW91dC5jYWxsKHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qcwppbmRl eCA0ODM1YjZhODc0NWFkZDYxZWJiZTI4NTU2MTU1YzY3M2I4ZmJmZTc0Li45ODVlZjk2YzA5OGRi ODIzMjEyZjViYWI0YTg0NGE0OWQ4OWEyZGFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TZWFyY2hUYWJDb250ZW50 Vmlldy5qcwpAQCAtNTQsMTMgKzU0LDYgQEAgV2ViSW5zcGVjdG9yLlNlYXJjaFRhYkNvbnRlbnRW aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgc2V0VGltZW91dCh0aGlzLmZvY3VzU2VhcmNoRmll bGQuYmluZCh0aGlzKSk7CiAgICAgfSwKIAotICAgIGNsb3NlZDogZnVuY3Rpb24oKQotICAgIHsK LSAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcucHJvdG90 eXBlLmNsb3NlZC5jYWxsKHRoaXMpOwotCi0gICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJQ YW5lbC5jbG9zZWQoKTsKLSAgICB9LAotCiAgICAgY2FuU2hvd1JlcHJlc2VudGVkT2JqZWN0OiBm dW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKICAgICB7CiAgICAgICAgIHJldHVybiByZXByZXNl bnRlZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSB8fCByZXByZXNlbnRl ZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5ET01UcmVlOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFu ZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVNpZGViYXJQYW5lbC5qcwppbmRleCA5ZDlhZTA3ZTU3NGRiYWMzNGEzZDRlY2E4OTNhYjE5ZTdl OTY2MDcxLi43OGIzNmJkMjg5YzI4YjYzYjFmYWVmODljNTBiY2Q1NDVjZWRkNTRlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNp ZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qcwpAQCAtMTM0LDYgKzEzNCwxNCBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBl eHRlbmRzIFdlYkluc3BlYwogICAgICAgICB0aGlzLmNvbnRlbnRCcm93c2VyLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLkV2ZW50LkN1cnJlbnRDb250ZW50Vmll d0RpZENoYW5nZSwgdGhpcy5fY29udGVudEJyb3dzZXJDdXJyZW50Q29udGVudFZpZXdEaWRDaGFu Z2UsIHRoaXMpOwogICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lTWFuYWdlci5FdmVudC5DYXB0dXJpbmdTdGFy dGVkLCB0aGlzLl9jYXB0dXJpbmdTdGFydGVkLCB0aGlzKTsKICAgICAgICAgV2ViSW5zcGVjdG9y LnRpbWVsaW5lTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1h bmFnZXIuRXZlbnQuQ2FwdHVyaW5nU3RvcHBlZCwgdGhpcy5fY2FwdHVyaW5nU3RvcHBlZCwgdGhp cyk7CisKKyAgICAgICAgZm9yICh2YXIgcmVjb3JkaW5nIG9mIFdlYkluc3BlY3Rvci50aW1lbGlu ZU1hbmFnZXIucmVjb3JkaW5ncykKKyAgICAgICAgICAgIHRoaXMuX2FkZFJlY29yZGluZyhyZWNv cmRpbmcpOworCisgICAgICAgIHRoaXMuX3JlY29yZGluZ0NvdW50Q2hhbmdlZCgpOworCisgICAg ICAgIGlmIChXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLmFjdGl2ZVJlY29yZGluZykKKyAg ICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0xvYWRlZCgpOwogICAgIH0KIAogICAgIC8vIFB1Ymxp YwpAQCAtMTQ2LDYgKzE1NCwxNSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwg PSBjbGFzcyBUaW1lbGluZVNpZGViYXJQYW5lbCBleHRlbmRzIFdlYkluc3BlYwogICAgICAgICAg ICAgdGhpcy5jb250ZW50QnJvd3Nlci5zaG93Q29udGVudFZpZXcodGhpcy5fZGlzcGxheWVkQ29u dGVudFZpZXcpOwogICAgIH0KIAorICAgIGNsb3NlZCgpCisgICAgeworICAgICAgICBXZWJJbnNw ZWN0b3Iuc2hvd1JlcGxheUludGVyZmFjZVNldHRpbmcucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxs LCBudWxsLCB0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnJlcGxheU1hbmFnZXIucmVtb3Zl RXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnRp bWVsaW5lTWFuYWdlci5yZW1vdmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworCisg ICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIucmVzZXQoKTsKKyAgICB9CisKICAg ICBnZXQgdmlld01vZGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3ZpZXdNb2RlOwpA QCAtMzk5LDE0ICs0MTYsMTcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0g Y2xhc3MgVGltZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKIAogICAgIF9yZWNv cmRpbmdDcmVhdGVkKGV2ZW50KQogICAgIHsKLSAgICAgICAgdmFyIHJlY29yZGluZyA9IGV2ZW50 LmRhdGEucmVjb3JkaW5nOworICAgICAgICB0aGlzLl9hZGRSZWNvcmRpbmcoZXZlbnQuZGF0YS5y ZWNvcmRpbmcpCisgICAgICAgIHRoaXMuX3JlY29yZGluZ0NvdW50Q2hhbmdlZCgpOworICAgIH0K KworICAgIF9hZGRSZWNvcmRpbmcocmVjb3JkaW5nKQorICAgIHsKICAgICAgICAgY29uc29sZS5h c3NlcnQocmVjb3JkaW5nIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5n LCByZWNvcmRpbmcpOwogCiAgICAgICAgIHZhciByZWNvcmRpbmdUcmVlRWxlbWVudCA9IG5ldyBX ZWJJbnNwZWN0b3IuR2VuZXJhbFRyZWVFbGVtZW50KFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGVi YXJQYW5lbC5TdG9wd2F0Y2hJY29uU3R5bGVDbGFzcywgcmVjb3JkaW5nLmRpc3BsYXlOYW1lLCBu dWxsLCByZWNvcmRpbmcpOwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdUcmVlRWxlbWVudE1hcC5z ZXQocmVjb3JkaW5nLCByZWNvcmRpbmdUcmVlRWxlbWVudCk7CiAgICAgICAgIHRoaXMuX3JlY29y ZGluZ3NUcmVlT3V0bGluZS5hcHBlbmRDaGlsZChyZWNvcmRpbmdUcmVlRWxlbWVudCk7Ci0KLSAg ICAgICAgdGhpcy5fcmVjb3JkaW5nQ291bnRDaGFuZ2VkKCk7CiAgICAgfQogCiAgICAgX3JlY29y ZGluZ0NvdW50Q2hhbmdlZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcwpp bmRleCAyNjk0MjUxNTZmZmUyN2U3YmUxNTMxZTQ5MzVkYWQ3NDg5MGJiNDc2Li5mMzljZThhNDEw ZTU3MDFkNzdiODBjYzFjYzJmYTBlNTNiNmZkM2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lVGFi Q29udGVudFZpZXcuanMKQEAgLTI4LDkgKzI4LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVGFi Q29udGVudFZpZXcgPSBmdW5jdGlvbihpZGVudGlmaWVyKQogICAgIHZhciB0YWJCYXJJdGVtID0g bmV3IFdlYkluc3BlY3Rvci5UYWJCYXJJdGVtKCJJbWFnZXMvVGltZWxpbmUuc3ZnIiwgV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZXMiKSk7CiAgICAgdmFyIGRldGFpbHNTaWRlYmFyUGFu ZWxzID0gW1dlYkluc3BlY3Rvci5yZXNvdXJjZURldGFpbHNTaWRlYmFyUGFuZWwsIFdlYkluc3Bl Y3Rvci5wcm9iZURldGFpbHNTaWRlYmFyUGFuZWwsIFdlYkluc3BlY3Rvci5yZW5kZXJpbmdGcmFt ZURldGFpbHNTaWRlYmFyUGFuZWxdOwogCi0gICAgLy8gRklNRTogVW50aWwgVGltZWxpbmVTaWRl YmFyUGFuZWwgc3VwcG9ydHMgaW5zdGFudGlhdGluZyBhZnRlciBpbnNwZWN0b3IgbGF1bmNoLCBk aXNhYmxlIGNsb3NpbmcuCi0gICAgdGFiQmFySXRlbS5oaWRlQ2xvc2VCdXR0b24gPSB0cnVlOwot CiAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuY2FsbCh0aGlz LCBpZGVudGlmaWVyIHx8ICJ0aW1lbGluZSIsICJ0aW1lbGluZSIsIHRhYkJhckl0ZW0sIFdlYklu c3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCwgZGV0YWlsc1NpZGViYXJQYW5lbHMpOwogfTsK IAo= 252232 2015-05-02 09:03:42 -0700 2015-05-04 13:24:15 -0700 Patch bug-144520-20150502090230.patch text/plain 18093 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw OTk5ZGY5MTdiZTczNjg3YjM0MWIxYmY4YWRhZTAwODA2NGIzYjc3Li5kYjgyMDY4ZTc5MzJiMjNh NzRhMjU2MTY3YmVjNDdjNDAyOGY5MTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NyBAQAogMjAxNS0wNS0wMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWxsb3cgY2xvc2luZyBhbmQgcmVvcGVuaW5n IHRoZSBUaW1lbGluZXMgdGFiCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDQ1MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLl91cGRhdGVOZXdUYWJCdXR0b25TdGF0ZSk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu VGltZWxpbmVNYW5hZ2VyKTogTm8gbmVlZCBmb3IgYSBkZWxheSBub3cuIENhbGwgcmVzZXQoKS4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIucHJvdG90eXBlLnJlc2V0KToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIuZGVsYXllZFdvcmspOiBEZWxl dGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250 ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRW aWV3LnByb3RvdHlwZS5jbG9zZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5 b3V0VGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxheW91dFRpbWVsaW5l Vmlldy5wcm90b3R5cGUuY2xvc2VkKTogQWRkZWQuIEZpeGVkIGxlYWsuCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBlLmNsb3NlZCk6IEFkZGVkLiBGaXhl ZCBsZWFrLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV3VGFiQ29udGVudFZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV3VGFiQ29udGVudFZpZXcpOiBBZGRlZCBUaW1l bGluZXMuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmll dy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5PdmVydmlld1RpbWVsaW5lVmlldy5wcm90b3R5 cGUuY2xvc2VkKTogQWRkZWQuIEZpeGVkIGxlYWsuCisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZW5kZXJpbmdGcmFtZVRpbWVsaW5lVmlldy5wcm90b3R5cGUuY2xvc2VkKTogQWRkZWQuIEZp eGVkIGxlYWsuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZVZp ZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0VGltZWxpbmVWaWV3LnByb3RvdHlw ZS5jbG9zZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2VhcmNoVGFiQ29udGVudFZpZXcucHJv dG90eXBlLmNsb3NlZCk6IERlbGV0ZWQuIE1hZGUgZ2VuZXJpYworICAgICAgICBpbiBDb250ZW50 QnJvd3NlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQuCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRhYkJy b3dzZXIucHJvdG90eXBlLl90YWJCYXJJdGVtU2VsZWN0ZWQpOiBGaXggYSBwb3RlbnRpYWwgZXhj ZXB0aW9uCisgICAgICAgIHdoZW4gc2VsZWN0ZWRUYWJCYXJJdGVtIGlzIG51bGwuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJvdG90eXBlLmNsb3NlZCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuX3JlY29yZGluZ0NyZWF0ZWQpOiBDYWxsIF9h ZGRSZWNvcmRpbmcuCisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwu X2FkZFJlY29yZGluZyk6IEFkZGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVRh YkNvbnRlbnRWaWV3KToKKworMjAxNS0wNS0wMiAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogU3dpdGNoaW5nIHJlY29yZGluZ3Mg aW4gdGhlIFRpbWVsaW5lIG5hdmlnYXRpb24gYmFyIGlzIGJyb2tlbgogICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NTE5CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCAyOGI1NzE1Y2Fl NTdkMWM0NWIxMDYwMDY2MGY5Y2Y5YWZjN2NjZTFkLi4xNjc3YWY4Njk5NDVlODdmYzI1MWExMTNj MGI0MzJiYWYzYjVkMDVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9NYWluLmpzCkBAIC00MzEsNyArNDMxLDggQEAgV2ViSW5zcGVjdG9yLl9yZW1l bWJlck9wZW5UYWJzID0gZnVuY3Rpb24oKQogV2ViSW5zcGVjdG9yLl91cGRhdGVOZXdUYWJCdXR0 b25TdGF0ZSA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHZhciBuZXdUYWJBbGxvd2VkID0gdGhp cy5pc05ld1RhYldpdGhUeXBlQWxsb3dlZChXZWJJbnNwZWN0b3IuQ29uc29sZVRhYkNvbnRlbnRW aWV3LlR5cGUpIHx8IHRoaXMuaXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVGFiQ29udGVudFZpZXcuVHlwZSkKLSAgICAgICAgIHx8IHRoaXMuaXNOZXdUYWJXaXRo VHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLlJlc291cmNlc1RhYkNvbnRlbnRWaWV3LlR5cGUpIHx8 IHRoaXMuaXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLlN0b3JhZ2VUYWJDb250 ZW50Vmlldy5UeXBlKTsKKyAgICAgICAgfHwgdGhpcy5pc05ld1RhYldpdGhUeXBlQWxsb3dlZChX ZWJJbnNwZWN0b3IuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcuVHlwZSkgfHwgdGhpcy5pc05ld1Rh YldpdGhUeXBlQWxsb3dlZChXZWJJbnNwZWN0b3IuU3RvcmFnZVRhYkNvbnRlbnRWaWV3LlR5cGUp CisgICAgICAgIHx8IHRoaXMuaXNOZXdUYWJXaXRoVHlwZUFsbG93ZWQoV2ViSW5zcGVjdG9yLlRp bWVsaW5lVGFiQ29udGVudFZpZXcuVHlwZSk7CiAgICAgdGhpcy50YWJCYXIubmV3VGFiSXRlbS5k aXNhYmxlZCA9ICFuZXdUYWJBbGxvd2VkOwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvVGltZWxpbmVN YW5hZ2VyLmpzCmluZGV4IDMzNWE4NTA2YzE1Yzk5ZDEzYjY2NzdjOGVmM2FjNTA0ZWIzZmYxZmIu LmFjOGYwZGI0NDFjYWJkNGNjNTNkMWU1MDhhN2ZjNDUyZDRiODhiZmEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFu YWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9UaW1lbGluZU1hbmFnZXIuanMKQEAgLTMzLDI1ICszMywyNiBAQCBXZWJJbnNwZWN0b3Iu VGltZWxpbmVNYW5hZ2VyID0gY2xhc3MgVGltZWxpbmVNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgICAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWlu UmVzb3VyY2VEaWRDaGFuZ2UsIHRoaXMpOwogICAgICAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQuUmVzb3VyY2VXYXNBZGRlZCwg dGhpcy5fcmVzb3VyY2VXYXNBZGRlZCwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fcmVjb3JkaW5n cyA9IFtdOwotICAgICAgICB0aGlzLl9hY3RpdmVSZWNvcmRpbmcgPSBudWxsOwogICAgICAgICB0 aGlzLl9pc0NhcHR1cmluZyA9IGZhbHNlOwotCi0gICAgICAgIHRoaXMuX25leHRSZWNvcmRpbmdJ ZGVudGlmaWVyID0gMTsKLQogICAgICAgICB0aGlzLl9ib3VuZFN0b3BDYXB0dXJpbmcgPSB0aGlz LnN0b3BDYXB0dXJpbmcuYmluZCh0aGlzKTsKIAotICAgICAgICBmdW5jdGlvbiBkZWxheWVkV29y aygpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHRoaXMuX2xvYWROZXdSZWNvcmRpbmcoKTsKLSAg ICAgICAgfQotCi0gICAgICAgIC8vIEFsbG93IG90aGVyIGNvZGUgdG8gc2V0IHVwIGxpc3RlbmVy cyBiZWZvcmUgZmlyaW5nIHRoZSBpbml0aWFsIFJlY29yZGluZ0xvYWRlZCBldmVudC4KLSAgICAg ICAgc2V0VGltZW91dChkZWxheWVkV29yay5iaW5kKHRoaXMpLCAwKTsKKyAgICAgICAgdGhpcy5y ZXNldCgpOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwogCisgICAgcmVzZXQoKQorICAgIHsKKyAg ICAgICAgaWYgKHRoaXMuX2lzQ2FwdHVyaW5nKQorICAgICAgICAgICAgdGhpcy5zdG9wQ2FwdHVy aW5nKCk7CisKKyAgICAgICAgdGhpcy5fcmVjb3JkaW5ncyA9IFtdOworICAgICAgICB0aGlzLl9h Y3RpdmVSZWNvcmRpbmcgPSBudWxsOworICAgICAgICB0aGlzLl9uZXh0UmVjb3JkaW5nSWRlbnRp ZmllciA9IDE7CisKKyAgICAgICAgdGhpcy5fbG9hZE5ld1JlY29yZGluZygpOworICAgIH0KKwog ICAgIC8vIFRoZSBjdXJyZW50IHJlY29yZGluZyB0aGF0IG5ldyB0aW1lbGluZSByZWNvcmRzIHdp bGwgYmUgYXBwZW5kZWQgdG8sIGlmIGFueS4KICAgICBnZXQgYWN0aXZlUmVjb3JkaW5nKCkKICAg ICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwppbmRl eCA0NmVkNzY3OWFmN2JkNjU2Y2VkOTJlMWQ5YjlhZDY2ODk5YjZjMmQ0Li4wY2QyNWVkZmU5ZjA5 NjRiNTJjMmE1NWQxNmY1ZTNkMzBkZDg0ODE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRC cm93c2VyVGFiQ29udGVudFZpZXcuanMKQEAgLTQxLDYgKzQxLDEwIEBAIFdlYkluc3BlY3Rvci5D b250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3ID0gZnVuY3Rpb24oaWRlbnRpZmllciwgc3R5bGVD bGFzc05hbWVzCiAgICAgdGhpcy5fY29udGVudEJyb3dzZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuQ29udGVudEJyb3dzZXIuRXZlbnQuQ3VycmVudFJlcHJlc2VudGVkT2JqZWN0c0Rp ZENoYW5nZSwgdGhpcy5zaG93RGV0YWlsc1NpZGViYXJQYW5lbHMsIHRoaXMpOwogICAgIHRoaXMu X2NvbnRlbnRCcm93c2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93 c2VyLkV2ZW50LkN1cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZSwgdGhpcy5fY29udGVudEJyb3dz ZXJDdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMpOwogCisgICAgLy8gSWYgYW55IGNv bnRlbnQgdmlld3Mgd2VyZSBzaG93biBkdXJpbmcgc2lkZWJhciBjb25zdHJ1Y3Rpb24sIGNvbnRl bnRCcm93c2VyVHJlZUVsZW1lbnRGb3JSZXByZXNlbnRlZE9iamVjdCgpIHdvdWxkIGhhdmUgcmV0 dXJuZWQgbnVsbC4KKyAgICAvLyBFeHBsaWNpdGx5IHVwZGF0ZSB0aGUgcGF0aCBmb3IgdGhlIG5h dmlnYXRpb24gYmFyIHRvIHByZXZlbnQgaXQgZnJvbSBzaG93aW5nIHVwIGFzIGJsYW5rLgorICAg IHRoaXMuX2NvbnRlbnRCcm93c2VyLnVwZGF0ZUhpZXJhcmNoaWNhbFBhdGhGb3JDdXJyZW50Q29u dGVudFZpZXcoKTsKKwogICAgIGlmIChuYXZpZ2F0aW9uU2lkZWJhclBhbmVsKSB7CiAgICAgICAg IHZhciBzaG93VG9vbFRpcCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hvdyB0aGUgbmF2aWdh dGlvbiBzaWRlYmFyICglcykiKS5mb3JtYXQoV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFy S2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSk7CiAgICAgICAgIHZhciBoaWRlVG9vbFRpcCA9 IFdlYkluc3BlY3Rvci5VSVN0cmluZygiSGlkZSB0aGUgbmF2aWdhdGlvbiBzaWRlYmFyICglcyki KS5mb3JtYXQoV2ViSW5zcGVjdG9yLm5hdmlnYXRpb25TaWRlYmFyS2V5Ym9hcmRTaG9ydGN1dC5k aXNwbGF5TmFtZSk7CkBAIC0xMTEsNiArMTE1LDkgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93 c2VyVGFiQ29udGVudFZpZXcucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IubmF2 aWdhdGlvblNpZGViYXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKICAg ICAgICAgV2ViSW5zcGVjdG9yLmRldGFpbHNTaWRlYmFyLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVs bCwgbnVsbCwgdGhpcyk7CiAKKyAgICAgICAgaWYgKHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5l bCAmJiB0eXBlb2YgdGhpcy5uYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmNsb3NlZCA9PT0gImZ1bmN0 aW9uIikKKyAgICAgICAgICAgIHRoaXMubmF2aWdhdGlvblNpZGViYXJQYW5lbC5jbG9zZWQoKTsK KwogICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nlci5jb250ZW50Vmlld0NvbnRhaW5lci5jbG9z ZUFsbENvbnRlbnRWaWV3cygpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lVmlldy5q cwppbmRleCBhYjdlNDU0NTdiNGFlMDBmNGNlM2JlODQyZTg1NjdkNTAxODIyZjJjLi5mYTJmYjc4 YWU5OGU5OWIyODg2MzdlMDFmOWJkYjNkYTEyZWU4MTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZVZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxp bmVWaWV3LmpzCkBAIC0xMjMsNiArMTIzLDEyIEBAIFdlYkluc3BlY3Rvci5MYXlvdXRUaW1lbGlu ZVZpZXcucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcucHJv dG90eXBlLmhpZGRlbi5jYWxsKHRoaXMpOwogICAgIH0sCiAKKyAgICBjbG9zZWQ6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMucmVwcmVzZW50ZWRPYmplY3Qg aW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuVGltZWxpbmUpOworICAgICAgICB0aGlzLnJlcHJlc2Vu dGVkT2JqZWN0LnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CisgICAgfSwK KwogICAgIGZpbHRlckRpZENoYW5nZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5cGUuZmlsdGVyRGlkQ2hhbmdlLmNhbGwodGhpcyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGltZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcwppbmRleCAyOTk3NzQ5ZThkZGY0N2NhNDgy ZDFjZWYxYTg4ZmFiYjc5NWJmNDA3Li5kYzQ4ZWMxMmIyMjhkOTJkYjcyNzA1YjExN2E2N2Y3MThl NmU2OTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9OZXR3b3JrVGltZWxpbmVWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuanMKQEAgLTEyNSw2ICsxMjUs MTIgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogICAg ICAgICBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXcucHJvdG90eXBlLmhpZGRlbi5jYWxsKHRoaXMp OwogICAgIH0sCiAKKyAgICBjbG9zZWQ6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHRoaXMucmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3Iu VGltZWxpbmUpOworICAgICAgICB0aGlzLnJlcHJlc2VudGVkT2JqZWN0LnJlbW92ZUV2ZW50TGlz dGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CisgICAgfSwKKwogICAgIHVwZGF0ZUxheW91dDogZnVu Y3Rpb24oKQogICAgIHsKICAgICAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldy5wcm90b3R5 cGUudXBkYXRlTGF5b3V0LmNhbGwodGhpcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXdUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ld1RhYkNvbnRlbnRWaWV3LmpzCmlu ZGV4IGZmM2U4Zjg1ZjMyYmNkZGEzNzJhYzFhMDA3ZmViYTYxNTEyMmVlM2MuLjk5MjczMWQ5ZjU4 MjkxYmJhYjA5MGEwZmY3OTA0ZTA4M2QwNGJiYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ld1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ld1RhYkNvbnRlbnRWaWV3 LmpzCkBAIC0zMiw2ICszMiw3IEBAIFdlYkluc3BlY3Rvci5OZXdUYWJDb250ZW50VmlldyA9IGZ1 bmN0aW9uKGlkZW50aWZpZXIpCiAgICAgdmFyIGFsbG93ZWROZXdUYWJzID0gWwogICAgICAgICB7 aW1hZ2U6ICJJbWFnZXMvRWxlbWVudHMuc3ZnIiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiRWxlbWVudHMiKSwgdHlwZTogV2ViSW5zcGVjdG9yLkVsZW1lbnRzVGFiQ29udGVudFZpZXcu VHlwZX0sCiAgICAgICAgIHtpbWFnZTogIkltYWdlcy9SZXNvdXJjZXMuc3ZnIiwgdGl0bGU6IFdl Ykluc3BlY3Rvci5VSVN0cmluZygiUmVzb3VyY2VzIiksIHR5cGU6IFdlYkluc3BlY3Rvci5SZXNv dXJjZXNUYWJDb250ZW50Vmlldy5UeXBlfSwKKyAgICAgICAge2ltYWdlOiAiSW1hZ2VzL1RpbWVs aW5lLnN2ZyIsIHRpdGxlOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVsaW5lcyIpLCB0eXBl OiBXZWJJbnNwZWN0b3IuVGltZWxpbmVUYWJDb250ZW50Vmlldy5UeXBlfSwKICAgICAgICAge2lt YWdlOiAiSW1hZ2VzL1N0b3JhZ2Uuc3ZnIiwgdGl0bGU6IFdlYkluc3BlY3Rvci5VSVN0cmluZygi U3RvcmFnZSIpLCB0eXBlOiBXZWJJbnNwZWN0b3IuU3RvcmFnZVRhYkNvbnRlbnRWaWV3LlR5cGV9 LAogICAgICAgICB7aW1hZ2U6ICJJbWFnZXMvQ29uc29sZS5zdmciLCB0aXRsZTogV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJDb25zb2xlIiksIHR5cGU6IFdlYkluc3BlY3Rvci5Db25zb2xlVGFiQ29u dGVudFZpZXcuVHlwZX0KICAgICBdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvT3ZlcnZpZXdUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcwpp bmRleCA4YjU5YTZkYjZkNjI5YTQ2YjE3MzM2MzgzOGRlYzkxMjk5NTY1YmZmLi5kOTRiY2I2NzU5 MDQ1OGU2NWJmNjJlZTgyMzA5MWI1ZDE5OTFlMTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVsaW5lVmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PdmVydmlld1RpbWVs aW5lVmlldy5qcwpAQCAtODgsNiArODgsMTIgQEAgV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxp bmVWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fdHJlZU91dGxpbmVEYXRhR3JpZFN5 bmNocm9uaXplci5zeW5jaHJvbml6ZSgpOwogICAgIH0sCiAKKyAgICBjbG9zZWQ6IGZ1bmN0aW9u KCkKKyAgICB7CisgICAgICAgIHRoaXMuX25ldHdvcmtUaW1lbGluZS5yZW1vdmVFdmVudExpc3Rl bmVyKG51bGwsIG51bGwsIHRoaXMpOworICAgICAgICB0aGlzLl9yZWNvcmRpbmcucmVtb3ZlRXZl bnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKKyAgICB9LAorCiAgICAgdXBkYXRlTGF5b3V0 OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnBy b3RvdHlwZS51cGRhdGVMYXlvdXQuY2FsbCh0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVyaW5n RnJhbWVUaW1lbGluZVZpZXcuanMKaW5kZXggYzRiNDNjYWI3Y2QwODZmNDZmYzFjYTYxOTA5ZDhh YWEwYzQ5NDllMS4uOGUyMWUzNTlhOTVlNTYzYjE3MWRjNGFiZmMwNDQxMjI0MTEzN2MyZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVuZGVy aW5nRnJhbWVUaW1lbGluZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUmVuZGVyaW5nRnJhbWVUaW1lbGluZVZpZXcuanMKQEAgLTEwMCw2ICsx MDAsMTIgQEAgV2ViSW5zcGVjdG9yLlJlbmRlcmluZ0ZyYW1lVGltZWxpbmVWaWV3LnByb3RvdHlw ZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLkNvbnRlbnRWaWV3LnByb3RvdHlwZS5oaWRkZW4u Y2FsbCh0aGlzKTsKICAgICB9LAogCisgICAgY2xvc2VkOiBmdW5jdGlvbigpCisgICAgeworICAg ICAgICBjb25zb2xlLmFzc2VydCh0aGlzLnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lKTsKKyAgICAgICAgdGhpcy5yZXByZXNlbnRlZE9iamVjdC5yZW1v dmVFdmVudExpc3RlbmVyKG51bGwsIG51bGwsIHRoaXMpOworICAgIH0sCisKICAgICB1cGRhdGVM YXlvdXQ6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5UaW1lbGluZVZp ZXcucHJvdG90eXBlLnVwZGF0ZUxheW91dC5jYWxsKHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxp bmVWaWV3LmpzCmluZGV4IDdjOGFkYWQ1NjlmMmJjYjE3YTA2MmI4YjY2NGIyNWQxNDhiZWU5ZWUu LjczODU5ZDVhZTIwZjgxYmYyYmQwNGY3ODVlZTNjZTBkYWY1NzY1ZTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lVmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3Jp cHRUaW1lbGluZVZpZXcuanMKQEAgLTEwMSw2ICsxMDEsMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlw dFRpbWVsaW5lVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5Db250ZW50 Vmlldy5wcm90b3R5cGUuaGlkZGVuLmNhbGwodGhpcyk7CiAgICAgfSwKIAorICAgIGNsb3NlZDog ZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5yZXByZXNlbnRl ZE9iamVjdCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5UaW1lbGluZSk7CisgICAgICAgIHRoaXMu cmVwcmVzZW50ZWRPYmplY3QucmVtb3ZlRXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsK KyAgICB9LAorCiAgICAgdXBkYXRlTGF5b3V0OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBX ZWJJbnNwZWN0b3IuVGltZWxpbmVWaWV3LnByb3RvdHlwZS51cGRhdGVMYXlvdXQuY2FsbCh0aGlz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NlYXJjaFRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMKaW5kZXggNDgzNWI2YTg3NDVhZGQ2 MWViYmUyODU1NjE1NWM2NzNiOGZiZmU3NC4uOTg1ZWY5NmMwOThkYjgyMzIxMmY1YmFiNGE4NDRh NDlkODlhMmRhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2VhcmNoVGFiQ29udGVudFZpZXcuanMKQEAgLTU0LDEz ICs1NCw2IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hUYWJDb250ZW50Vmlldy5wcm90b3R5cGUgPSB7 CiAgICAgICAgIHNldFRpbWVvdXQodGhpcy5mb2N1c1NlYXJjaEZpZWxkLmJpbmQodGhpcykpOwog ICAgIH0sCiAKLSAgICBjbG9zZWQ6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3Bl Y3Rvci5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LnByb3RvdHlwZS5jbG9zZWQuY2FsbCh0 aGlzKTsKLQotICAgICAgICB0aGlzLm5hdmlnYXRpb25TaWRlYmFyUGFuZWwuY2xvc2VkKCk7Ci0g ICAgfSwKLQogICAgIGNhblNob3dSZXByZXNlbnRlZE9iamVjdDogZnVuY3Rpb24ocmVwcmVzZW50 ZWRPYmplY3QpCiAgICAgewogICAgICAgICByZXR1cm4gcmVwcmVzZW50ZWRPYmplY3QgaW5zdGFu Y2VvZiBXZWJJbnNwZWN0b3IuUmVzb3VyY2UgfHwgcmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2Vv ZiBXZWJJbnNwZWN0b3IuRE9NVHJlZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCmluZGV4IDE2Yzg5ZjBlY2ZhMWY2 YzYwNTgwODZmYjE1N2NiZGRlMGNkMzkxNmEuLjA1OGQ5MmI3OGJmMzNhNGQ1OGI0ZTQ3ZWQ3OTU2 MWVlZWUxYzg5ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nlci5qcwpAQCAtMTg4LDcgKzE4OCw3IEBAIFdlYkluc3Bl Y3Rvci5UYWJCcm93c2VyID0gY2xhc3MgVGFiQnJvd3NlciBleHRlbmRzIFdlYkluc3BlY3Rvci5P YmplY3QKIAogICAgIF90YWJCYXJJdGVtU2VsZWN0ZWQoZXZlbnQpCiAgICAgewotICAgICAgICB2 YXIgdGFiQ29udGVudFZpZXcgPSB0aGlzLl90YWJCYXIuc2VsZWN0ZWRUYWJCYXJJdGVtLnJlcHJl c2VudGVkT2JqZWN0OworICAgICAgICB2YXIgdGFiQ29udGVudFZpZXcgPSB0aGlzLl90YWJCYXIu c2VsZWN0ZWRUYWJCYXJJdGVtID8gdGhpcy5fdGFiQmFyLnNlbGVjdGVkVGFiQmFySXRlbS5yZXBy ZXNlbnRlZE9iamVjdCA6IG51bGw7CiAKICAgICAgICAgaWYgKHRhYkNvbnRlbnRWaWV3KSB7CiAg ICAgICAgICAgICB0aGlzLl9yZWNlbnRUYWJDb250ZW50Vmlld3MucmVtb3ZlKHRhYkNvbnRlbnRW aWV3KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKaW5kZXggOWQ5YWUwN2U1NzRk YmFjMzRhM2Q0ZWNhODkzYWIxOWU3ZTk2NjA3MS4uNzhiMzZiZDI4OWMyOGI2M2IxZmFlZjg5YzUw YmNkNTQ1Y2VkZDU0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKQEAgLTEz NCw2ICsxMzQsMTQgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xhc3Mg VGltZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgdGhpcy5jb250 ZW50QnJvd3Nlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3Nlci5F dmVudC5DdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMuX2NvbnRlbnRCcm93c2VyQ3Vy cmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzKTsKICAgICAgICAgV2ViSW5zcGVjdG9yLnRp bWVsaW5lTWFuYWdlci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFn ZXIuRXZlbnQuQ2FwdHVyaW5nU3RhcnRlZCwgdGhpcy5fY2FwdHVyaW5nU3RhcnRlZCwgdGhpcyk7 CiAgICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LkNhcHR1cmluZ1N0b3BwZWQsIHRoaXMu X2NhcHR1cmluZ1N0b3BwZWQsIHRoaXMpOworCisgICAgICAgIGZvciAodmFyIHJlY29yZGluZyBv ZiBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnJlY29yZGluZ3MpCisgICAgICAgICAgICB0 aGlzLl9hZGRSZWNvcmRpbmcocmVjb3JkaW5nKTsKKworICAgICAgICB0aGlzLl9yZWNvcmRpbmdD b3VudENoYW5nZWQoKTsKKworICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdl ci5hY3RpdmVSZWNvcmRpbmcpCisgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdMb2FkZWQoKTsK ICAgICB9CiAKICAgICAvLyBQdWJsaWMKQEAgLTE0Niw2ICsxNTQsMTUgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lU2lkZWJhclBhbmVsID0gY2xhc3MgVGltZWxpbmVTaWRlYmFyUGFuZWwgZXh0ZW5k cyBXZWJJbnNwZWMKICAgICAgICAgICAgIHRoaXMuY29udGVudEJyb3dzZXIuc2hvd0NvbnRlbnRW aWV3KHRoaXMuX2Rpc3BsYXllZENvbnRlbnRWaWV3KTsKICAgICB9CiAKKyAgICBjbG9zZWQoKQor ICAgIHsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dSZXBsYXlJbnRlcmZhY2VTZXR0aW5nLnJl bW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7CisgICAgICAgIFdlYkluc3BlY3Rv ci5yZXBsYXlNYW5hZ2VyLnJlbW92ZUV2ZW50TGlzdGVuZXIobnVsbCwgbnVsbCwgdGhpcyk7Cisg ICAgICAgIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIucmVtb3ZlRXZlbnRMaXN0ZW5lcihu dWxsLCBudWxsLCB0aGlzKTsKKworICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2Vy LnJlc2V0KCk7CisgICAgfQorCiAgICAgZ2V0IHZpZXdNb2RlKCkKICAgICB7CiAgICAgICAgIHJl dHVybiB0aGlzLl92aWV3TW9kZTsKQEAgLTM5OSwxNCArNDE2LDE3IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVNpZGViYXJQYW5lbCA9IGNsYXNzIFRpbWVsaW5lU2lkZWJhclBhbmVsIGV4dGVuZHMg V2ViSW5zcGVjCiAKICAgICBfcmVjb3JkaW5nQ3JlYXRlZChldmVudCkKICAgICB7Ci0gICAgICAg IHZhciByZWNvcmRpbmcgPSBldmVudC5kYXRhLnJlY29yZGluZzsKKyAgICAgICAgdGhpcy5fYWRk UmVjb3JkaW5nKGV2ZW50LmRhdGEucmVjb3JkaW5nKQorICAgICAgICB0aGlzLl9yZWNvcmRpbmdD b3VudENoYW5nZWQoKTsKKyAgICB9CisKKyAgICBfYWRkUmVjb3JkaW5nKHJlY29yZGluZykKKyAg ICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlY29yZGluZyBpbnN0YW5jZW9mIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZGluZywgcmVjb3JkaW5nKTsKIAogICAgICAgICB2YXIgcmVjb3Jk aW5nVHJlZUVsZW1lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkdlbmVyYWxUcmVlRWxlbWVudChXZWJJ bnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuU3RvcHdhdGNoSWNvblN0eWxlQ2xhc3MsIHJl Y29yZGluZy5kaXNwbGF5TmFtZSwgbnVsbCwgcmVjb3JkaW5nKTsKICAgICAgICAgdGhpcy5fcmVj b3JkaW5nVHJlZUVsZW1lbnRNYXAuc2V0KHJlY29yZGluZywgcmVjb3JkaW5nVHJlZUVsZW1lbnQp OwogICAgICAgICB0aGlzLl9yZWNvcmRpbmdzVHJlZU91dGxpbmUuYXBwZW5kQ2hpbGQocmVjb3Jk aW5nVHJlZUVsZW1lbnQpOwotCi0gICAgICAgIHRoaXMuX3JlY29yZGluZ0NvdW50Q2hhbmdlZCgp OwogICAgIH0KIAogICAgIF9yZWNvcmRpbmdDb3VudENoYW5nZWQoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lVGFiQ29udGVudFZpZXcuanMKaW5kZXggMjY5NDI1MTU2ZmZlMjdlN2JlMTUzMWU0OTM1ZGFk NzQ4OTBiYjQ3Ni4uZjM5Y2U4YTQxMGU1NzAxZDc3YjgwY2MxY2MyZmEwZTUzYjZmZDNiMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0yOCw5ICsyOCw2IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVRhYkNvbnRlbnRWaWV3ID0gZnVuY3Rpb24oaWRlbnRpZmllcikK ICAgICB2YXIgdGFiQmFySXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuVGFiQmFySXRlbSgiSW1hZ2Vz L1RpbWVsaW5lLnN2ZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZWxpbmVzIikpOwogICAg IHZhciBkZXRhaWxzU2lkZWJhclBhbmVscyA9IFtXZWJJbnNwZWN0b3IucmVzb3VyY2VEZXRhaWxz U2lkZWJhclBhbmVsLCBXZWJJbnNwZWN0b3IucHJvYmVEZXRhaWxzU2lkZWJhclBhbmVsLCBXZWJJ bnNwZWN0b3IucmVuZGVyaW5nRnJhbWVEZXRhaWxzU2lkZWJhclBhbmVsXTsKIAotICAgIC8vIEZJ TUU6IFVudGlsIFRpbWVsaW5lU2lkZWJhclBhbmVsIHN1cHBvcnRzIGluc3RhbnRpYXRpbmcgYWZ0 ZXIgaW5zcGVjdG9yIGxhdW5jaCwgZGlzYWJsZSBjbG9zaW5nLgotICAgIHRhYkJhckl0ZW0uaGlk ZUNsb3NlQnV0dG9uID0gdHJ1ZTsKLQogICAgIFdlYkluc3BlY3Rvci5Db250ZW50QnJvd3NlclRh YkNvbnRlbnRWaWV3LmNhbGwodGhpcywgaWRlbnRpZmllciB8fCAidGltZWxpbmUiLCAidGltZWxp bmUiLCB0YWJCYXJJdGVtLCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwsIGRldGFp bHNTaWRlYmFyUGFuZWxzKTsKIH07CiAK