126921 2014-01-13 11:28:04 -0800 Web Inspector: Implement state cookie support for WebInspector.TimelineSidebarPanel 2014-01-20 19:03:53 -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 967426 0 timothy 2014-01-13 11:28:04 -0800 The new WebInspector.TimelineSidebarPanel needs to implement the state cookie plumbing. 967433 1 221068 timothy 2014-01-13 11:51:56 -0800 Created attachment 221068 Patch 967460 2 timothy 2014-01-13 12:57:05 -0800 <rdar://problem/15806365> 969189 3 221068 joepeck 2014-01-17 11:56:35 -0800 Comment on attachment 221068 Patch Nice! r=me 970128 4 timothy 2014-01-20 19:03:53 -0800 https://trac.webkit.org/changeset/162413 221068 2014-01-13 11:51:56 -0800 2014-01-17 11:56:35 -0800 Patch bug-126921-20140113115155.patch text/plain 17835 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBk ZTA3ZDk2ZGQ2MjVjOTNhNmZmYzgwNWFjMjkyODFkNmM5YTgxNmM2Li5lZDliZmIxZDJiNTEyZTk2 ZWQ0MTIwZDNmNjc2ZWY0ZjA0NWE2OTQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw1MCBAQAorMjAxNC0wMS0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgSW1wbGVtZW50IHN0YXRlIGNvb2tpZSBzdXBwb3J0IGZvciBXZWJJbnNw ZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjkyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9EZWJ1Z2dlclNpZGViYXJQYW5l bC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5wcm90b3R5 cGUucmVzdG9yZVN0YXRlRnJvbUNvb2tpZSk6CisgICAgICAgIERyaXZlLWJ5IGZpeCB0byBwYXNz IGFsb25nIHJlbGF4ZWRNYXRjaERlbGF5IHRvIHRoZSBzdXBlcmNsYXNzLiAKKworICAgICAgICAq IFVzZXJJbnRlcmZhY2UvTWFpbi5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5sb2FkZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLl9wcm92aXNpb25hbExvYWRTdGFydGVkKToKKyAgICAgICAg TGlzdGVuIGZvciBQcm92aXNpb25hbExvYWRTdGFydGVkIGluc3RlYWQgb2YgUHJvdmlzaW9uYWxM b2FkQ29tbWl0dGVkIHRvIHNhdmUgdGhlIGNvb2tpZQorICAgICAgICBiZWZvcmUgdGhlIFRpbWVs aW5lUmVjb3JkaW5nIGlzIHJlc2V0IGFuZCBjbGVhcnMgdGhlIFVJLgorCisgICAgICAgICogVXNl ckludGVyZmFjZS9OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLmdldCByZXN0b3JpbmdTdGF0ZSk6 IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJv dG90eXBlLnJlc3RvcmVTdGF0ZUZyb21Db29raWUuZmluYWxBdHRlbXB0VG9SZXN0b3JlVmlld1N0 YXRlRnJvbUNvb2tpZSk6CisgICAgICAgIERlbGV0ZSBfcGVuZGluZ1ZpZXdTdGF0ZUNvb2tpZSBz aW5jZSB0aGlzIHdhcyB0aGUgZmluYWwgYXR0ZW1wdC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5O YXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5yZXN0b3JlU3RhdGVGcm9tQ29va2llKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5f aXNUcmVlRWxlbWVudFdpdGhvdXRSZXByZXNlbnRlZE9iamVjdCk6IEJsb2NrIHN0cmluZyByZXBy ZXNlbnRlZCBvYmplY3RzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFy UGFuZWwucHJvdG90eXBlLl9jaGVja0VsZW1lbnRzRm9yUGVuZGluZ1ZpZXdTdGF0ZUNvb2tpZSk6 CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL092ZXJ2aWV3VGltZWxpbmVWaWV3LmpzOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk92ZXJ2aWV3VGltZWxpbmVWaWV3LnByb3RvdHlwZS5fdHJlZUVs ZW1lbnRTZWxlY3RlZCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Jlc291cmNlU2lkZWJh clBhbmVsLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlU2lkZWJhclBhbmVsLnBy b3RvdHlwZS50cmVlRWxlbWVudEZvclJlcHJlc2VudGVkT2JqZWN0KToKKyAgICAgICAgRHJpdmUt YnkgZml4IHRvIG51bGwgY2hlY2sgcGFyZW50RnJhbWUgc2luY2UgaXQgY2FuIGJlIG51bGwuIFdh cyBjYXVzaW5nIGFuIGV4Y2VwdGlvbiB3aGlsZSB3b3JraW5nIG9uIHRoaXMuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1NvdXJjZUNvZGVUaW1lbGluZS5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5Tb3VyY2VDb2RlVGltZWxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUNv ZGVUaW1lbGluZS5wcm90b3R5cGUuc2F2ZUlkZW50aXR5VG9Db29raWUpOgorCisgICAgICAgICog VXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuY2FuU2hvd0RpZmZlcmVudENvbnRl bnRWaWV3KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90 b3R5cGUuc2F2ZVN0YXRlVG9Db29raWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l U2lkZWJhclBhbmVsLnByb3RvdHlwZS5yZXN0b3JlU3RhdGVGcm9tQ29va2llKToKKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVHJlZU91dGxpbmUuanM6CisgICAgICAgIChUcmVlT3V0bGluZS5w cm90b3R5cGUuX2ZvcmdldFRyZWVFbGVtZW50KToKKyAgICAgICAgRHJpdmUtYnkgZml4IHRvIGNs ZWFyIHNlbGVjdGVkVHJlZUVsZW1lbnQgaWYgaXQgaXMgcmVtb3ZlZCBmcm9tIHRoZSB0cmVlLiBX YXMgY2F1c2luZyByZW1vdmVkIFRyZWVFbGVtZW50cyB0byBiZQorICAgICAgICBzYXZlZCBhcyBh IGNvb2tpZSBzaW5jZSBpdCB3YXMgc3RpbGwgdGhlIHNlbGVjdGVkIGl0ZW0uCisKIDIwMTQtMDEt MTEgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxl bWVudCBiYXIgZ3JhcGggcmVuZGVyaW5nIGZvciBXZWJJbnNwZWN0b3IuT3ZlcnZpZXdUaW1lbGlu ZVZpZXcuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9E ZWJ1Z2dlclNpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCmluZGV4IGFiMjA4NGE1MDE2MmNhNDlmOGM3OGE5 MzMxMDc2YjIxNzlmYWVlZGUuLmE0NTg5MTQ1NGU3MmMwZjRlM2Q1ZDc5ZWI2OWU2YjU1MGUwNDI3 MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0RlYnVn Z2VyU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL0RlYnVnZ2VyU2lkZWJhclBhbmVsLmpzCkBAIC0xNTgsNyArMTU4LDcgQEAgV2ViSW5zcGVj dG9yLkRlYnVnZ2VyU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVj dG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLnNhdmVTdGF0ZVRvQ29va2llLmNh bGwodGhpcywgY29va2llKTsKICAgICB9LAogCi0gICAgcmVzdG9yZVN0YXRlRnJvbUNvb2tpZTog ZnVuY3Rpb24oY29va2llKQorICAgIHJlc3RvcmVTdGF0ZUZyb21Db29raWU6IGZ1bmN0aW9uKGNv b2tpZSwgcmVsYXhlZE1hdGNoRGVsYXkpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChj b29raWUpOwogCkBAIC0xNjgsNyArMTY4LDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2lkZWJh clBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgZWxzZSBpZiAoY29va2llW1dlYkluc3BlY3Rv ci5EZWJ1Z2dlclNpZGViYXJQYW5lbC5TZWxlY3RlZEFsbFVuY2F1Z2h0RXhjZXB0aW9uc0Nvb2tp ZUtleV0pCiAgICAgICAgICAgICB0aGlzLl9hbGxVbmNhdWdodEV4Y2VwdGlvbnNCcmVha3BvaW50 VHJlZUVsZW1lbnQucmV2ZWFsQW5kU2VsZWN0KCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAg IFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5yZXN0b3JlU3Rh dGVGcm9tQ29va2llLmNhbGwodGhpcywgY29va2llKTsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5yZXN0b3JlU3RhdGVGcm9tQ29va2ll LmNhbGwodGhpcywgY29va2llLCByZWxheGVkTWF0Y2hEZWxheSk7CiAgICAgfSwKIAogICAgIC8v IFByaXZhdGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmpzCmlu ZGV4IGE5ZjRiYmMzMDUyNjQ4OTg3YzA3M2FkYjU5ZWZlODU1MThjMTM4NzEuLjQ1YjhhN2UxMGZi MzExMjg2ZTZiYTNlODA2MWNmYjkwMzEwYjZjZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTWFpbi5qcwpAQCAtNzgsNiArNzgsMTAgQEAgV2ViSW5zcGVjdG9yLmxv YWRlZCA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3IuQ1NTQ29tcGxldGlvbnMucmVxdWVz dENTU05hbWVDb21wbGV0aW9ucygpOwogICAgIHRoaXMuX2dlbmVyYXRlRGlzY2xvc3VyZVRyaWFu Z2xlSW1hZ2VzKCk7CiAKKyAgICAvLyBMaXN0ZW4gZm9yIHRoZSBQcm92aXNpb25hbExvYWRTdGFy dGVkIGV2ZW50IGJlZm9yZSByZWdpc3RlcmluZyBmb3IgZXZlbnRzIHNvIG91ciBjb2RlIGdldHMg Y2FsbGVkIGJlZm9yZSBhbnkgbWFuYWdlcnMgb3Igc2lkZWJhcnMuCisgICAgLy8gVGhpcyBsZXRz IHVzIHNhdmUgYSBzdGF0ZSBjb29raWUgYmVmb3JlIGFueSBtYW5hZ2VycyBvciBzaWRlYmFycyBk byBhbnkgcmVzZXRzIHRoYXQgd291bGQgYWZmZWN0IHN0YXRlIChuYW1lbHkgVGltZWxpbmVNYW5h Z2VyKS4KKyAgICBXZWJJbnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0 b3IuRnJhbWUuRXZlbnQuUHJvdmlzaW9uYWxMb2FkU3RhcnRlZCwgdGhpcy5fcHJvdmlzaW9uYWxM b2FkU3RhcnRlZCwgdGhpcyk7CisKICAgICAvLyBDcmVhdGUgdGhlIHNpbmdsZXRvbiBtYW5hZ2Vy cyBuZXh0LCBiZWZvcmUgdGhlIHVzZXIgaW50ZXJmYWNlIGVsZW1lbnRzLCBzbyB0aGUgdXNlciBp bnRlcmZhY2UgY2FuIHJlZ2lzdGVyCiAgICAgLy8gYXMgZXZlbnQgbGlzdGVuZXJzIG9uIHRoZXNl IG1hbmFnZXJzLgogICAgIHRoaXMuYnJhbmNoTWFuYWdlciA9IG5ldyBXZWJJbnNwZWN0b3IuQnJh bmNoTWFuYWdlcjsKQEAgLTEwNiw3ICsxMTAsNiBAQCBXZWJJbnNwZWN0b3IubG9hZGVkID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuZnJhbWVSZXNvdXJjZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZU1hbmFnZXIuRXZlbnQuTWFpbkZyYW1lRGlkQ2hhbmdl LCB0aGlzLl9tYWluRnJhbWVEaWRDaGFuZ2UsIHRoaXMpOwogCiAgICAgV2ViSW5zcGVjdG9yLkZy YW1lLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkZyYW1lLkV2ZW50Lk1haW5SZXNvdXJj ZURpZENoYW5nZSwgdGhpcy5fbWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzKTsKLSAgICBXZWJJ bnNwZWN0b3IuRnJhbWUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRnJhbWUuRXZlbnQu UHJvdmlzaW9uYWxMb2FkQ29tbWl0dGVkLCB0aGlzLl9wcm92aXNpb25hbExvYWRDb21taXR0ZWQs IHRoaXMpOwogCiAgICAgZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiRE9NQ29udGVudExvYWRl ZCIsIHRoaXMuY29udGVudExvYWRlZC5iaW5kKHRoaXMpKTsKIApAQCAtNzIxLDcgKzcyNCw3IEBA IFdlYkluc3BlY3Rvci5fbWFpblJlc291cmNlRGlkQ2hhbmdlID0gZnVuY3Rpb24oZXZlbnQpCiAg ICAgdGhpcy51cGRhdGVXaW5kb3dUaXRsZSgpOwogfQogCi1XZWJJbnNwZWN0b3IuX3Byb3Zpc2lv bmFsTG9hZENvbW1pdHRlZCA9IGZ1bmN0aW9uKGV2ZW50KQorV2ViSW5zcGVjdG9yLl9wcm92aXNp b25hbExvYWRTdGFydGVkID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgaWYgKCFldmVudC50YXJn ZXQuaXNNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL05hdmlnYXRpb25TaWRlYmFyUGFuZWwu anMKaW5kZXggMWNlYjBjODdhMTk4MzZjZWVkNGI0Zjc1NThhYWNlOTA3ZTY3MzhmMi4uYWIxZjNj MWQyMzVhMzc2YTc2NzRjOWU5Y2U3ZTU1MTlmNGYyMmU5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTmF2aWdhdGlvblNpZGViYXJQYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9OYXZpZ2F0aW9uU2lkZWJhclBh bmVsLmpzCkBAIC0xNTMsNiArMTUzLDExIEBAIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJh clBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2ZpbHRlckJhcjsKICAg ICB9LAogCisgICAgZ2V0IHJlc3RvcmluZ1N0YXRlKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0 aGlzLl9yZXN0b3JpbmdTdGF0ZTsKKyAgICB9LAorCiAgICAgY3JlYXRlQ29udGVudFRyZWVPdXRs aW5lOiBmdW5jdGlvbihkb250SGlkZUJ5RGVmYXVsdCkKICAgICB7CiAgICAgICAgIHZhciBjb250 ZW50VHJlZU91dGxpbmVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgib2wiKTsKQEAg LTIyMiw2ICsyMjcsNyBAQCBXZWJJbnNwZWN0b3IuTmF2aWdhdGlvblNpZGViYXJQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgcmVzdG9yZVN0YXRlRnJvbUNvb2tpZTogZnVuY3Rpb24oY29va2llLCBy ZWxheGVkTWF0Y2hEZWxheSkKICAgICB7CiAgICAgICAgIHRoaXMuX3BlbmRpbmdWaWV3U3RhdGVD b29raWUgPSBjb29raWU7CisgICAgICAgIHRoaXMuX3Jlc3RvcmluZ1N0YXRlID0gdHJ1ZTsKIAog ICAgICAgICAvLyBDaGVjayBpZiBhbnkgZXhpc3RpbmcgdHJlZSBlbGVtZW50cyBpbiBhbnkgb3V0 bGluZSBtYXRjaCB0aGUgY29va2llLgogICAgICAgICB0aGlzLl9jaGVja091dGxpbmVzRm9yUGVu ZGluZ1ZpZXdTdGF0ZUNvb2tpZSgpOwpAQCAtMjI5LDEwICsyMzUsMTUgQEAgV2ViSW5zcGVjdG9y Lk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5f ZmluYWxBdHRlbXB0VG9SZXN0b3JlVmlld1N0YXRlVGltZW91dCkKICAgICAgICAgICAgIGNsZWFy VGltZW91dCh0aGlzLl9maW5hbEF0dGVtcHRUb1Jlc3RvcmVWaWV3U3RhdGVUaW1lb3V0KTsKIAot ICAgICAgICB2YXIgZmluYWxBdHRlbXB0VG9SZXN0b3JlVmlld1N0YXRlRnJvbUNvb2tpZSA9IGZ1 bmN0aW9uKCkgeworICAgICAgICBmdW5jdGlvbiBmaW5hbEF0dGVtcHRUb1Jlc3RvcmVWaWV3U3Rh dGVGcm9tQ29va2llKCkKKyAgICAgICAgewogICAgICAgICAgICAgZGVsZXRlIHRoaXMuX2ZpbmFs QXR0ZW1wdFRvUmVzdG9yZVZpZXdTdGF0ZVRpbWVvdXQ7CisKICAgICAgICAgICAgIHRoaXMuX2No ZWNrT3V0bGluZXNGb3JQZW5kaW5nVmlld1N0YXRlQ29va2llKHRydWUpOwotICAgICAgICB9Owor CisgICAgICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ1ZpZXdTdGF0ZUNvb2tpZTsKKyAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9yZXN0b3JpbmdTdGF0ZTsKKyAgICAgICAgfQogCiAgICAgICAg IC8vIElmIHRoZSBzcGVjaWZpYyB0cmVlIGVsZW1lbnQgd2Fzbid0IGZvdW5kLCB3ZSBtYXkgbmVl ZCB0byB3YWl0IGZvciB0aGUgcmVzb3VyY2VzCiAgICAgICAgIC8vIHRvIGJlIHJlZ2lzdGVyZWQu IFdlIHRyeSBvbmUgbGFzdCB0aW1lIChtYXRjaCB0eXBlIG9ubHkpIGFmdGVyIGFuIGFyYml0cmFy eSBhbW91bnQgb2YgdGltZW91dC4KQEAgLTU1Niw3ICs1NjcsOSBAQCBXZWJJbnNwZWN0b3IuTmF2 aWdhdGlvblNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgX2lzVHJlZUVsZW1lbnRXaXRo b3V0UmVwcmVzZW50ZWRPYmplY3Q6IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQogICAgIHsKICAgICAg ICAgcmV0dXJuIHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkZvbGRlclRyZWVF bGVtZW50Ci0gICAgICAgICAgICB8fCB0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rv ci5EYXRhYmFzZUhvc3RUcmVlRWxlbWVudDsKKyAgICAgICAgICAgIHx8IHRyZWVFbGVtZW50IGlu c3RhbmNlb2YgV2ViSW5zcGVjdG9yLkRhdGFiYXNlSG9zdFRyZWVFbGVtZW50CisgICAgICAgICAg ICB8fCB0eXBlb2YgdHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QgPT09ICJzdHJpbmciCisg ICAgICAgICAgICB8fCB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdCBpbnN0YW5jZW9mIFN0 cmluZzsKICAgICB9LAogCiAgICAgX2NoZWNrT3V0bGluZXNGb3JQZW5kaW5nVmlld1N0YXRlQ29v a2llOiBmdW5jdGlvbihtYXRjaFR5cGVPbmx5KQpAQCAtNjIwLDEwICs2MzMsMjAgQEAgV2ViSW5z cGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB9LCB0 aGlzKTsKIAogICAgICAgICBpZiAobWF0Y2hlZEVsZW1lbnQpIHsKLSAgICAgICAgICAgIG1hdGNo ZWRFbGVtZW50LnJldmVhbEFuZFNlbGVjdCgpOworICAgICAgICAgICAgbWF0Y2hlZEVsZW1lbnQu cmV2ZWFsQW5kU2VsZWN0KHRydWUsIGZhbHNlKTsKKwogICAgICAgICAgICAgZGVsZXRlIHRoaXMu X3BlbmRpbmdWaWV3U3RhdGVDb29raWU7Ci0gICAgICAgICAgICBpZiAodGhpcy5fZmluYWxBdHRl bXB0VG9SZXN0b3JlVmlld1N0YXRlVGltZW91dCkKKworICAgICAgICAgICAgLy8gRGVsYXkgY2xl YXJpbmcgdGhlIHJlc3RvcmluZ1N0YXRlIGZsYWcgdW50aWwgdGhlIG5leHQgcnVubG9vcCBzbyBs aXN0ZW5lcnMKKyAgICAgICAgICAgIC8vIGNoZWNraW5nIGZvciBpdCBpbiB0aGlzIHJ1bmxvb3Ag c3RpbGwga25vdyBzdGF0ZSB3YXMgYmVpbmcgcmVzdG9yZWQuCisgICAgICAgICAgICBzZXRUaW1l b3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9yZXN0b3JpbmdT dGF0ZTsKKyAgICAgICAgICAgIH0uYmluZCh0aGlzKSk7CisKKyAgICAgICAgICAgIGlmICh0aGlz Ll9maW5hbEF0dGVtcHRUb1Jlc3RvcmVWaWV3U3RhdGVUaW1lb3V0KSB7CiAgICAgICAgICAgICAg ICAgY2xlYXJUaW1lb3V0KHRoaXMuX2ZpbmFsQXR0ZW1wdFRvUmVzdG9yZVZpZXdTdGF0ZVRpbWVv dXQpOworICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9maW5hbEF0dGVtcHRUb1Jlc3RvcmVW aWV3U3RhdGVUaW1lb3V0OworICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL092ZXJ2aWV3VGlt ZWxpbmVWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvT3ZlcnZp ZXdUaW1lbGluZVZpZXcuanMKaW5kZXggM2FiZDJiMTc1MWMxZmQ5MWI0NjNiYmI0YTgxYTU5MDZi Y2JjNmI3Zi4uNjJlZTRlY2I2OTYzNDNjNjMwMjYzYjY5ZTE1OGI4NjI1MjZiNzhmNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvT3ZlcnZpZXdUaW1lbGlu ZVZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvT3ZlcnZp ZXdUaW1lbGluZVZpZXcuanMKQEAgLTI0MCw2ICsyNDAsOSBAQCBXZWJJbnNwZWN0b3IuT3ZlcnZp ZXdUaW1lbGluZVZpZXcucHJvdG90eXBlID0gewogCiAgICAgX3RyZWVFbGVtZW50U2VsZWN0ZWQ6 IGZ1bmN0aW9uKHRyZWVFbGVtZW50LCBzZWxlY3RlZEJ5VXNlcikKICAgICB7CisgICAgICAgIGlm ICghV2ViSW5zcGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLmNhblNob3dEaWZmZXJlbnRDb250 ZW50VmlldygpKQorICAgICAgICAgICAgcmV0dXJuOworCiAgICAgICAgIGlmICh0cmVlRWxlbWVu dCBpbnN0YW5jZW9mIFdlYkluc3BlY3Rvci5Gb2xkZXJUcmVlRWxlbWVudCkKICAgICAgICAgICAg IHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwppbmRleCAxZGY4YzIzMjkyYzNiN2ZiZGM3 ZmM3N2FkNzY3ZWUzMmY0ZDY1OWM5Li44MjhjMDViZDU5ZTJlZGNkZThjNzFiMjczNTU4M2NkYmY1 M2JlMjk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9S ZXNvdXJjZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpAQCAtMjE5LDcgKzIxOSw3IEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIC8vIEEg Y3VzdG9tIGltcGxlbWVudGF0aW9uIGlzIG5lZWRlZCBmb3IgdGhpcyBzaW5jZSB0aGUgZnJhbWVz IGFyZSBwb3B1bGF0ZWQgbGF6aWx5LgogCiAgICAgICAgIC8vIFRoZSBGcmFtZSBpcyB1c2VkIGFz IHRoZSByZXByZXNlbnRlZE9iamVjdCBpbnN0ZWFkIG9mIHRoZSBtYWluIHJlc291cmNlIGluIG91 ciB0cmVlLgotICAgICAgICBpZiAocmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UgJiYgcmVwcmVzZW50ZWRPYmplY3QucGFyZW50RnJhbWUubWFpblJlc291 cmNlID09PSByZXByZXNlbnRlZE9iamVjdCkKKyAgICAgICAgaWYgKHJlcHJlc2VudGVkT2JqZWN0 IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlICYmIHJlcHJlc2VudGVkT2JqZWN0LnBh cmVudEZyYW1lICYmIHJlcHJlc2VudGVkT2JqZWN0LnBhcmVudEZyYW1lLm1haW5SZXNvdXJjZSA9 PT0gcmVwcmVzZW50ZWRPYmplY3QpCiAgICAgICAgICAgICByZXByZXNlbnRlZE9iamVjdCA9IHJl cHJlc2VudGVkT2JqZWN0LnBhcmVudEZyYW1lOwogCiAgICAgICAgIGZ1bmN0aW9uIGlzQW5jZXN0 b3IoYW5jZXN0b3IsIHJlc291cmNlT3JGcmFtZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NvdXJjZUNvZGVUaW1lbGluZS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1NvdXJjZUNvZGVUaW1lbGluZS5qcwppbmRleCA2YmU3 MTJjZTAxNGU3YmI5ZjY2NTBmMjFlYjA1NDYxYjM1M2RmYmRhLi4zNDhmZjU3ZmVjODI1Njk5NjVk ZmU2NGFhZTQ2YzI2NGRjNTQ2MzVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Tb3VyY2VDb2RlVGltZWxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvU291cmNlQ29kZVRpbWVsaW5lLmpzCkBAIC0yOCw2ICsyOCw3 IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmUgPSBmdW5jdGlvbihzb3VyY2VDb2Rl LCBzb3VyY2VDb2RlTG9jYXRpb24sIHJlY29yCiAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lLmNh bGwodGhpcyk7CiAKICAgICBjb25zb2xlLmFzc2VydChzb3VyY2VDb2RlKTsKKyAgICBjb25zb2xl LmFzc2VydCghc291cmNlQ29kZUxvY2F0aW9uIHx8IHNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VD b2RlID09PSBzb3VyY2VDb2RlKTsKICAgICBjb25zb2xlLmFzc2VydChyZWNvcmRUeXBlKTsKIAog ICAgIHRoaXMuX3NvdXJjZUNvZGUgPSBzb3VyY2VDb2RlOwpAQCAtMzYsNiArMzcsMTQgQEAgV2Vi SW5zcGVjdG9yLlNvdXJjZUNvZGVUaW1lbGluZSA9IGZ1bmN0aW9uKHNvdXJjZUNvZGUsIHNvdXJj ZUNvZGVMb2NhdGlvbiwgcmVjb3IKICAgICB0aGlzLl9yZWNvcmRFdmVudFR5cGUgPSByZWNvcmRF dmVudFR5cGUgfHwgbnVsbDsKIH07CiAKK1dlYkluc3BlY3Rvci5Tb3VyY2VDb2RlVGltZWxpbmUu VHlwZUlkZW50aWZpZXIgPSAic291cmNlLWNvZGUtdGltZWxpbmUiOworV2ViSW5zcGVjdG9yLlNv dXJjZUNvZGVUaW1lbGluZS5Tb3VyY2VDb2RlVVJMQ29va2llS2V5ID0gInNvdXJjZS1jb2RlLXRp bWVsaW5lLXNvdXJjZS1jb2RlLXVybCI7CitXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRpbWVsaW5l LlNvdXJjZUNvZGVMb2NhdGlvbkxpbmVDb29raWVLZXkgPSAic291cmNlLWNvZGUtdGltZWxpbmUt c291cmNlLWNvZGUtbG9jYXRpb24tbGluZSI7CitXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRpbWVs aW5lLlNvdXJjZUNvZGVMb2NhdGlvbkNvbHVtbkNvb2tpZUtleSA9ICJzb3VyY2UtY29kZS10aW1l bGluZS1zb3VyY2UtY29kZS1sb2NhdGlvbi1jb2x1bW4iOworV2ViSW5zcGVjdG9yLlNvdXJjZUNv ZGVUaW1lbGluZS5Tb3VyY2VDb2RlVVJMQ29va2llS2V5ID0gInNvdXJjZS1jb2RlLXRpbWVsaW5l LXNvdXJjZS1jb2RlLXVybCI7CitXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRpbWVsaW5lLlJlY29y ZFR5cGVDb29raWVLZXkgPSAic291cmNlLWNvZGUtdGltZWxpbmUtcmVjb3JkLXR5cGUiOworV2Vi SW5zcGVjdG9yLlNvdXJjZUNvZGVUaW1lbGluZS5SZWNvcmRFdmVudFR5cGVDb29raWVLZXkgPSAi c291cmNlLWNvZGUtdGltZWxpbmUtcmVjb3JkLWV2ZW50LXR5cGUiOworCiBXZWJJbnNwZWN0b3Iu U291cmNlQ29kZVRpbWVsaW5lLnByb3RvdHlwZSA9IHsKICAgICBjb25zdHJ1Y3RvcjogV2ViSW5z cGVjdG9yLlNvdXJjZUNvZGVUaW1lbGluZSwKICAgICBfX3Byb3RvX186IFdlYkluc3BlY3Rvci5U aW1lbGluZS5wcm90b3R5cGUsCkBAIC02MCw1ICs2OSwxNCBAQCBXZWJJbnNwZWN0b3IuU291cmNl Q29kZVRpbWVsaW5lLnByb3RvdHlwZSA9IHsKICAgICBnZXQgcmVjb3JkRXZlbnRUeXBlKCkKICAg ICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZWNvcmRFdmVudFR5cGU7CisgICAgfSwKKworICAg IHNhdmVJZGVudGl0eVRvQ29va2llOiBmdW5jdGlvbihjb29raWUpCisgICAgeworICAgICAgICBj b29raWVbV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUaW1lbGluZS5Tb3VyY2VDb2RlVVJMQ29va2ll S2V5XSA9IHRoaXMuX3NvdXJjZUNvZGUudXJsID8gdGhpcy5fc291cmNlQ29kZS51cmwuaGFzaCA6 IG51bGw7CisgICAgICAgIGNvb2tpZVtXZWJJbnNwZWN0b3IuU291cmNlQ29kZVRpbWVsaW5lLlNv dXJjZUNvZGVMb2NhdGlvbkxpbmVDb29raWVLZXldID0gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9u ID8gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uLmxpbmVOdW1iZXIgOiBudWxsOworICAgICAgICBj b29raWVbV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVUaW1lbGluZS5Tb3VyY2VDb2RlTG9jYXRpb25D b2x1bW5Db29raWVLZXldID0gdGhpcy5fc291cmNlQ29kZUxvY2F0aW9uID8gdGhpcy5fc291cmNl Q29kZUxvY2F0aW9uLmNvbHVtbk51bWJlciA6IG51bGw7CisgICAgICAgIGNvb2tpZVtXZWJJbnNw ZWN0b3IuU291cmNlQ29kZVRpbWVsaW5lLlJlY29yZFR5cGVDb29raWVLZXldID0gdGhpcy5fcmVj b3JkVHlwZSB8fCBudWxsOworICAgICAgICBjb29raWVbV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVU aW1lbGluZS5SZWNvcmRFdmVudFR5cGVDb29raWVLZXldID0gdGhpcy5fcmVjb3JkRXZlbnRUeXBl IHx8IG51bGw7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKaW5kZXggNTg2MmQyYjI3 NzYyYTkyYWUxNzNmMGQ1MDgwZmM4ZTY4NDVhOGQ3MC4uMDYyYzQ4ZDNmZDhkOGVhYTI4NTgxZjdh MTAwZDMzYzIyYTUyOTljNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFuZWwuanMKQEAgLTEwMiw2ICsxMDIs OSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuTmV0d29ya0ljb25TdHlsZUNs YXNzID0gIm5ldHdvcmstaWNvbiI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwu Q29sb3JzSWNvblN0eWxlQ2xhc3MgPSAiY29sb3JzLWljb24iOwogV2ViSW5zcGVjdG9yLlRpbWVs aW5lU2lkZWJhclBhbmVsLlNjcmlwdEljb25TdHlsZUNsYXNzID0gInNjcmlwdC1pY29uIjsKIFdl Ykluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5UaW1lbGluZUNvbnRlbnRWaWV3U2hvd2lu Z1N0eWxlQ2xhc3MgPSAidGltZWxpbmUtY29udGVudC12aWV3LXNob3dpbmciOworV2ViSW5zcGVj dG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlNob3dpbmdUaW1lbGluZUNvbnRlbnRWaWV3Q29va2ll S2V5ID0gInRpbWVsaW5lLXNpZGViYXItcGFuZWwtc2hvd2luZy10aW1lbGluZS1jb250ZW50LXZp ZXciOworV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlNlbGVjdGVkVGltZWxpbmVW aWV3SWRlbnRpZmllckNvb2tpZUtleSA9ICJ0aW1lbGluZS1zaWRlYmFyLXBhbmVsLXNlbGVjdGVk LXRpbWVsaW5lLXZpZXctaWRlbnRpZmllciI7CitXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFy UGFuZWwuT3ZlcnZpZXdUaW1lbGluZUlkZW50aWZpZXJDb29raWVWYWx1ZSA9ICJvdmVydmlldyI7 CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAg Y29uc3RydWN0b3I6IFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCwKQEAgLTE1OSw2 ICsxNjIsNTAgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLmNvbnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmlldyh0 aGlzLl90aW1lbGluZUNvbnRlbnRWaWV3KTsKICAgICB9LAogCisgICAgY2FuU2hvd0RpZmZlcmVu dENvbnRlbnRWaWV3OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gIXRoaXMucmVz dG9yaW5nU3RhdGUgfHwgIXRoaXMuX3Jlc3RvcmVkU2hvd2luZ1RpbWVsaW5lQ29udGVudFZpZXc7 CisgICAgfSwKKworICAgIC8vIFByb3RlY3RlZAorCisgICAgc2F2ZVN0YXRlVG9Db29raWU6IGZ1 bmN0aW9uKGNvb2tpZSkKKyAgICB7CisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNvb2tpZSk7CisK KyAgICAgICAgY29va2llW1dlYkluc3BlY3Rvci50aW1lbGluZVNpZGViYXJQYW5lbC5TaG93aW5n VGltZWxpbmVDb250ZW50Vmlld0Nvb2tpZUtleV0gPSBXZWJJbnNwZWN0b3IuY29udGVudEJyb3dz ZXIuY3VycmVudENvbnRlbnRWaWV3IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29u dGVudFZpZXc7CisKKyAgICAgICAgdmFyIHNlbGVjdGVkVHJlZUVsZW1lbnQgPSB0aGlzLl90aW1l bGluZXNUcmVlT3V0bGluZS5zZWxlY3RlZFRyZWVFbGVtZW50OworICAgICAgICBpZiAoc2VsZWN0 ZWRUcmVlRWxlbWVudCkKKyAgICAgICAgICAgIGNvb2tpZVtXZWJJbnNwZWN0b3IuVGltZWxpbmVT aWRlYmFyUGFuZWwuU2VsZWN0ZWRUaW1lbGluZVZpZXdJZGVudGlmaWVyQ29va2llS2V5XSA9IHNl bGVjdGVkVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3Q7CisgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIGNvb2tpZVtXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuU2VsZWN0ZWRU aW1lbGluZVZpZXdJZGVudGlmaWVyQ29va2llS2V5XSA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVNp ZGViYXJQYW5lbC5PdmVydmlld1RpbWVsaW5lSWRlbnRpZmllckNvb2tpZVZhbHVlOworCisgICAg ICAgIFdlYkluc3BlY3Rvci5OYXZpZ2F0aW9uU2lkZWJhclBhbmVsLnByb3RvdHlwZS5zYXZlU3Rh dGVUb0Nvb2tpZS5jYWxsKHRoaXMsIGNvb2tpZSk7CisgICAgfSwKKworICAgIHJlc3RvcmVTdGF0 ZUZyb21Db29raWU6IGZ1bmN0aW9uKGNvb2tpZSwgcmVsYXhlZE1hdGNoRGVsYXkpCisgICAgewor ICAgICAgICBjb25zb2xlLmFzc2VydChjb29raWUpOworCisgICAgICAgIC8vIFRoZSBfdGltZWxp bmVDb250ZW50VmlldyBpcyBub3QgcmVhZHkgb24gaW5pdGlhbCBsb2FkLCBzbyBkZWxheSB0aGUg cmVzdG9yZS4KKyAgICAgICAgLy8gVGhpcyBtYXRjaGVzIHRoZSBkZWxheWVkIHdvcmsgaW4gdGhl IFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbCBjb25zdHJ1Y3Rvci4KKyAgICAgICAg aWYgKCF0aGlzLl90aW1lbGluZUNvbnRlbnRWaWV3KSB7CisgICAgICAgICAgICBzZXRUaW1lb3V0 KHRoaXMucmVzdG9yZVN0YXRlRnJvbUNvb2tpZS5iaW5kKHRoaXMsIGNvb2tpZSwgcmVsYXhlZE1h dGNoRGVsYXkpLCAwKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAg IHRoaXMuX3Jlc3RvcmVkU2hvd2luZ1RpbWVsaW5lQ29udGVudFZpZXcgPSBjb29raWVbV2ViSW5z cGVjdG9yLnRpbWVsaW5lU2lkZWJhclBhbmVsLlNob3dpbmdUaW1lbGluZUNvbnRlbnRWaWV3Q29v a2llS2V5XTsKKworICAgICAgICB2YXIgc2VsZWN0ZWRUaW1lbGluZVZpZXdJZGVudGlmaWVyID0g Y29va2llW1dlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5TZWxlY3RlZFRpbWVsaW5l Vmlld0lkZW50aWZpZXJDb29raWVLZXldOworICAgICAgICBpZiAoc2VsZWN0ZWRUaW1lbGluZVZp ZXdJZGVudGlmaWVyID09PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuT3ZlcnZp ZXdUaW1lbGluZUlkZW50aWZpZXJDb29raWVWYWx1ZSkKKyAgICAgICAgICAgIHRoaXMuc2hvd1Rp bWVsaW5lT3ZlcnZpZXcoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgdGhpcy5zaG93VGlt ZWxpbmVWaWV3KHNlbGVjdGVkVGltZWxpbmVWaWV3SWRlbnRpZmllcik7CisKKyAgICAgICAgV2Vi SW5zcGVjdG9yLk5hdmlnYXRpb25TaWRlYmFyUGFuZWwucHJvdG90eXBlLnJlc3RvcmVTdGF0ZUZy b21Db29raWUuY2FsbCh0aGlzLCBjb29raWUsIHJlbGF4ZWRNYXRjaERlbGF5KTsKKyAgICB9LAor CiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3RpbWVsaW5lc1RyZWVFbGVtZW50U2VsZWN0ZWQ6IGZ1 bmN0aW9uKHRyZWVFbGVtZW50LCBzZWxlY3RlZEJ5VXNlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVHJlZU91dGxpbmUuanMKaW5kZXggODkyNDkxOTdmOGFi NDkwNDdmZjUzMzQxMTNkYTY1MzdiNjVjOGJkZS4uZWMyMWM3MGE4NjhlNTZmZDk4OGM1MmE5MjI3 MzFkYjhhNTNhYjVkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVHJlZU91dGxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVHJlZU91dGxpbmUuanMKQEAgLTI3Niw2ICsyNzYsOCBAQCBUcmVlT3V0bGluZS5wcm90 b3R5cGUuX3JlbWVtYmVyVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihlbGVtZW50KQogCiBUcmVlT3V0 bGluZS5wcm90b3R5cGUuX2ZvcmdldFRyZWVFbGVtZW50ID0gZnVuY3Rpb24oZWxlbWVudCkKIHsK KyAgICBpZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50ID09PSBlbGVtZW50KQorICAgICAgICB0 aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQgPSBudWxsOwogICAgIGlmICh0aGlzLl9rbm93blRyZWVF bGVtZW50c1tlbGVtZW50LmlkZW50aWZpZXJdKQogICAgICAgICB0aGlzLl9rbm93blRyZWVFbGVt ZW50c1tlbGVtZW50LmlkZW50aWZpZXJdLnJlbW92ZShlbGVtZW50LCB0cnVlKTsKIH0K