150178 2015-10-15 11:50:10 -0700 Web Inspector: Timeline current time marker does not start moving when starting recording after just opening inspector 2015-10-27 14:39:36 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1133545 0 joepeck 2015-10-15 11:50:10 -0700 * SUMMARY Timeline current time marker does not start moving when starting recording after just opening inspector. * STEPS TO REPRODUCE 1. Load webkit.org 2. Open Inspector 3. Show Timelines Tab 4. Start Recording => expected current time marker to start moving, it did not until the first event. 1133546 1 webkit-bug-importer 2015-10-15 11:51:21 -0700 <rdar://problem/23130818> 1133550 2 263177 joepeck 2015-10-15 12:08:15 -0700 Created attachment 263177 [PATCH] Proposed Fix 1134371 3 263177 bburg 2015-10-18 15:53:59 -0700 Comment on attachment 263177 [PATCH] Proposed Fix This is an annoying bug, but I'm not sure this is the right way to fix it. My reservation is that we are potentially updating the TimelineRecording model object based on when the TimelineRecordingContentView is shown (and triggers startUpdatingCurrentTime). Why can't TimelineManager set the recording's startTime if it's not already set, when we get the Timeline.capturingStarted event? This way there's no special fixup that needs to be done in the view code. 1134931 4 joepeck 2015-10-20 10:58:46 -0700 (In reply to comment #3) > Comment on attachment 263177 [details] > [PATCH] Proposed Fix > > This is an annoying bug, but I'm not sure this is the right way to fix it. > My reservation is that we are potentially updating the TimelineRecording > model object based on when the TimelineRecordingContentView is shown (and > triggers startUpdatingCurrentTime). In this path, startUpdatingCurrentTime would not have a startTime. > Why can't TimelineManager set the recording's startTime if it's not already > set, when we get the Timeline.capturingStarted event? This way there's no > special fixup that needs to be done in the view code. That is exactly what we are doing here. On handling the WebInspector.TimelineManager.Event.CapturingStarted event, TimelineRecordingContentView calls startUpdatingCurrentTime(startTime) and we set the recording's startTime. Do you think this should be moved somewhere else? 1134951 5 bburg 2015-10-20 11:40:27 -0700 (In reply to comment #4) > (In reply to comment #3) > > Comment on attachment 263177 [details] > > [PATCH] Proposed Fix > > > > This is an annoying bug, but I'm not sure this is the right way to fix it. > > My reservation is that we are potentially updating the TimelineRecording > > model object based on when the TimelineRecordingContentView is shown (and > > triggers startUpdatingCurrentTime). > > In this path, startUpdatingCurrentTime would not have a startTime. > > > > Why can't TimelineManager set the recording's startTime if it's not already > > set, when we get the Timeline.capturingStarted event? This way there's no > > special fixup that needs to be done in the view code. > > That is exactly what we are doing here. On handling the > WebInspector.TimelineManager.Event.CapturingStarted event, > TimelineRecordingContentView calls startUpdatingCurrentTime(startTime) and > we set the recording's startTime. > > Do you think this should be moved somewhere else? I suggest that TimelineManager itself should set the recording's startTime before dispatching CapturingStarted. Then the views can assume that an actively capturing recording has a valid start time. 1136633 6 264075 joepeck 2015-10-26 14:22:17 -0700 Created attachment 264075 [PATCH] Proposed Fix Better fix taking Brian's suggestion. I like it much better. 1136815 7 264075 timothy 2015-10-27 09:34:22 -0700 Comment on attachment 264075 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=264075&action=review > Source/WebInspectorUI/UserInterface/Models/TimelineRecording.js:234 > + this._startTime = timestamp; Should this fire? this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimesUpdated) 1136816 8 264075 bburg 2015-10-27 09:35:45 -0700 Comment on attachment 264075 [PATCH] Proposed Fix He beat me to it! 1136914 9 264156 joepeck 2015-10-27 13:50:02 -0700 Created attachment 264156 [PATCH] Proposed Fix Dispatch the event, and also set endTime because that is what happens when new records come in, so we might as well do it here. 1136918 10 264156 bburg 2015-10-27 13:54:04 -0700 Comment on attachment 264156 [PATCH] Proposed Fix r=me 1136931 11 264156 commit-queue 2015-10-27 14:39:33 -0700 Comment on attachment 264156 [PATCH] Proposed Fix Clearing flags on attachment: 264156 Committed r191639: <http://trac.webkit.org/changeset/191639> 1136932 12 commit-queue 2015-10-27 14:39:36 -0700 All reviewed patches have been landed. Closing bug. 263177 2015-10-15 12:08:15 -0700 2015-10-26 14:22:17 -0700 [PATCH] Proposed Fix start-play-head.patch text/plain 5509 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVjNzMzZTkuLjI2M2MzMzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTEwLTE1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxp bmUgY3VycmVudCB0aW1lIG1hcmtlciBkb2VzIG5vdCBzdGFydCBtb3Zpbmcgd2hlbiBzdGFydGlu ZyByZWNvcmRpbmcgYWZ0ZXIganVzdCBvcGVuaW5nIGluc3BlY3RvcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMTc4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9U aW1lbGluZVJlY29yZGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZGluZy5wcm90b3R5cGUuc2V0U3RhcnRUaW1lQmVmb3JlUmVjb3Jkcyk6CisgICAgICAgIEZvciBh IHJlY29yZGluZyB0byBzdGFydCB1cGRhdGluZyBjdXJyZW50IHRpbWUgdGhlIHJlY29yZGluZyBp dHNlbGYKKyAgICAgICAgbXVzdCBoYXZlIGEgc3RhcnQgdGltZS4gUHJvdmlkZSBhIHNldHRlciBz byB0aGF0IHRoZSBzdGFydCB0aW1lIGNhbgorICAgICAgICBiZSBzZXQgd2l0aG91dCB3YWl0aW5n IGZvciBhIHRpbWVsaW5lIHJlY29yZC4gRm9yIGV4YW1wbGUgdGhlCisgICAgICAgIHRpbWVzdGFt cCB0aGF0IHRoZSBmcm9udGVuZCByZWNlaXZlcyB3aGVuIGl0IHN0YXJ0cyBhIHJlY29yZGluZy4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50 Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRW aWV3LnByb3RvdHlwZS5fc3RhcnRVcGRhdGluZ0N1cnJlbnRUaW1lKToKKyAgICAgICAgV2hlbiB3 ZSBoYXZlIGEgc3RhcnRUaW1lIG51bWJlciAobmV3IGJhY2tlbmRzKSBhbHdheXMgdXNlIGl0IGFz IHRoZSBjdXJyZW50IHRpbWUKKyAgICAgICAgYW5kIHVwZGF0ZSB0aGUgcmVjb3JkaW5nJ3Mgc3Rh cnQgdGltZSBpZiBpdCB3YXMgTmFOIHNvIHdlIGhhdmUgYSBzdGFydCBiYXNlLiBQcmV2aW91c2x5 CisgICAgICAgIHdlIHdlcmUgb25seSBkb2luZyB0aGlzIGlmIGN1cnJlbnQgdGltZSB3YXMgTmFO LCB3aGljaCB3b3VsZCBiZSB3aGVuIHJlLXN0YXJ0aW5nCisgICAgICAgIGEgcmVjb3JkaW5nIGFm dGVyIGl0IGhhZCBzdG9wcGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJ1bGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUnVsZXIucHJvdG90 eXBlLnVwZGF0ZUxheW91dCk6CisgICAgICAgIEV2ZW4gaWYgd2UgZG8gbm90IG5lZWQgdG8gY3Jl YXRlIG5ldyB0aW1lIGRpdmlkZXJzIHdlIG1heSBuZWVkIHRvIHBlcmZvcm0KKyAgICAgICAgb3Ro ZXIgdXBkYXRlcyBsaWtlIHVwZGF0ZSB0aGUgY3VycmVudCB0aW1lIG1hcmtlci4gU28gZG8gd29y ayBiZWZvcmUgYmFpbGluZy4KKwogMjAxNS0xMC0xNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluY2x1ZGUgR2FyYmFnZSBD b2xsZWN0aW9uIEV2ZW50IGluIFRpbWVsaW5lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMK aW5kZXggNWJhM2IzMS4uNWFkZWJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJlY29yZGluZy5qcwpA QCAtMjI4LDYgKzIyOCwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcgPSBjbGFz cyBUaW1lbGluZVJlY29yZGluZyBleHRlbmRzIFdlYkluc3BlY3Rvci5PYgogICAgICAgICB0aGlz Ll9sZWdhY3lGaXJzdFJlY29yZGVkVGltZXN0YW1wID0gdGltZXN0YW1wOwogICAgIH0KIAorICAg IHNldFN0YXJ0VGltZUJlZm9yZVJlY29yZHModGltZXN0YW1wKQorICAgIHsKKyAgICAgICAgdGhp cy5fc3RhcnRUaW1lID0gdGltZXN0YW1wOworICAgIH0KKwogICAgIC8vIFByaXZhdGUKIAogICAg IF9rZXlGb3JSZWNvcmQocmVjb3JkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcuanMKaW5kZXggNTYyNmU4Zi4uZWFjNmFlYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250 ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCkBAIC00NTgsMTggKzQ1OCwxOCBAQCBX ZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcgZQogICAgICAgICBpZiAodGhpcy5fdXBkYXRpbmcpCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKCFpc05hTih0aGlzLl9jdXJyZW50VGltZSkp IHsKKyAgICAgICAgaWYgKHR5cGVvZiBzdGFydFRpbWUgPT09ICJudW1iZXIiKSB7CisgICAgICAg ICAgICB0aGlzLl9jdXJyZW50VGltZSA9IHN0YXJ0VGltZTsKKyAgICAgICAgICAgIGlmIChpc05h Tih0aGlzLl9yZWNvcmRpbmcuc3RhcnRUaW1lKSkKKyAgICAgICAgICAgICAgICB0aGlzLl9yZWNv cmRpbmcuc2V0U3RhcnRUaW1lQmVmb3JlUmVjb3JkcyhzdGFydFRpbWUpOworICAgICAgICB9IGVs c2UgaWYgKCFpc05hTih0aGlzLl9jdXJyZW50VGltZSkpIHsKICAgICAgICAgICAgIC8vIFRoaXMg aGFwcGVucyB3aGVuIHlvdSBzdG9wIGFuZCBsYXRlciByZXN0YXJ0IHJlY29yZGluZy4KLSAgICAg ICAgICAgIGlmICh0eXBlb2Ygc3RhcnRUaW1lID09PSAibnVtYmVyIikKLSAgICAgICAgICAgICAg ICB0aGlzLl9jdXJyZW50VGltZSA9IHN0YXJ0VGltZTsKLSAgICAgICAgICAgIGVsc2UgewotICAg ICAgICAgICAgICAgIC8vIENPTVBBVElCSUxJVFkgKGlPUyA5KTogVGltZWxpbmUucmVjb3JkaW5n U3RhcnRlZCBldmVudHMgZGlkIG5vdCBpbmNsdWRlIGEgdGltZXN0YW1wLgotICAgICAgICAgICAg ICAgIC8vIFdlIGxpa2VseSBuZWVkIHRvIGp1bXAgaW50byB0aGUgZnV0dXJlIHRvIGEgYmV0dGVy IGN1cnJlbnQgdGltZSB3aGljaCB3ZSBjYW4KLSAgICAgICAgICAgICAgICAvLyBhc2NlcnRhaW5l ZCBmcm9tIGEgbmV3IGluY29taW5nIHRpbWVsaW5lIHJlY29yZCwgc28gd2Ugd2FpdCBmb3IgYSBU aW1lbGluZSB0byB1cGRhdGUuCi0gICAgICAgICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMu X3dhaXRpbmdUb1Jlc2V0Q3VycmVudFRpbWUpOwotICAgICAgICAgICAgICAgIHRoaXMuX3dhaXRp bmdUb1Jlc2V0Q3VycmVudFRpbWUgPSB0cnVlOwotICAgICAgICAgICAgICAgIHRoaXMuX3JlY29y ZGluZy5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVu dC5UaW1lc1VwZGF0ZWQsIHRoaXMuX3JlY29yZGluZ1RpbWVzVXBkYXRlZCwgdGhpcyk7Ci0gICAg ICAgICAgICB9CisgICAgICAgICAgICAvLyBDT01QQVRJQklMSVRZIChpT1MgOSk6IFRpbWVsaW5l LnJlY29yZGluZ1N0YXJ0ZWQgZXZlbnRzIGRpZCBub3QgaW5jbHVkZSBhIHRpbWVzdGFtcC4KKyAg ICAgICAgICAgIC8vIFdlIGxpa2VseSBuZWVkIHRvIGp1bXAgaW50byB0aGUgZnV0dXJlIHRvIGEg YmV0dGVyIGN1cnJlbnQgdGltZSB3aGljaCB3ZSBjYW4KKyAgICAgICAgICAgIC8vIGFzY2VydGFp bmVkIGZyb20gYSBuZXcgaW5jb21pbmcgdGltZWxpbmUgcmVjb3JkLCBzbyB3ZSB3YWl0IGZvciBh IFRpbWVsaW5lIHRvIHVwZGF0ZS4KKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl93 YWl0aW5nVG9SZXNldEN1cnJlbnRUaW1lKTsKKyAgICAgICAgICAgIHRoaXMuX3dhaXRpbmdUb1Jl c2V0Q3VycmVudFRpbWUgPSB0cnVlOworICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLkV2ZW50LlRpbWVzVXBk YXRlZCwgdGhpcy5fcmVjb3JkaW5nVGltZXNVcGRhdGVkLCB0aGlzKTsKICAgICAgICAgfQogCiAg ICAgICAgIHRoaXMuX3VwZGF0aW5nID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzCmluZGV4IGU2 NmYxZjUuLjQwOTJkNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcwpAQCAtMzcxLDggKzM3MSwxMiBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlciA9IGNsYXNzIFRpbWVsaW5lUnVsZXIgZXh0ZW5k cyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICBsYXN0VGltZTogbGFzdERpdmlkZXJU aW1lLAogICAgICAgICB9OwogCi0gICAgICAgIGlmIChPYmplY3Quc2hhbGxvd0VxdWFsKGRpdmlk ZXJEYXRhLCB0aGlzLl9jdXJyZW50RGl2aWRlcnMpKQorICAgICAgICBpZiAoT2JqZWN0LnNoYWxs b3dFcXVhbChkaXZpZGVyRGF0YSwgdGhpcy5fY3VycmVudERpdmlkZXJzKSkgeworICAgICAgICAg ICAgdGhpcy5fdXBkYXRlTWFya2Vycyh2aXNpYmxlV2lkdGgsIGR1cmF0aW9uKTsKKyAgICAgICAg ICAgIHRoaXMuX3VwZGF0ZVNlbGVjdGlvbih2aXNpYmxlV2lkdGgsIGR1cmF0aW9uKTsKICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIHRoaXMuX2N1cnJlbnREaXZpZGVy cyA9IGRpdmlkZXJEYXRhOwogCiAgICAgICAgIHZhciBtYXJrZXJEaXZpZGVycyA9IHRoaXMuX21h cmtlcnNFbGVtZW50LnF1ZXJ5U2VsZWN0b3JBbGwoIi4iICsgV2ViSW5zcGVjdG9yLlRpbWVsaW5l UnVsZXIuRGl2aWRlckVsZW1lbnRTdHlsZUNsYXNzTmFtZSk7Cg== 264075 2015-10-26 14:22:17 -0700 2015-10-27 13:50:02 -0700 [PATCH] Proposed Fix better-timeline.patch text/plain 6182 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDYxOWQzOWMuLjIxZjQxMmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE1LTEwLTI2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogVGltZWxp bmUgY3VycmVudCB0aW1lIG1hcmtlciBkb2VzIG5vdCBzdGFydCBtb3Zpbmcgd2hlbiBzdGFydGlu ZyByZWNvcmRpbmcgYWZ0ZXIganVzdCBvcGVuaW5nIGluc3BlY3RvcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUwMTc4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xs ZXJzL1RpbWVsaW5lTWFuYWdlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZU1h bmFnZXIucHJvdG90eXBlLmNhcHR1cmluZ1N0YXJ0ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvTW9kZWxzL1RpbWVsaW5lUmVjb3JkaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lUmVjb3JkaW5nLnByb3RvdHlwZS5zZXRTdGFydFRpbWVJZk5lY2Vzc2FyeSk6CisgICAg ICAgIEZvciBhIHJlY29yZGluZyB0byBzdGFydCB1cGRhdGluZyBjdXJyZW50IHRpbWUgdGhlIHJl Y29yZGluZyBpdHNlbGYKKyAgICAgICAgbXVzdCBoYXZlIGEgc3RhcnQgdGltZS4gUHJvdmlkZSBh IHNldHRlciBzbyB0aGF0IHRoZSBzdGFydCB0aW1lIGNhbgorICAgICAgICBiZSBzZXQgd2l0aG91 dCB3YWl0aW5nIGZvciBhIHRpbWVsaW5lIHJlY29yZC4gRm9yIGV4YW1wbGUgdGhlCisgICAgICAg IHRpbWVzdGFtcCB0aGF0IHRoZSBmcm9udGVuZCByZWNlaXZlcyB3aGVuIGl0IHN0YXJ0cyBhIHJl Y29yZGluZy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRp bmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc3RhcnRVcGRhdGluZ0N1cnJlbnRUaW1lKToKKyAgICAg ICAgV2hlbiB3ZSBoYXZlIGEgc3RhcnRUaW1lIG51bWJlciAobmV3IGJhY2tlbmRzKSBhbHdheXMg dXNlIGl0IGFzIHRoZSBjdXJyZW50IHRpbWUuCisgICAgICAgIFByZXZpb3VzbHkgd2Ugd2VyZSBv bmx5IGRvaW5nIHRoaXMgaWYgY3VycmVudCB0aW1lIHdhcyBOYU4sIHdoaWNoIHdvdWxkIGJlIHdo ZW4KKyAgICAgICAgcmUtc3RhcnRpbmcgYSByZWNvcmRpbmcgYWZ0ZXIgaXQgaGFkIHN0b3BwZWQs IGJ1dCBub3QgZm9yIHRoZSBpbml0aWFsIHJlY29yZGluZworICAgICAgICBhZnRlciBvcGVuaW5n IHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l UnVsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5cGUu dXBkYXRlTGF5b3V0KToKKyAgICAgICAgRXZlbiBpZiB3ZSBkbyBub3QgbmVlZCB0byBjcmVhdGUg bmV3IHRpbWUgZGl2aWRlcnMgd2UgbWF5IG5lZWQgdG8gcGVyZm9ybQorICAgICAgICBvdGhlciB1 cGRhdGVzIGxpa2UgdXBkYXRlIHRoZSBjdXJyZW50IHRpbWUgbWFya2VyLiBTbyBkbyB3b3JrIGJl Zm9yZSBiYWlsaW5nLgorCiAyMDE1LTEwLTI0ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZA YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxOTE0MTkuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggNzBlYmQxYy4uZDU2NTllZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxl cnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAtMTUzLDYgKzE1Myw5IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgdGhpcy5faXNDYXB0dXJpbmcgPSB0 cnVlOwogCisgICAgICAgIGlmIChzdGFydFRpbWUpCisgICAgICAgICAgICB0aGlzLmFjdGl2ZVJl Y29yZGluZy5zZXRTdGFydFRpbWVJZk5lY2Vzc2FyeShzdGFydFRpbWUpOworCiAgICAgICAgIHRo aXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIu RXZlbnQuQ2FwdHVyaW5nU3RhcnRlZCwge3N0YXJ0VGltZX0pOwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVj b3JkaW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Rp bWVsaW5lUmVjb3JkaW5nLmpzCmluZGV4IDViYTNiMzEuLjBiNzI0MTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9UaW1lbGluZVJlY29yZGlu Zy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGlt ZWxpbmVSZWNvcmRpbmcuanMKQEAgLTIyOCw2ICsyMjgsMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVs aW5lUmVjb3JkaW5nID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmcgZXh0ZW5kcyBXZWJJbnNwZWN0 b3IuT2IKICAgICAgICAgdGhpcy5fbGVnYWN5Rmlyc3RSZWNvcmRlZFRpbWVzdGFtcCA9IHRpbWVz dGFtcDsKICAgICB9CiAKKyAgICBzZXRTdGFydFRpbWVJZk5lY2Vzc2FyeSh0aW1lc3RhbXApCisg ICAgeworICAgICAgICBpZiAoaXNOYU4odGhpcy5fc3RhcnRUaW1lKSkKKyAgICAgICAgICAgIHRo aXMuX3N0YXJ0VGltZSA9IHRpbWVzdGFtcDsKKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAKICAg ICBfa2V5Rm9yUmVjb3JkKHJlY29yZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LmpzCmluZGV4IDU2MjZlOGYuLjdlYjYwZDMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29u dGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpAQCAtNDU4LDE4ICs0NTgsMTYgQEAg V2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBUaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3IGUKICAgICAgICAgaWYgKHRoaXMuX3VwZGF0aW5nKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghaXNOYU4odGhpcy5fY3VycmVudFRpbWUp KSB7CisgICAgICAgIGlmICh0eXBlb2Ygc3RhcnRUaW1lID09PSAibnVtYmVyIikKKyAgICAgICAg ICAgIHRoaXMuX2N1cnJlbnRUaW1lID0gc3RhcnRUaW1lOworICAgICAgICBlbHNlIGlmICghaXNO YU4odGhpcy5fY3VycmVudFRpbWUpKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGhhcHBlbnMgd2hl biB5b3Ugc3RvcCBhbmQgbGF0ZXIgcmVzdGFydCByZWNvcmRpbmcuCi0gICAgICAgICAgICBpZiAo dHlwZW9mIHN0YXJ0VGltZSA9PT0gIm51bWJlciIpCi0gICAgICAgICAgICAgICAgdGhpcy5fY3Vy cmVudFRpbWUgPSBzdGFydFRpbWU7Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAg ICAvLyBDT01QQVRJQklMSVRZIChpT1MgOSk6IFRpbWVsaW5lLnJlY29yZGluZ1N0YXJ0ZWQgZXZl bnRzIGRpZCBub3QgaW5jbHVkZSBhIHRpbWVzdGFtcC4KLSAgICAgICAgICAgICAgICAvLyBXZSBs aWtlbHkgbmVlZCB0byBqdW1wIGludG8gdGhlIGZ1dHVyZSB0byBhIGJldHRlciBjdXJyZW50IHRp bWUgd2hpY2ggd2UgY2FuCi0gICAgICAgICAgICAgICAgLy8gYXNjZXJ0YWluZWQgZnJvbSBhIG5l dyBpbmNvbWluZyB0aW1lbGluZSByZWNvcmQsIHNvIHdlIHdhaXQgZm9yIGEgVGltZWxpbmUgdG8g dXBkYXRlLgotICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl93YWl0aW5nVG9S ZXNldEN1cnJlbnRUaW1lKTsKLSAgICAgICAgICAgICAgICB0aGlzLl93YWl0aW5nVG9SZXNldEN1 cnJlbnRUaW1lID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmcuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuVGltZXNVcGRh dGVkLCB0aGlzLl9yZWNvcmRpbmdUaW1lc1VwZGF0ZWQsIHRoaXMpOwotICAgICAgICAgICAgfQor ICAgICAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDkpOiBUaW1lbGluZS5yZWNvcmRpbmdT dGFydGVkIGV2ZW50cyBkaWQgbm90IGluY2x1ZGUgYSB0aW1lc3RhbXAuCisgICAgICAgICAgICAv LyBXZSBsaWtlbHkgbmVlZCB0byBqdW1wIGludG8gdGhlIGZ1dHVyZSB0byBhIGJldHRlciBjdXJy ZW50IHRpbWUgd2hpY2ggd2UgY2FuCisgICAgICAgICAgICAvLyBhc2NlcnRhaW5lZCBmcm9tIGEg bmV3IGluY29taW5nIHRpbWVsaW5lIHJlY29yZCwgc28gd2Ugd2FpdCBmb3IgYSBUaW1lbGluZSB0 byB1cGRhdGUuCisgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fd2FpdGluZ1RvUmVz ZXRDdXJyZW50VGltZSk7CisgICAgICAgICAgICB0aGlzLl93YWl0aW5nVG9SZXNldEN1cnJlbnRU aW1lID0gdHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZy5hZGRFdmVudExpc3RlbmVy KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVudC5UaW1lc1VwZGF0ZWQsIHRoaXMu X3JlY29yZGluZ1RpbWVzVXBkYXRlZCwgdGhpcyk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlz Ll91cGRhdGluZyA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcwppbmRleCBlNjZmMWY1Li40MDky ZDQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUnVsZXIuanMKQEAgLTM3MSw4ICszNzEsMTIgQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUnVsZXIgPSBjbGFzcyBUaW1lbGluZVJ1bGVyIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgICAgICAgICAgbGFzdFRpbWU6IGxhc3REaXZpZGVyVGltZSwKICAgICAg ICAgfTsKIAotICAgICAgICBpZiAoT2JqZWN0LnNoYWxsb3dFcXVhbChkaXZpZGVyRGF0YSwgdGhp cy5fY3VycmVudERpdmlkZXJzKSkKKyAgICAgICAgaWYgKE9iamVjdC5zaGFsbG93RXF1YWwoZGl2 aWRlckRhdGEsIHRoaXMuX2N1cnJlbnREaXZpZGVycykpIHsKKyAgICAgICAgICAgIHRoaXMuX3Vw ZGF0ZU1hcmtlcnModmlzaWJsZVdpZHRoLCBkdXJhdGlvbik7CisgICAgICAgICAgICB0aGlzLl91 cGRhdGVTZWxlY3Rpb24odmlzaWJsZVdpZHRoLCBkdXJhdGlvbik7CiAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgIH0KKwogICAgICAgICB0aGlzLl9jdXJyZW50RGl2aWRlcnMgPSBkaXZpZGVy RGF0YTsKIAogICAgICAgICB2YXIgbWFya2VyRGl2aWRlcnMgPSB0aGlzLl9tYXJrZXJzRWxlbWVu dC5xdWVyeVNlbGVjdG9yQWxsKCIuIiArIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkRpdmlk ZXJFbGVtZW50U3R5bGVDbGFzc05hbWUpOwo= 264156 2015-10-27 13:50:02 -0700 2015-10-27 14:39:33 -0700 [PATCH] Proposed Fix next-version.patch text/plain 6575 joepeck Y29tbWl0IDU3ODg4YTBkYjljYTM2OTJhZTI3OWI2OTZhNTdiMTQwODhkNzRhNDMKQXV0aG9yOiBK b3NlcGggUGVjb3Jhcm8gPHBlY29yYXJvQGFwcGxlLmNvbT4KRGF0ZTogICBNb24gT2N0IDI2IDE0 OjIzOjE1IDIwMTUgLTA3MDAKCiAgICBQUk9HUkVTUzogVGltZWxpbmUgc3RhcnRpbmcKCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZwppbmRleCA2MTlkMzljLi4zM2VlYmJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwzMSBAQAorMjAxNS0xMC0yNyAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lIGN1 cnJlbnQgdGltZSBtYXJrZXIgZG9lcyBub3Qgc3RhcnQgbW92aW5nIHdoZW4gc3RhcnRpbmcgcmVj b3JkaW5nIGFmdGVyIGp1c3Qgb3BlbmluZyBpbnNwZWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDE3OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9U aW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2Vy LnByb3RvdHlwZS5jYXB0dXJpbmdTdGFydGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01v ZGVscy9UaW1lbGluZVJlY29yZGluZy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZGluZy5wcm90b3R5cGUuaW5pdGlhbGl6ZVRpbWVCb3VuZHNJZk5lY2Vzc2FyeSk6Cisg ICAgICAgIEZvciBhIHJlY29yZGluZyB0byBzdGFydCB1cGRhdGluZyBjdXJyZW50IHRpbWUgdGhl IHJlY29yZGluZyBpdHNlbGYKKyAgICAgICAgbXVzdCBoYXZlIGEgc3RhcnQgdGltZS4gUHJvdmlk ZSBhIHNldHRlciBzbyB0aGF0IHRoZSBzdGFydCB0aW1lIGNhbgorICAgICAgICBiZSBzZXQgd2l0 aG91dCB3YWl0aW5nIGZvciBhIHRpbWVsaW5lIHJlY29yZC4gRm9yIGV4YW1wbGUgdGhlCisgICAg ICAgIHRpbWVzdGFtcCB0aGF0IHRoZSBmcm9udGVuZCByZWNlaXZlcyB3aGVuIGl0IHN0YXJ0cyBh IHJlY29yZGluZy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fc3RhcnRVcGRhdGluZ0N1cnJlbnRUaW1lKToKKyAg ICAgICAgV2hlbiB3ZSBoYXZlIGEgc3RhcnRUaW1lIG51bWJlciAobmV3IGJhY2tlbmRzKSBhbHdh eXMgdXNlIGl0IGFzIHRoZSBjdXJyZW50IHRpbWUuCisgICAgICAgIFByZXZpb3VzbHkgd2Ugd2Vy ZSBvbmx5IGRvaW5nIHRoaXMgaWYgY3VycmVudCB0aW1lIHdhcyBOYU4sIHdoaWNoIHdvdWxkIGJl IHdoZW4KKyAgICAgICAgcmUtc3RhcnRpbmcgYSByZWNvcmRpbmcgYWZ0ZXIgaXQgaGFkIHN0b3Bw ZWQsIGJ1dCBub3QgZm9yIHRoZSBpbml0aWFsIHJlY29yZGluZworICAgICAgICBhZnRlciBvcGVu aW5nIHRoZSBpbnNwZWN0b3IuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUnVsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSdWxlci5wcm90b3R5 cGUudXBkYXRlTGF5b3V0KToKKyAgICAgICAgRXZlbiBpZiB3ZSBkbyBub3QgbmVlZCB0byBjcmVh dGUgbmV3IHRpbWUgZGl2aWRlcnMgd2UgbWF5IG5lZWQgdG8gcGVyZm9ybQorICAgICAgICBvdGhl ciB1cGRhdGVzIGxpa2UgdXBkYXRlIHRoZSBjdXJyZW50IHRpbWUgbWFya2VyLiBTbyBkbyB3b3Jr IGJlZm9yZSBiYWlsaW5nLgorCiAyMDE1LTEwLTI0ICBOaWtpdGEgVmFzaWx5ZXYgIDxudmFzaWx5 ZXZAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxOTE0MTku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9UaW1lbGluZU1hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIuanMKaW5kZXggNzBlYmQxYy4uMmQ0Y2Q1 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvVGltZWxpbmVNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5qcwpAQCAtMTUzLDYgKzE1Myw5 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIg ZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAKICAgICAgICAgdGhpcy5faXNDYXB0dXJpbmcg PSB0cnVlOwogCisgICAgICAgIGlmIChzdGFydFRpbWUpCisgICAgICAgICAgICB0aGlzLmFjdGl2 ZVJlY29yZGluZy5pbml0aWFsaXplVGltZUJvdW5kc0lmTmVjZXNzYXJ5KHN0YXJ0VGltZSk7CisK ICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVs aW5lTWFuYWdlci5FdmVudC5DYXB0dXJpbmdTdGFydGVkLCB7c3RhcnRUaW1lfSk7CiAgICAgfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv VGltZWxpbmVSZWNvcmRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvVGltZWxpbmVSZWNvcmRpbmcuanMKaW5kZXggNWJhM2IzMS4uYWQxMzQ5NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVs aW5lUmVjb3JkaW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L01vZGVscy9UaW1lbGluZVJlY29yZGluZy5qcwpAQCAtMjI4LDYgKzIyOCwxOCBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcgPSBjbGFzcyBUaW1lbGluZVJlY29yZGluZyBleHRlbmRz IFdlYkluc3BlY3Rvci5PYgogICAgICAgICB0aGlzLl9sZWdhY3lGaXJzdFJlY29yZGVkVGltZXN0 YW1wID0gdGltZXN0YW1wOwogICAgIH0KIAorICAgIGluaXRpYWxpemVUaW1lQm91bmRzSWZOZWNl c3NhcnkodGltZXN0YW1wKQorICAgIHsKKyAgICAgICAgaWYgKGlzTmFOKHRoaXMuX3N0YXJ0VGlt ZSkpIHsKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGlzTmFOKHRoaXMuX2VuZFRpbWUpKTsK KworICAgICAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0gdGltZXN0YW1wOworICAgICAgICAgICAg dGhpcy5fZW5kVGltZSA9IHRpbWVzdGFtcDsKKworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLkV2ZW50LlRpbWVz VXBkYXRlZCk7CisgICAgICAgIH0KKyAgICB9CisKICAgICAvLyBQcml2YXRlCiAKICAgICBfa2V5 Rm9yUmVjb3JkKHJlY29yZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LmpzCmluZGV4IDU2MjZlOGYuLjdlYjYwZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpAQCAtNDU4LDE4ICs0NTgsMTYgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBUaW1lbGluZVJlY29y ZGluZ0NvbnRlbnRWaWV3IGUKICAgICAgICAgaWYgKHRoaXMuX3VwZGF0aW5nKQogICAgICAgICAg ICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghaXNOYU4odGhpcy5fY3VycmVudFRpbWUpKSB7Cisg ICAgICAgIGlmICh0eXBlb2Ygc3RhcnRUaW1lID09PSAibnVtYmVyIikKKyAgICAgICAgICAgIHRo aXMuX2N1cnJlbnRUaW1lID0gc3RhcnRUaW1lOworICAgICAgICBlbHNlIGlmICghaXNOYU4odGhp cy5fY3VycmVudFRpbWUpKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGhhcHBlbnMgd2hlbiB5b3Ug c3RvcCBhbmQgbGF0ZXIgcmVzdGFydCByZWNvcmRpbmcuCi0gICAgICAgICAgICBpZiAodHlwZW9m IHN0YXJ0VGltZSA9PT0gIm51bWJlciIpCi0gICAgICAgICAgICAgICAgdGhpcy5fY3VycmVudFRp bWUgPSBzdGFydFRpbWU7Ci0gICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAvLyBD T01QQVRJQklMSVRZIChpT1MgOSk6IFRpbWVsaW5lLnJlY29yZGluZ1N0YXJ0ZWQgZXZlbnRzIGRp ZCBub3QgaW5jbHVkZSBhIHRpbWVzdGFtcC4KLSAgICAgICAgICAgICAgICAvLyBXZSBsaWtlbHkg bmVlZCB0byBqdW1wIGludG8gdGhlIGZ1dHVyZSB0byBhIGJldHRlciBjdXJyZW50IHRpbWUgd2hp Y2ggd2UgY2FuCi0gICAgICAgICAgICAgICAgLy8gYXNjZXJ0YWluZWQgZnJvbSBhIG5ldyBpbmNv bWluZyB0aW1lbGluZSByZWNvcmQsIHNvIHdlIHdhaXQgZm9yIGEgVGltZWxpbmUgdG8gdXBkYXRl LgotICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl93YWl0aW5nVG9SZXNldEN1 cnJlbnRUaW1lKTsKLSAgICAgICAgICAgICAgICB0aGlzLl93YWl0aW5nVG9SZXNldEN1cnJlbnRU aW1lID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmcuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQuVGltZXNVcGRhdGVkLCB0 aGlzLl9yZWNvcmRpbmdUaW1lc1VwZGF0ZWQsIHRoaXMpOwotICAgICAgICAgICAgfQorICAgICAg ICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDkpOiBUaW1lbGluZS5yZWNvcmRpbmdTdGFydGVk IGV2ZW50cyBkaWQgbm90IGluY2x1ZGUgYSB0aW1lc3RhbXAuCisgICAgICAgICAgICAvLyBXZSBs aWtlbHkgbmVlZCB0byBqdW1wIGludG8gdGhlIGZ1dHVyZSB0byBhIGJldHRlciBjdXJyZW50IHRp bWUgd2hpY2ggd2UgY2FuCisgICAgICAgICAgICAvLyBhc2NlcnRhaW5lZCBmcm9tIGEgbmV3IGlu Y29taW5nIHRpbWVsaW5lIHJlY29yZCwgc28gd2Ugd2FpdCBmb3IgYSBUaW1lbGluZSB0byB1cGRh dGUuCisgICAgICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fd2FpdGluZ1RvUmVzZXRDdXJy ZW50VGltZSk7CisgICAgICAgICAgICB0aGlzLl93YWl0aW5nVG9SZXNldEN1cnJlbnRUaW1lID0g dHJ1ZTsKKyAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZy5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5FdmVudC5UaW1lc1VwZGF0ZWQsIHRoaXMuX3JlY29y ZGluZ1RpbWVzVXBkYXRlZCwgdGhpcyk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlzLl91cGRh dGluZyA9IHRydWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UaW1lbGluZVJ1bGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSdWxlci5qcwppbmRleCBlNjZmMWY1Li40MDkyZDQyIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJ1bGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUnVsZXIuanMKQEAgLTM3MSw4ICszNzEsMTIgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUnVsZXIgPSBjbGFzcyBUaW1lbGluZVJ1bGVyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9i amVjdAogICAgICAgICAgICAgbGFzdFRpbWU6IGxhc3REaXZpZGVyVGltZSwKICAgICAgICAgfTsK IAotICAgICAgICBpZiAoT2JqZWN0LnNoYWxsb3dFcXVhbChkaXZpZGVyRGF0YSwgdGhpcy5fY3Vy cmVudERpdmlkZXJzKSkKKyAgICAgICAgaWYgKE9iamVjdC5zaGFsbG93RXF1YWwoZGl2aWRlckRh dGEsIHRoaXMuX2N1cnJlbnREaXZpZGVycykpIHsKKyAgICAgICAgICAgIHRoaXMuX3VwZGF0ZU1h cmtlcnModmlzaWJsZVdpZHRoLCBkdXJhdGlvbik7CisgICAgICAgICAgICB0aGlzLl91cGRhdGVT ZWxlY3Rpb24odmlzaWJsZVdpZHRoLCBkdXJhdGlvbik7CiAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgIH0KKwogICAgICAgICB0aGlzLl9jdXJyZW50RGl2aWRlcnMgPSBkaXZpZGVyRGF0YTsK IAogICAgICAgICB2YXIgbWFya2VyRGl2aWRlcnMgPSB0aGlzLl9tYXJrZXJzRWxlbWVudC5xdWVy eVNlbGVjdG9yQWxsKCIuIiArIFdlYkluc3BlY3Rvci5UaW1lbGluZVJ1bGVyLkRpdmlkZXJFbGVt ZW50U3R5bGVDbGFzc05hbWUpOwo=