135307 2014-07-25 15:19:24 -0700 Web Inspector: Should be a way to go directly from an event in the overview view to the specialized timeline for that event 2018-10-16 12:09:40 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck hi commit-queue graouts inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1024932 0 joepeck 2014-07-25 15:19:24 -0700 * SUMMARY In the generic timeline overview view we see events like Forced Layout, or Mouse Down Event Dispatched. In both cases, to find out more information about those individual events you must switch to the specialized timeline (e.g. Layout duration + backtrace, e.g. JavaScript duration and profiling information). Currently there is no way to go directly from the overview to the deeper information about a particular event. 1024933 1 webkit-bug-importer 2014-07-25 15:19:37 -0700 <rdar://problem/17816221> 1213818 2 joepeck 2016-07-22 20:02:55 -0700 <rdar://problem/17273966> 1213819 3 joepeck 2016-07-22 20:03:47 -0700 This might also be a good opportunity for a force click on hardware that supports it. 1468299 4 352122 hi 2018-10-11 18:57:18 -0700 Created attachment 352122 Patch 1469616 5 352122 joepeck 2018-10-15 20:13:55 -0700 Comment on attachment 352122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352122&action=review r=me > Source/WebInspectorUI/UserInterface/Views/TimelineOverview.js:734 > + if (firstRecord.startTime < this.selectionStartTime || lastRecord.endTime > this.selectionStartTime + this.selectionDuration) { > + let selectionPadding = this.secondsPerPixel * 10; Neat! > Source/WebInspectorUI/UserInterface/Views/TimelineOverviewGraph.js:40 > this._selectedRecord = null; > - this._selectedRecordChanged = false; > + this._selectedRecordBar = null; It seems weird but possible that the selectedRecord and selectedRecordBar might get out of sync. Can we add an assertion somewhere (such as inside of `set selectedRecord` that the record is inside of the selectedRecordBar if that is available)? > Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css:98 > +.timeline-record-bar:not(.selected).timeline-record-type-network > .segment { Can the selection colors above just be "!important" and avoid the :not(.selected) classes? I think that is normally how we handle selection styles. > Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js:37 > + this._element.addEventListener("click", this._handleClick.bind(this)); I wonder about the performance (CPU and Memory) different between doing a bind like this versus doing an arrow function. I mused about this once over here: https://bugs.webkit.org/show_bug.cgi?id=158315 Compare: this._element.addEventListener("click", this._handleClick.bind(this)); this._element.addEventListener("click", (e) => { this._handleClick(e); }); This is in my head because: • Function.prototype.bind is a function call (maybe it gets optimized away though?) • JSBoundFunction has extra memory (maybe this has been optimized away for no-args as well?) This might be a fun thing to measure some time in the future. It just always jumps out at me in Timeline code for things we may be creating many many object instances (like this), how much time we are likely spending inside of Function.prototype.bind. > Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.js:188 > + set selected(selected) > + { > + this._element.classList.toggle("selected", !!selected); > + } We should add a getter just for consistency. 1469741 6 352122 hi 2018-10-16 09:28:40 -0700 Comment on attachment 352122 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=352122&action=review >> Source/WebInspectorUI/UserInterface/Views/TimelineRecordBar.css:98 >> +.timeline-record-bar:not(.selected).timeline-record-type-network > .segment { > > Can the selection colors above just be "!important" and avoid the :not(.selected) classes? I think that is normally how we handle selection styles. Really? Where do we do this? I personally avoid `!Important` wherever I can as it can really be annoying to deal with if future changes are needed. 1469748 7 352463 hi 2018-10-16 09:40:21 -0700 Created attachment 352463 Patch 1469812 8 352479 hi 2018-10-16 11:44:11 -0700 Created attachment 352479 Patch 1469824 9 352479 commit-queue 2018-10-16 12:09:38 -0700 Comment on attachment 352479 Patch Clearing flags on attachment: 352479 Committed r237195: <https://trac.webkit.org/changeset/237195> 1469825 10 commit-queue 2018-10-16 12:09:40 -0700 All reviewed patches have been landed. Closing bug. 352122 2018-10-11 18:57:18 -0700 2018-10-16 09:40:18 -0700 Patch bug-135307-20181011185717.patch text/plain 20769 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGM2NzE4YTdmNDgxZjRhM2NmNTQ5MjNhOTNlYzJh YmFiNzViY2QzOTcuLmJlNmUwZDM1NDNjNjViNGYxNWU0MDIyMjUzNzJmZjlhMmQ3OTgwYjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYzIEBACisyMDE4LTEwLTExICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT aG91bGQgYmUgYSB3YXkgdG8gZ28gZGlyZWN0bHkgZnJvbSBhbiBldmVudCBpbiB0aGUgb3ZlcnZp ZXcgdmlldyB0byB0aGUgc3BlY2lhbGl6ZWQgdGltZWxpbmUgZm9yIHRoYXQgZXZlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTMwNworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTcyNzM5NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhIGBXSS5UaW1lbGluZVJlY29yZEJhcmAgaXMgY2xp Y2tlZCwgY2FsbCB1cCB0aGUgZGVsZWdhdGUgY2hhaW4gdG8gdGhlIG92ZXJ2aWV3IGFuZAorICAg ICAgICBhZGp1c3QgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBgV0kuVGltZWxpbmVSZWNvcmRCYXJg IGFtb25nIHRoZSBgV0kuVGltZWxpbmVPdmVydmlld0dyYXBoYHMuCisgICAgICAgIFNpbWlsYXJs eSwgc2VsZWN0aW5nIGEgYFdJLkRhdGFHcmlkTm9kZWAgaW4gYW55IGBXSS5UaW1lbGluZVZpZXdg IHN1YmNsYXNzIHdpbGwgdXNlIHRoZSBzYW1lCisgICAgICAgIGxvZ2ljIHRvIHNlbGVjdCB0aGUg Y29ycmVzcG9uZGluZyBgV0kuVGltZWxpbmVSZWNvcmRCYXJgLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVP dmVydmlldyk6CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5yZXNldCk6 CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3LnByb3RvdHlwZS5fcmVjb3JkU2VsZWN0ZWQp OgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3R3JhcGgu anM6CisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGgpOgorICAgICAgICAoV0kuVGlt ZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5zZXQgc2VsZWN0ZWRSZWNvcmQpOgorICAgICAg ICAoV0kuVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5nZXQgc2VsZWN0ZWRSZWNvcmRC YXIpOiBBZGRlZC4KKyAgICAgICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUu c2V0IHNlbGVjdGVkUmVjb3JkQmFyKTogQWRkZWQuCisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2 aWV3R3JhcGgucHJvdG90eXBlLnRpbWVsaW5lUmVjb3JkQmFyQ2xpY2tlZCk6IEFkZGVkLgorICAg ICAgICAoV0kuVGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5fbmVlZHNTZWxlY3RlZFJl Y29yZExheW91dCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVj b3JkQmFyLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVSZWNvcmRCYXIpOgorICAgICAgICAoV0ku VGltZWxpbmVSZWNvcmRCYXIucHJvdG90eXBlLnNldCBzZWxlY3RlZCk6IEFkZGVkLgorICAgICAg ICAoV0kuVGltZWxpbmVSZWNvcmRCYXIucHJvdG90eXBlLl9oYW5kbGVDbGljayk6IEFkZGVkLgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuY3NzOgorICAg ICAgICAoLnRpbWVsaW5lLXJlY29yZC1iYXIuc2VsZWN0ZWQgPiAuc2VnbWVudCk6CisgICAgICAg ICgudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1lbGluZS1yZWNvcmQtdHlw ZS1uZXR3b3JrID4gLnNlZ21lbnQpOgorICAgICAgICAoLnRpbWVsaW5lLXJlY29yZC1iYXI6bm90 KC5zZWxlY3RlZCkudGltZWxpbmUtcmVjb3JkLXR5cGUtbmV0d29yayA+IC5zZWdtZW50LmluYWN0 aXZlKToKKyAgICAgICAgKC50aW1lbGluZS1yZWNvcmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVs aW5lLXJlY29yZC10eXBlLWxheW91dCA+IC5zZWdtZW50KToKKyAgICAgICAgKC50aW1lbGluZS1y ZWNvcmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLWxheW91dC5sYXlv dXQtdGltZWxpbmUtcmVjb3JkLXBhaW50ID4gLnNlZ21lbnQsIC50aW1lbGluZS1yZWNvcmQtYmFy Om5vdCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLWxheW91dC5sYXlvdXQtdGltZWxp bmUtcmVjb3JkLWNvbXBvc2l0ZSA+IC5zZWdtZW50KToKKyAgICAgICAgKC50aW1lbGluZS1yZWNv cmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLXNjcmlwdCA+IC5zZWdt ZW50KToKKyAgICAgICAgKC50aW1lbGluZS1yZWNvcmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVs aW5lLXJlY29yZC10eXBlLXNjcmlwdC5zY3JpcHQtdGltZWxpbmUtcmVjb3JkLWdhcmJhZ2UtY29s bGVjdGVkID4gLnNlZ21lbnQpOgorICAgICAgICAoLnRpbWVsaW5lLXJlY29yZC1iYXIudGltZWxp bmUtcmVjb3JkLXR5cGUtbmV0d29yayA+IC5zZWdtZW50KTogRGVsZXRlZC4KKyAgICAgICAgKC50 aW1lbGluZS1yZWNvcmQtYmFyLnRpbWVsaW5lLXJlY29yZC10eXBlLW5ldHdvcmsgPiAuc2VnbWVu dC5pbmFjdGl2ZSk6IERlbGV0ZWQuCisgICAgICAgICgudGltZWxpbmUtcmVjb3JkLWJhci50aW1l bGluZS1yZWNvcmQtdHlwZS1sYXlvdXQgPiAuc2VnbWVudCk6IERlbGV0ZWQuCisgICAgICAgICgu dGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1sYXlvdXQubGF5b3V0LXRp bWVsaW5lLXJlY29yZC1wYWludCA+IC5zZWdtZW50LCAudGltZWxpbmUtcmVjb3JkLWJhci50aW1l bGluZS1yZWNvcmQtdHlwZS1sYXlvdXQubGF5b3V0LXRpbWVsaW5lLXJlY29yZC1jb21wb3NpdGUg PiAuc2VnbWVudCk6IERlbGV0ZWQuCisgICAgICAgICgudGltZWxpbmUtcmVjb3JkLWJhci50aW1l bGluZS1yZWNvcmQtdHlwZS1zY3JpcHQgPiAuc2VnbWVudCk6IERlbGV0ZWQuCisgICAgICAgICgu dGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1zY3JpcHQuc2NyaXB0LXRp bWVsaW5lLXJlY29yZC1nYXJiYWdlLWNvbGxlY3RlZCA+IC5zZWdtZW50KTogRGVsZXRlZC4KKyAg ICAgICAgQWRkIGEgYGRlbGVnYXRlYCB0aGF0IGlzIG5vdGlmaWVkIHdoZW5ldmVyIHRoZSBlbGVt ZW50IGlzIGNsaWNrZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l RGF0YUdyaWROb2RlLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVEYXRhR3JpZE5vZGUucHJvdG90 eXBlLnJlZnJlc2hHcmFwaC5jcmVhdGVCYXIpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAoV0kuTGF5b3V0VGlt ZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS51cGRhdGVTZWxlY3RlZFJlY29yZCk6CisgICAg ICAgIChXSS5MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlLl91cGRhdGVSb3dM YXlvdXQuY3JlYXRlQmFyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtU aW1lbGluZU92ZXJ2aWV3R3JhcGguanM6CisgICAgICAgIChXSS5OZXR3b3JrVGltZWxpbmVPdmVy dmlld0dyYXBoLnByb3RvdHlwZS5sYXlvdXQuY3JlYXRlQmFyKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qczoKKyAgICAgICAgKFdJ LlNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUubGF5b3V0LmNyZWF0ZUJhcik6 CisgICAgICAgIChXSS5TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlLnVwZGF0 ZVNlbGVjdGVkUmVjb3JkKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxp bmVSZWNvcmRpbmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkaW5n Q29udGVudFZpZXcucHJvdG90eXBlLnNob3dUaW1lbGluZVZpZXdGb3JUaW1lbGluZSk6CisKIDIw MTgtMTAtMTAgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IGNyZWF0ZSBzcGVjaWFsIE5ldHdvcmsgd2F0ZXJmYWxsIGZvciBtZWRpYSBl dmVudHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRl eCA2ZTU0YWNiNjk0YmFmNjE4MzgwMjRjYTliNTJhNzJmZTJkN2Y2MmUxLi5lOTgwMzBhMzYxM2Uz YTBlNTE1YzZmZDZmYTAxMzA5YjM1YzA2MzI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGlt ZWxpbmVPdmVydmlld0dyYXBoLmpzCkBAIC02OCw2ICs2OCwyMiBAQCBXSS5MYXlvdXRUaW1lbGlu ZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBMYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5k cyBXSS5UaQogICAgICAgICB0aGlzLl91cGRhdGVSb3dMYXlvdXQodGhpcy5fdGltZWxpbmVMYXlv dXRSZWNvcmRSb3cpOwogICAgIH0KIAorICAgIHVwZGF0ZVNlbGVjdGVkUmVjb3JkKCkKKyAgICB7 CisgICAgICAgIHN1cGVyLnVwZGF0ZVNlbGVjdGVkUmVjb3JkKCk7CisKKyAgICAgICAgZm9yIChs ZXQgcmVjb3JkUm93IG9mIFt0aGlzLl90aW1lbGluZUxheW91dFJlY29yZFJvdywgdGhpcy5fdGlt ZWxpbmVQYWludFJlY29yZFJvd10pIHsKKyAgICAgICAgICAgIGZvciAobGV0IHJlY29yZEJhciBv ZiByZWNvcmRSb3cucmVjb3JkQmFycykgeworICAgICAgICAgICAgICAgIGlmIChyZWNvcmRCYXIu cmVjb3Jkcy5pbmNsdWRlcyh0aGlzLnNlbGVjdGVkUmVjb3JkKSkgeworICAgICAgICAgICAgICAg ICAgICB0aGlzLnNlbGVjdGVkUmVjb3JkQmFyID0gcmVjb3JkQmFyOworICAgICAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICB9 CisKKyAgICAgICAgdGhpcy5zZWxlY3RlZFJlY29yZEJhciA9IG51bGw7CisgICAgfQorCiAgICAg Ly8gUHJpdmF0ZQogCiAgICAgX3VwZGF0ZVJvd0xheW91dChyb3cpCkBAIC03OSw3ICs5NSw3IEBA IFdJLkxheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGNsYXNzIExheW91dFRpbWVsaW5lT3Zl cnZpZXdHcmFwaCBleHRlbmRzIFdJLlRpCiAgICAgICAgIHsKICAgICAgICAgICAgIHZhciB0aW1l bGluZVJlY29yZEJhciA9IHJvdy5yZWNvcmRCYXJzW3JlY29yZEJhckluZGV4XTsKICAgICAgICAg ICAgIGlmICghdGltZWxpbmVSZWNvcmRCYXIpCi0gICAgICAgICAgICAgICAgdGltZWxpbmVSZWNv cmRCYXIgPSByb3cucmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxpbmVS ZWNvcmRCYXIocmVjb3JkcywgcmVuZGVyTW9kZSk7CisgICAgICAgICAgICAgICAgdGltZWxpbmVS ZWNvcmRCYXIgPSByb3cucmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxp bmVSZWNvcmRCYXIodGhpcywgcmVjb3JkcywgcmVuZGVyTW9kZSk7CiAgICAgICAgICAgICBlbHNl IHsKICAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhci5yZW5kZXJNb2RlID0gcmVuZGVy TW9kZTsKICAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhci5yZWNvcmRzID0gcmVjb3Jk czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCmluZGV4 IGJlYTdiNjQ0NmFkNGUyMzRiN2QxZGI5Njg1MGRjMjI2MzQyNTgxZGMuLjc0ZDk0YWIwZjMzNzFl NDQwNDBiZmY2YWM1MWRlNzQ1OWYwZmZlOTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwpAQCAtNzUsNyArNzUsNyBAQCBXSS5OZXR3b3JrVGltZWxp bmVPdmVydmlld0dyYXBoID0gY2xhc3MgTmV0d29ya1RpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRl bmRzIFdJLgogICAgICAgICB7CiAgICAgICAgICAgICBsZXQgdGltZWxpbmVSZWNvcmRCYXIgPSBy b3dSZWNvcmRCYXJzW3JlY29yZEJhckluZGV4XTsKICAgICAgICAgICAgIGlmICghdGltZWxpbmVS ZWNvcmRCYXIpCi0gICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIgPSByb3dSZWNvcmRC YXJzW3JlY29yZEJhckluZGV4XSA9IG5ldyBXSS5UaW1lbGluZVJlY29yZEJhcihyZWNvcmRzLCBy ZW5kZXJNb2RlKTsKKyAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhciA9IHJvd1JlY29y ZEJhcnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFyKHRoaXMsIHJl Y29yZHMsIHJlbmRlck1vZGUpOwogICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAg dGltZWxpbmVSZWNvcmRCYXIucmVuZGVyTW9kZSA9IHJlbmRlck1vZGU7CiAgICAgICAgICAgICAg ICAgdGltZWxpbmVSZWNvcmRCYXIucmVjb3JkcyA9IHJlY29yZHM7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZU92ZXJ2 aWV3R3JhcGguanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T Y3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKaW5kZXggN2QzYjU3OGFjNmY1M2UxNDU5NGFl MDI2MzIyMTNkMzk4ZTU1MzZmNy4uOGUzOGViZjhhZjlhM2IyMGQ2YzQ4NDBjYzYxMWRjMTdhMGYz NjU3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvU2NyaXB0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwpA QCAtNjIsNyArNjIsNyBAQCBXSS5TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBT Y3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5UaQogICAgICAgICB7CiAgICAg ICAgICAgICBsZXQgdGltZWxpbmVSZWNvcmRCYXIgPSB0aGlzLl90aW1lbGluZVJlY29yZEJhcnNb cmVjb3JkQmFySW5kZXhdOwogICAgICAgICAgICAgaWYgKCF0aW1lbGluZVJlY29yZEJhcikKLSAg ICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhciA9IHRoaXMuX3RpbWVsaW5lUmVjb3JkQmFy c1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxpbmVSZWNvcmRCYXIocmVjb3JkcywgcmVu ZGVyTW9kZSk7CisgICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIgPSB0aGlzLl90aW1l bGluZVJlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFy KHRoaXMsIHJlY29yZHMsIHJlbmRlck1vZGUpOwogICAgICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIucmVuZGVyTW9kZSA9IHJlbmRlck1vZGU7CiAgICAg ICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIucmVjb3JkcyA9IHJlY29yZHM7CkBAIC04Niw2 ICs4NiwyMCBAQCBXSS5TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBTY3JpcHRU aW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5UaQogICAgICAgICB9CiAgICAgfQogCisg ICAgdXBkYXRlU2VsZWN0ZWRSZWNvcmQoKQorICAgIHsKKyAgICAgICAgc3VwZXIudXBkYXRlU2Vs ZWN0ZWRSZWNvcmQoKTsKKworICAgICAgICBmb3IgKGxldCByZWNvcmRCYXIgb2YgdGhpcy5fdGlt ZWxpbmVSZWNvcmRCYXJzKSB7CisgICAgICAgICAgICBpZiAocmVjb3JkQmFyLnJlY29yZHMuaW5j bHVkZXModGhpcy5zZWxlY3RlZFJlY29yZCkpIHsKKyAgICAgICAgICAgICAgICB0aGlzLnNlbGVj dGVkUmVjb3JkQmFyID0gcmVjb3JkQmFyOworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuc2VsZWN0ZWRSZWNvcmRCYXIgPSBu dWxsOworICAgIH0KKwogICAgIC8vIFByaXZhdGUKIAogICAgIF9zY3JpcHRUaW1lbGluZVJlY29y ZEFkZGVkKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZE5vZGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkTm9kZS5qcwppbmRleCBkNjU0 MGE1MWU2ODQ4MDYxMTQ1MTE0ZGU2MDk1MWU5ZTk4N2NiNTY0Li5hMmY2MjQ3YTEwZWVjNzQyYjNl OTk0NzE1OTlkMzYyYzc0NmM4NjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkTm9kZS5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkTm9kZS5q cwpAQCAtMjQxLDcgKzI0MSw3IEBAIFdJLlRpbWVsaW5lRGF0YUdyaWROb2RlID0gY2xhc3MgVGlt ZWxpbmVEYXRhR3JpZE5vZGUgZXh0ZW5kcyBXSS5EYXRhR3JpZE5vZGUKICAgICAgICAgewogICAg ICAgICAgICAgdmFyIHRpbWVsaW5lUmVjb3JkQmFyID0gdGhpcy5fdGltZWxpbmVSZWNvcmRCYXJz W3JlY29yZEJhckluZGV4XTsKICAgICAgICAgICAgIGlmICghdGltZWxpbmVSZWNvcmRCYXIpCi0g ICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIgPSB0aGlzLl90aW1lbGluZVJlY29yZEJh cnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFyKHJlY29yZHMsIHJl bmRlck1vZGUpOworICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyID0gdGhpcy5fdGlt ZWxpbmVSZWNvcmRCYXJzW3JlY29yZEJhckluZGV4XSA9IG5ldyBXSS5UaW1lbGluZVJlY29yZEJh cih0aGlzLCByZWNvcmRzLCByZW5kZXJNb2RlKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAg ICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyLnJlbmRlck1vZGUgPSByZW5kZXJNb2RlOwogICAg ICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyLnJlY29yZHMgPSByZWNvcmRzOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lT3ZlcnZpZXcuanMKaW5kZXggZjRhYzJiZGJhYTIyYThjOWYxMjZjMjFlZWM2OTc3NDcx Y2Y1NjNkZS4uNTU3OGIxODZiMDc3NDYxZmM0ZGY4N2Y3MTU5ODllYThiZDgzZjQ5ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzCkBAIC01NSw2ICs1NSw3IEBAIFdJLlRpbWVsaW5lT3ZlcnZp ZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlz Ll9ncmFwaHNDb250YWluZXJWaWV3LmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiZ3JhcGhzLWNvbnRh aW5lciIpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fZ3JhcGhzQ29udGFpbmVyVmll dyk7CiAKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29yZCA9IG51bGw7CiAgICAg ICAgIHRoaXMuX292ZXJ2aWV3R3JhcGhzQnlUeXBlTWFwID0gbmV3IE1hcDsKIAogICAgICAgICB0 aGlzLl9lZGl0SW5zdHJ1bWVudHNCdXR0b24gPSBuZXcgV0kuQWN0aXZhdGVCdXR0b25OYXZpZ2F0 aW9uSXRlbSgidG9nZ2xlLWVkaXQtaW5zdHJ1bWVudHMiLCBXSS5VSVN0cmluZygiRWRpdCBjb25m aWd1cmF0aW9uIiksIFdJLlVJU3RyaW5nKCJTYXZlIGNvbmZpZ3VyYXRpb24iKSk7CkBAIC0zNzEs NiArMzcyLDcgQEAgV0kuVGltZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcg ZXh0ZW5kcyBXSS5WaWV3CiAKICAgICByZXNldCgpCiAgICAgeworICAgICAgICB0aGlzLl9zZWxl Y3RlZFRpbWVsaW5lUmVjb3JkID0gbnVsbDsKICAgICAgICAgZm9yIChsZXQgb3ZlcnZpZXdHcmFw aCBvZiB0aGlzLl9vdmVydmlld0dyYXBoc0J5VHlwZU1hcC52YWx1ZXMoKSkKICAgICAgICAgICAg IG92ZXJ2aWV3R3JhcGgucmVzZXQoKTsKIApAQCAtNzA3LDEzICs3MDksNDEgQEAgV0kuVGltZWxp bmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAKICAg ICBfcmVjb3JkU2VsZWN0ZWQoZXZlbnQpCiAgICAgeworICAgICAgICBsZXQge3JlY29yZCwgcmVj b3JkQmFyfSA9IGV2ZW50LmRhdGE7CisgICAgICAgIGlmICghcmVjb3JkIHx8IHJlY29yZCA9PT0g dGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29yZCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAg ICAgICBpZiAodGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29yZCAmJiB0aGlzLl9zZWxlY3RlZFRp bWVsaW5lUmVjb3JkLnR5cGUgIT09IHJlY29yZC50eXBlKSB7CisgICAgICAgICAgICBsZXQgdGlt ZWxpbmVPdmVydmlld0dyYXBoID0gdGhpcy5fb3ZlcnZpZXdHcmFwaHNCeVR5cGVNYXAuZ2V0KHRo aXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQudHlwZSk7CisgICAgICAgICAgICBjb25zb2xlLmFz c2VydCh0aW1lbGluZU92ZXJ2aWV3R3JhcGgpOworICAgICAgICAgICAgaWYgKHRpbWVsaW5lT3Zl cnZpZXdHcmFwaCkKKyAgICAgICAgICAgICAgICB0aW1lbGluZU92ZXJ2aWV3R3JhcGguc2VsZWN0 ZWRSZWNvcmQgPSBudWxsOworICAgICAgICB9CisKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRUaW1l bGluZVJlY29yZCA9IHJlY29yZDsKKworICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRUaW1lbGlu ZVJlY29yZCkgeworICAgICAgICAgICAgbGV0IGZpcnN0UmVjb3JkID0gdGhpcy5fc2VsZWN0ZWRU aW1lbGluZVJlY29yZDsKKyAgICAgICAgICAgIGxldCBsYXN0UmVjb3JkID0gdGhpcy5fc2VsZWN0 ZWRUaW1lbGluZVJlY29yZDsKKyAgICAgICAgICAgIGlmIChyZWNvcmRCYXIpIHsKKyAgICAgICAg ICAgICAgICBmaXJzdFJlY29yZCA9IHJlY29yZEJhci5yZWNvcmRzWzBdOworICAgICAgICAgICAg ICAgIGxhc3RSZWNvcmQgPSByZWNvcmRCYXIucmVjb3Jkcy5sYXN0VmFsdWU7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIGlmIChmaXJzdFJlY29yZC5zdGFydFRpbWUgPCB0aGlzLnNlbGVj dGlvblN0YXJ0VGltZSB8fCBsYXN0UmVjb3JkLmVuZFRpbWUgPiB0aGlzLnNlbGVjdGlvblN0YXJ0 VGltZSArIHRoaXMuc2VsZWN0aW9uRHVyYXRpb24pIHsKKyAgICAgICAgICAgICAgICBsZXQgc2Vs ZWN0aW9uUGFkZGluZyA9IHRoaXMuc2Vjb25kc1BlclBpeGVsICogMTA7CisgICAgICAgICAgICAg ICAgdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgPSBmaXJzdFJlY29yZC5zdGFydFRpbWUgLSBzZWxl Y3Rpb25QYWRkaW5nOworICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0aW9uRHVyYXRpb24gPSBs YXN0UmVjb3JkLmVuZFRpbWUgLSBmaXJzdFJlY29yZC5zdGFydFRpbWUgKyAoc2VsZWN0aW9uUGFk ZGluZyAqIDIpOworICAgICAgICAgICAgfQorICAgICAgICB9CisKICAgICAgICAgZm9yIChsZXQg W3R5cGUsIG92ZXJ2aWV3R3JhcGhdIG9mIHRoaXMuX292ZXJ2aWV3R3JhcGhzQnlUeXBlTWFwKSB7 CiAgICAgICAgICAgICBpZiAob3ZlcnZpZXdHcmFwaCAhPT0gZXZlbnQudGFyZ2V0KQogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgICAgICBsZXQgdGltZWxpbmUgPSB0aGlzLl9y ZWNvcmRpbmcudGltZWxpbmVzLmdldCh0eXBlKTsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0 KHRpbWVsaW5lLCAiVGltZWxpbmUgcmVjb3JkaW5nIG1pc3NpbmcgdGltZWxpbmUgdHlwZSIsIHR5 cGUpOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuVGltZWxp bmVPdmVydmlldy5FdmVudC5SZWNvcmRTZWxlY3RlZCwge3RpbWVsaW5lLCByZWNvcmQ6IGV2ZW50 LmRhdGEucmVjb3JkfSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5UaW1lbGluZU92ZXJ2aWV3LkV2ZW50LlJlY29yZFNlbGVjdGVkLCB7dGltZWxpbmUsIHJl Y29yZDogdGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29yZH0pOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCmlu ZGV4IDNhZmJjNGQzNGE0ZGNkYTQ1NDhhYjhmY2IwNDgyYTNhMDFlOTJhOWEuLjgwOTJlZTViZjRl NWVjOTljM2U3ZDY2OWQ5MDRlMDZiYjU4NmY0ZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2 aWV3R3JhcGguanMKQEAgLTM3LDcgKzM3LDcgQEAgV0kuVGltZWxpbmVPdmVydmlld0dyYXBoID0g Y2xhc3MgVGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlz Ll9jdXJyZW50VGltZSA9IDA7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lT3ZlcnZpZXcgPSB0aW1l bGluZU92ZXJ2aWV3OwogICAgICAgICB0aGlzLl9zZWxlY3RlZFJlY29yZCA9IG51bGw7Ci0gICAg ICAgIHRoaXMuX3NlbGVjdGVkUmVjb3JkQ2hhbmdlZCA9IGZhbHNlOworICAgICAgICB0aGlzLl9z ZWxlY3RlZFJlY29yZEJhciA9IG51bGw7CiAgICAgICAgIHRoaXMuX3NjaGVkdWxlZFNlbGVjdGVk UmVjb3JkTGF5b3V0VXBkYXRlSWRlbnRpZmllciA9IHVuZGVmaW5lZDsKICAgICAgICAgdGhpcy5f c2VsZWN0ZWQgPSBmYWxzZTsKICAgICAgICAgdGhpcy5fdmlzaWJsZSA9IHRydWU7CkBAIC0xNjYs MTEgKzE2NiwyOSBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBUaW1lbGluZU92 ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgdGhpcy5fc2VsZWN0ZWRSZWNvcmQgPSB4OwotICAgICAgICB0aGlzLl9zZWxlY3RlZFJlY29y ZENoYW5nZWQgPSB0cnVlOwogCiAgICAgICAgIHRoaXMuX25lZWRzU2VsZWN0ZWRSZWNvcmRMYXlv dXQoKTsKICAgICB9CiAKKyAgICBnZXQgc2VsZWN0ZWRSZWNvcmRCYXIoKQorICAgIHsKKyAgICAg ICAgcmV0dXJuIHRoaXMuX3NlbGVjdGVkUmVjb3JkQmFyOworICAgIH0KKworICAgIHNldCBzZWxl Y3RlZFJlY29yZEJhcihyZWNvcmRCYXIpCisgICAgeworICAgICAgICBpZiAodGhpcy5fc2VsZWN0 ZWRSZWNvcmRCYXIgPT09IHJlY29yZEJhcikKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAg ICBpZiAodGhpcy5fc2VsZWN0ZWRSZWNvcmRCYXIpCisgICAgICAgICAgICB0aGlzLl9zZWxlY3Rl ZFJlY29yZEJhci5zZWxlY3RlZCA9IGZhbHNlOworCisgICAgICAgIHRoaXMuX3NlbGVjdGVkUmVj b3JkQmFyID0gcmVjb3JkQmFyOworCisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZFJlY29yZEJh cikKKyAgICAgICAgICAgIHRoaXMuX3NlbGVjdGVkUmVjb3JkQmFyLnNlbGVjdGVkID0gdHJ1ZTsK KyAgICB9CisKICAgICBnZXQgaGVpZ2h0KCkKICAgICB7CiAgICAgICAgIC8vIE92ZXJyaWRkZW4g Ynkgc3ViLWNsYXNzZXMgaWYgbmVlZGVkLgpAQCAtMjI2LDYgKzI0NCwxMyBAQCBXSS5UaW1lbGlu ZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5W aWV3CiAgICAgICAgIHN1cGVyLm5lZWRzTGF5b3V0KCk7CiAgICAgfQogCisgICAgLy8gVGltZWxp bmVSZWNvcmRCYXIgZGVsZWdhdGUKKworICAgIHRpbWVsaW5lUmVjb3JkQmFyQ2xpY2tlZCh0aW1l bGluZVJlY29yZEJhcikKKyAgICB7CisgICAgICAgIHRoaXMuc2VsZWN0ZWRSZWNvcmQgPSB0aW1l bGluZVJlY29yZEJhci5yZWNvcmRzWzBdOworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAg ICAgdXBkYXRlU2VsZWN0ZWRSZWNvcmQoKQpAQCAtMjQ4LDcgKzI3Myw3IEBAIFdJLlRpbWVsaW5l T3ZlcnZpZXdHcmFwaCA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlZp ZXcKICAgICAgICAgICAgIHRoaXMuX3NjaGVkdWxlZFNlbGVjdGVkUmVjb3JkTGF5b3V0VXBkYXRl SWRlbnRpZmllciA9IHVuZGVmaW5lZDsKIAogICAgICAgICAgICAgdGhpcy51cGRhdGVTZWxlY3Rl ZFJlY29yZCgpOwotICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0ku VGltZWxpbmVPdmVydmlld0dyYXBoLkV2ZW50LlJlY29yZFNlbGVjdGVkLCB7cmVjb3JkOiB0aGlz LnNlbGVjdGVkUmVjb3JkfSk7CisgICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGguRXZlbnQuUmVjb3JkU2VsZWN0ZWQsIHtyZWNv cmQ6IHRoaXMuc2VsZWN0ZWRSZWNvcmQsIHJlY29yZEJhcjogdGhpcy5zZWxlY3RlZFJlY29yZEJh cn0pOwogICAgICAgICB9KTsKICAgICB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuY3NzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuY3Nz CmluZGV4IGE1ZTZlNGY2MzI3MGRjZDdmYmI2YzFhZDQ4M2E2Zjc4YzdjYzlmZGUuLjhiODIxMjVi ODc1YzhmYjFhMGIxNDk5YWQzYzBjZWU0OGUyYzNiOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmNzcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29y ZEJhci5jc3MKQEAgLTQxLDYgKzQxLDExIEBACiAgICAgei1pbmRleDogMTsKIH0KIAorLnRpbWVs aW5lLXJlY29yZC1iYXIuc2VsZWN0ZWQgPiAuc2VnbWVudCB7CisgICAgYmFja2dyb3VuZC1jb2xv cjogdmFyKC0tc2VsZWN0ZWQtYmFja2dyb3VuZC1jb2xvcik7CisgICAgYm9yZGVyLWNvbG9yOiB2 YXIoLS1zZWxlY3RlZC1iYWNrZ3JvdW5kLWNvbG9yLWFjdGl2ZSk7Cit9CisKIC50aW1lbGluZS1y ZWNvcmQtYmFyOm5vdCguaGFzLWluYWN0aXZlLXNlZ21lbnQpID4gLnNlZ21lbnQgewogICAgIGxl ZnQ6IDA7CiAgICAgd2lkdGg6IDEwMCU7CkBAIC05MCwzNCArOTUsMzQgQEAgYm9keVtkaXI9cnRs XSA6bWF0Y2hlcyg6Zm9jdXMsIC5mb3JjZS1mb2N1cykgLnNlbGVjdGVkIC50aW1lbGluZS1yZWNv cmQtYmFyLmhhcy0KICAgICBib3JkZXItcmlnaHQ6IHZhcigtLXRpbWVsaW5lLXJlY29yZC1iYXIt aGFzLWluYWN0aXZlLXNlZ21lbnQtbm90LWluYWN0aXZlLXNlZ21lbnQtYm9yZGVyLXN0YXJ0KTsK IH0KIAotLnRpbWVsaW5lLXJlY29yZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbmV0d29yayA+ IC5zZWdtZW50IHsKKy50aW1lbGluZS1yZWNvcmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVsaW5l LXJlY29yZC10eXBlLW5ldHdvcmsgPiAuc2VnbWVudCB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjog aHNsKDIwNywgNjMlLCA2NyUpOwogICAgIGJvcmRlci1jb2xvcjogaHNsKDIwMiwgNTUlLCA1MSUp OwogfQogCi0udGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1uZXR3b3Jr ID4gLnNlZ21lbnQuaW5hY3RpdmUgeworLnRpbWVsaW5lLXJlY29yZC1iYXI6bm90KC5zZWxlY3Rl ZCkudGltZWxpbmUtcmVjb3JkLXR5cGUtbmV0d29yayA+IC5zZWdtZW50LmluYWN0aXZlIHsKICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMjA4LCA2NiUsIDc5JSk7CiAgICAgYm9yZGVyLWNvbG9y OiBoc2woMjAyLCA1NyUsIDY4JSk7CiB9CiAKLS50aW1lbGluZS1yZWNvcmQtYmFyLnRpbWVsaW5l LXJlY29yZC10eXBlLWxheW91dCA+IC5zZWdtZW50IHsKKy50aW1lbGluZS1yZWNvcmQtYmFyOm5v dCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLWxheW91dCA+IC5zZWdtZW50IHsKICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMCwgNjUlLCA3NSUpOwogICAgIGJvcmRlci1jb2xvcjog aHNsKDAsIDU0JSwgNjIlKTsKIH0KIAogCi0udGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1y ZWNvcmQtdHlwZS1sYXlvdXQubGF5b3V0LXRpbWVsaW5lLXJlY29yZC1wYWludCA+IC5zZWdtZW50 LAotLnRpbWVsaW5lLXJlY29yZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbGF5b3V0LmxheW91 dC10aW1lbGluZS1yZWNvcmQtY29tcG9zaXRlID4gLnNlZ21lbnQgeworLnRpbWVsaW5lLXJlY29y ZC1iYXI6bm90KC5zZWxlY3RlZCkudGltZWxpbmUtcmVjb3JkLXR5cGUtbGF5b3V0LmxheW91dC10 aW1lbGluZS1yZWNvcmQtcGFpbnQgPiAuc2VnbWVudCwKKy50aW1lbGluZS1yZWNvcmQtYmFyOm5v dCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLWxheW91dC5sYXlvdXQtdGltZWxpbmUt cmVjb3JkLWNvbXBvc2l0ZSA+IC5zZWdtZW50IHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2wo NzYsIDQ5JSwgNjAlKTsKICAgICBib3JkZXItY29sb3I6IGhzbCg3OSwgNDUlLCA1MSUpOwogfQog Ci0udGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1zY3JpcHQgPiAuc2Vn bWVudCB7CisudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1lbGluZS1yZWNv cmQtdHlwZS1zY3JpcHQgPiAuc2VnbWVudCB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDI2 OSwgNjUlLCA3NCUpOwogICAgIGJvcmRlci1jb2xvcjogaHNsKDI3MywgMzMlLCA1OCUpOwogfQog Ci0udGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1zY3JpcHQuc2NyaXB0 LXRpbWVsaW5lLXJlY29yZC1nYXJiYWdlLWNvbGxlY3RlZCA+IC5zZWdtZW50IHsKKy50aW1lbGlu ZS1yZWNvcmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLXNjcmlwdC5z Y3JpcHQtdGltZWxpbmUtcmVjb3JkLWdhcmJhZ2UtY29sbGVjdGVkID4gLnNlZ21lbnQgewogICAg IGJhY2tncm91bmQtY29sb3I6IGhzbCgyMywgNjklLCA3MyUpOwogICAgIGJvcmRlci1jb2xvcjog aHNsKDExLCA1NCUsIDYyJSk7ICAgIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5qcwppbmRl eCAzNThmNzFmNTRkYTk2ZTI3ODFlNGM2ZmY4YzI3OTVjMjIyYmFmY2VlLi4zMDY1MTU3MmQzMDI1 MThlZGYwYjgxMzJkNzZkYWFjZTg3ZWRhYmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5q cwpAQCAtMjUsMTMgKzI1LDE2IEBACiAKIFdJLlRpbWVsaW5lUmVjb3JkQmFyID0gY2xhc3MgVGlt ZWxpbmVSZWNvcmRCYXIgZXh0ZW5kcyBXSS5PYmplY3QKIHsKLSAgICBjb25zdHJ1Y3RvcihyZWNv cmRzLCByZW5kZXJNb2RlKQorICAgIGNvbnN0cnVjdG9yKGRlbGVnYXRlLCByZWNvcmRzLCByZW5k ZXJNb2RlKQogICAgIHsKICAgICAgICAgc3VwZXIoKTsKIAorICAgICAgICB0aGlzLl9kZWxlZ2F0 ZSA9IGRlbGVnYXRlOworCiAgICAgICAgIHRoaXMuX2VsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJ0aW1l bGluZS1yZWNvcmQtYmFyIik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnRbV0kuVGltZWxpbmVSZWNv cmRCYXIuRWxlbWVudFJlZmVyZW5jZVN5bWJvbF0gPSB0aGlzOworICAgICAgICB0aGlzLl9lbGVt ZW50LmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgdGhpcy5faGFuZGxlQ2xpY2suYmluZCh0aGlz KSk7CiAKICAgICAgICAgdGhpcy5yZW5kZXJNb2RlID0gcmVuZGVyTW9kZTsKICAgICAgICAgdGhp cy5yZWNvcmRzID0gcmVjb3JkczsKQEAgLTE3OSw2ICsxODIsMTEgQEAgV0kuVGltZWxpbmVSZWNv cmRCYXIgPSBjbGFzcyBUaW1lbGluZVJlY29yZEJhciBleHRlbmRzIFdJLk9iamVjdAogICAgICAg ICByZXR1cm4gdGhpcy5fZWxlbWVudDsKICAgICB9CiAKKyAgICBzZXQgc2VsZWN0ZWQoc2VsZWN0 ZWQpCisgICAgeworICAgICAgICB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC50b2dnbGUoInNlbGVj dGVkIiwgISFzZWxlY3RlZCk7CisgICAgfQorCiAgICAgZ2V0IHJlbmRlck1vZGUoKQogICAgIHsK ICAgICAgICAgcmV0dXJuIHRoaXMuX3JlbmRlck1vZGU7CkBAIC0zNzIsNiArMzgwLDEyIEBAIFdJ LlRpbWVsaW5lUmVjb3JkQmFyID0gY2xhc3MgVGltZWxpbmVSZWNvcmRCYXIgZXh0ZW5kcyBXSS5P YmplY3QKICAgICAgICAgaWYgKGN1cnJlbnRQb3NpdGlvbkFwcm94ICE9PSBuZXdQb3NpdGlvbkFw cm94KQogICAgICAgICAgICAgZWxlbWVudC5zdHlsZVtwcm9wZXJ0eV0gPSAobmV3UG9zaXRpb25B cHJveCAvIDEwMCkgKyAiJSI7CiAgICAgfQorCisgICAgX2hhbmRsZUNsaWNrKGV2ZW50KQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlLnRpbWVsaW5lUmVjb3JkQmFyQ2xpY2tlZCkK KyAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnRpbWVsaW5lUmVjb3JkQmFyQ2xpY2tlZCh0aGlz KTsKKyAgICB9CiB9OwogCiBXSS5UaW1lbGluZVJlY29yZEJhci5FbGVtZW50UmVmZXJlbmNlU3lt Ym9sID0gU3ltYm9sKCJ0aW1lbGluZS1yZWNvcmQtYmFyIik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGlt ZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwppbmRleCBkZWFiZGZiMThhZGI1NmRhYmRmZjEy YTNmZjQyYmMxMmEyMzg3MzdiLi5mNTRjNzY3NzViYjg3YTY2MTFiYzdiNzg3YjhhMmUzZTNmZjI5 MGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMK QEAgLTExNCw3ICsxMTQsMTMgQEAgV0kuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGNs YXNzIFRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS4KICAgICAgICAgaWYg KCF0aGlzLl90aW1lbGluZVZpZXdNYXAuaGFzKHRpbWVsaW5lKSkKICAgICAgICAgICAgIHJldHVy bjsKIAotICAgICAgICB0aGlzLl90aW1lbGluZUNvbnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmll dyh0aGlzLl90aW1lbGluZVZpZXdNYXAuZ2V0KHRpbWVsaW5lKSk7CisgICAgICAgIGxldCBjb250 ZW50VmlldyA9IHRoaXMuX3RpbWVsaW5lQ29udGVudEJyb3dzZXIuc2hvd0NvbnRlbnRWaWV3KHRo aXMuX3RpbWVsaW5lVmlld01hcC5nZXQodGltZWxpbmUpKTsKKworICAgICAgICAvLyBGSVhNRTog YFdJLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlld2AgcmVsaWVzIG9uIGl0J3MgYF9kYXRhR3Jp ZGAgZm9yIGRldGVybWluaW5nIHdoYXQKKyAgICAgICAgLy8gb2JqZWN0IGlzIGN1cnJlbnRseSBz ZWxlY3RlZC4gSWYgdGhhdCBgX2RhdGFHcmlkYCBoYXNuJ3QgeWV0IGNhbGxlZCBgbGF5b3V0KClg IHdoZW4gZmlyc3QKKyAgICAgICAgLy8gc2hvd24sIHdlIHdpbGwgbG9zZSB0aGUgc2VsZWN0aW9u LgorICAgICAgICBpZiAoIWNvbnRlbnRWaWV3LmRpZEluaXRpYWxMYXlvdXQpCisgICAgICAgICAg ICBjb250ZW50Vmlldy51cGRhdGVMYXlvdXQoKTsKICAgICB9CiAKICAgICBnZXQgc3VwcG9ydHNT cGxpdENvbnRlbnRCcm93c2VyKCkK 352463 2018-10-16 09:40:21 -0700 2018-10-16 11:44:09 -0700 Patch bug-135307-20181016094020.patch text/plain 21078 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGMwY2E4MzA3Y2M1NzFlOWMyNGE5ZWI4ODQ1NGJh NjMzZmEwNTI5ZTMuLjBmMTgyNjJiZjQ2M2VhM2JhMDc2ZjNkNjhhZmFlNDcwODlhNTAyZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY0IEBACisyMDE4LTEwLTE2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT aG91bGQgYmUgYSB3YXkgdG8gZ28gZGlyZWN0bHkgZnJvbSBhbiBldmVudCBpbiB0aGUgb3ZlcnZp ZXcgdmlldyB0byB0aGUgc3BlY2lhbGl6ZWQgdGltZWxpbmUgZm9yIHRoYXQgZXZlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTMwNworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTcyNzM5NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBo IFBlY29yYXJvLgorCisgICAgICAgIFdoZW4gYSBgV0kuVGltZWxpbmVSZWNvcmRCYXJgIGlzIGNs aWNrZWQsIGNhbGwgdXAgdGhlIGRlbGVnYXRlIGNoYWluIHRvIHRoZSBvdmVydmlldyBhbmQKKyAg ICAgICAgYWRqdXN0IHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgYFdJLlRpbWVsaW5lUmVjb3JkQmFy YCBhbW9uZyB0aGUgYFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaGBzLgorICAgICAgICBTaW1pbGFy bHksIHNlbGVjdGluZyBhIGBXSS5EYXRhR3JpZE5vZGVgIGluIGFueSBgV0kuVGltZWxpbmVWaWV3 YCBzdWJjbGFzcyB3aWxsIHVzZSB0aGUgc2FtZQorICAgICAgICBsb2dpYyB0byBzZWxlY3QgdGhl IGNvcnJlc3BvbmRpbmcgYFdJLlRpbWVsaW5lUmVjb3JkQmFyYC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5l T3ZlcnZpZXcpOgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUucmVzZXQp OgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX3JlY29yZFNlbGVjdGVk KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBo LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlld0dyYXBoKToKKyAgICAgICAgKFdJLlRp bWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUuc2V0IHNlbGVjdGVkUmVjb3JkKToKKyAgICAg ICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUuZ2V0IHNlbGVjdGVkUmVjb3Jk QmFyKTogQWRkZWQuCisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBl LnNldCBzZWxlY3RlZFJlY29yZEJhcik6IEFkZGVkLgorICAgICAgICAoV0kuVGltZWxpbmVPdmVy dmlld0dyYXBoLnByb3RvdHlwZS50aW1lbGluZVJlY29yZEJhckNsaWNrZWQpOiBBZGRlZC4KKyAg ICAgICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUuX25lZWRzU2VsZWN0ZWRS ZWNvcmRMYXlvdXQpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJl Y29yZEJhci5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkQmFyKToKKyAgICAgICAgKFdJ LlRpbWVsaW5lUmVjb3JkQmFyLnByb3RvdHlwZS5nZXQgc2VsZWN0ZWQpOiBBZGRlZC4KKyAgICAg ICAgKFdJLlRpbWVsaW5lUmVjb3JkQmFyLnByb3RvdHlwZS5zZXQgc2VsZWN0ZWQpOiBBZGRlZC4K KyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkQmFyLnByb3RvdHlwZS5faGFuZGxlQ2xpY2spOiBB ZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmNz czoKKyAgICAgICAgKC50aW1lbGluZS1yZWNvcmQtYmFyLnNlbGVjdGVkID4gLnNlZ21lbnQpOgor ICAgICAgICAoLnRpbWVsaW5lLXJlY29yZC1iYXI6bm90KC5zZWxlY3RlZCkudGltZWxpbmUtcmVj b3JkLXR5cGUtbmV0d29yayA+IC5zZWdtZW50KToKKyAgICAgICAgKC50aW1lbGluZS1yZWNvcmQt YmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLW5ldHdvcmsgPiAuc2VnbWVu dC5pbmFjdGl2ZSk6CisgICAgICAgICgudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVk KS50aW1lbGluZS1yZWNvcmQtdHlwZS1sYXlvdXQgPiAuc2VnbWVudCk6CisgICAgICAgICgudGlt ZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1lbGluZS1yZWNvcmQtdHlwZS1sYXlv dXQubGF5b3V0LXRpbWVsaW5lLXJlY29yZC1wYWludCA+IC5zZWdtZW50LCAudGltZWxpbmUtcmVj b3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1lbGluZS1yZWNvcmQtdHlwZS1sYXlvdXQubGF5b3V0 LXRpbWVsaW5lLXJlY29yZC1jb21wb3NpdGUgPiAuc2VnbWVudCk6CisgICAgICAgICgudGltZWxp bmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1lbGluZS1yZWNvcmQtdHlwZS1zY3JpcHQg PiAuc2VnbWVudCk6CisgICAgICAgICgudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVk KS50aW1lbGluZS1yZWNvcmQtdHlwZS1zY3JpcHQuc2NyaXB0LXRpbWVsaW5lLXJlY29yZC1nYXJi YWdlLWNvbGxlY3RlZCA+IC5zZWdtZW50KToKKyAgICAgICAgKC50aW1lbGluZS1yZWNvcmQtYmFy LnRpbWVsaW5lLXJlY29yZC10eXBlLW5ldHdvcmsgPiAuc2VnbWVudCk6IERlbGV0ZWQuCisgICAg ICAgICgudGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1uZXR3b3JrID4g LnNlZ21lbnQuaW5hY3RpdmUpOiBEZWxldGVkLgorICAgICAgICAoLnRpbWVsaW5lLXJlY29yZC1i YXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbGF5b3V0ID4gLnNlZ21lbnQpOiBEZWxldGVkLgorICAg ICAgICAoLnRpbWVsaW5lLXJlY29yZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbGF5b3V0Lmxh eW91dC10aW1lbGluZS1yZWNvcmQtcGFpbnQgPiAuc2VnbWVudCwgLnRpbWVsaW5lLXJlY29yZC1i YXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbGF5b3V0LmxheW91dC10aW1lbGluZS1yZWNvcmQtY29t cG9zaXRlID4gLnNlZ21lbnQpOiBEZWxldGVkLgorICAgICAgICAoLnRpbWVsaW5lLXJlY29yZC1i YXIudGltZWxpbmUtcmVjb3JkLXR5cGUtc2NyaXB0ID4gLnNlZ21lbnQpOiBEZWxldGVkLgorICAg ICAgICAoLnRpbWVsaW5lLXJlY29yZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtc2NyaXB0LnNj cmlwdC10aW1lbGluZS1yZWNvcmQtZ2FyYmFnZS1jb2xsZWN0ZWQgPiAuc2VnbWVudCk6IERlbGV0 ZWQuCisgICAgICAgIEFkZCBhIGBkZWxlZ2F0ZWAgdGhhdCBpcyBub3RpZmllZCB3aGVuZXZlciB0 aGUgZWxlbWVudCBpcyBjbGlja2VkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9U aW1lbGluZURhdGFHcmlkTm9kZS5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lRGF0YUdyaWROb2Rl LnByb3RvdHlwZS5yZWZyZXNoR3JhcGguY3JlYXRlQmFyKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qczoKKyAgICAgICAgKFdJLkxh eW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUudXBkYXRlU2VsZWN0ZWRSZWNvcmQp OgorICAgICAgICAoV0kuTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5fdXBk YXRlUm93TGF5b3V0LmNyZWF0ZUJhcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9O ZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAoV0kuTmV0d29ya1RpbWVs aW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUubGF5b3V0LmNyZWF0ZUJhcik6CisgICAgICAgICog VXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanM6CisgICAg ICAgIChXSS5TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlLmxheW91dC5jcmVh dGVCYXIpOgorICAgICAgICAoV0kuU2NyaXB0VGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlw ZS51cGRhdGVTZWxlY3RlZFJlY29yZCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5UaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5zaG93VGltZWxpbmVWaWV3Rm9yVGltZWxpbmUp OgorCiAyMDE4LTEwLTE1ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OIChyMjMzODI0KTogZXhlY3V0aW9uIGhpZ2hs aWdodCByYW5nZSBtaXNzaW5nL2luY29ycmVjdCBpbiBwcmV0dHkgcHJpbnRlZCBjb2RlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXlvdXRU aW1lbGluZU92ZXJ2aWV3R3JhcGguanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKaW5kZXggNmU1NGFjYjY5 NGJhZjYxODM4MDI0Y2E5YjUyYTcyZmUyZDdmNjJlMS4uZTk4MDMwYTM2MTNlM2EwZTUxNWM2ZmQ2 ZmEwMTMwOWIzNWMwNjMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZp ZXdHcmFwaC5qcwpAQCAtNjgsNiArNjgsMjIgQEAgV0kuTGF5b3V0VGltZWxpbmVPdmVydmlld0dy YXBoID0gY2xhc3MgTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVGkKICAg ICAgICAgdGhpcy5fdXBkYXRlUm93TGF5b3V0KHRoaXMuX3RpbWVsaW5lTGF5b3V0UmVjb3JkUm93 KTsKICAgICB9CiAKKyAgICB1cGRhdGVTZWxlY3RlZFJlY29yZCgpCisgICAgeworICAgICAgICBz dXBlci51cGRhdGVTZWxlY3RlZFJlY29yZCgpOworCisgICAgICAgIGZvciAobGV0IHJlY29yZFJv dyBvZiBbdGhpcy5fdGltZWxpbmVMYXlvdXRSZWNvcmRSb3csIHRoaXMuX3RpbWVsaW5lUGFpbnRS ZWNvcmRSb3ddKSB7CisgICAgICAgICAgICBmb3IgKGxldCByZWNvcmRCYXIgb2YgcmVjb3JkUm93 LnJlY29yZEJhcnMpIHsKKyAgICAgICAgICAgICAgICBpZiAocmVjb3JkQmFyLnJlY29yZHMuaW5j bHVkZXModGhpcy5zZWxlY3RlZFJlY29yZCkpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5z ZWxlY3RlZFJlY29yZEJhciA9IHJlY29yZEJhcjsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAg IHRoaXMuc2VsZWN0ZWRSZWNvcmRCYXIgPSBudWxsOworICAgIH0KKwogICAgIC8vIFByaXZhdGUK IAogICAgIF91cGRhdGVSb3dMYXlvdXQocm93KQpAQCAtNzksNyArOTUsNyBAQCBXSS5MYXlvdXRU aW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBMYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGgg ZXh0ZW5kcyBXSS5UaQogICAgICAgICB7CiAgICAgICAgICAgICB2YXIgdGltZWxpbmVSZWNvcmRC YXIgPSByb3cucmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF07CiAgICAgICAgICAgICBpZiAoIXRp bWVsaW5lUmVjb3JkQmFyKQotICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyID0gcm93 LnJlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFyKHJl Y29yZHMsIHJlbmRlck1vZGUpOworICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyID0g cm93LnJlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFy KHRoaXMsIHJlY29yZHMsIHJlbmRlck1vZGUpOwogICAgICAgICAgICAgZWxzZSB7CiAgICAgICAg ICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIucmVuZGVyTW9kZSA9IHJlbmRlck1vZGU7CiAgICAg ICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIucmVjb3JkcyA9IHJlY29yZHM7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGlt ZWxpbmVPdmVydmlld0dyYXBoLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTmV0d29ya1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRleCBiZWE3YjY0NDZh ZDRlMjM0YjdkMWRiOTY4NTBkYzIyNjM0MjU4MWRjLi43NGQ5NGFiMGYzMzcxZTQ0MDQwYmZmNmFj NTFkZTc0NTlmMGZmZTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZU92ZXJ2 aWV3R3JhcGguanMKQEAgLTc1LDcgKzc1LDcgQEAgV0kuTmV0d29ya1RpbWVsaW5lT3ZlcnZpZXdH cmFwaCA9IGNsYXNzIE5ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS4KICAg ICAgICAgewogICAgICAgICAgICAgbGV0IHRpbWVsaW5lUmVjb3JkQmFyID0gcm93UmVjb3JkQmFy c1tyZWNvcmRCYXJJbmRleF07CiAgICAgICAgICAgICBpZiAoIXRpbWVsaW5lUmVjb3JkQmFyKQot ICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyID0gcm93UmVjb3JkQmFyc1tyZWNvcmRC YXJJbmRleF0gPSBuZXcgV0kuVGltZWxpbmVSZWNvcmRCYXIocmVjb3JkcywgcmVuZGVyTW9kZSk7 CisgICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIgPSByb3dSZWNvcmRCYXJzW3JlY29y ZEJhckluZGV4XSA9IG5ldyBXSS5UaW1lbGluZVJlY29yZEJhcih0aGlzLCByZWNvcmRzLCByZW5k ZXJNb2RlKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVj b3JkQmFyLnJlbmRlck1vZGUgPSByZW5kZXJNb2RlOwogICAgICAgICAgICAgICAgIHRpbWVsaW5l UmVjb3JkQmFyLnJlY29yZHMgPSByZWNvcmRzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVPdmVydmlld0dyYXBoLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxp bmVPdmVydmlld0dyYXBoLmpzCmluZGV4IDdkM2I1NzhhYzZmNTNlMTQ1OTRhZTAyNjMyMjEzZDM5 OGU1NTM2ZjcuLjhlMzhlYmY4YWY5YTNiMjBkNmM0ODQwY2M2MTFkYzE3YTBmMzY1N2UgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKQEAgLTYyLDcgKzYy LDcgQEAgV0kuU2NyaXB0VGltZWxpbmVPdmVydmlld0dyYXBoID0gY2xhc3MgU2NyaXB0VGltZWxp bmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVGkKICAgICAgICAgewogICAgICAgICAgICAgbGV0 IHRpbWVsaW5lUmVjb3JkQmFyID0gdGhpcy5fdGltZWxpbmVSZWNvcmRCYXJzW3JlY29yZEJhcklu ZGV4XTsKICAgICAgICAgICAgIGlmICghdGltZWxpbmVSZWNvcmRCYXIpCi0gICAgICAgICAgICAg ICAgdGltZWxpbmVSZWNvcmRCYXIgPSB0aGlzLl90aW1lbGluZVJlY29yZEJhcnNbcmVjb3JkQmFy SW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFyKHJlY29yZHMsIHJlbmRlck1vZGUpOwor ICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyID0gdGhpcy5fdGltZWxpbmVSZWNvcmRC YXJzW3JlY29yZEJhckluZGV4XSA9IG5ldyBXSS5UaW1lbGluZVJlY29yZEJhcih0aGlzLCByZWNv cmRzLCByZW5kZXJNb2RlKTsKICAgICAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIHRp bWVsaW5lUmVjb3JkQmFyLnJlbmRlck1vZGUgPSByZW5kZXJNb2RlOwogICAgICAgICAgICAgICAg IHRpbWVsaW5lUmVjb3JkQmFyLnJlY29yZHMgPSByZWNvcmRzOwpAQCAtODYsNiArODYsMjAgQEAg V0kuU2NyaXB0VGltZWxpbmVPdmVydmlld0dyYXBoID0gY2xhc3MgU2NyaXB0VGltZWxpbmVPdmVy dmlld0dyYXBoIGV4dGVuZHMgV0kuVGkKICAgICAgICAgfQogICAgIH0KIAorICAgIHVwZGF0ZVNl bGVjdGVkUmVjb3JkKCkKKyAgICB7CisgICAgICAgIHN1cGVyLnVwZGF0ZVNlbGVjdGVkUmVjb3Jk KCk7CisKKyAgICAgICAgZm9yIChsZXQgcmVjb3JkQmFyIG9mIHRoaXMuX3RpbWVsaW5lUmVjb3Jk QmFycykgeworICAgICAgICAgICAgaWYgKHJlY29yZEJhci5yZWNvcmRzLmluY2x1ZGVzKHRoaXMu c2VsZWN0ZWRSZWNvcmQpKSB7CisgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RlZFJlY29yZEJh ciA9IHJlY29yZEJhcjsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKworICAgICAgICB0aGlzLnNlbGVjdGVkUmVjb3JkQmFyID0gbnVsbDsKKyAgICB9 CisKICAgICAvLyBQcml2YXRlCiAKICAgICBfc2NyaXB0VGltZWxpbmVSZWNvcmRBZGRlZChldmVu dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lRGF0YUdyaWROb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKaW5kZXggZDY1NDBhNTFlNjg0ODA2 MTE0NTExNGRlNjA5NTFlOWU5ODdjYjU2NC4uYTJmNjI0N2ExMGVlYzc0MmIzZTk5NDcxNTk5ZDM2 MmM3NDZjODY4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVEYXRhR3JpZE5vZGUuanMKQEAgLTI0MSw3 ICsyNDEsNyBAQCBXSS5UaW1lbGluZURhdGFHcmlkTm9kZSA9IGNsYXNzIFRpbWVsaW5lRGF0YUdy aWROb2RlIGV4dGVuZHMgV0kuRGF0YUdyaWROb2RlCiAgICAgICAgIHsKICAgICAgICAgICAgIHZh ciB0aW1lbGluZVJlY29yZEJhciA9IHRoaXMuX3RpbWVsaW5lUmVjb3JkQmFyc1tyZWNvcmRCYXJJ bmRleF07CiAgICAgICAgICAgICBpZiAoIXRpbWVsaW5lUmVjb3JkQmFyKQotICAgICAgICAgICAg ICAgIHRpbWVsaW5lUmVjb3JkQmFyID0gdGhpcy5fdGltZWxpbmVSZWNvcmRCYXJzW3JlY29yZEJh ckluZGV4XSA9IG5ldyBXSS5UaW1lbGluZVJlY29yZEJhcihyZWNvcmRzLCByZW5kZXJNb2RlKTsK KyAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhciA9IHRoaXMuX3RpbWVsaW5lUmVjb3Jk QmFyc1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxpbmVSZWNvcmRCYXIodGhpcywgcmVj b3JkcywgcmVuZGVyTW9kZSk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICB0 aW1lbGluZVJlY29yZEJhci5yZW5kZXJNb2RlID0gcmVuZGVyTW9kZTsKICAgICAgICAgICAgICAg ICB0aW1lbGluZVJlY29yZEJhci5yZWNvcmRzID0gcmVjb3JkczsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2 aWV3LmpzCmluZGV4IGY0YWMyYmRiYWEyMmE4YzlmMTI2YzIxZWVjNjk3NzQ3MWNmNTYzZGUuLjU1 NzhiMTg2YjA3NzQ2MWZjNGRmODdmNzE1OTg5ZWE4YmQ4M2Y0OWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVP dmVydmlldy5qcwpAQCAtNTUsNiArNTUsNyBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3Mg VGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5fZ3JhcGhzQ29u dGFpbmVyVmlldy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoImdyYXBocy1jb250YWluZXIiKTsKICAg ICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2dyYXBoc0NvbnRhaW5lclZpZXcpOwogCisgICAg ICAgIHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQgPSBudWxsOwogICAgICAgICB0aGlzLl9v dmVydmlld0dyYXBoc0J5VHlwZU1hcCA9IG5ldyBNYXA7CiAKICAgICAgICAgdGhpcy5fZWRpdElu c3RydW1lbnRzQnV0dG9uID0gbmV3IFdJLkFjdGl2YXRlQnV0dG9uTmF2aWdhdGlvbkl0ZW0oInRv Z2dsZS1lZGl0LWluc3RydW1lbnRzIiwgV0kuVUlTdHJpbmcoIkVkaXQgY29uZmlndXJhdGlvbiIp LCBXSS5VSVN0cmluZygiU2F2ZSBjb25maWd1cmF0aW9uIikpOwpAQCAtMzcxLDYgKzM3Miw3IEBA IFdJLlRpbWVsaW5lT3ZlcnZpZXcgPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0ku VmlldwogCiAgICAgcmVzZXQoKQogICAgIHsKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRUaW1lbGlu ZVJlY29yZCA9IG51bGw7CiAgICAgICAgIGZvciAobGV0IG92ZXJ2aWV3R3JhcGggb2YgdGhpcy5f b3ZlcnZpZXdHcmFwaHNCeVR5cGVNYXAudmFsdWVzKCkpCiAgICAgICAgICAgICBvdmVydmlld0dy YXBoLnJlc2V0KCk7CiAKQEAgLTcwNywxMyArNzA5LDQxIEBAIFdJLlRpbWVsaW5lT3ZlcnZpZXcg PSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3IGV4dGVuZHMgV0kuVmlldwogCiAgICAgX3JlY29yZFNl bGVjdGVkKGV2ZW50KQogICAgIHsKKyAgICAgICAgbGV0IHtyZWNvcmQsIHJlY29yZEJhcn0gPSBl dmVudC5kYXRhOworICAgICAgICBpZiAoIXJlY29yZCB8fCByZWNvcmQgPT09IHRoaXMuX3NlbGVj dGVkVGltZWxpbmVSZWNvcmQpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRo aXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQgJiYgdGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29y ZC50eXBlICE9PSByZWNvcmQudHlwZSkgeworICAgICAgICAgICAgbGV0IHRpbWVsaW5lT3ZlcnZp ZXdHcmFwaCA9IHRoaXMuX292ZXJ2aWV3R3JhcGhzQnlUeXBlTWFwLmdldCh0aGlzLl9zZWxlY3Rl ZFRpbWVsaW5lUmVjb3JkLnR5cGUpOworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodGltZWxp bmVPdmVydmlld0dyYXBoKTsKKyAgICAgICAgICAgIGlmICh0aW1lbGluZU92ZXJ2aWV3R3JhcGgp CisgICAgICAgICAgICAgICAgdGltZWxpbmVPdmVydmlld0dyYXBoLnNlbGVjdGVkUmVjb3JkID0g bnVsbDsKKyAgICAgICAgfQorCisgICAgICAgIHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQg PSByZWNvcmQ7CisKKyAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQpIHsK KyAgICAgICAgICAgIGxldCBmaXJzdFJlY29yZCA9IHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNv cmQ7CisgICAgICAgICAgICBsZXQgbGFzdFJlY29yZCA9IHRoaXMuX3NlbGVjdGVkVGltZWxpbmVS ZWNvcmQ7CisgICAgICAgICAgICBpZiAocmVjb3JkQmFyKSB7CisgICAgICAgICAgICAgICAgZmly c3RSZWNvcmQgPSByZWNvcmRCYXIucmVjb3Jkc1swXTsKKyAgICAgICAgICAgICAgICBsYXN0UmVj b3JkID0gcmVjb3JkQmFyLnJlY29yZHMubGFzdFZhbHVlOworICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBpZiAoZmlyc3RSZWNvcmQuc3RhcnRUaW1lIDwgdGhpcy5zZWxlY3Rpb25TdGFydFRp bWUgfHwgbGFzdFJlY29yZC5lbmRUaW1lID4gdGhpcy5zZWxlY3Rpb25TdGFydFRpbWUgKyB0aGlz LnNlbGVjdGlvbkR1cmF0aW9uKSB7CisgICAgICAgICAgICAgICAgbGV0IHNlbGVjdGlvblBhZGRp bmcgPSB0aGlzLnNlY29uZHNQZXJQaXhlbCAqIDEwOworICAgICAgICAgICAgICAgIHRoaXMuc2Vs ZWN0aW9uU3RhcnRUaW1lID0gZmlyc3RSZWNvcmQuc3RhcnRUaW1lIC0gc2VsZWN0aW9uUGFkZGlu ZzsKKyAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvbkR1cmF0aW9uID0gbGFzdFJlY29yZC5l bmRUaW1lIC0gZmlyc3RSZWNvcmQuc3RhcnRUaW1lICsgKHNlbGVjdGlvblBhZGRpbmcgKiAyKTsK KyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCiAgICAgICAgIGZvciAobGV0IFt0eXBlLCBvdmVy dmlld0dyYXBoXSBvZiB0aGlzLl9vdmVydmlld0dyYXBoc0J5VHlwZU1hcCkgewogICAgICAgICAg ICAgaWYgKG92ZXJ2aWV3R3JhcGggIT09IGV2ZW50LnRhcmdldCkKICAgICAgICAgICAgICAgICBj b250aW51ZTsKIAogICAgICAgICAgICAgbGV0IHRpbWVsaW5lID0gdGhpcy5fcmVjb3JkaW5nLnRp bWVsaW5lcy5nZXQodHlwZSk7CiAgICAgICAgICAgICBjb25zb2xlLmFzc2VydCh0aW1lbGluZSwg IlRpbWVsaW5lIHJlY29yZGluZyBtaXNzaW5nIHRpbWVsaW5lIHR5cGUiLCB0eXBlKTsKLSAgICAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLlRpbWVsaW5lT3ZlcnZpZXcu RXZlbnQuUmVjb3JkU2VsZWN0ZWQsIHt0aW1lbGluZSwgcmVjb3JkOiBldmVudC5kYXRhLnJlY29y ZH0pOworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuVGltZWxp bmVPdmVydmlldy5FdmVudC5SZWNvcmRTZWxlY3RlZCwge3RpbWVsaW5lLCByZWNvcmQ6IHRoaXMu X3NlbGVjdGVkVGltZWxpbmVSZWNvcmR9KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRleCAzYWZiYzRk MzRhNGRjZGE0NTQ4YWI4ZmNiMDQ4MmEzYTAxZTkyYTlhLi44OGM1ZGZkZjYwMDhjNTlkZWMwMDE5 M2FiN2M4ZWEzNmZlZjQ0N2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBoLmpz CkBAIC0zNyw3ICszNyw3IEBAIFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGNsYXNzIFRpbWVs aW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5fY3VycmVudFRp bWUgPSAwOwogICAgICAgICB0aGlzLl90aW1lbGluZU92ZXJ2aWV3ID0gdGltZWxpbmVPdmVydmll dzsKICAgICAgICAgdGhpcy5fc2VsZWN0ZWRSZWNvcmQgPSBudWxsOwotICAgICAgICB0aGlzLl9z ZWxlY3RlZFJlY29yZENoYW5nZWQgPSBmYWxzZTsKKyAgICAgICAgdGhpcy5fc2VsZWN0ZWRSZWNv cmRCYXIgPSBudWxsOwogICAgICAgICB0aGlzLl9zY2hlZHVsZWRTZWxlY3RlZFJlY29yZExheW91 dFVwZGF0ZUlkZW50aWZpZXIgPSB1bmRlZmluZWQ7CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkID0g ZmFsc2U7CiAgICAgICAgIHRoaXMuX3Zpc2libGUgPSB0cnVlOwpAQCAtMTY2LDExICsxNjYsMzIg QEAgV0kuVGltZWxpbmVPdmVydmlld0dyYXBoID0gY2xhc3MgVGltZWxpbmVPdmVydmlld0dyYXBo IGV4dGVuZHMgV0kuVmlldwogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX3Nl bGVjdGVkUmVjb3JkID0geDsKLSAgICAgICAgdGhpcy5fc2VsZWN0ZWRSZWNvcmRDaGFuZ2VkID0g dHJ1ZTsKIAogICAgICAgICB0aGlzLl9uZWVkc1NlbGVjdGVkUmVjb3JkTGF5b3V0KCk7CiAgICAg fQogCisgICAgZ2V0IHNlbGVjdGVkUmVjb3JkQmFyKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0 aGlzLl9zZWxlY3RlZFJlY29yZEJhcjsKKyAgICB9CisKKyAgICBzZXQgc2VsZWN0ZWRSZWNvcmRC YXIocmVjb3JkQmFyKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3NlbGVjdGVkUmVjb3JkQmFy ID09PSByZWNvcmRCYXIpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgaWYgKHRoaXMu X3NlbGVjdGVkUmVjb3JkQmFyKQorICAgICAgICAgICAgdGhpcy5fc2VsZWN0ZWRSZWNvcmRCYXIu c2VsZWN0ZWQgPSBmYWxzZTsKKworICAgICAgICB0aGlzLl9zZWxlY3RlZFJlY29yZEJhciA9IHJl Y29yZEJhcjsKKworICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRSZWNvcmRCYXIpIHsKKyAgICAg ICAgICAgIHRoaXMuX3NlbGVjdGVkUmVjb3JkQmFyLnNlbGVjdGVkID0gdHJ1ZTsKKworICAgICAg ICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fc2VsZWN0ZWRSZWNvcmRCYXIucmVjb3Jkcy5pbmNs dWRlcyh0aGlzLl9zZWxlY3RlZFJlY29yZCkpOworICAgICAgICB9CisgICAgfQorCiAgICAgZ2V0 IGhlaWdodCgpCiAgICAgewogICAgICAgICAvLyBPdmVycmlkZGVuIGJ5IHN1Yi1jbGFzc2VzIGlm IG5lZWRlZC4KQEAgLTIyNiw2ICsyNDcsMTMgQEAgV0kuVGltZWxpbmVPdmVydmlld0dyYXBoID0g Y2xhc3MgVGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVmlldwogICAgICAgICBzdXBl ci5uZWVkc0xheW91dCgpOwogICAgIH0KIAorICAgIC8vIFRpbWVsaW5lUmVjb3JkQmFyIGRlbGVn YXRlCisKKyAgICB0aW1lbGluZVJlY29yZEJhckNsaWNrZWQodGltZWxpbmVSZWNvcmRCYXIpCisg ICAgeworICAgICAgICB0aGlzLnNlbGVjdGVkUmVjb3JkID0gdGltZWxpbmVSZWNvcmRCYXIucmVj b3Jkc1swXTsKKyAgICB9CisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIHVwZGF0ZVNlbGVjdGVk UmVjb3JkKCkKQEAgLTI0OCw3ICsyNzYsNyBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBj bGFzcyBUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICB0 aGlzLl9zY2hlZHVsZWRTZWxlY3RlZFJlY29yZExheW91dFVwZGF0ZUlkZW50aWZpZXIgPSB1bmRl ZmluZWQ7CiAKICAgICAgICAgICAgIHRoaXMudXBkYXRlU2VsZWN0ZWRSZWNvcmQoKTsKLSAgICAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLlRpbWVsaW5lT3ZlcnZpZXdH cmFwaC5FdmVudC5SZWNvcmRTZWxlY3RlZCwge3JlY29yZDogdGhpcy5zZWxlY3RlZFJlY29yZH0p OworICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuVGltZWxpbmVP dmVydmlld0dyYXBoLkV2ZW50LlJlY29yZFNlbGVjdGVkLCB7cmVjb3JkOiB0aGlzLnNlbGVjdGVk UmVjb3JkLCByZWNvcmRCYXI6IHRoaXMuc2VsZWN0ZWRSZWNvcmRCYXJ9KTsKICAgICAgICAgfSk7 CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmNzcwppbmRleCBjMmE1MzgxOThi YjM2MzFiYTEyMzc2NDA2ZjMxOTY1OWM3NzNmNjliLi4yZmY3NTEyYTUwOTE0Yzc1NDc2NWRjOGFk NTUyNTE2NDJmNDU4MjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5jc3MKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuY3NzCkBAIC00MSw2 ICs0MSwxMSBAQAogICAgIHotaW5kZXg6IDE7CiB9CiAKKy50aW1lbGluZS1yZWNvcmQtYmFyLnNl bGVjdGVkID4gLnNlZ21lbnQgeworICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLXNlbGVjdGVk LWJhY2tncm91bmQtY29sb3IpOworICAgIGJvcmRlci1jb2xvcjogdmFyKC0tc2VsZWN0ZWQtYmFj a2dyb3VuZC1jb2xvci1hY3RpdmUpOworfQorCiAudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLmhh cy1pbmFjdGl2ZS1zZWdtZW50KSA+IC5zZWdtZW50IHsKICAgICBsZWZ0OiAwOwogICAgIHdpZHRo OiAxMDAlOwpAQCAtOTAsMzQgKzk1LDM0IEBAIGJvZHlbZGlyPXJ0bF0gOmZvY3VzIC5zZWxlY3Rl ZCAudGltZWxpbmUtcmVjb3JkLWJhci5oYXMtaW5hY3RpdmUtc2VnbWVudCA+IC5zZWdtCiAgICAg Ym9yZGVyLXJpZ2h0OiB2YXIoLS10aW1lbGluZS1yZWNvcmQtYmFyLWhhcy1pbmFjdGl2ZS1zZWdt ZW50LW5vdC1pbmFjdGl2ZS1zZWdtZW50LWJvcmRlci1zdGFydCk7CiB9CiAKLS50aW1lbGluZS1y ZWNvcmQtYmFyLnRpbWVsaW5lLXJlY29yZC10eXBlLW5ldHdvcmsgPiAuc2VnbWVudCB7CisudGlt ZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1lbGluZS1yZWNvcmQtdHlwZS1uZXR3 b3JrID4gLnNlZ21lbnQgewogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyMDcsIDYzJSwgNjcl KTsKICAgICBib3JkZXItY29sb3I6IGhzbCgyMDIsIDU1JSwgNTElKTsKIH0KIAotLnRpbWVsaW5l LXJlY29yZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbmV0d29yayA+IC5zZWdtZW50LmluYWN0 aXZlIHsKKy50aW1lbGluZS1yZWNvcmQtYmFyOm5vdCguc2VsZWN0ZWQpLnRpbWVsaW5lLXJlY29y ZC10eXBlLW5ldHdvcmsgPiAuc2VnbWVudC5pbmFjdGl2ZSB7CiAgICAgYmFja2dyb3VuZC1jb2xv cjogaHNsKDIwOCwgNjYlLCA3OSUpOwogICAgIGJvcmRlci1jb2xvcjogaHNsKDIwMiwgNTclLCA2 OCUpOwogfQogCi0udGltZWxpbmUtcmVjb3JkLWJhci50aW1lbGluZS1yZWNvcmQtdHlwZS1sYXlv dXQgPiAuc2VnbWVudCB7CisudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1l bGluZS1yZWNvcmQtdHlwZS1sYXlvdXQgPiAuc2VnbWVudCB7CiAgICAgYmFja2dyb3VuZC1jb2xv cjogaHNsKDAsIDY1JSwgNzUlKTsKICAgICBib3JkZXItY29sb3I6IGhzbCgwLCA1NCUsIDYyJSk7 CiB9CiAKIAotLnRpbWVsaW5lLXJlY29yZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtbGF5b3V0 LmxheW91dC10aW1lbGluZS1yZWNvcmQtcGFpbnQgPiAuc2VnbWVudCwKLS50aW1lbGluZS1yZWNv cmQtYmFyLnRpbWVsaW5lLXJlY29yZC10eXBlLWxheW91dC5sYXlvdXQtdGltZWxpbmUtcmVjb3Jk LWNvbXBvc2l0ZSA+IC5zZWdtZW50IHsKKy50aW1lbGluZS1yZWNvcmQtYmFyOm5vdCguc2VsZWN0 ZWQpLnRpbWVsaW5lLXJlY29yZC10eXBlLWxheW91dC5sYXlvdXQtdGltZWxpbmUtcmVjb3JkLXBh aW50ID4gLnNlZ21lbnQsCisudGltZWxpbmUtcmVjb3JkLWJhcjpub3QoLnNlbGVjdGVkKS50aW1l bGluZS1yZWNvcmQtdHlwZS1sYXlvdXQubGF5b3V0LXRpbWVsaW5lLXJlY29yZC1jb21wb3NpdGUg PiAuc2VnbWVudCB7CiAgICAgYmFja2dyb3VuZC1jb2xvcjogaHNsKDc2LCA0OSUsIDYwJSk7CiAg ICAgYm9yZGVyLWNvbG9yOiBoc2woNzksIDQ1JSwgNTElKTsKIH0KIAotLnRpbWVsaW5lLXJlY29y ZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtc2NyaXB0ID4gLnNlZ21lbnQgeworLnRpbWVsaW5l LXJlY29yZC1iYXI6bm90KC5zZWxlY3RlZCkudGltZWxpbmUtcmVjb3JkLXR5cGUtc2NyaXB0ID4g LnNlZ21lbnQgewogICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgyNjksIDY1JSwgNzQlKTsKICAg ICBib3JkZXItY29sb3I6IGhzbCgyNzMsIDMzJSwgNTglKTsKIH0KIAotLnRpbWVsaW5lLXJlY29y ZC1iYXIudGltZWxpbmUtcmVjb3JkLXR5cGUtc2NyaXB0LnNjcmlwdC10aW1lbGluZS1yZWNvcmQt Z2FyYmFnZS1jb2xsZWN0ZWQgPiAuc2VnbWVudCB7CisudGltZWxpbmUtcmVjb3JkLWJhcjpub3Qo LnNlbGVjdGVkKS50aW1lbGluZS1yZWNvcmQtdHlwZS1zY3JpcHQuc2NyaXB0LXRpbWVsaW5lLXJl Y29yZC1nYXJiYWdlLWNvbGxlY3RlZCA+IC5zZWdtZW50IHsKICAgICBiYWNrZ3JvdW5kLWNvbG9y OiBoc2woMjMsIDY5JSwgNzMlKTsKICAgICBib3JkZXItY29sb3I6IGhzbCgxMSwgNTQlLCA2MiUp OyAgICAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMKaW5kZXggMzU4ZjcxZjU0ZGE5NmUy NzgxZTRjNmZmOGMyNzk1YzIyMmJhZmNlZS4uZjE4ODVhZmU5OWQ1MWFlM2E5NzhmMzFkODljNmQ2 ZTBkMDBiZDQwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuanMKQEAgLTI1LDEzICsyNSwx NiBAQAogCiBXSS5UaW1lbGluZVJlY29yZEJhciA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkQmFyIGV4 dGVuZHMgV0kuT2JqZWN0CiB7Ci0gICAgY29uc3RydWN0b3IocmVjb3JkcywgcmVuZGVyTW9kZSkK KyAgICBjb25zdHJ1Y3RvcihkZWxlZ2F0ZSwgcmVjb3JkcywgcmVuZGVyTW9kZSkKICAgICB7CiAg ICAgICAgIHN1cGVyKCk7CiAKKyAgICAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKKwog ICAgICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAg ICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NMaXN0LmFkZCgidGltZWxpbmUtcmVjb3JkLWJhciIp OwogICAgICAgICB0aGlzLl9lbGVtZW50W1dJLlRpbWVsaW5lUmVjb3JkQmFyLkVsZW1lbnRSZWZl cmVuY2VTeW1ib2xdID0gdGhpczsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJjbGljayIsIHRoaXMuX2hhbmRsZUNsaWNrLmJpbmQodGhpcykpOwogCiAgICAgICAgIHRo aXMucmVuZGVyTW9kZSA9IHJlbmRlck1vZGU7CiAgICAgICAgIHRoaXMucmVjb3JkcyA9IHJlY29y ZHM7CkBAIC0xNzksNiArMTgyLDE2IEBAIFdJLlRpbWVsaW5lUmVjb3JkQmFyID0gY2xhc3MgVGlt ZWxpbmVSZWNvcmRCYXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgcmV0dXJuIHRoaXMuX2Vs ZW1lbnQ7CiAgICAgfQogCisgICAgZ2V0IHNlbGVjdGVkKCkKKyAgICB7CisgICAgICAgIHJldHVy biB0aGlzLl9lbGVtZW50LmNsYXNzTGlzdC5jb250YWlucygic2VsZWN0ZWQiKTsKKyAgICB9CisK KyAgICBzZXQgc2VsZWN0ZWQoc2VsZWN0ZWQpCisgICAgeworICAgICAgICB0aGlzLl9lbGVtZW50 LmNsYXNzTGlzdC50b2dnbGUoInNlbGVjdGVkIiwgISFzZWxlY3RlZCk7CisgICAgfQorCiAgICAg Z2V0IHJlbmRlck1vZGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JlbmRlck1vZGU7 CkBAIC0zNzIsNiArMzg1LDEyIEBAIFdJLlRpbWVsaW5lUmVjb3JkQmFyID0gY2xhc3MgVGltZWxp bmVSZWNvcmRCYXIgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKGN1cnJlbnRQb3NpdGlv bkFwcm94ICE9PSBuZXdQb3NpdGlvbkFwcm94KQogICAgICAgICAgICAgZWxlbWVudC5zdHlsZVtw cm9wZXJ0eV0gPSAobmV3UG9zaXRpb25BcHJveCAvIDEwMCkgKyAiJSI7CiAgICAgfQorCisgICAg X2hhbmRsZUNsaWNrKGV2ZW50KQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlLnRp bWVsaW5lUmVjb3JkQmFyQ2xpY2tlZCkKKyAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnRpbWVs aW5lUmVjb3JkQmFyQ2xpY2tlZCh0aGlzKTsKKyAgICB9CiB9OwogCiBXSS5UaW1lbGluZVJlY29y ZEJhci5FbGVtZW50UmVmZXJlbmNlU3ltYm9sID0gU3ltYm9sKCJ0aW1lbGluZS1yZWNvcmQtYmFy Iik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwppbmRl eCBkZWFiZGZiMThhZGI1NmRhYmRmZjEyYTNmZjQyYmMxMmEyMzg3MzdiLi5mNTRjNzY3NzViYjg3 YTY2MTFiYzdiNzg3YjhhMmUzZTNmZjI5MGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcuanMKQEAgLTExNCw3ICsxMTQsMTMgQEAgV0kuVGltZWxpbmVS ZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS4KICAgICAgICAgaWYgKCF0aGlzLl90aW1lbGluZVZpZXdNYXAuaGFzKHRpbWVs aW5lKSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl90aW1lbGluZUNvbnRl bnRCcm93c2VyLnNob3dDb250ZW50Vmlldyh0aGlzLl90aW1lbGluZVZpZXdNYXAuZ2V0KHRpbWVs aW5lKSk7CisgICAgICAgIGxldCBjb250ZW50VmlldyA9IHRoaXMuX3RpbWVsaW5lQ29udGVudEJy b3dzZXIuc2hvd0NvbnRlbnRWaWV3KHRoaXMuX3RpbWVsaW5lVmlld01hcC5nZXQodGltZWxpbmUp KTsKKworICAgICAgICAvLyBGSVhNRTogYFdJLkhlYXBBbGxvY2F0aW9uc1RpbWVsaW5lVmlld2Ag cmVsaWVzIG9uIGl0J3MgYF9kYXRhR3JpZGAgZm9yIGRldGVybWluaW5nIHdoYXQKKyAgICAgICAg Ly8gb2JqZWN0IGlzIGN1cnJlbnRseSBzZWxlY3RlZC4gSWYgdGhhdCBgX2RhdGFHcmlkYCBoYXNu J3QgeWV0IGNhbGxlZCBgbGF5b3V0KClgIHdoZW4gZmlyc3QKKyAgICAgICAgLy8gc2hvd24sIHdl IHdpbGwgbG9zZSB0aGUgc2VsZWN0aW9uLgorICAgICAgICBpZiAoIWNvbnRlbnRWaWV3LmRpZElu aXRpYWxMYXlvdXQpCisgICAgICAgICAgICBjb250ZW50Vmlldy51cGRhdGVMYXlvdXQoKTsKICAg ICB9CiAKICAgICBnZXQgc3VwcG9ydHNTcGxpdENvbnRlbnRCcm93c2VyKCkK 352479 2018-10-16 11:44:11 -0700 2018-10-16 12:09:38 -0700 Patch bug-135307-20181016114410.patch text/plain 17758 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDA4ODFiNmJiNTdkMmNjMjFhNDk3MTA1ZjExZmIx MTNkYzdkNDgwNzkuLmE2MjAwNjQxNDJhZmRiNTIwMmRkMmJhN2Y2ZDBhNjljM2Q0YmM1NWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDE4LTEwLTE2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBT aG91bGQgYmUgYSB3YXkgdG8gZ28gZGlyZWN0bHkgZnJvbSBhbiBldmVudCBpbiB0aGUgb3ZlcnZp ZXcgdmlldyB0byB0aGUgc3BlY2lhbGl6ZWQgdGltZWxpbmUgZm9yIHRoYXQgZXZlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTMwNworICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTcyNzM5NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBo IFBlY29yYXJvLgorCisgICAgICAgIFdoZW4gYSBgV0kuVGltZWxpbmVSZWNvcmRCYXJgIGlzIGNs aWNrZWQsIGNhbGwgdXAgdGhlIGRlbGVnYXRlIGNoYWluIHRvIHRoZSBvdmVydmlldyBhbmQKKyAg ICAgICAgYWRqdXN0IHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgYFdJLlRpbWVsaW5lUmVjb3JkQmFy YCBhbW9uZyB0aGUgYFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaGBzLgorICAgICAgICBTaW1pbGFy bHksIHNlbGVjdGluZyBhIGBXSS5EYXRhR3JpZE5vZGVgIGluIGFueSBgV0kuVGltZWxpbmVWaWV3 YCBzdWJjbGFzcyB3aWxsIHVzZSB0aGUgc2FtZQorICAgICAgICBsb2dpYyB0byBzZWxlY3QgdGhl IGNvcnJlc3BvbmRpbmcgYFdJLlRpbWVsaW5lUmVjb3JkQmFyYC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5l T3ZlcnZpZXcpOgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUucmVzZXQp OgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlldy5wcm90b3R5cGUuX3JlY29yZFNlbGVjdGVk KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dyYXBo LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVPdmVydmlld0dyYXBoKToKKyAgICAgICAgKFdJLlRp bWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUuc2V0IHNlbGVjdGVkUmVjb3JkKToKKyAgICAg ICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUuZ2V0IHNlbGVjdGVkUmVjb3Jk QmFyKTogQWRkZWQuCisgICAgICAgIChXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBl LnNldCBzZWxlY3RlZFJlY29yZEJhcik6IEFkZGVkLgorICAgICAgICAoV0kuVGltZWxpbmVPdmVy dmlld0dyYXBoLnByb3RvdHlwZS50aW1lbGluZVJlY29yZEJhckNsaWNrZWQpOiBBZGRlZC4KKyAg ICAgICAgKFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUuX25lZWRzU2VsZWN0ZWRS ZWNvcmRMYXlvdXQpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJl Y29yZEJhci5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkQmFyKToKKyAgICAgICAgKFdJ LlRpbWVsaW5lUmVjb3JkQmFyLnByb3RvdHlwZS5nZXQgc2VsZWN0ZWQpOiBBZGRlZC4KKyAgICAg ICAgKFdJLlRpbWVsaW5lUmVjb3JkQmFyLnByb3RvdHlwZS5zZXQgc2VsZWN0ZWQpOiBBZGRlZC4K KyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkQmFyLnByb3RvdHlwZS5faGFuZGxlQ2xpY2spOiBB ZGRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmNz czoKKyAgICAgICAgKC50aW1lbGluZS1yZWNvcmQtYmFyLnNlbGVjdGVkID4gLnNlZ21lbnQpOiBB ZGRlZC4KKyAgICAgICAgQWRkIGEgYGRlbGVnYXRlYCB0aGF0IGlzIG5vdGlmaWVkIHdoZW5ldmVy IHRoZSBlbGVtZW50IGlzIGNsaWNrZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lRGF0YUdyaWROb2RlLmpzOgorICAgICAgICAoV0kuVGltZWxpbmVEYXRhR3JpZE5v ZGUucHJvdG90eXBlLnJlZnJlc2hHcmFwaC5jcmVhdGVCYXIpOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzOgorICAgICAgICAoV0ku TGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS51cGRhdGVTZWxlY3RlZFJlY29y ZCk6CisgICAgICAgIChXSS5MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90eXBlLl91 cGRhdGVSb3dMYXlvdXQuY3JlYXRlQmFyKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguanM6CisgICAgICAgIChXSS5OZXR3b3JrVGlt ZWxpbmVPdmVydmlld0dyYXBoLnByb3RvdHlwZS5sYXlvdXQuY3JlYXRlQmFyKToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qczoKKyAg ICAgICAgKFdJLlNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5wcm90b3R5cGUubGF5b3V0LmNy ZWF0ZUJhcik6CisgICAgICAgIChXSS5TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGgucHJvdG90 eXBlLnVwZGF0ZVNlbGVjdGVkUmVjb3JkKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLnNob3dUaW1lbGluZVZpZXdGb3JUaW1lbGlu ZSk6CisKIDIwMTgtMTAtMTYgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAg ICAgICAgIFdlYiBJbnNwZWN0b3I6IHNlcXVlbmNlcyBvZiBzcGFjZXMgbG9uZ2VyIHRoYW4gMTYg ZG9uJ3Qgc2hvdyBhIGRvdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5b3V0VGltZWxpbmVPdmVydmlld0dy YXBoLmpzCmluZGV4IDZlNTRhY2I2OTRiYWY2MTgzODAyNGNhOWI1MmE3MmZlMmQ3ZjYyZTEuLmU5 ODAzMGEzNjEzZTNhMGU1MTVjNmZkNmZhMDEzMDliMzVjMDYzMjQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZp ZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9MYXlvdXRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKQEAgLTY4LDYgKzY4LDIyIEBAIFdJLkxh eW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGNsYXNzIExheW91dFRpbWVsaW5lT3ZlcnZpZXdH cmFwaCBleHRlbmRzIFdJLlRpCiAgICAgICAgIHRoaXMuX3VwZGF0ZVJvd0xheW91dCh0aGlzLl90 aW1lbGluZUxheW91dFJlY29yZFJvdyk7CiAgICAgfQogCisgICAgdXBkYXRlU2VsZWN0ZWRSZWNv cmQoKQorICAgIHsKKyAgICAgICAgc3VwZXIudXBkYXRlU2VsZWN0ZWRSZWNvcmQoKTsKKworICAg ICAgICBmb3IgKGxldCByZWNvcmRSb3cgb2YgW3RoaXMuX3RpbWVsaW5lTGF5b3V0UmVjb3JkUm93 LCB0aGlzLl90aW1lbGluZVBhaW50UmVjb3JkUm93XSkgeworICAgICAgICAgICAgZm9yIChsZXQg cmVjb3JkQmFyIG9mIHJlY29yZFJvdy5yZWNvcmRCYXJzKSB7CisgICAgICAgICAgICAgICAgaWYg KHJlY29yZEJhci5yZWNvcmRzLmluY2x1ZGVzKHRoaXMuc2VsZWN0ZWRSZWNvcmQpKSB7CisgICAg ICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWRSZWNvcmRCYXIgPSByZWNvcmRCYXI7CisgICAg ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9 CisgICAgICAgIH0KKworICAgICAgICB0aGlzLnNlbGVjdGVkUmVjb3JkQmFyID0gbnVsbDsKKyAg ICB9CisKICAgICAvLyBQcml2YXRlCiAKICAgICBfdXBkYXRlUm93TGF5b3V0KHJvdykKQEAgLTc5 LDcgKzk1LDcgQEAgV0kuTGF5b3V0VGltZWxpbmVPdmVydmlld0dyYXBoID0gY2xhc3MgTGF5b3V0 VGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMgV0kuVGkKICAgICAgICAgewogICAgICAgICAg ICAgdmFyIHRpbWVsaW5lUmVjb3JkQmFyID0gcm93LnJlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhd OwogICAgICAgICAgICAgaWYgKCF0aW1lbGluZVJlY29yZEJhcikKLSAgICAgICAgICAgICAgICB0 aW1lbGluZVJlY29yZEJhciA9IHJvdy5yZWNvcmRCYXJzW3JlY29yZEJhckluZGV4XSA9IG5ldyBX SS5UaW1lbGluZVJlY29yZEJhcihyZWNvcmRzLCByZW5kZXJNb2RlKTsKKyAgICAgICAgICAgICAg ICB0aW1lbGluZVJlY29yZEJhciA9IHJvdy5yZWNvcmRCYXJzW3JlY29yZEJhckluZGV4XSA9IG5l dyBXSS5UaW1lbGluZVJlY29yZEJhcih0aGlzLCByZWNvcmRzLCByZW5kZXJNb2RlKTsKICAgICAg ICAgICAgIGVsc2UgewogICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyLnJlbmRlck1v ZGUgPSByZW5kZXJNb2RlOwogICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyLnJlY29y ZHMgPSByZWNvcmRzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3Jh cGguanMKaW5kZXggYmVhN2I2NDQ2YWQ0ZTIzNGI3ZDFkYjk2ODUwZGMyMjYzNDI1ODFkYy4uNzRk OTRhYjBmMzM3MWU0NDA0MGJmZjZhYzUxZGU3NDU5ZjBmZmU5NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RpbWVsaW5lT3ZlcnZp ZXdHcmFwaC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzCkBAIC03NSw3ICs3NSw3IEBAIFdJLk5l dHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGggPSBjbGFzcyBOZXR3b3JrVGltZWxpbmVPdmVydmll d0dyYXBoIGV4dGVuZHMgV0kuCiAgICAgICAgIHsKICAgICAgICAgICAgIGxldCB0aW1lbGluZVJl Y29yZEJhciA9IHJvd1JlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdOwogICAgICAgICAgICAgaWYg KCF0aW1lbGluZVJlY29yZEJhcikKLSAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhciA9 IHJvd1JlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVsaW5lUmVjb3JkQmFy KHJlY29yZHMsIHJlbmRlck1vZGUpOworICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFy ID0gcm93UmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxpbmVSZWNvcmRC YXIodGhpcywgcmVjb3JkcywgcmVuZGVyTW9kZSk7CiAgICAgICAgICAgICBlbHNlIHsKICAgICAg ICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhci5yZW5kZXJNb2RlID0gcmVuZGVyTW9kZTsKICAg ICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhci5yZWNvcmRzID0gcmVjb3JkczsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdFRp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwppbmRleCA3ZDNiNTc4YWM2 ZjUzZTE0NTk0YWUwMjYzMjIxM2QzOThlNTUzNmY3Li44ZTM4ZWJmOGFmOWEzYjIwZDZjNDg0MGNj NjExZGMxN2EwZjM2NTdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TY3JpcHRUaW1lbGluZU92ZXJ2aWV3R3JhcGguanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VGltZWxpbmVPdmVydmll d0dyYXBoLmpzCkBAIC02Miw3ICs2Miw3IEBAIFdJLlNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFw aCA9IGNsYXNzIFNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlRpCiAgICAg ICAgIHsKICAgICAgICAgICAgIGxldCB0aW1lbGluZVJlY29yZEJhciA9IHRoaXMuX3RpbWVsaW5l UmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF07CiAgICAgICAgICAgICBpZiAoIXRpbWVsaW5lUmVj b3JkQmFyKQotICAgICAgICAgICAgICAgIHRpbWVsaW5lUmVjb3JkQmFyID0gdGhpcy5fdGltZWxp bmVSZWNvcmRCYXJzW3JlY29yZEJhckluZGV4XSA9IG5ldyBXSS5UaW1lbGluZVJlY29yZEJhcihy ZWNvcmRzLCByZW5kZXJNb2RlKTsKKyAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhciA9 IHRoaXMuX3RpbWVsaW5lUmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxp bmVSZWNvcmRCYXIodGhpcywgcmVjb3JkcywgcmVuZGVyTW9kZSk7CiAgICAgICAgICAgICBlbHNl IHsKICAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhci5yZW5kZXJNb2RlID0gcmVuZGVy TW9kZTsKICAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhci5yZWNvcmRzID0gcmVjb3Jk czsKQEAgLTg2LDYgKzg2LDIwIEBAIFdJLlNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGNs YXNzIFNjcmlwdFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlRpCiAgICAgICAgIH0K ICAgICB9CiAKKyAgICB1cGRhdGVTZWxlY3RlZFJlY29yZCgpCisgICAgeworICAgICAgICBzdXBl ci51cGRhdGVTZWxlY3RlZFJlY29yZCgpOworCisgICAgICAgIGZvciAobGV0IHJlY29yZEJhciBv ZiB0aGlzLl90aW1lbGluZVJlY29yZEJhcnMpIHsKKyAgICAgICAgICAgIGlmIChyZWNvcmRCYXIu cmVjb3Jkcy5pbmNsdWRlcyh0aGlzLnNlbGVjdGVkUmVjb3JkKSkgeworICAgICAgICAgICAgICAg IHRoaXMuc2VsZWN0ZWRSZWNvcmRCYXIgPSByZWNvcmRCYXI7CisgICAgICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgdGhpcy5zZWxlY3RlZFJl Y29yZEJhciA9IG51bGw7CisgICAgfQorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3NjcmlwdFRp bWVsaW5lUmVjb3JkQWRkZWQoZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZURhdGFHcmlkTm9kZS5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWROb2RlLmpz CmluZGV4IGQ2NTQwYTUxZTY4NDgwNjExNDUxMTRkZTYwOTUxZTllOTg3Y2I1NjQuLmEyZjYyNDdh MTBlZWM3NDJiM2U5OTQ3MTU5OWQzNjJjNzQ2Yzg2ODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0YUdyaWROb2RlLmpzCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lRGF0 YUdyaWROb2RlLmpzCkBAIC0yNDEsNyArMjQxLDcgQEAgV0kuVGltZWxpbmVEYXRhR3JpZE5vZGUg PSBjbGFzcyBUaW1lbGluZURhdGFHcmlkTm9kZSBleHRlbmRzIFdJLkRhdGFHcmlkTm9kZQogICAg ICAgICB7CiAgICAgICAgICAgICB2YXIgdGltZWxpbmVSZWNvcmRCYXIgPSB0aGlzLl90aW1lbGlu ZVJlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdOwogICAgICAgICAgICAgaWYgKCF0aW1lbGluZVJl Y29yZEJhcikKLSAgICAgICAgICAgICAgICB0aW1lbGluZVJlY29yZEJhciA9IHRoaXMuX3RpbWVs aW5lUmVjb3JkQmFyc1tyZWNvcmRCYXJJbmRleF0gPSBuZXcgV0kuVGltZWxpbmVSZWNvcmRCYXIo cmVjb3JkcywgcmVuZGVyTW9kZSk7CisgICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIg PSB0aGlzLl90aW1lbGluZVJlY29yZEJhcnNbcmVjb3JkQmFySW5kZXhdID0gbmV3IFdJLlRpbWVs aW5lUmVjb3JkQmFyKHRoaXMsIHJlY29yZHMsIHJlbmRlck1vZGUpOwogICAgICAgICAgICAgZWxz ZSB7CiAgICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIucmVuZGVyTW9kZSA9IHJlbmRl ck1vZGU7CiAgICAgICAgICAgICAgICAgdGltZWxpbmVSZWNvcmRCYXIucmVjb3JkcyA9IHJlY29y ZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5qcwppbmRleCBmNGFjMmJkYmFhMjJhOGM5ZjEyNmMy MWVlYzY5Nzc0NzFjZjU2M2RlLi41NTc4YjE4NmIwNzc0NjFmYzRkZjg3ZjcxNTk4OWVhOGJkODNm NDllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UaW1lbGluZU92ZXJ2aWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuanMKQEAgLTU1LDYgKzU1LDcgQEAgV0kuVGlt ZWxpbmVPdmVydmlldyA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAg ICAgICAgIHRoaXMuX2dyYXBoc0NvbnRhaW5lclZpZXcuZWxlbWVudC5jbGFzc0xpc3QuYWRkKCJn cmFwaHMtY29udGFpbmVyIik7CiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl9ncmFwaHND b250YWluZXJWaWV3KTsKIAorICAgICAgICB0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkID0g bnVsbDsKICAgICAgICAgdGhpcy5fb3ZlcnZpZXdHcmFwaHNCeVR5cGVNYXAgPSBuZXcgTWFwOwog CiAgICAgICAgIHRoaXMuX2VkaXRJbnN0cnVtZW50c0J1dHRvbiA9IG5ldyBXSS5BY3RpdmF0ZUJ1 dHRvbk5hdmlnYXRpb25JdGVtKCJ0b2dnbGUtZWRpdC1pbnN0cnVtZW50cyIsIFdJLlVJU3RyaW5n KCJFZGl0IGNvbmZpZ3VyYXRpb24iKSwgV0kuVUlTdHJpbmcoIlNhdmUgY29uZmlndXJhdGlvbiIp KTsKQEAgLTM3MSw2ICszNzIsNyBAQCBXSS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxp bmVPdmVydmlldyBleHRlbmRzIFdJLlZpZXcKIAogICAgIHJlc2V0KCkKICAgICB7CisgICAgICAg IHRoaXMuX3NlbGVjdGVkVGltZWxpbmVSZWNvcmQgPSBudWxsOwogICAgICAgICBmb3IgKGxldCBv dmVydmlld0dyYXBoIG9mIHRoaXMuX292ZXJ2aWV3R3JhcGhzQnlUeXBlTWFwLnZhbHVlcygpKQog ICAgICAgICAgICAgb3ZlcnZpZXdHcmFwaC5yZXNldCgpOwogCkBAIC03MDcsMTMgKzcwOSw0MSBA QCBXSS5UaW1lbGluZU92ZXJ2aWV3ID0gY2xhc3MgVGltZWxpbmVPdmVydmlldyBleHRlbmRzIFdJ LlZpZXcKIAogICAgIF9yZWNvcmRTZWxlY3RlZChldmVudCkKICAgICB7CisgICAgICAgIGxldCB7 cmVjb3JkLCByZWNvcmRCYXJ9ID0gZXZlbnQuZGF0YTsKKyAgICAgICAgaWYgKCFyZWNvcmQgfHwg cmVjb3JkID09PSB0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkKQorICAgICAgICAgICAgcmV0 dXJuOworCisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkICYmIHRoaXMu X3NlbGVjdGVkVGltZWxpbmVSZWNvcmQudHlwZSAhPT0gcmVjb3JkLnR5cGUpIHsKKyAgICAgICAg ICAgIGxldCB0aW1lbGluZU92ZXJ2aWV3R3JhcGggPSB0aGlzLl9vdmVydmlld0dyYXBoc0J5VHlw ZU1hcC5nZXQodGhpcy5fc2VsZWN0ZWRUaW1lbGluZVJlY29yZC50eXBlKTsKKyAgICAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHRpbWVsaW5lT3ZlcnZpZXdHcmFwaCk7CisgICAgICAgICAgICBpZiAo dGltZWxpbmVPdmVydmlld0dyYXBoKQorICAgICAgICAgICAgICAgIHRpbWVsaW5lT3ZlcnZpZXdH cmFwaC5zZWxlY3RlZFJlY29yZCA9IG51bGw7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl9z ZWxlY3RlZFRpbWVsaW5lUmVjb3JkID0gcmVjb3JkOworCisgICAgICAgIGlmICh0aGlzLl9zZWxl Y3RlZFRpbWVsaW5lUmVjb3JkKSB7CisgICAgICAgICAgICBsZXQgZmlyc3RSZWNvcmQgPSB0aGlz Ll9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkOworICAgICAgICAgICAgbGV0IGxhc3RSZWNvcmQgPSB0 aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkOworICAgICAgICAgICAgaWYgKHJlY29yZEJhcikg eworICAgICAgICAgICAgICAgIGZpcnN0UmVjb3JkID0gcmVjb3JkQmFyLnJlY29yZHNbMF07Cisg ICAgICAgICAgICAgICAgbGFzdFJlY29yZCA9IHJlY29yZEJhci5yZWNvcmRzLmxhc3RWYWx1ZTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKGZpcnN0UmVjb3JkLnN0YXJ0VGltZSA8 IHRoaXMuc2VsZWN0aW9uU3RhcnRUaW1lIHx8IGxhc3RSZWNvcmQuZW5kVGltZSA+IHRoaXMuc2Vs ZWN0aW9uU3RhcnRUaW1lICsgdGhpcy5zZWxlY3Rpb25EdXJhdGlvbikgeworICAgICAgICAgICAg ICAgIGxldCBzZWxlY3Rpb25QYWRkaW5nID0gdGhpcy5zZWNvbmRzUGVyUGl4ZWwgKiAxMDsKKyAg ICAgICAgICAgICAgICB0aGlzLnNlbGVjdGlvblN0YXJ0VGltZSA9IGZpcnN0UmVjb3JkLnN0YXJ0 VGltZSAtIHNlbGVjdGlvblBhZGRpbmc7CisgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3Rpb25E dXJhdGlvbiA9IGxhc3RSZWNvcmQuZW5kVGltZSAtIGZpcnN0UmVjb3JkLnN0YXJ0VGltZSArIChz ZWxlY3Rpb25QYWRkaW5nICogMik7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKwogICAgICAg ICBmb3IgKGxldCBbdHlwZSwgb3ZlcnZpZXdHcmFwaF0gb2YgdGhpcy5fb3ZlcnZpZXdHcmFwaHNC eVR5cGVNYXApIHsKICAgICAgICAgICAgIGlmIChvdmVydmlld0dyYXBoICE9PSBldmVudC50YXJn ZXQpCiAgICAgICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgICAgIGxldCB0aW1lbGlu ZSA9IHRoaXMuX3JlY29yZGluZy50aW1lbGluZXMuZ2V0KHR5cGUpOwogICAgICAgICAgICAgY29u c29sZS5hc3NlcnQodGltZWxpbmUsICJUaW1lbGluZSByZWNvcmRpbmcgbWlzc2luZyB0aW1lbGlu ZSB0eXBlIiwgdHlwZSk7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5UaW1lbGluZU92ZXJ2aWV3LkV2ZW50LlJlY29yZFNlbGVjdGVkLCB7dGltZWxpbmUsIHJl Y29yZDogZXZlbnQuZGF0YS5yZWNvcmR9KTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVu dFRvTGlzdGVuZXJzKFdJLlRpbWVsaW5lT3ZlcnZpZXcuRXZlbnQuUmVjb3JkU2VsZWN0ZWQsIHt0 aW1lbGluZSwgcmVjb3JkOiB0aGlzLl9zZWxlY3RlZFRpbWVsaW5lUmVjb3JkfSk7CiAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3R3JhcGguanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3 R3JhcGguanMKaW5kZXggM2FmYmM0ZDM0YTRkY2RhNDU0OGFiOGZjYjA0ODJhM2EwMWU5MmE5YS4u ODhjNWRmZGY2MDA4YzU5ZGVjMDAxOTNhYjdjOGVhMzZmZWY0NDdkZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlld0dy YXBoLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lT3ZlcnZpZXdHcmFwaC5qcwpAQCAtMzcsNyArMzcsNyBAQCBXSS5UaW1lbGluZU92ZXJ2 aWV3R3JhcGggPSBjbGFzcyBUaW1lbGluZU92ZXJ2aWV3R3JhcGggZXh0ZW5kcyBXSS5WaWV3CiAg ICAgICAgIHRoaXMuX2N1cnJlbnRUaW1lID0gMDsKICAgICAgICAgdGhpcy5fdGltZWxpbmVPdmVy dmlldyA9IHRpbWVsaW5lT3ZlcnZpZXc7CiAgICAgICAgIHRoaXMuX3NlbGVjdGVkUmVjb3JkID0g bnVsbDsKLSAgICAgICAgdGhpcy5fc2VsZWN0ZWRSZWNvcmRDaGFuZ2VkID0gZmFsc2U7CisgICAg ICAgIHRoaXMuX3NlbGVjdGVkUmVjb3JkQmFyID0gbnVsbDsKICAgICAgICAgdGhpcy5fc2NoZWR1 bGVkU2VsZWN0ZWRSZWNvcmRMYXlvdXRVcGRhdGVJZGVudGlmaWVyID0gdW5kZWZpbmVkOwogICAg ICAgICB0aGlzLl9zZWxlY3RlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLl92aXNpYmxlID0gdHJ1 ZTsKQEAgLTE2NiwxMSArMTY2LDMyIEBAIFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGNsYXNz IFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgICAgIHJldHVy bjsKIAogICAgICAgICB0aGlzLl9zZWxlY3RlZFJlY29yZCA9IHg7Ci0gICAgICAgIHRoaXMuX3Nl bGVjdGVkUmVjb3JkQ2hhbmdlZCA9IHRydWU7CiAKICAgICAgICAgdGhpcy5fbmVlZHNTZWxlY3Rl ZFJlY29yZExheW91dCgpOwogICAgIH0KIAorICAgIGdldCBzZWxlY3RlZFJlY29yZEJhcigpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc2VsZWN0ZWRSZWNvcmRCYXI7CisgICAgfQorCisg ICAgc2V0IHNlbGVjdGVkUmVjb3JkQmFyKHJlY29yZEJhcikKKyAgICB7CisgICAgICAgIGlmICh0 aGlzLl9zZWxlY3RlZFJlY29yZEJhciA9PT0gcmVjb3JkQmFyKQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIGlmICh0aGlzLl9zZWxlY3RlZFJlY29yZEJhcikKKyAgICAgICAgICAgIHRo aXMuX3NlbGVjdGVkUmVjb3JkQmFyLnNlbGVjdGVkID0gZmFsc2U7CisKKyAgICAgICAgdGhpcy5f c2VsZWN0ZWRSZWNvcmRCYXIgPSByZWNvcmRCYXI7CisKKyAgICAgICAgaWYgKHRoaXMuX3NlbGVj dGVkUmVjb3JkQmFyKSB7CisgICAgICAgICAgICB0aGlzLl9zZWxlY3RlZFJlY29yZEJhci5zZWxl Y3RlZCA9IHRydWU7CisKKyAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX3NlbGVjdGVk UmVjb3JkQmFyLnJlY29yZHMuaW5jbHVkZXModGhpcy5fc2VsZWN0ZWRSZWNvcmQpKTsKKyAgICAg ICAgfQorICAgIH0KKwogICAgIGdldCBoZWlnaHQoKQogICAgIHsKICAgICAgICAgLy8gT3ZlcnJp ZGRlbiBieSBzdWItY2xhc3NlcyBpZiBuZWVkZWQuCkBAIC0yMjYsNiArMjQ3LDEzIEBAIFdJLlRp bWVsaW5lT3ZlcnZpZXdHcmFwaCA9IGNsYXNzIFRpbWVsaW5lT3ZlcnZpZXdHcmFwaCBleHRlbmRz IFdJLlZpZXcKICAgICAgICAgc3VwZXIubmVlZHNMYXlvdXQoKTsKICAgICB9CiAKKyAgICAvLyBU aW1lbGluZVJlY29yZEJhciBkZWxlZ2F0ZQorCisgICAgdGltZWxpbmVSZWNvcmRCYXJDbGlja2Vk KHRpbWVsaW5lUmVjb3JkQmFyKQorICAgIHsKKyAgICAgICAgdGhpcy5zZWxlY3RlZFJlY29yZCA9 IHRpbWVsaW5lUmVjb3JkQmFyLnJlY29yZHNbMF07CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVk CiAKICAgICB1cGRhdGVTZWxlY3RlZFJlY29yZCgpCkBAIC0yNDgsNyArMjc2LDcgQEAgV0kuVGlt ZWxpbmVPdmVydmlld0dyYXBoID0gY2xhc3MgVGltZWxpbmVPdmVydmlld0dyYXBoIGV4dGVuZHMg V0kuVmlldwogICAgICAgICAgICAgdGhpcy5fc2NoZWR1bGVkU2VsZWN0ZWRSZWNvcmRMYXlvdXRV cGRhdGVJZGVudGlmaWVyID0gdW5kZWZpbmVkOwogCiAgICAgICAgICAgICB0aGlzLnVwZGF0ZVNl bGVjdGVkUmVjb3JkKCk7Ci0gICAgICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5UaW1lbGluZU92ZXJ2aWV3R3JhcGguRXZlbnQuUmVjb3JkU2VsZWN0ZWQsIHtyZWNvcmQ6 IHRoaXMuc2VsZWN0ZWRSZWNvcmR9KTsKKyAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRv TGlzdGVuZXJzKFdJLlRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5FdmVudC5SZWNvcmRTZWxlY3RlZCwg e3JlY29yZDogdGhpcy5zZWxlY3RlZFJlY29yZCwgcmVjb3JkQmFyOiB0aGlzLnNlbGVjdGVkUmVj b3JkQmFyfSk7CiAgICAgICAgIH0pOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJhci5jc3MgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZEJh ci5jc3MKaW5kZXggYzJhNTM4MTk4YmIzNjMxYmExMjM3NjQwNmYzMTk2NTljNzczZjY5Yi4uNDU1 Nzc5OTU5ZGM3NmIzZWU4ZTM0NzgwYWVhMjdjZjI5MDk1ZGJmNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRCYXIuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5l UmVjb3JkQmFyLmNzcwpAQCAtNDEsNiArNDEsMTEgQEAKICAgICB6LWluZGV4OiAxOwogfQogCisu dGltZWxpbmUtcmVjb3JkLWJhci5zZWxlY3RlZCA+IC5zZWdtZW50IHsKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiB2YXIoLS1zZWxlY3RlZC1iYWNrZ3JvdW5kLWNvbG9yKSAhaW1wb3J0YW50OworICAg IGJvcmRlci1jb2xvcjogdmFyKC0tc2VsZWN0ZWQtYmFja2dyb3VuZC1jb2xvci1hY3RpdmUpICFp bXBvcnRhbnQ7Cit9CisKIC50aW1lbGluZS1yZWNvcmQtYmFyOm5vdCguaGFzLWluYWN0aXZlLXNl Z21lbnQpID4gLnNlZ21lbnQgewogICAgIGxlZnQ6IDA7CiAgICAgd2lkdGg6IDEwMCU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVJlY29yZEJhci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1RpbWVsaW5lUmVjb3JkQmFyLmpzCmluZGV4IDM1OGY3MWY1NGRhOTZlMjc4MWU0YzZmZjhjMjc5 NWMyMjJiYWZjZWUuLmYxODg1YWZlOTlkNTFhZTNhOTc4ZjMxZDg5YzZkNmUwZDAwYmQ0MDEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUmVjb3JkQmFyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lUmVjb3JkQmFyLmpzCkBAIC0yNSwxMyArMjUsMTYgQEAKIAogV0kuVGlt ZWxpbmVSZWNvcmRCYXIgPSBjbGFzcyBUaW1lbGluZVJlY29yZEJhciBleHRlbmRzIFdJLk9iamVj dAogewotICAgIGNvbnN0cnVjdG9yKHJlY29yZHMsIHJlbmRlck1vZGUpCisgICAgY29uc3RydWN0 b3IoZGVsZWdhdGUsIHJlY29yZHMsIHJlbmRlck1vZGUpCiAgICAgewogICAgICAgICBzdXBlcigp OwogCisgICAgICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGU7CisKICAgICAgICAgdGhpcy5f ZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlzLl9l bGVtZW50LmNsYXNzTGlzdC5hZGQoInRpbWVsaW5lLXJlY29yZC1iYXIiKTsKICAgICAgICAgdGhp cy5fZWxlbWVudFtXSS5UaW1lbGluZVJlY29yZEJhci5FbGVtZW50UmVmZXJlbmNlU3ltYm9sXSA9 IHRoaXM7CisgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0 aGlzLl9oYW5kbGVDbGljay5iaW5kKHRoaXMpKTsKIAogICAgICAgICB0aGlzLnJlbmRlck1vZGUg PSByZW5kZXJNb2RlOwogICAgICAgICB0aGlzLnJlY29yZHMgPSByZWNvcmRzOwpAQCAtMTc5LDYg KzE4MiwxNiBAQCBXSS5UaW1lbGluZVJlY29yZEJhciA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkQmFy IGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIHJldHVybiB0aGlzLl9lbGVtZW50OwogICAgIH0K IAorICAgIGdldCBzZWxlY3RlZCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZWxlbWVu dC5jbGFzc0xpc3QuY29udGFpbnMoInNlbGVjdGVkIik7CisgICAgfQorCisgICAgc2V0IHNlbGVj dGVkKHNlbGVjdGVkKQorICAgIHsKKyAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QudG9n Z2xlKCJzZWxlY3RlZCIsICEhc2VsZWN0ZWQpOworICAgIH0KKwogICAgIGdldCByZW5kZXJNb2Rl KCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZW5kZXJNb2RlOwpAQCAtMzcyLDYgKzM4 NSwxMiBAQCBXSS5UaW1lbGluZVJlY29yZEJhciA9IGNsYXNzIFRpbWVsaW5lUmVjb3JkQmFyIGV4 dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgIGlmIChjdXJyZW50UG9zaXRpb25BcHJveCAhPT0gbmV3 UG9zaXRpb25BcHJveCkKICAgICAgICAgICAgIGVsZW1lbnQuc3R5bGVbcHJvcGVydHldID0gKG5l d1Bvc2l0aW9uQXByb3ggLyAxMDApICsgIiUiOwogICAgIH0KKworICAgIF9oYW5kbGVDbGljayhl dmVudCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9kZWxlZ2F0ZS50aW1lbGluZVJlY29yZEJh ckNsaWNrZWQpCisgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS50aW1lbGluZVJlY29yZEJhckNs aWNrZWQodGhpcyk7CisgICAgfQogfTsKIAogV0kuVGltZWxpbmVSZWNvcmRCYXIuRWxlbWVudFJl ZmVyZW5jZVN5bWJvbCA9IFN5bWJvbCgidGltZWxpbmUtcmVjb3JkLWJhciIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKaW5kZXggZGVhYmRmYjE4YWRi NTZkYWJkZmYxMmEzZmY0MmJjMTJhMjM4NzM3Yi4uZjU0Yzc2Nzc1YmI4N2E2NjExYmM3Yjc4N2I4 YTJlM2UzZmYyOTBmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRl bnRWaWV3LmpzCkBAIC0xMTQsNyArMTE0LDEzIEBAIFdJLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVu dFZpZXcgPSBjbGFzcyBUaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuCiAg ICAgICAgIGlmICghdGhpcy5fdGltZWxpbmVWaWV3TWFwLmhhcyh0aW1lbGluZSkpCiAgICAgICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgdGhpcy5fdGltZWxpbmVDb250ZW50QnJvd3Nlci5zaG93 Q29udGVudFZpZXcodGhpcy5fdGltZWxpbmVWaWV3TWFwLmdldCh0aW1lbGluZSkpOworICAgICAg ICBsZXQgY29udGVudFZpZXcgPSB0aGlzLl90aW1lbGluZUNvbnRlbnRCcm93c2VyLnNob3dDb250 ZW50Vmlldyh0aGlzLl90aW1lbGluZVZpZXdNYXAuZ2V0KHRpbWVsaW5lKSk7CisKKyAgICAgICAg Ly8gRklYTUU6IGBXSS5IZWFwQWxsb2NhdGlvbnNUaW1lbGluZVZpZXdgIHJlbGllcyBvbiBpdCdz IGBfZGF0YUdyaWRgIGZvciBkZXRlcm1pbmluZyB3aGF0CisgICAgICAgIC8vIG9iamVjdCBpcyBj dXJyZW50bHkgc2VsZWN0ZWQuIElmIHRoYXQgYF9kYXRhR3JpZGAgaGFzbid0IHlldCBjYWxsZWQg YGxheW91dCgpYCB3aGVuIGZpcnN0CisgICAgICAgIC8vIHNob3duLCB3ZSB3aWxsIGxvc2UgdGhl IHNlbGVjdGlvbi4KKyAgICAgICAgaWYgKCFjb250ZW50Vmlldy5kaWRJbml0aWFsTGF5b3V0KQor ICAgICAgICAgICAgY29udGVudFZpZXcudXBkYXRlTGF5b3V0KCk7CiAgICAgfQogCiAgICAgZ2V0 IHN1cHBvcnRzU3BsaXRDb250ZW50QnJvd3NlcigpCg==