127314 2014-01-20 15:01:46 -0800 Web Inspector: Add the recording button back to the Timelines sidebar 2014-01-20 19:05:59 -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 970030 0 timothy 2014-01-20 15:01:46 -0800 Add the recording button back and a clear button. 970031 1 webkit-bug-importer 2014-01-20 15:02:10 -0800 <rdar://problem/15863684> 970046 2 221699 timothy 2014-01-20 15:37:37 -0800 Created attachment 221699 Patch 970055 3 221699 joepeck 2014-01-20 15:55:48 -0800 Comment on attachment 221699 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221699&action=review r=me > Source/WebInspectorUI/UserInterface/TimelineContentView.js:311 > + // We have a current time alredy, so we likely need to jump into the future to a better current time. Typo: alredy => already > Source/WebInspectorUI/UserInterface/TimelineContentView.js:378 > _recordingReset: function(event) > { > - this._startTimeNeedsReset = true; > this._currentTime = NaN; > > + if (!this._updating) { > + // Force the time ruler and views to reset to 0. > + this._startTimeNeedsReset = true; > + this._updateTimes(0, 0, 0); > + } > + > + this._lastUpdateTimestamp = NaN; > + this._startTimeNeedsReset = true; Should this also delete this._waitingToResetCurrentTime if it was waiting? Seeing as we just deleted currentTime. 970056 4 joepeck 2014-01-20 15:57:02 -0800 Does the main navigator forward/back buttons update as expected? This could ravage the back/forward list of views, just double check that still works as expected. 970137 5 timothy 2014-01-20 19:05:59 -0800 https://trac.webkit.org/changeset/162422 221699 2014-01-20 15:37:37 -0800 2014-01-20 15:55:47 -0800 Patch bug-127314-20140120153736.patch text/plain 17004 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyMjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBm OTQ0NWI4NWQ0OWRiNThmNDQ0YWEyY2MyODIwMzllY2JkMDUxMDBhLi5jZGE1NDY5NmRkMzlhNGIw MDkxOTBmZDhiZmY5ZDk4YjdmODJhNzM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NSBAQAogMjAxNC0wMS0yMCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgQWRkIHRoZSByZWNvcmRpbmcgYnV0dG9uIGJhY2sgdG8gdGhlIFRpbWVs aW5lcyBzaWRlYmFyLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjczMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczogVXBk YXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5qczoK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5nZXQg bmF2aWdhdGlvbkl0ZW1zKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRW aWV3LnByb3RvdHlwZS5fdXBkYXRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNv bnRlbnRWaWV3LnByb3RvdHlwZS5fdXBkYXRlVGltZXMpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlLl9zdGFydFVwZGF0aW5nQ3VycmVudFRpbWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZpZXcucHJvdG90eXBlLl9y ZWNvcmRpbmdUaW1lc1VwZGF0ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29u dGVudFZpZXcucHJvdG90eXBlLl9jbGVhclRpbWVsaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5fcmVjb3JkaW5nUmVzZXQpOgorICAgICAg ICBBZGQgYSBjbGVhciBidXR0b24gYW5kIHJlc2V0IHRoZSB0aW1lIHJ1bGVyIGFuZCB2aWV3cyB3 aGVuIHRoZSByZWNvcmRpbmcgcmVzZXRzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9UaW1l bGluZVNpZGViYXJQYW5lbC5jc3M6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC50aW1lbGlu ZSA+IC5zdGF0dXMtYmFyKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLnRpbWVsaW5lID4g LnN0YXR1cy1iYXIgPiAucmVjb3JkLWdseXBoKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVs LnRpbWVsaW5lID4gLnN0YXR1cy1iYXIgPiAucmVjb3JkLWdseXBoLnJlY29yZGluZyk6CisgICAg ICAgICguc2lkZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5zdGF0dXMtYmFyID4gLnJlY29yZC1n bHlwaDpob3Zlcik6CisgICAgICAgICguc2lkZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5zdGF0 dXMtYmFyID4gLnJlY29yZC1nbHlwaC5yZWNvcmRpbmc6aG92ZXIpOgorICAgICAgICAoLnNpZGVi YXIgPiAucGFuZWwudGltZWxpbmUgPiAuc3RhdHVzLWJhciA+IC5yZWNvcmQtZ2x5cGguZm9yY2Vk KToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLnRpbWVsaW5lID4gLnN0YXR1cy1iYXIgPiAu cmVjb3JkLWdseXBoLnJlY29yZGluZy5mb3JjZWQpOgorICAgICAgICAoLnNpZGViYXIgPiAucGFu ZWwudGltZWxpbmUgPiAuc3RhdHVzLWJhciA+IC5yZWNvcmQtc3RhdHVzKToKKyAgICAgICAgQWRk IHN0eWxlcyBmb3IgdGhlIHJlY29yZGluZyBidXR0b24gYW5kIHN0YXR1cyBtZXNzYWdlLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuX2NvbnRlbnRCcm93 c2VyQ3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZVNpZGViYXJQYW5lbC5wcm90b3R5cGUuX3JlY29yZGluZ1N0YXJ0ZWQpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVjb3JkaW5n U3RvcHBlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwucHJv dG90eXBlLl9yZWNvcmRHbHlwaE1vdXNlZE92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVjb3JkR2x5cGhNb3VzZWRPdXQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZS5fcmVjb3Jk R2x5cGhDbGlja2VkKToKKyAgICAgICAgQWRkIHN1cHBvcnQgZm9yIHRoZSByZWNvcmRpbmcgYnV0 dG9uIGFuZCBzdGF0dXMgbWVzc2FnZS4KKworMjAxNC0wMS0yMCAgVGltb3RoeSBIYXRjaGVyICA8 dGltb3RoeUBhcHBsZS5jb20+CisKICAgICAgICAgTWFrZSB0aGUgVGltZWxpbmVSZWNvcmRUcmVl RWxlbWVudCBsb2NhdGlvbiBzdWJ0aXRsZSBsaXZlLgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjcyNzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJp bmdzLmpzCmluZGV4IDAyYzU3ZmZhMmMzMTYwOTNkMjkzNjE0NDI0YmE5YWQxOWRhMjNmMWQuLjVh ZGYwMWNhMGNlZWVhODFmZTg1NDE3Y2M5NGNkYTY5YWNiYzE5YjEgMTAwNjQ0CkdJVCBiaW5hcnkg cGF0Y2gKZGVsdGEgMTUxCnpjbWRuPG8kMUxoclZaIWk4QUIjVlpJJXt4WDJAWWtXa19Ud1ZvK2NS VmFSMDJXa3tYdVA7V2RyUT1WdEBkSER3IQp6bGgxZF5PLT5pcitCfjtvaHFQYzJQO0R8cEsyVVdF UDtETVZgczYhe0NBcERBQ250eS1adVZTfiF6QHw9RyFSSncKUXMoanJ0YVNZfF9tLUM3TTBGdmh9 MzsrTkMKCmRlbHRhIDI5CmxjbWFGemkpcWh5clZaIWlIYF4qYSRrPCVveGxEUjx8SSE1SiY5Tils TUY4c3A0anVwaQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1RpbWVsaW5lQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9UaW1lbGluZUNvbnRlbnRWaWV3LmpzCmluZGV4IDYyYjAwZmU4NzZhYTA4MWNiNThk YjcyODIzYTc1YTJhMTM0ZjM5MDAuLjgzNjU0MjNjMDk4NTBhNDc2MzU0NjcwNzE1OGFkM2VkYjQx MTNiMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rp bWVsaW5lQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVGltZWxpbmVDb250ZW50Vmlldy5qcwpAQCAtNDQsNiArNDQsOSBAQCBXZWJJbnNwZWN0 b3IuVGltZWxpbmVDb250ZW50VmlldyA9IGZ1bmN0aW9uKHJlY29yZGluZykKICAgICB0aGlzLl92 aWV3Q29udGFpbmVyLmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZp ZXcuVmlld0NvbnRhaW5lclN0eWxlQ2xhc3NOYW1lKTsKICAgICB0aGlzLmVsZW1lbnQuYXBwZW5k Q2hpbGQodGhpcy5fdmlld0NvbnRhaW5lcik7CiAKKyAgICB0aGlzLl9jbGVhclRpbWVsaW5lTmF2 aWdhdGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJjbGVh ci10aW1lbGluZSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgVGltZWxpbmUiKSwgIklt YWdlcy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIsIDE2LCAxNik7CisgICAgdGhpcy5fY2xlYXJU aW1lbGluZU5hdmlnYXRpb25JdGVtLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkJ1dHRv bk5hdmlnYXRpb25JdGVtLkV2ZW50LkNsaWNrZWQsIHRoaXMuX2NsZWFyVGltZWxpbmUsIHRoaXMp OworCiAgICAgdGhpcy5fb3ZlcnZpZXdUaW1lbGluZVZpZXcgPSBuZXcgV2ViSW5zcGVjdG9yLk92 ZXJ2aWV3VGltZWxpbmVWaWV3KHJlY29yZGluZyk7CiAKICAgICB0aGlzLl9kaXNjcmV0ZVRpbWVs aW5lVmlld01hcCA9IG5ldyBNYXA7CkBAIC03Nyw2ICs4MCw3IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZUNvbnRlbnRWaWV3ID0gZnVuY3Rpb24ocmVjb3JkaW5nKQogICAgIHRoaXMuX2N1cnJlbnRU aW1lbGluZVZpZXdJZGVudGlmaWVyID0gbnVsbDsKIAogICAgIHRoaXMuX3VwZGF0aW5nID0gZmFs c2U7CisgICAgdGhpcy5fY3VycmVudFRpbWUgPSBOYU47CiAgICAgdGhpcy5fbGFzdFVwZGF0ZVRp bWVzdGFtcCA9IE5hTjsKIAogICAgIHJlY29yZGluZy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVudC5SZXNldCwgdGhpcy5fcmVjb3JkaW5nUmVzZXQs IHRoaXMpOwpAQCAtMTI4LDYgKzEzMiwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVDb250ZW50 Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBbdGhpcy5fcGF0aENvbXBvbmVudE1h cC5nZXQodGhpcy5fY3VycmVudFRpbWVsaW5lVmlld0lkZW50aWZpZXIpXTsKICAgICB9LAogCisg ICAgZ2V0IG5hdmlnYXRpb25JdGVtcygpCisgICAgeworICAgICAgICByZXR1cm4gW3RoaXMuX2Ns ZWFyVGltZWxpbmVOYXZpZ2F0aW9uSXRlbV07CisgICAgfSwKKwogICAgIHNob3duOiBmdW5jdGlv bigpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2N1cnJlbnRUaW1lbGluZVZpZXcpCkBAIC0y NDEsNiArMjUwLDExIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlw ZSA9IHsKIAogICAgIF91cGRhdGU6IGZ1bmN0aW9uKHRpbWVzdGFtcCkKICAgICB7CisgICAgICAg IGlmICh0aGlzLl93YWl0aW5nVG9SZXNldEN1cnJlbnRUaW1lKSB7CisgICAgICAgICAgICByZXF1 ZXN0QW5pbWF0aW9uRnJhbWUodGhpcy5fdXBkYXRlQ2FsbGJhY2spOworICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CisKICAgICAgICAgdmFyIHN0YXJ0VGltZSA9IHRoaXMuX3JlY29yZGlu Zy5zdGFydFRpbWU7CiAgICAgICAgIHZhciBjdXJyZW50VGltZSA9IHRoaXMuX2N1cnJlbnRUaW1l IHx8IHN0YXJ0VGltZTsKICAgICAgICAgdmFyIGVuZFRpbWUgPSB0aGlzLl9yZWNvcmRpbmcuZW5k VGltZTsKQEAgLTI0OCw2ICsyNjIsMjEgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ29udGVudFZp ZXcucHJvdG90eXBlID0gewogCiAgICAgICAgIGN1cnJlbnRUaW1lICs9IHRpbWVzcGFuU2luY2VM YXN0VXBkYXRlOwogCisgICAgICAgIHRoaXMuX3VwZGF0ZVRpbWVzKHN0YXJ0VGltZSwgY3VycmVu dFRpbWUsIGVuZFRpbWUpOworCisgICAgICAgIC8vIE9ubHkgc3RvcCB1cGRhdGluZyBpZiB0aGUg Y3VycmVudCB0aW1lIGlzIGdyZWF0ZXIgdGhhbiB0aGUgZW5kIHRpbWUuCisgICAgICAgIGlmICgh dGhpcy5fdXBkYXRpbmcgJiYgY3VycmVudFRpbWUgPj0gZW5kVGltZSkgeworICAgICAgICAgICAg dGhpcy5fbGFzdFVwZGF0ZVRpbWVzdGFtcCA9IE5hTjsKKyAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgfQorCisgICAgICAgIHRoaXMuX2xhc3RVcGRhdGVUaW1lc3RhbXAgPSB0aW1lc3RhbXA7 CisKKyAgICAgICAgcmVxdWVzdEFuaW1hdGlvbkZyYW1lKHRoaXMuX3VwZGF0ZUNhbGxiYWNrKTsK KyAgICB9LAorCisgICAgX3VwZGF0ZVRpbWVzOiBmdW5jdGlvbihzdGFydFRpbWUsIGN1cnJlbnRU aW1lLCBlbmRUaW1lKQorICAgIHsKICAgICAgICAgaWYgKHRoaXMuX3N0YXJ0VGltZU5lZWRzUmVz ZXQgJiYgIWlzTmFOKHN0YXJ0VGltZSkpIHsKICAgICAgICAgICAgIHZhciBzZWxlY3Rpb25PZmZz ZXQgPSB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LnNlbGVjdGlvblN0YXJ0VGltZSAtIHRoaXMuX3Rp bWVsaW5lT3ZlcnZpZXcuc3RhcnRUaW1lOwogCkBAIC0yNzAsMTYgKzI5OSw2IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgLy8gRm9yY2Ug YSBsYXlvdXQgbm93IHNpbmNlIHdlIGFyZSBhbHJlYWR5IGluIGFuIGFuaW1hdGlvbiBmcmFtZSBh bmQgZG9uJ3QgbmVlZCB0byBkZWxheSBpdCB1bnRpbCB0aGUgbmV4dC4KICAgICAgICAgdGhpcy5f dGltZWxpbmVPdmVydmlldy51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOwogICAgICAgICB0aGlzLl9j dXJyZW50VGltZWxpbmVWaWV3LnVwZGF0ZUxheW91dElmTmVlZGVkKCk7Ci0KLSAgICAgICAgLy8g T25seSBzdG9wIHVwZGF0aW5nIGlmIHRoZSBjdXJyZW50IHRpbWUgaXMgZ3JlYXRlciB0aGFuIHRo ZSBlbmQgdGltZS4KLSAgICAgICAgaWYgKCF0aGlzLl91cGRhdGluZyAmJiBjdXJyZW50VGltZSA+ PSBlbmRUaW1lKSB7Ci0gICAgICAgICAgICB0aGlzLl9sYXN0VXBkYXRlVGltZXN0YW1wID0gTmFO OwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0KLSAgICAgICAgdGhpcy5fbGFzdFVw ZGF0ZVRpbWVzdGFtcCA9IHRpbWVzdGFtcDsKLQotICAgICAgICByZXF1ZXN0QW5pbWF0aW9uRnJh bWUodGhpcy5fdXBkYXRlQ2FsbGJhY2spOwogICAgIH0sCiAKICAgICBfc3RhcnRVcGRhdGluZ0N1 cnJlbnRUaW1lOiBmdW5jdGlvbigpCkBAIC0yODgsNiArMzA3LDEzIEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZUNvbnRlbnRWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX3VwZGF0 aW5nKQogICAgICAgICAgICAgcmV0dXJuOwogCisgICAgICAgIGlmICghaXNOYU4odGhpcy5fY3Vy cmVudFRpbWUpKSB7CisgICAgICAgICAgICAvLyBXZSBoYXZlIGEgY3VycmVudCB0aW1lIGFscmVk eSwgc28gd2UgbGlrZWx5IG5lZWQgdG8ganVtcCBpbnRvIHRoZSBmdXR1cmUgdG8gYSBiZXR0ZXIg Y3VycmVudCB0aW1lLgorICAgICAgICAgICAgLy8gVGhpcyBoYXBwZW5zIHdoZW4geW91IHN0b3Ag YW5kIGxhdGVyIHJlc3RhcnQgcmVjb3JkaW5nLgorICAgICAgICAgICAgdGhpcy5fd2FpdGluZ1Rv UmVzZXRDdXJyZW50VGltZSA9IHRydWU7CisgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmcuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuVGltZXNV cGRhdGVkLCB0aGlzLl9yZWNvcmRpbmdUaW1lc1VwZGF0ZWQsIHRoaXMpOworICAgICAgICB9CisK ICAgICAgICAgdGhpcy5fdXBkYXRpbmcgPSB0cnVlOwogCiAgICAgICAgIGlmICghdGhpcy5fdXBk YXRlQ2FsbGJhY2spCkBAIC0zMTIsMTEgKzMzOCw0NSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVD b250ZW50Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3N0b3BVcGRhdGluZ0N1cnJl bnRUaW1lKCk7CiAgICAgfSwKIAorICAgIF9yZWNvcmRpbmdUaW1lc1VwZGF0ZWQ6IGZ1bmN0aW9u KGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKCF0aGlzLl93YWl0aW5nVG9SZXNldEN1cnJlbnRU aW1lKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIE1ha2UgdGhlIGN1cnJlbnQg dGltZSBiZSB0aGUgc3RhcnQgdGltZSBvZiB0aGUgbGFzdCBhZGRlZCByZWNvcmQuIFRoaXMgaXMg dGhlIGJlc3Qgd2F5CisgICAgICAgIC8vIGN1cnJlbnRseSB0byBqdW1wIHRvIHRoZSByaWdodCBw ZXJpb2Qgb2YgdGltZSBhZnRlciByZWNvcmRpbmcgc3RhcnRzLgorICAgICAgICAvLyBGSVhNRTog SWYgbm8gYWN0aXZpdHkgaXMgaGFwcGVuaW5nIHdlIGNhbiBzaXQgZm9yIGEgd2hpbGUgdW50aWwg YSByZWNvcmQgaXMgYWRkZWQuCisgICAgICAgIC8vIFdlIG1pZ2h0IHdhbnQgdG8gaGF2ZSB0aGUg YmFja2VuZCBzZW5kIGEgInN0YXJ0IiByZWNvcmQgdG8gZ2V0IGN1cnJlbnQgdGltZSBtb3Zpbmcu CisKKyAgICAgICAgZm9yICh2YXIgdGltZWxpbmUgb2YgdGhpcy5fcmVjb3JkaW5nLnRpbWVsaW5l cy52YWx1ZXMoKSkgeworICAgICAgICAgICAgdmFyIGxhc3RSZWNvcmQgPSB0aW1lbGluZS5yZWNv cmRzLmxhc3RWYWx1ZTsKKyAgICAgICAgICAgIGlmICghbGFzdFJlY29yZCkKKyAgICAgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lID0gTWF0aC5tYXgo dGhpcy5fY3VycmVudFRpbWUsIGxhc3RSZWNvcmQuc3RhcnRUaW1lKTsKKyAgICAgICAgfQorCisg ICAgICAgIHRoaXMuX3JlY29yZGluZy5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5U aW1lbGluZVJlY29yZGluZy5FdmVudC5UaW1lc1VwZGF0ZWQsIHRoaXMuX3JlY29yZGluZ1RpbWVz VXBkYXRlZCwgdGhpcyk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl93YWl0aW5nVG9SZXNldEN1cnJl bnRUaW1lOworICAgIH0sCisKKyAgICBfY2xlYXJUaW1lbGluZTogZnVuY3Rpb24oZXZlbnQpCisg ICAgeworICAgICAgICB0aGlzLl9yZWNvcmRpbmcucmVzZXQoKTsKKyAgICB9LAorCiAgICAgX3Jl Y29yZGluZ1Jlc2V0OiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRoaXMuX3N0YXJ0 VGltZU5lZWRzUmVzZXQgPSB0cnVlOwogICAgICAgICB0aGlzLl9jdXJyZW50VGltZSA9IE5hTjsK IAorICAgICAgICBpZiAoIXRoaXMuX3VwZGF0aW5nKSB7CisgICAgICAgICAgICAvLyBGb3JjZSB0 aGUgdGltZSBydWxlciBhbmQgdmlld3MgdG8gcmVzZXQgdG8gMC4KKyAgICAgICAgICAgIHRoaXMu X3N0YXJ0VGltZU5lZWRzUmVzZXQgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5fdXBkYXRlVGlt ZXMoMCwgMCwgMCk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9sYXN0VXBkYXRlVGltZXN0 YW1wID0gTmFOOworICAgICAgICB0aGlzLl9zdGFydFRpbWVOZWVkc1Jlc2V0ID0gdHJ1ZTsKKwog ICAgICAgICB0aGlzLl9vdmVydmlld1RpbWVsaW5lVmlldy5yZXNldCgpOwogICAgICAgICBmb3Ig KHZhciB0aW1lbGluZVZpZXcgb2YgdGhpcy5fZGlzY3JldGVUaW1lbGluZVZpZXdNYXAudmFsdWVz KCkpCiAgICAgICAgICAgICB0aW1lbGluZVZpZXcucmVzZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVs LmNzcwppbmRleCAyZWFlYjVkZmQ0ZTZhYWI0OTU5MzAxNDYyZjE3YTA5YmY4ZmYyYmQ2Li5kM2My Njk0ZDk3MmE2YzRkMjdjMzM2ZGUxYTliMTU5YzAyNTMzMmViIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVTaWRlYmFyUGFu ZWwuY3NzCkBAIC0yMywxMSArMjMsNzAgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERB TUFHRS4KICAqLwogCi0uc2lkZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5uYXZpZ2F0aW9uLWJh ciB7Cisuc2lkZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5zdGF0dXMtYmFyIHsKICAgICBwb3Np dGlvbjogYWJzb2x1dGU7CiAgICAgdG9wOiAwOwogICAgIGxlZnQ6IDA7CiAgICAgcmlnaHQ6IDA7 CisgICAgaGVpZ2h0OiAyMnB4OworICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xpZCByZ2IoMTc5 LCAxNzksIDE3OSk7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLnRpbWVsaW5lID4gLnN0YXR1cy1i YXIgPiAucmVjb3JkLWdseXBoIHsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAgdG9wOiAw OworICAgIGxlZnQ6IDA7CisgICAgd2lkdGg6IDIxcHg7CisgICAgaGVpZ2h0OiAyMXB4OworICAg IHBhZGRpbmc6IDA7CisgICAgYm9yZGVyOiBub25lOworICAgIG91dGxpbmU6IG5vbmU7CisgICAg Y29sb3I6IHRyYW5zcGFyZW50OworICAgIG92ZXJmbG93OiBoaWRkZW47CisKKyAgICAtd2Via2l0 LWFwcGVhcmFuY2U6IG5vbmU7CisKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsK KyAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWltYWdlLXNldCh1cmwoSW1hZ2VzL1JlY29y ZGluZ1N0b3BwZWQucG5nKSAxeCwgdXJsKEltYWdlcy9SZWNvcmRpbmdTdG9wcGVkQDJ4LnBuZykg MngpOworICAgIGJhY2tncm91bmQtcmVwZWF0OiBuby1yZXBlYXQ7CisgICAgYmFja2dyb3VuZC1z aXplOiAyMXB4IDIxcHg7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLnRpbWVsaW5lID4gLnN0YXR1 cy1iYXIgPiAucmVjb3JkLWdseXBoLnJlY29yZGluZyB7CisgICAgYmFja2dyb3VuZC1pbWFnZTog LXdlYmtpdC1pbWFnZS1zZXQodXJsKEltYWdlcy9SZWNvcmRpbmcucG5nKSAxeCwgdXJsKEltYWdl cy9SZWNvcmRpbmdAMngucG5nKSAyeCk7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLnRpbWVsaW5l ID4gLnN0YXR1cy1iYXIgPiAucmVjb3JkLWdseXBoOmhvdmVyIHsKKyAgICBiYWNrZ3JvdW5kLWlt YWdlOiAtd2Via2l0LWltYWdlLXNldCh1cmwoSW1hZ2VzL1JlY29yZGluZ0hvdmVyZWQucG5nKSAx eCwgdXJsKEltYWdlcy9SZWNvcmRpbmdIb3ZlcmVkQDJ4LnBuZykgMngpOworfQorCisuc2lkZWJh ciA+IC5wYW5lbC50aW1lbGluZSA+IC5zdGF0dXMtYmFyID4gLnJlY29yZC1nbHlwaC5yZWNvcmRp bmc6aG92ZXIgeworICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQtaW1hZ2Utc2V0KHVybChJ bWFnZXMvUmVjb3JkaW5nU3RvcHBlZC5wbmcpIDF4LCB1cmwoSW1hZ2VzL1JlY29yZGluZ1N0b3Bw ZWRAMngucG5nKSAyeCk7Cit9CisKKy5zaWRlYmFyID4gLnBhbmVsLnRpbWVsaW5lID4gLnN0YXR1 cy1iYXIgPiAucmVjb3JkLWdseXBoLmZvcmNlZCB7CisgICAgYmFja2dyb3VuZC1pbWFnZTogLXdl YmtpdC1pbWFnZS1zZXQodXJsKEltYWdlcy9SZWNvcmRpbmdTdG9wcGVkLnBuZykgMXgsIHVybChJ bWFnZXMvUmVjb3JkaW5nU3RvcHBlZEAyeC5wbmcpIDJ4KSAhaW1wb3J0YW50OworfQorCisuc2lk ZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5zdGF0dXMtYmFyID4gLnJlY29yZC1nbHlwaC5yZWNv cmRpbmcuZm9yY2VkIHsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWltYWdlLXNldCh1 cmwoSW1hZ2VzL1JlY29yZGluZy5wbmcpIDF4LCB1cmwoSW1hZ2VzL1JlY29yZGluZ0AyeC5wbmcp IDJ4KSAhaW1wb3J0YW50OworfQorCisuc2lkZWJhciA+IC5wYW5lbC50aW1lbGluZSA+IC5zdGF0 dXMtYmFyID4gLnJlY29yZC1zdGF0dXMgeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICB0 b3A6IDA7CisgICAgcmlnaHQ6IDIxcHg7CisgICAgbGVmdDogMjFweDsKKworICAgIHRleHQtYWxp Z246IGNlbnRlcjsKKworICAgIGxpbmUtaGVpZ2h0OiAyMHB4OworICAgIGZvbnQtc2l6ZTogMTFw eDsKKyAgICBmb250LWZhbWlseTogIkx1Y2lkYSBHcmFuZGUiLCBzYW5zLXNlcmlmOworICAgIGZv bnQtd2VpZ2h0OiBib2xkOworCisgICAgY29sb3I6IHJnYig3NiwgNzYsIDc2KTsKKyAgICB0ZXh0 LXNoYWRvdzogcmdiYSgyNTUsIDI1NSwgMjU1LCAwLjUpIDAgMXB4IDA7CiB9CiAKIC5zaWRlYmFy ID4gLnBhbmVsLnRpbWVsaW5lID4gLnRpdGxlLWJhciB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UaW1lbGluZVNpZGViYXJQYW5lbC5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCmlu ZGV4IGFmNGFkZjA4OTYxNmRkZDM3ODczYTM0M2Y4OTNkMmNmNzY0ZjYxMjkuLmJmMjdmN2UxNzc0 NTk3MzE4MTU2MjFjZDM5MzhkYzgxODljNjE5NDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lU2lkZWJhclBhbmVsLmpzCkBA IC00OSw4ICs0OSwyMCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBmdW5j dGlvbigpCiAgICAgdGltZWxpbmVzVGl0bGVCYXJFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5z cGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlRpbWVsaW5lc1RpdGxlQmFyU3R5bGVDbGFzcyk7 CiAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZSh0aW1lbGluZXNUaXRsZUJhckVsZW1lbnQs IHRoaXMuZWxlbWVudC5maXJzdENoaWxkKTsKIAotICAgIHRoaXMuX25hdmlnYXRpb25CYXIgPSBu ZXcgV2ViSW5zcGVjdG9yLk5hdmlnYXRpb25CYXI7Ci0gICAgdGhpcy5lbGVtZW50Lmluc2VydEJl Zm9yZSh0aGlzLl9uYXZpZ2F0aW9uQmFyLmVsZW1lbnQsIHRoaXMuZWxlbWVudC5maXJzdENoaWxk KTsKKyAgICB2YXIgc3RhdHVzQmFyRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRp diIpOworICAgIHN0YXR1c0JhckVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVTaWRlYmFyUGFuZWwuU3RhdHVzQmFyU3R5bGVDbGFzcyk7CisgICAgdGhpcy5lbGVtZW50 Lmluc2VydEJlZm9yZShzdGF0dXNCYXJFbGVtZW50LCB0aGlzLmVsZW1lbnQuZmlyc3RDaGlsZCk7 CisKKyAgICB0aGlzLl9yZWNvcmRHbHlwaEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKKyAgICB0aGlzLl9yZWNvcmRHbHlwaEVsZW1lbnQuY2xhc3NOYW1lID0gV2ViSW5z cGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlJlY29yZEdseXBoU3R5bGVDbGFzczsKKyAgICB0 aGlzLl9yZWNvcmRHbHlwaEVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2VvdmVyIiwgdGhp cy5fcmVjb3JkR2x5cGhNb3VzZWRPdmVyLmJpbmQodGhpcykpOworICAgIHRoaXMuX3JlY29yZEds eXBoRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuX3JlY29yZEdseXBo TW91c2VkT3V0LmJpbmQodGhpcykpOworICAgIHRoaXMuX3JlY29yZEdseXBoRWxlbWVudC5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX3JlY29yZEdseXBoQ2xpY2tlZC5iaW5kKHRoaXMp KTsKKyAgICBzdGF0dXNCYXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZEdseXBoRWxl bWVudCk7CisKKyAgICB0aGlzLl9yZWNvcmRTdGF0dXNFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgiZGl2Iik7CisgICAgdGhpcy5fcmVjb3JkU3RhdHVzRWxlbWVudC5jbGFzc05hbWUg PSBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuUmVjb3JkU3RhdHVzU3R5bGVDbGFz czsKKyAgICBzdGF0dXNCYXJFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3JlY29yZFN0YXR1c0Vs ZW1lbnQpOwogCiAgICAgZnVuY3Rpb24gY3JlYXRlVGltZWxpbmVUcmVlRWxlbWVudChsYWJlbCwg aWNvbkNsYXNzLCBpZGVudGlmaWVyKQogICAgIHsKQEAgLTc4LDYgKzkwLDggQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMuY29udGVudEVs ZW1lbnQuaW5zZXJ0QmVmb3JlKHRoaXMuX3N0cmlwZUJhY2tncm91bmRFbGVtZW50LCB0aGlzLmNv bnRlbnRFbGVtZW50LmZpcnN0Q2hpbGQpOwogCiAgICAgV2ViSW5zcGVjdG9yLmNvbnRlbnRCcm93 c2VyLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyLkV2ZW50LkN1 cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZSwgdGhpcy5fY29udGVudEJyb3dzZXJDdXJyZW50Q29u dGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMpOworICAgIFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFn ZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LlJl Y29yZGluZ1N0YXJ0ZWQsIHRoaXMuX3JlY29yZGluZ1N0YXJ0ZWQsIHRoaXMpOworICAgIFdlYklu c3BlY3Rvci50aW1lbGluZU1hbmFnZXIuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGlt ZWxpbmVNYW5hZ2VyLkV2ZW50LlJlY29yZGluZ1N0b3BwZWQsIHRoaXMuX3JlY29yZGluZ1N0b3Bw ZWQsIHRoaXMpOwogCiAgICAgZnVuY3Rpb24gZGVsYXllZFdvcmsoKQogICAgIHsKQEAgLTg5LDYg KzEwMywxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwgPSBmdW5jdGlvbigp CiAgICAgc2V0VGltZW91dChkZWxheWVkV29yay5iaW5kKHRoaXMpLCAwKTsKIH07CiAKK1dlYklu c3BlY3Rvci5UaW1lbGluZVNpZGViYXJQYW5lbC5TdGF0dXNCYXJTdHlsZUNsYXNzID0gInN0YXR1 cy1iYXIiOworV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlJlY29yZEdseXBoU3R5 bGVDbGFzcyA9ICJyZWNvcmQtZ2x5cGgiOworV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBh bmVsLlJlY29yZEdseXBoUmVjb3JkaW5nU3R5bGVDbGFzcyA9ICJyZWNvcmRpbmciOworV2ViSW5z cGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlJlY29yZEdseXBoUmVjb3JkaW5nRm9yY2VkU3R5 bGVDbGFzcyA9ICJmb3JjZWQiOworV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLlJl Y29yZFN0YXR1c1N0eWxlQ2xhc3MgPSAicmVjb3JkLXN0YXR1cyI7CiBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVTaWRlYmFyUGFuZWwuVGl0bGVCYXJTdHlsZUNsYXNzID0gInRpdGxlLWJhciI7CiBXZWJJ bnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuVGltZWxpbmVzVGl0bGVCYXJTdHlsZUNsYXNz ID0gInRpbWVsaW5lcyI7CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuVGltZWxp bmVFdmVudHNUaXRsZUJhclN0eWxlQ2xhc3MgPSAidGltZWxpbmUtZXZlbnRzIjsKQEAgLTI4OCw1 ICszMDcsNDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVsLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIHRoaXMuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5U aW1lbGluZVNpZGViYXJQYW5lbC5UaW1lbGluZUNvbnRlbnRWaWV3U2hvd2luZ1N0eWxlQ2xhc3Mp OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92 ZShXZWJJbnNwZWN0b3IuVGltZWxpbmVTaWRlYmFyUGFuZWwuVGltZWxpbmVDb250ZW50Vmlld1No b3dpbmdTdHlsZUNsYXNzKTsKKyAgICB9LAorCisgICAgX3JlY29yZGluZ1N0YXJ0ZWQ6IGZ1bmN0 aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVjb3JkU3RhdHVzRWxlbWVudC50ZXh0 Q29udGVudCA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVjb3JkaW5nIik7CisgICAgICAgIHRo aXMuX3JlY29yZEdseXBoRWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVNpZGViYXJQYW5lbC5SZWNvcmRHbHlwaFJlY29yZGluZ1N0eWxlQ2xhc3MpOworICAgIH0sCisK KyAgICBfcmVjb3JkaW5nU3RvcHBlZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB0 aGlzLl9yZWNvcmRTdGF0dXNFbGVtZW50LnRleHRDb250ZW50ID0gIiI7CisgICAgICAgIHRoaXMu X3JlY29yZEdseXBoRWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVNpZGViYXJQYW5lbC5SZWNvcmRHbHlwaFJlY29yZGluZ1N0eWxlQ2xhc3MpOworICAgIH0sCisK KyAgICBfcmVjb3JkR2x5cGhNb3VzZWRPdmVyOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAg ICAgIHRoaXMuX3JlY29yZEdseXBoRWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rv ci5UaW1lbGluZVNpZGViYXJQYW5lbC5SZWNvcmRHbHlwaFJlY29yZGluZ0ZvcmNlZFN0eWxlQ2xh c3MpOworCisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnJlY29yZGlu Z0VuYWJsZWQpCisgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdGF0dXNFbGVtZW50LnRleHRDb250 ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdG9wIFJlY29yZGluZyIpOworICAgICAgICBl bHNlCisgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdGF0dXNFbGVtZW50LnRleHRDb250ZW50ID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdGFydCBSZWNvcmRpbmciKTsKKyAgICB9LAorCisgICAg X3JlY29yZEdseXBoTW91c2VkT3V0OiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAgIHRo aXMuX3JlY29yZEdseXBoRWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5UaW1l bGluZVNpZGViYXJQYW5lbC5SZWNvcmRHbHlwaFJlY29yZGluZ0ZvcmNlZFN0eWxlQ2xhc3MpOwor CisgICAgICAgIGlmIChXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnJlY29yZGluZ0VuYWJs ZWQpCisgICAgICAgICAgICB0aGlzLl9yZWNvcmRTdGF0dXNFbGVtZW50LnRleHRDb250ZW50ID0g V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZWNvcmRpbmciKTsKKyAgICAgICAgZWxzZQorICAgICAg ICAgICAgdGhpcy5fcmVjb3JkU3RhdHVzRWxlbWVudC50ZXh0Q29udGVudCA9ICIiOworICAgIH0s CisKKyAgICBfcmVjb3JkR2x5cGhDbGlja2VkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAg ICAgIC8vIEFkZCBmb3JjZWQgY2xhc3MgdG8gcHJldmVudCB0aGUgZ2x5cGggZnJvbSBzaG93aW5n IGEgY29uZnVzaW5nIHN0YXR1cyBhZnRlciBjbGljay4KKyAgICAgICAgdGhpcy5fcmVjb3JkR2x5 cGhFbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlRpbWVsaW5lU2lkZWJhclBhbmVs LlJlY29yZEdseXBoUmVjb3JkaW5nRm9yY2VkU3R5bGVDbGFzcyk7CisKKyAgICAgICAgaWYgKFdl Ykluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIucmVjb3JkaW5nRW5hYmxlZCkKKyAgICAgICAgICAg IFdlYkluc3BlY3Rvci50aW1lbGluZU1hbmFnZXIuc3RvcFJlY29yZGluZygpOworICAgICAgICBl bHNlCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IudGltZWxpbmVNYW5hZ2VyLnN0YXJ0UmVjb3Jk aW5nKCk7CiAgICAgfQogfTsK