209640 2020-03-26 19:28:52 -0700 Web Inspector: add keyboard shortcut to tooltip of pinned tabs 2020-03-30 18:56:33 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209627 InRadar P2 Normal --- 209793 1 hi hi hi inspector-bugzilla-changes opendarwin timothy webkit-bug-importer oldest_to_newest 1634705 0 hi 2020-03-26 19:28:52 -0700 When hovering the Search Tab, for example, I should be able to see that I can quickly select that tab via ⇧⌘F. 1634706 1 394693 hi 2020-03-26 19:36:40 -0700 Created attachment 394693 Patch 1634716 2 ews-feeder 2020-03-26 20:07:30 -0700 Committed r259101: <https://trac.webkit.org/changeset/259101> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394693. 1634717 3 webkit-bug-importer 2020-03-26 20:08:15 -0700 <rdar://problem/60949477> 1634752 4 joepeck 2020-03-26 23:20:51 -0700 *** Bug 209627 has been marked as a duplicate of this bug. *** 394693 2020-03-26 19:36:40 -0700 2020-03-26 20:07:31 -0700 Patch bug-209640-20200326203639.patch text/plain 27731 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU1ZWVlMTk1ZjY5OWVhMzNkM2JiMWNjZDIwNDcz YWVhZmQ5NGM4OGYuLjU0NTAyM2FjMWZlNjA3NjFiYzUyOThlODM5NDczODg3OTNjM2Y0NDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDc0IEBACisyMDIwLTAzLTI2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBh ZGQga2V5Ym9hcmQgc2hvcnRjdXQgdG8gdG9vbHRpcCBvZiBwaW5uZWQgdGFicworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5NjQwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL1RhYkJhckl0ZW0uanM6CisgICAgICAgIChXSS5UYWJCYXJJdGVtKToKKyAgICAgICAgKFdJ LlRhYkJhckl0ZW0ucHJvdG90eXBlLmdldCBkaXNwbGF5TmFtZSk6IEFkZGVkLgorICAgICAgICAo V0kuVGFiQmFySXRlbS5wcm90b3R5cGUuc2V0IGRpc3BsYXlOYW1lKTogQWRkZWQuCisgICAgICAg IChXSS5UYWJCYXJJdGVtLnByb3RvdHlwZS5zZXQgdGl0bGUpOgorICAgICAgICAoV0kuVGFiQmFy SXRlbS5wcm90b3R5cGUudGl0bGVEaWRDaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvR2VuZXJhbFRhYkJhckl0ZW0uanM6CisgICAgICAgIChXSS5HZW5lcmFs VGFiQmFySXRlbS5mcm9tVGFiQ29udGVudFZpZXcpOgorICAgICAgICAoV0kuR2VuZXJhbFRhYkJh ckl0ZW0ucHJvdG90eXBlLmdldCBkaXNwbGF5TmFtZSk6IEFkZGVkLgorICAgICAgICAoV0kuR2Vu ZXJhbFRhYkJhckl0ZW0ucHJvdG90eXBlLnNldCBkaXNwbGF5TmFtZSk6IEFkZGVkLgorICAgICAg ICAoV0kuR2VuZXJhbFRhYkJhckl0ZW0ucHJvdG90eXBlLmdldCB0aXRsZSk6IERlbGV0ZWQuCisg ICAgICAgIChXSS5HZW5lcmFsVGFiQmFySXRlbS5wcm90b3R5cGUuc2V0IHRpdGxlKTogRGVsZXRl ZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Bpbm5lZFRhYkJhckl0ZW0uanM6Cisg ICAgICAgIChXSS5QaW5uZWRUYWJCYXJJdGVtKToKKyAgICAgICAgKFdJLlBpbm5lZFRhYkJhckl0 ZW0uZnJvbVRhYkNvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLlBpbm5lZFRhYkJhckl0ZW0udGl0 bGVEaWRDaGFuZ2UpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGFi QmFyLmNzczoKKyAgICAgICAgKC50YWItYmFyID4gLnRhYnMgPiAuaXRlbSA+IC5uYW1lKTogQWRk ZWQuCisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAudGFiLWJhciA+IC50YWJzID4gLml0 ZW0gPiAubmFtZSk6IEFkZGVkLgorICAgICAgICAoLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtID4g Lm5hbWUgPiAuY29udGVudCk6IEFkZGVkLgorICAgICAgICAoLnRhYi1iYXIgPiAudGFicyA+IC5p dGVtOm5vdCguc2VsZWN0ZWQpOmhvdmVyID4gLm5hbWUpOiBBZGRlZC4KKyAgICAgICAgKC50YWIt YmFyID4gLnRhYnMgPiAuaXRlbTpub3QoLmRpc2FibGVkKS5zZWxlY3RlZCA+IC5uYW1lKTogQWRk ZWQuCisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAudGFiLWJhciA+IC50YWJzID4gLml0 ZW06bm90KC5kaXNhYmxlZCkuc2VsZWN0ZWQgPiAubmFtZSk6IEFkZGVkLgorICAgICAgICAoLnRh Yi1iYXIgPiAudGFicyA+IC5pdGVtID4gLnRpdGxlKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHku d2luZG93LWluYWN0aXZlIC50YWItYmFyID4gLnRhYnMgPiAuaXRlbSA+IC50aXRsZSk6IERlbGV0 ZWQuCisgICAgICAgICgudGFiLWJhciA+IC50YWJzID4gLml0ZW0gPiAudGl0bGUgPiAuY29udGVu dCk6IERlbGV0ZWQuCisgICAgICAgICgudGFiLWJhciA+IC50YWJzID4gLml0ZW06bm90KC5zZWxl Y3RlZCk6aG92ZXIgPiAudGl0bGUpOiBEZWxldGVkLgorICAgICAgICAoLnRhYi1iYXIgPiAudGFi cyA+IC5pdGVtOm5vdCguZGlzYWJsZWQpLnNlbGVjdGVkID4gLnRpdGxlKTogRGVsZXRlZC4KKyAg ICAgICAgKGJvZHkud2luZG93LWluYWN0aXZlIC50YWItYmFyID4gLnRhYnMgPiAuaXRlbTpub3Qo LmRpc2FibGVkKS5zZWxlY3RlZCA+IC50aXRsZSk6IERlbGV0ZWQuCisgICAgICAgIFNlcGFyYXRl IHRoZSBzaG93biBuYW1lIG9mIHRoZSB0YWIgKGBkaXNwbGF5TmFtZWApIGZyb20gdGhlIHRvb2x0 aXAgdGV4dCAoYHRpdGxlYCkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJj aFRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuU2VhcmNoVGFiQ29udGVudFZpZXcudGFi SW5mbyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV0kuU2V0dGluZ3NUYWJDb250ZW50Vmlldy50YWJJbmZvKToKKyAg ICAgICAgTW92ZSB0aGUgY3VycmVudCBgdGl0bGVgIHZhbHVlIHRvIGBkaXNwbGF5TmFtZWAgYW5k IGFkZCBhIG5ldyBgdGl0bGVgIHZhbHVlIHdpdGggdGhlCisgICAgICAgIGtleWJvYXJkIHNob3J0 Y3V0IGluIHBhcmVudGhlc2lzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BdWRp dFRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuQXVkaXRUYWJDb250ZW50Vmlldy50YWJJ bmZvKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkNvbnNvbGVUYWJDb250ZW50Vmlldy50YWJJbmZvKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanM6CisgICAg ICAgIChXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3LnRhYkluZm8pOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvR3JhcGhpY3NUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkdy YXBoaWNzVGFiQ29udGVudFZpZXcudGFiSW5mbyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9MYXllcnNUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkxheWVyc1RhYkNvbnRl bnRWaWV3LnRhYkluZm8pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuTmV0d29ya1RhYkNvbnRlbnRWaWV3LnRhYklu Zm8pOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc1RhYkNvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV0kuU291cmNlc1RhYkNvbnRlbnRWaWV3LnRhYkluZm8pOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3RvcmFnZVRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAg ICAoV0kuU3RvcmFnZVRhYkNvbnRlbnRWaWV3LnRhYkluZm8pOgorICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlRpbWVs aW5lVGFiQ29udGVudFZpZXcudGFiSW5mbyk6CisgICAgICAgIFVzZSBgZGlzcGxheU5hbWVgIGlu c3RlYWQgb2YgYHRpdGxlYCBzaW5jZSB0aGUgbmFtZSBpcyBzaG93biBpbiB0aGUgVUkuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdJLmNvbnRlbnRM b2FkZWQpOgorICAgICAgICBNYWtlIHRoZSBTZXR0aW5ncyBUYWIgc2hvcnRjdXQgcHVibGljLgor CisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgor CiAyMDIwLTAzLTIzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAg ICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNTc3OTEpOiBldmVudCBicmVha3BvaW50IGlj b24gc2hvdWxkIGJlIFtFXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggYmVm ODRhNDY3ZWYyZjA4NjkyNmQ5ZTQ3NjM3OTU5OGE5MTU3MTdjMC4uMjE1MTUyNmFmYmQwNmIxOGQz MDQ0YmRhYzQ4MTNmYzM5ZWJhOTcxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L0xvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpz CkBAIC0xNjUsOCArMTY1LDkgQEAgbG9jYWxpemVkU3RyaW5nc1siQXR0cmlidXRlIl0gPSAiQXR0 cmlidXRlIjsKIC8qIEEgc3VibWVudSBpdGVtIG9mICdCcmVhayBPbicgdGhhdCBicmVha3MgKHBh dXNlcykgYmVmb3JlIERPTSBhdHRyaWJ1dGUgaXMgbW9kaWZpZWQgKi8KIGxvY2FsaXplZFN0cmlu Z3NbIkF0dHJpYnV0ZSBNb2RpZmllZCJdID0gIkF0dHJpYnV0ZSBNb2RpZmllZCI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJBdHRyaWJ1dGVzIl0gPSAiQXR0cmlidXRlcyI7Ci1sb2NhbGl6ZWRTdHJpbmdz WyJBdWRpdCJdID0gIkF1ZGl0IjsKIGxvY2FsaXplZFN0cmluZ3NbIkF1ZGl0IEVycm9yOiAlcyJd ID0gIkF1ZGl0IEVycm9yOiAlcyI7CisvKiBOYW1lIG9mIEF1ZGl0IFRhYiAqLworbG9jYWxpemVk U3RyaW5nc1siQXVkaXQgVGFiIE5hbWUiXSA9ICJBdWRpdCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJB dWRpdCBXYXJuaW5nOiAlcyJdID0gIkF1ZGl0IFdhcm5pbmc6ICVzIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkF1ZGl0IHZlcnNpb246ICVzIl0gPSAiQXVkaXQgdmVyc2lvbjogJXMiOwogbG9jYWxpemVk U3RyaW5nc1siQXVkaXRzIl0gPSAiQXVkaXRzIjsKQEAgLTMxNiw2ICszMTcsOCBAQCBsb2NhbGl6 ZWRTdHJpbmdzWyJDb25zb2xlIl0gPSAiQ29uc29sZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb25z b2xlIEV2YWx1YXRpb24iXSA9ICJDb25zb2xlIEV2YWx1YXRpb24iOwogbG9jYWxpemVkU3RyaW5n c1siQ29uc29sZSBFdmFsdWF0aW9uICVkIl0gPSAiQ29uc29sZSBFdmFsdWF0aW9uICVkIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkNvbnNvbGUgUHJvZmlsZSBSZWNvcmRlZCJdID0gIkNvbnNvbGUgUHJv ZmlsZSBSZWNvcmRlZCI7CisvKiBOYW1lIG9mIENvbnNvbGUgVGFiICovCitsb2NhbGl6ZWRTdHJp bmdzWyJDb25zb2xlIFRhYiBOYW1lIl0gPSAiQ29uc29sZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJD b25zb2xlIGNsZWFyZWQgYXQgJXMiXSA9ICJDb25zb2xlIGNsZWFyZWQgYXQgJXMiOwogbG9jYWxp emVkU3RyaW5nc1siQ29uc29sZSBvcGVuZWQgYXQgJXMiXSA9ICJDb25zb2xlIG9wZW5lZCBhdCAl cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDb25zb2xlIHByb21wdCJdID0gIkNvbnNvbGUgcHJvbXB0 IjsKQEAgLTQ4MCw2ICs0ODMsOCBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJFbGVtZW50IGlzIHRoZSBy b290IGVsZW1lbnQiXSA9ICJFbGVtZW50IGlzIHRoZSByb290IGVsZW1lbnQiOwogbG9jYWxpemVk U3RyaW5nc1siRWxlbWVudCBtYXkgb3ZlcmxhcCBhbm90aGVyIGNvbXBvc2l0aW5nIGVsZW1lbnQi XSA9ICJFbGVtZW50IG1heSBvdmVybGFwIGFub3RoZXIgY29tcG9zaXRpbmcgZWxlbWVudCI7CiBs b2NhbGl6ZWRTdHJpbmdzWyJFbGVtZW50IG92ZXJsYXBzIG90aGVyIGNvbXBvc2l0aW5nIGVsZW1l bnQiXSA9ICJFbGVtZW50IG92ZXJsYXBzIG90aGVyIGNvbXBvc2l0aW5nIGVsZW1lbnQiOwogbG9j YWxpemVkU3RyaW5nc1siRWxlbWVudHMiXSA9ICJFbGVtZW50cyI7CisvKiBOYW1lIG9mIEVsZW1l bnRzIFRhYiAqLworbG9jYWxpemVkU3RyaW5nc1siRWxlbWVudHMgVGFiIE5hbWUiXSA9ICJFbGVt ZW50cyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJFbXVsYXRlIFVzZXIgR2VzdHVyZSJdID0gIkVtdWxh dGUgVXNlciBHZXN0dXJlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkVuYWJsZSBCcmVha3BvaW50Il0g PSAiRW5hYmxlIEJyZWFrcG9pbnQiOwogbG9jYWxpemVkU3RyaW5nc1siRW5hYmxlIEJyZWFrcG9p bnRzIl0gPSAiRW5hYmxlIEJyZWFrcG9pbnRzIjsKQEAgLTYwNSw3ICs2MTAsOCBAQCBsb2NhbGl6 ZWRTdHJpbmdzWyJHbG9iYWwgQ29kZSJdID0gIkdsb2JhbCBDb2RlIjsKIGxvY2FsaXplZFN0cmlu Z3NbIkdsb2JhbCBMZXhpY2FsIEVudmlyb25tZW50Il0gPSAiR2xvYmFsIExleGljYWwgRW52aXJv bm1lbnQiOwogbG9jYWxpemVkU3RyaW5nc1siR2xvYmFsIFZhcmlhYmxlcyJdID0gIkdsb2JhbCBW YXJpYWJsZXMiOwogbG9jYWxpemVkU3RyaW5nc1siR3JhbW1hciJdID0gIkdyYW1tYXIiOwotbG9j YWxpemVkU3RyaW5nc1siR3JhcGhpY3MiXSA9ICJHcmFwaGljcyI7CisvKiBOYW1lIG9mIEdyYXBo aWNzIFRhYiAqLworbG9jYWxpemVkU3RyaW5nc1siR3JhcGhpY3MgVGFiIE5hbWUiXSA9ICJHcmFw aGljcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJHcm91cCJdID0gIkdyb3VwIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkdyb3VwIEJ5IFJlc291cmNlIl0gPSAiR3JvdXAgQnkgUmVzb3VyY2UiOwogbG9jYWxp emVkU3RyaW5nc1siR3JvdXAgTWVkaWEgUmVxdWVzdHMiXSA9ICJHcm91cCBNZWRpYSBSZXF1ZXN0 cyI7CkBAIC02OTgsNiArNzA0LDggQEAgbG9jYWxpemVkU3RyaW5nc1siTGF0ZW5jeSJdID0gIkxh dGVuY3kiOwogbG9jYWxpemVkU3RyaW5nc1siTGF5ZXIgQ291bnQ6ICVkIl0gPSAiTGF5ZXIgQ291 bnQ6ICVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIkxheWVyIEluZm8iXSA9ICJMYXllciBJbmZvIjsK IGxvY2FsaXplZFN0cmluZ3NbIkxheWVycyJdID0gIkxheWVycyI7CisvKiBOYW1lIG9mIExheWVy cyBUYWIgKi8KK2xvY2FsaXplZFN0cmluZ3NbIkxheWVycyBUYWIgTmFtZSJdID0gIkxheWVycyI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJMYXlvdXQgJiBSZW5kZXJpbmciXSA9ICJMYXlvdXQgJiBSZW5k ZXJpbmciOwogLyogTGF5b3V0IHBoYXNlIHRpbWVsaW5lIHJlY29yZHMgKi8KIGxvY2FsaXplZFN0 cmluZ3NbIkxheW91dCBAIFRpbWVsaW5lIHJlY29yZCJdID0gIkxheW91dCI7CkBAIC03NzksNiAr Nzg3LDggQEAgbG9jYWxpemVkU3RyaW5nc1siTmV0d29yayJdID0gIk5ldHdvcmsiOwogbG9jYWxp emVkU3RyaW5nc1siTmV0d29yayBJc3N1ZSJdID0gIk5ldHdvcmsgSXNzdWUiOwogbG9jYWxpemVk U3RyaW5nc1siTmV0d29yayBSZXF1ZXN0cyJdID0gIk5ldHdvcmsgUmVxdWVzdHMiOwogbG9jYWxp emVkU3RyaW5nc1siTmV0d29yayBSZXF1ZXN0czoiXSA9ICJOZXR3b3JrIFJlcXVlc3RzOiI7Cisv KiBOYW1lIG9mIE5ldHdvcmsgVGFiICovCitsb2NhbGl6ZWRTdHJpbmdzWyJOZXR3b3JrIFRhYiBO YW1lIl0gPSAiTmV0d29yayI7CiAvKiBBIHN1Ym1lbnUgaXRlbSBvZiAnQWRkJyB0byBhZGQgRE9N IG5vZGVzIGFmdGVyIHRoZSBzZWxlY3RlZCBET00gbm9kZSAqLwogbG9jYWxpemVkU3RyaW5nc1si TmV4dCBTaWJsaW5nIl0gPSAiTmV4dCBTaWJsaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIl0g PSAiTm8iOwpAQCAtMTA0Myw2ICsxMDUzLDEwIEBAIGxvY2FsaXplZFN0cmluZ3NbIlNjcm9sbCBp bnRvIFZpZXciXSA9ICJTY3JvbGwgaW50byBWaWV3IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJj aCJdID0gIlNlYXJjaCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWFyY2ggQWdhaW4iXSA9ICJTZWFy Y2ggQWdhaW4iOwogbG9jYWxpemVkU3RyaW5nc1siU2VhcmNoIFJlc291cmNlIENvbnRlbnQiXSA9 ICJTZWFyY2ggUmVzb3VyY2UgQ29udGVudCI7CisvKiBOYW1lIG9mIFNlYXJjaCBUYWIgKi8KK2xv Y2FsaXplZFN0cmluZ3NbIlNlYXJjaCBUYWIgTmFtZSJdID0gIlNlYXJjaCI7CisvKiBUaXRsZSBv ZiBTZWFyY2ggVGFiIHdpdGgga2V5Ym9hcmQgc2hvcnRjdXQgKi8KK2xvY2FsaXplZFN0cmluZ3Nb IlNlYXJjaCBUYWIgVGl0bGUiXSA9ICJTZWFyY2ggKCVzKSI7CiAvKiBTZXR0aW5ncyB0YWIgbGFi ZWwgZm9yIHNlYXJjaCByZWxhdGVkIHNldHRpbmdzICovCiBsb2NhbGl6ZWRTdHJpbmdzWyJTZWFy Y2g6IEAgU2V0dGluZ3MiXSA9ICJTZWFyY2g6IjsKIGxvY2FsaXplZFN0cmluZ3NbIlNlYXJjaGlu ZyAlcyJdID0gIlNlYXJjaGluZyAlcyI7CkBAIC0xMDc3LDcgKzEwOTEsMTAgQEAgbG9jYWxpemVk U3RyaW5nc1siU2Vzc2lvbiJdID0gIlNlc3Npb24iOwogbG9jYWxpemVkU3RyaW5nc1siU2Vzc2lv biBTdG9yYWdlIl0gPSAiU2Vzc2lvbiBTdG9yYWdlIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNldCB0 byBBdXRvbWF0aWNhbGx5IENvbnRpbnVlIl0gPSAiU2V0IHRvIEF1dG9tYXRpY2FsbHkgQ29udGlu dWUiOwogbG9jYWxpemVkU3RyaW5nc1siU2V0dGVyIl0gPSAiU2V0dGVyIjsKLWxvY2FsaXplZFN0 cmluZ3NbIlNldHRpbmdzIl0gPSAiU2V0dGluZ3MiOworLyogTmFtZSBvZiBTZXR0aW5ncyBUYWIg Ki8KK2xvY2FsaXplZFN0cmluZ3NbIlNldHRpbmdzIFRhYiBOYW1lIl0gPSAiU2V0dGluZ3MiOwor LyogVGl0bGUgb2YgU2V0dGluZ3MgVGFiIHdpdGgga2V5Ym9hcmQgc2hvcnRjdXQgKi8KK2xvY2Fs aXplZFN0cmluZ3NbIlNldHRpbmdzIFRhYiBUaXRsZSJdID0gIlNldHRpbmdzICglcykiOwogbG9j YWxpemVkU3RyaW5nc1siU2hhZGVyIFByb2dyYW1zIl0gPSAiU2hhZGVyIFByb2dyYW1zIjsKIGxv Y2FsaXplZFN0cmluZ3NbIlNoYWRvdyBDb250ZW50Il0gPSAiU2hhZG93IENvbnRlbnQiOwogbG9j YWxpemVkU3RyaW5nc1siU2hhZG93IENvbnRlbnQgKCVzKSJdID0gIlNoYWRvdyBDb250ZW50ICgl cykiOwpAQCAtMTEyMyw2ICsxMTQwLDggQEAgbG9jYWxpemVkU3RyaW5nc1siU29ydCBEZXNjZW5k aW5nIl0gPSAiU29ydCBEZXNjZW5kaW5nIjsKIGxvY2FsaXplZFN0cmluZ3NbIlNvdXJjZSJdID0g IlNvdXJjZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTb3VyY2UgTWFwczoiXSA9ICJTb3VyY2UgTWFw czoiOwogbG9jYWxpemVkU3RyaW5nc1siU291cmNlcyJdID0gIlNvdXJjZXMiOworLyogTmFtZSBv ZiBTb3VyY2VzIFRhYiAqLworbG9jYWxpemVkU3RyaW5nc1siU291cmNlcyBUYWIgTmFtZSJdID0g IlNvdXJjZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU3BhY2UiXSA9ICJTcGFjZSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJTcGFjZXMiXSA9ICJTcGFjZXMiOwogbG9jYWxpemVkU3RyaW5nc1siU3BlY2lh bGx5IEV4cG9zZWQgRGF0YSJdID0gIlNwZWNpYWxseSBFeHBvc2VkIERhdGEiOwpAQCAtMTE1NSw2 ICsxMTc0LDggQEAgbG9jYWxpemVkU3RyaW5nc1siU3RvcCByZWNvcmRpbmcgY2FudmFzIGFjdGlv bnMiXSA9ICJTdG9wIHJlY29yZGluZyBjYW52YXMgYWN0aW8KIGxvY2FsaXplZFN0cmluZ3NbIlN0 b3AgcmVjb3JkaW5nIG9uY2UgcGFnZSBsb2FkcyJdID0gIlN0b3AgcmVjb3JkaW5nIG9uY2UgcGFn ZSBsb2FkcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJTdG9wcGluZyB0aGUgXHUyMDFDJXNcdTIwMUQg YXVkaXQiXSA9ICJTdG9wcGluZyB0aGUgXHUyMDFDJXNcdTIwMUQgYXVkaXQiOwogbG9jYWxpemVk U3RyaW5nc1siU3RvcmFnZSJdID0gIlN0b3JhZ2UiOworLyogTmFtZSBvZiBTdG9yYWdlIFRhYiAq LworbG9jYWxpemVkU3RyaW5nc1siU3RvcmFnZSBUYWIgTmFtZSJdID0gIlN0b3JhZ2UiOwogLyog Q1NTIHByb3BlcnRpZXMgZGVmaW5lZCB2aWEgSFRNTCBzdHlsZSBhdHRyaWJ1dGUgKi8KIGxvY2Fs aXplZFN0cmluZ3NbIlN0eWxlIEF0dHJpYnV0ZSJdID0gIlN0eWxlIEF0dHJpYnV0ZSI7CiBsb2Nh bGl6ZWRTdHJpbmdzWyJTdHlsZSBTaGVldCJdID0gIlN0eWxlIFNoZWV0IjsKQEAgLTEyNDIsNyAr MTI2Myw4IEBAIGxvY2FsaXplZFN0cmluZ3NbIlRpbWUgdG8gRmlyc3QgQnl0ZSJdID0gIlRpbWUg dG8gRmlyc3QgQnl0ZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaW1lbGluZSJdID0gIlRpbWVsaW5l IjsKIGxvY2FsaXplZFN0cmluZ3NbIlRpbWVsaW5lIFJlY29yZGluZyAlZCJdID0gIlRpbWVsaW5l IFJlY29yZGluZyAlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaW1lbGluZSBSZWNvcmRpbmcgSW1w b3J0IEVycm9yOiAlcyJdID0gIlRpbWVsaW5lIFJlY29yZGluZyBJbXBvcnQgRXJyb3I6ICVzIjsK LWxvY2FsaXplZFN0cmluZ3NbIlRpbWVsaW5lcyJdID0gIlRpbWVsaW5lcyI7CisvKiBOYW1lIG9m IFRpbWVsaW5lcyBUYWIgKi8KK2xvY2FsaXplZFN0cmluZ3NbIlRpbWVsaW5lcyBUYWIgTmFtZSJd ID0gIlRpbWVsaW5lcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaW1lciAlZCBGaXJlZCJdID0gIlRp bWVyICVkIEZpcmVkIjsKIGxvY2FsaXplZFN0cmluZ3NbIlRpbWVyICVkIEluc3RhbGxlZCJdID0g IlRpbWVyICVkIEluc3RhbGxlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJUaW1lciAlZCBSZW1vdmVk Il0gPSAiVGltZXIgJWQgUmVtb3ZlZCI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggYzhmNWVlNDc0MjhjYjE5NjA5ODM0M2E5YTlk ZGM3NjBmYTI4ZWRmZC4uOTcyNjNiZmVjNzg2ZjUyMDczZTExMGUyNmM2MjljMmQ3NjI5NTJlNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWlu LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5q cwpAQCAtMzYyLDcgKzM2Miw3IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAg V0kuc3RlcEludG9BbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hv cnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCBXSS5L ZXlib2FyZFNob3J0Y3V0LktleS5TZW1pY29sb24sIFdJLmRlYnVnZ2VyU3RlcEludG8pOwogICAg IFdJLnN0ZXBPdXRBbHRlcm5hdGVLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hv cnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCB8IFdJLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXku U2VtaWNvbG9uLCBXSS5kZWJ1Z2dlclN0ZXBPdXQpOwogCi0gICAgV0kuX3NldHRpbmdzS2V5Ym9h cmRTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuQ29tbWEs IFdJLl9oYW5kbGVTZXR0aW5nc0tleWJvYXJkU2hvcnRjdXQpOworICAgIFdJLnNldHRpbmdzS2V5 Ym9hcmRTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KFdJLktleWJvYXJkU2hvcnRj dXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5LZXkuQ29t bWEsIFdJLl9oYW5kbGVTZXR0aW5nc0tleWJvYXJkU2hvcnRjdXQpOwogCiAgICAgV0kuX3RvZ2ds ZVByZXZpb3VzRG9ja0NvbmZpZ3VyYXRpb25LZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdJLktleWJv YXJkU2hvcnRjdXQoV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9s IHwgV0kuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5TaGlmdCwgIkQiLCBXSS5fdG9nZ2xlUHJl dmlvdXNEb2NrQ29uZmlndXJhdGlvbik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3Lmpz CmluZGV4IDUzMmQwYzNhZWZlNzlhNzM1MjhmYmZiY2JjMjEyMTZkNjYyODgwZjIuLmM4YTY4MzAy OTFiNDU3NGI3ODZmMWNmMjlhYzQ2MDBkMzhlOTQxNDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJDb250 ZW50Vmlldy5qcwpAQCAtNDMsNyArNDMsNyBAQCBXSS5BdWRpdFRhYkNvbnRlbnRWaWV3ID0gY2xh c3MgQXVkaXRUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGFiQwogICAg ICAgICByZXR1cm4gewogICAgICAgICAgICAgaWRlbnRpZmllcjogQXVkaXRUYWJDb250ZW50Vmll dy5UeXBlLAogICAgICAgICAgICAgaW1hZ2U6ICJJbWFnZXMvQXVkaXQuc3ZnIiwKLSAgICAgICAg ICAgIHRpdGxlOiBXSS5VSVN0cmluZygiQXVkaXQiKSwKKyAgICAgICAgICAgIGRpc3BsYXlOYW1l OiBXSS5VSVN0cmluZygiQXVkaXQiLCAiQXVkaXQgVGFiIE5hbWUiLCAiTmFtZSBvZiBBdWRpdCBU YWIiKSwKICAgICAgICAgfTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmll dy5qcwppbmRleCBmNjhhOWZhYzI3YmI1NGYyZGVhYTIwNTU1M2MzMjRlOTVmZGY2YjVhLi4xMjNh ZDI1YjAzNzhhYWY1M2FkZTkzZDkyNzgzMzVlMTE1Y2RmNjc0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29s ZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0zNSw3ICszNSw3IEBAIFdJLkNvbnNvbGVUYWJDb250ZW50 VmlldyA9IGNsYXNzIENvbnNvbGVUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93 c2VyCiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICBpZGVudGlmaWVyOiBDb25zb2xlVGFi Q29udGVudFZpZXcuVHlwZSwKICAgICAgICAgICAgIGltYWdlOiAiSW1hZ2VzL0NvbnNvbGUuc3Zn IiwKLSAgICAgICAgICAgIHRpdGxlOiBXSS5VSVN0cmluZygiQ29uc29sZSIpLAorICAgICAgICAg ICAgZGlzcGxheU5hbWU6IFdJLlVJU3RyaW5nKCJDb25zb2xlIiwgIkNvbnNvbGUgVGFiIE5hbWUi LCAiTmFtZSBvZiBDb25zb2xlIFRhYiIpLAogICAgICAgICB9OwogICAgIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJD b250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKaW5kZXggZmYyMWNmMDI1ZjJlNTQxMmYwOWRiZTdk ZjVkNjUyNGFhODdmODVjNC4uNDFmMmRiYWQyNThhZmUwY2RkOWE1YmMxMTQ3MzJiOGFmMTZhNmFl YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RWxlbWVudHNUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCkBAIC00Nyw3ICs0Nyw3 IEBAIFdJLkVsZW1lbnRzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBFbGVtZW50c1RhYkNvbnRlbnRW aWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzCiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAg ICBpZGVudGlmaWVyOiBFbGVtZW50c1RhYkNvbnRlbnRWaWV3LlR5cGUsCiAgICAgICAgICAgICBp bWFnZTogIkltYWdlcy9FbGVtZW50cy5zdmciLAotICAgICAgICAgICAgdGl0bGU6IFdJLlVJU3Ry aW5nKCJFbGVtZW50cyIpLAorICAgICAgICAgICAgZGlzcGxheU5hbWU6IFdJLlVJU3RyaW5nKCJF bGVtZW50cyIsICJFbGVtZW50cyBUYWIgTmFtZSIsICJOYW1lIG9mIEVsZW1lbnRzIFRhYiIpLAog ICAgICAgICB9OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFRhYkJhckl0ZW0uanMgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVGFiQmFySXRlbS5qcwppbmRleCBlMGZj Mjg4YjRmYjg5N2Q1MDk3N2NiMzVjZmIzYzg2NGYyODlkY2QzLi4zMDZlNzE4ZmFiZWIxN2NjNmFl ODgwYWRkMjg2NzI0OWI5M2VkNmZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVGFiQmFySXRlbS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HZW5lcmFsVGFiQmFySXRlbS5qcwpAQCAt MzIsMzYgKzMyLDM1IEBAIFdJLkdlbmVyYWxUYWJCYXJJdGVtID0gY2xhc3MgR2VuZXJhbFRhYkJh ckl0ZW0gZXh0ZW5kcyBXSS5UYWJCYXJJdGVtCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2Vy dCh0YWJDb250ZW50VmlldyBpbnN0YW5jZW9mIFdJLlRhYkNvbnRlbnRWaWV3KTsKIAotICAgICAg ICBsZXQge2ltYWdlLCB0aXRsZX0gPSB0YWJDb250ZW50Vmlldy5jb25zdHJ1Y3Rvci50YWJJbmZv KCk7Ci0gICAgICAgIHJldHVybiBuZXcgV0kuR2VuZXJhbFRhYkJhckl0ZW0odGFiQ29udGVudFZp ZXcsIGltYWdlLCB0aXRsZSk7CisgICAgICAgIGxldCB7aW1hZ2UsIGRpc3BsYXlOYW1lLCB0aXRs ZX0gPSB0YWJDb250ZW50Vmlldy5jb25zdHJ1Y3Rvci50YWJJbmZvKCk7CisgICAgICAgIHJldHVy biBuZXcgV0kuR2VuZXJhbFRhYkJhckl0ZW0odGFiQ29udGVudFZpZXcsIGltYWdlLCBkaXNwbGF5 TmFtZSwgdGl0bGUpOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwogCi0gICAgZ2V0IHRpdGxlKCkK KyAgICBnZXQgZGlzcGxheU5hbWUoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHN1cGVyLnRpdGxl OworICAgICAgICByZXR1cm4gc3VwZXIuZGlzcGxheU5hbWU7CiAgICAgfQogCi0gICAgc2V0IHRp dGxlKHRpdGxlKQorICAgIHNldCBkaXNwbGF5TmFtZShkaXNwbGF5TmFtZSkKICAgICB7Ci0gICAg ICAgIGlmICh0aXRsZSkgewotICAgICAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwotICAgICAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50 LmNsYXNzTGlzdC5hZGQoInRpdGxlIik7CisgICAgICAgIGlmIChkaXNwbGF5TmFtZSkgeworICAg ICAgICAgICAgdGhpcy5fZGlzcGxheU5hbWVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVu dCgic3BhbiIpOworICAgICAgICAgICAgdGhpcy5fZGlzcGxheU5hbWVFbGVtZW50LmNsYXNzTmFt ZSA9ICJuYW1lIjsKIAotICAgICAgICAgICAgbGV0IHRpdGxlQ29udGVudEVsZW1lbnQgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgICAgICB0aXRsZUNvbnRlbnRFbGVt ZW50LmNsYXNzTGlzdC5hZGQoImNvbnRlbnQiKTsKLSAgICAgICAgICAgIHRpdGxlQ29udGVudEVs ZW1lbnQudGV4dENvbnRlbnQgPSB0aXRsZTsKLSAgICAgICAgICAgIHRoaXMuX3RpdGxlRWxlbWVu dC5hcHBlbmRDaGlsZCh0aXRsZUNvbnRlbnRFbGVtZW50KTsKKyAgICAgICAgICAgIGxldCBkaXNw bGF5TmFtZUNvbnRlbnRFbGVtZW50ID0gdGhpcy5fZGlzcGxheU5hbWVFbGVtZW50LmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKSk7CisgICAgICAgICAgICBkaXNwbGF5 TmFtZUNvbnRlbnRFbGVtZW50LmNsYXNzTmFtZSA9ICJjb250ZW50IjsKKyAgICAgICAgICAgIGRp c3BsYXlOYW1lQ29udGVudEVsZW1lbnQudGV4dENvbnRlbnQgPSBkaXNwbGF5TmFtZTsKIAotICAg ICAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLl90aXRsZUVsZW1lbnQsIHRo aXMuZWxlbWVudC5sYXN0Q2hpbGQpOworICAgICAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJl Zm9yZSh0aGlzLl9kaXNwbGF5TmFtZUVsZW1lbnQsIHRoaXMuZWxlbWVudC5sYXN0Q2hpbGQpOwog ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgaWYgKHRoaXMuX3RpdGxlRWxlbWVudCkKLSAg ICAgICAgICAgICAgICB0aGlzLl90aXRsZUVsZW1lbnQucmVtb3ZlKCk7CisgICAgICAgICAgICBp ZiAodGhpcy5fZGlzcGxheU5hbWVFbGVtZW50KQorICAgICAgICAgICAgICAgIHRoaXMuX2Rpc3Bs YXlOYW1lRWxlbWVudC5yZW1vdmUoKTsKIAotICAgICAgICAgICAgdGhpcy5fdGl0bGVFbGVtZW50 ID0gbnVsbDsKKyAgICAgICAgICAgIHRoaXMuX2Rpc3BsYXlOYW1lRWxlbWVudCA9IG51bGw7CiAg ICAgICAgIH0KIAotICAgICAgICBzdXBlci50aXRsZSA9IHRpdGxlOworICAgICAgICBzdXBlci5k aXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc1RhYkNvbnRlbnRWaWV3 LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NU YWJDb250ZW50Vmlldy5qcwppbmRleCBjYzAyOWUzOGUwM2ZhYjA2MTljMWY2MDVjNGI1ODViMTE1 NWFlZTc4Li4zYjIwYTc3NjdjMzQyZjNhODBlZGViZDJiNTMxYWMyNzJmZGY3ZTU1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc1Rh YkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0dyYXBoaWNzVGFiQ29udGVudFZpZXcuanMKQEAgLTY2LDcgKzY2LDcgQEAgV0kuR3Jh cGhpY3NUYWJDb250ZW50VmlldyA9IGNsYXNzIEdyYXBoaWNzVGFiQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50QnJvd3MKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIGlkZW50aWZp ZXI6IEdyYXBoaWNzVGFiQ29udGVudFZpZXcuVHlwZSwKICAgICAgICAgICAgIGltYWdlOiAiSW1h Z2VzL0dyYXBoaWNzLnN2ZyIsCi0gICAgICAgICAgICB0aXRsZTogV0kuVUlTdHJpbmcoIkdyYXBo aWNzIiksCisgICAgICAgICAgICBkaXNwbGF5TmFtZTogV0kuVUlTdHJpbmcoIkdyYXBoaWNzIiwg IkdyYXBoaWNzIFRhYiBOYW1lIiwgIk5hbWUgb2YgR3JhcGhpY3MgVGFiIiksCiAgICAgICAgIH07 CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9MYXllcnNUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDJiYzBjOWI0 MzUwY2M3MWIzNGM4NzAzMzBiOGRkNjIyNjQ5MzAzNzEuLjM0ODYzM2QzYmIyYjc3YjJhODUyMjIw NzI4MzlhMDA3YjIwYWI5NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xheWVyc1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyc1RhYkNvbnRlbnRWaWV3LmpzCkBA IC00NSw3ICs0NSw3IEBAIFdJLkxheWVyc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgTGF5ZXJzVGFi Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhCiAgICAgICAgIHJldHVybiB7 CiAgICAgICAgICAgICBpZGVudGlmaWVyOiBMYXllcnNUYWJDb250ZW50Vmlldy5UeXBlLAogICAg ICAgICAgICAgaW1hZ2U6ICJJbWFnZXMvTGF5ZXJzLnN2ZyIsCi0gICAgICAgICAgICB0aXRsZTog V0kuVUlTdHJpbmcoIkxheWVycyIpLAorICAgICAgICAgICAgZGlzcGxheU5hbWU6IFdJLlVJU3Ry aW5nKCJMYXllcnMiLCAiTGF5ZXJzIFRhYiBOYW1lIiwgIk5hbWUgb2YgTGF5ZXJzIFRhYiIpLAog ICAgICAgICB9OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCmlu ZGV4IDY1MTEwYWNhMjMyNDg0ZmRlYmNmM2ZlOTJjYzE0NzcxYzUwMWM1MTcuLjdiMTZjMDgzNmRl Mjg4ZTA1M2I3NWQ4ZGU4YjJkZmFlM2I1MTdkMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29u dGVudFZpZXcuanMKQEAgLTUwLDcgKzUwLDcgQEAgV0kuTmV0d29ya1RhYkNvbnRlbnRWaWV3ID0g Y2xhc3MgTmV0d29ya1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVudFZpZXcKICAg ICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIGlkZW50aWZpZXI6IE5ldHdvcmtUYWJDb250ZW50 Vmlldy5UeXBlLAogICAgICAgICAgICAgaW1hZ2U6ICJJbWFnZXMvTmV0d29yay5zdmciLAotICAg ICAgICAgICAgdGl0bGU6IFdJLlVJU3RyaW5nKCJOZXR3b3JrIiksCisgICAgICAgICAgICBkaXNw bGF5TmFtZTogV0kuVUlTdHJpbmcoIk5ldHdvcmsiLCAiTmV0d29yayBUYWIgTmFtZSIsICJOYW1l IG9mIE5ldHdvcmsgVGFiIiksCiAgICAgICAgIH07CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9QaW5uZWRUYWJCYXJJdGVtLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUGlubmVkVGFiQmFy SXRlbS5qcwppbmRleCBkNTgyMDNiNjEyOGJjMWQ0NzAyY2E2ZWNjMWE4ZGVhNmI4ODg5YmM0Li4z NDJjNjc5ODg0OTE5NGNlM2RkZDgxZTU5YTU4MTEzMmYwNGRiZTQ5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9QaW5uZWRUYWJCYXJJdGVtLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Bpbm5lZFRh YkJhckl0ZW0uanMKQEAgLTI1LDkgKzI1LDkgQEAKIAogV0kuUGlubmVkVGFiQmFySXRlbSA9IGNs YXNzIFBpbm5lZFRhYkJhckl0ZW0gZXh0ZW5kcyBXSS5UYWJCYXJJdGVtCiB7Ci0gICAgY29uc3Ry dWN0b3IocmVwcmVzZW50ZWRPYmplY3QsIGltYWdlLCB0aXRsZSkKKyAgICBjb25zdHJ1Y3Rvcihy ZXByZXNlbnRlZE9iamVjdCwgaW1hZ2UsIGRpc3BsYXlOYW1lLCB0aXRsZSkKICAgICB7Ci0gICAg ICAgIHN1cGVyKHJlcHJlc2VudGVkT2JqZWN0LCBpbWFnZSwgdGl0bGUpOworICAgICAgICBzdXBl cihyZXByZXNlbnRlZE9iamVjdCwgaW1hZ2UsIGRpc3BsYXlOYW1lLCB0aXRsZSk7CiAKICAgICAg ICAgdGhpcy5lbGVtZW50LmNsYXNzTGlzdC5hZGQoInBpbm5lZCIpOwogICAgIH0KQEAgLTM4LDE0 ICszOCw3IEBAIFdJLlBpbm5lZFRhYkJhckl0ZW0gPSBjbGFzcyBQaW5uZWRUYWJCYXJJdGVtIGV4 dGVuZHMgV0kuVGFiQmFySXRlbQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGFiQ29u dGVudFZpZXcgaW5zdGFuY2VvZiBXSS5UYWJDb250ZW50Vmlldyk7CiAKLSAgICAgICAgbGV0IHtp bWFnZSwgdGl0bGV9ID0gdGFiQ29udGVudFZpZXcuY29uc3RydWN0b3IudGFiSW5mbygpOwotICAg ICAgICByZXR1cm4gbmV3IFdJLlBpbm5lZFRhYkJhckl0ZW0odGFiQ29udGVudFZpZXcsIGltYWdl LCB0aXRsZSk7Ci0gICAgfQotCi0gICAgLy8gUHJvdGVjdGVkCi0KLSAgICB0aXRsZURpZENoYW5n ZSgpCi0gICAgewotICAgICAgICB0aGlzLmVsZW1lbnQudGl0bGUgPSB0aGlzLnRpdGxlOworICAg ICAgICBsZXQge2ltYWdlLCBkaXNwbGF5TmFtZSwgdGl0bGV9ID0gdGFiQ29udGVudFZpZXcuY29u c3RydWN0b3IudGFiSW5mbygpOworICAgICAgICByZXR1cm4gbmV3IFdJLlBpbm5lZFRhYkJhckl0 ZW0odGFiQ29udGVudFZpZXcsIGltYWdlLCBkaXNwbGF5TmFtZSwgdGl0bGUpOwogICAgIH0KIH07 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T ZWFyY2hUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NlYXJjaFRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDAwNjE2NDA2MGUwZTVmZTJh NmI0NGFjMDg2MGU3ZDVlOGZhMDE0MDIuLmMyYWYxNWE5NzFmZGQ1N2E4NjZhYTkxOTg1ODEzNzdk ZGQ1ZTMwM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NlYXJjaFRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NlYXJjaFRhYkNvbnRlbnRWaWV3LmpzCkBAIC01MCw3ICs1 MCw4IEBAIFdJLlNlYXJjaFRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2VhcmNoVGFiQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhCiAgICAgICAgIHJldHVybiB7CiAgICAgICAg ICAgICBpZGVudGlmaWVyOiBTZWFyY2hUYWJDb250ZW50Vmlldy5UeXBlLAogICAgICAgICAgICAg aW1hZ2U6ICJJbWFnZXMvU2VhcmNoLnN2ZyIsCi0gICAgICAgICAgICB0aXRsZTogV0kuVUlTdHJp bmcoIlNlYXJjaCIpLAorICAgICAgICAgICAgZGlzcGxheU5hbWU6IFdJLlVJU3RyaW5nKCJTZWFy Y2giLCAiU2VhcmNoIFRhYiBOYW1lIiwgIk5hbWUgb2YgU2VhcmNoIFRhYiIpLAorICAgICAgICAg ICAgdGl0bGU6IFdJLlVJU3RyaW5nKCJTZWFyY2ggKCVzKSIsICJTZWFyY2ggVGFiIFRpdGxlIiwg IlRpdGxlIG9mIFNlYXJjaCBUYWIgd2l0aCBrZXlib2FyZCBzaG9ydGN1dCIpLmZvcm1hdChXSS5z ZWFyY2hLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwKICAgICAgICAgfTsKICAgICB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Nl dHRpbmdzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9TZXR0aW5nc1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IGIxZWRhYWM5MGFkOGFl ODg3YTk3ZjMxMzUyMDU4MWJlMmNhNTMyN2QuLjk5YTNkNTdkNDIyNjlkNGE4OTgxYWFjMTFmMjQ3 ZTRmNDhjNWUxM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1NldHRpbmdzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2V0dGluZ3NUYWJDb250ZW50Vmlldy5qcwpAQCAt MzksNyArMzksOCBAQCBXSS5TZXR0aW5nc1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgU2V0dGluZ3NU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaQogICAgICAgICByZXR1cm4gewog ICAgICAgICAgICAgaWRlbnRpZmllcjogU2V0dGluZ3NUYWJDb250ZW50Vmlldy5UeXBlLAogICAg ICAgICAgICAgaW1hZ2U6ICJJbWFnZXMvR2Vhci5zdmciLAotICAgICAgICAgICAgdGl0bGU6IFdJ LlVJU3RyaW5nKCJTZXR0aW5ncyIpLAorICAgICAgICAgICAgZGlzcGxheU5hbWU6IFdJLlVJU3Ry aW5nKCJTZXR0aW5ncyIsICJTZXR0aW5ncyBUYWIgTmFtZSIsICJOYW1lIG9mIFNldHRpbmdzIFRh YiIpLAorICAgICAgICAgICAgdGl0bGU6IFdJLlVJU3RyaW5nKCJTZXR0aW5ncyAoJXMpIiwgIlNl dHRpbmdzIFRhYiBUaXRsZSIsICJUaXRsZSBvZiBTZXR0aW5ncyBUYWIgd2l0aCBrZXlib2FyZCBz aG9ydGN1dCIpLmZvcm1hdChXSS5zZXR0aW5nc0tleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUp LAogICAgICAgICB9OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU291cmNlc1RhYkNvbnRlbnRWaWV3Lmpz CmluZGV4IDEzYjFkNTVhODkyOGRkODJlZWIxNjFhMTIzOTk0ZGQ5MGJjN2I1MGQuLjBiZDdhMGNk ZTA5NTJjMTNjMDJlNjU4NGU2MjBkZjg1NjViZGRkMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NvdXJjZXNUYWJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Tb3VyY2VzVGFi Q29udGVudFZpZXcuanMKQEAgLTQ3LDcgKzQ3LDcgQEAgV0kuU291cmNlc1RhYkNvbnRlbnRWaWV3 ID0gY2xhc3MgU291cmNlc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzZXIK ICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIGlkZW50aWZpZXI6IFNvdXJjZXNUYWJDb250 ZW50Vmlldy5UeXBlLAogICAgICAgICAgICAgaW1hZ2U6ICJJbWFnZXMvU291cmNlcy5zdmciLAot ICAgICAgICAgICAgdGl0bGU6IFdJLlVJU3RyaW5nKCJTb3VyY2VzIiksCisgICAgICAgICAgICBk aXNwbGF5TmFtZTogV0kuVUlTdHJpbmcoIlNvdXJjZXMiLCAiU291cmNlcyBUYWIgTmFtZSIsICJO YW1lIG9mIFNvdXJjZXMgVGFiIiksCiAgICAgICAgIH07CiAgICAgfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdG9yYWdlVGFiQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TdG9y YWdlVGFiQ29udGVudFZpZXcuanMKaW5kZXggOTU0MGFiOGNiMTZkODAwODcxZTU3NjUyYzk0ZmU5 MDRhY2UwYTYwYi4uYmQwYjdjOTkzYWViOGY3OTM0OTBjMDdhY2QxMTRiNDk3NzUwMzVkNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3RvcmFn ZVRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1N0b3JhZ2VUYWJDb250ZW50Vmlldy5qcwpAQCAtNDYsNyArNDYsNyBAQCBXSS5T dG9yYWdlVGFiQ29udGVudFZpZXcgPSBjbGFzcyBTdG9yYWdlVGFiQ29udGVudFZpZXcgZXh0ZW5k cyBXSS5Db250ZW50QnJvd3NlcgogICAgICAgICByZXR1cm4gewogICAgICAgICAgICAgaWRlbnRp ZmllcjogU3RvcmFnZVRhYkNvbnRlbnRWaWV3LlR5cGUsCiAgICAgICAgICAgICBpbWFnZTogIklt YWdlcy9TdG9yYWdlLnN2ZyIsCi0gICAgICAgICAgICB0aXRsZTogV0kuVUlTdHJpbmcoIlN0b3Jh Z2UiKSwKKyAgICAgICAgICAgIGRpc3BsYXlOYW1lOiBXSS5VSVN0cmluZygiU3RvcmFnZSIsICJT dG9yYWdlIFRhYiBOYW1lIiwgIk5hbWUgb2YgU3RvcmFnZSBUYWIiKSwKICAgICAgICAgfTsKICAg ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RhYkJhci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCYXIuY3NzCmluZGV4IGNiMGY2OTBjNWZkNWMxNjIyMDhjY2YzYWM5MTYxYzA3ZTBkOWQ2 ZGMuLjdhZGQ3NmVkZmQzMmEwZTA5NDZlOWU3YzE2MTYyOGFhMDczMTEyMDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhci5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFyLmNzcwpA QCAtMjk5LDcgKzI5OSw3IEBAIGJvZHkud2luZG93LWluYWN0aXZlIC50YWItYmFyID4gLnRhYnMg PiAuaXRlbTpub3QoLmRpc2FibGVkKS5zZWxlY3RlZCA+IC5pY29uIHsKICAgICBvcGFjaXR5OiAw LjQ7CiB9CiAKLS50YWItYmFyID4gLnRhYnMgPiAuaXRlbSA+IC50aXRsZSB7CisudGFiLWJhciA+ IC50YWJzID4gLml0ZW0gPiAubmFtZSB7CiAgICAgY29sb3I6IGhzbGEoMCwgMCUsIHZhcigtLWZv cmVncm91bmQtbGlnaHRuZXNzKSwgMC42KTsKIAogICAgIGRpc3BsYXk6IGZsZXg7CkBAIC0zMDks MTEgKzMwOSwxMSBAQCBib2R5LndpbmRvdy1pbmFjdGl2ZSAudGFiLWJhciA+IC50YWJzID4gLml0 ZW06bm90KC5kaXNhYmxlZCkuc2VsZWN0ZWQgPiAuaWNvbiB7CiAgICAgLXdlYmtpdC1tYXJnaW4t c3RhcnQ6IDZweDsKIH0KIAotYm9keS53aW5kb3ctaW5hY3RpdmUgLnRhYi1iYXIgPiAudGFicyA+ IC5pdGVtID4gLnRpdGxlIHsKK2JvZHkud2luZG93LWluYWN0aXZlIC50YWItYmFyID4gLnRhYnMg PiAuaXRlbSA+IC5uYW1lIHsKICAgICBjb2xvcjogaHNsYSgwLCAwJSwgdmFyKC0tZm9yZWdyb3Vu ZC1saWdodG5lc3MpLCAwLjQpOwogfQogCi0udGFiLWJhciA+IC50YWJzID4gLml0ZW0gPiAudGl0 bGUgPiAuY29udGVudCB7CisudGFiLWJhciA+IC50YWJzID4gLml0ZW0gPiAubmFtZSA+IC5jb250 ZW50IHsKICAgICBtaW4td2lkdGg6IDA7CiAgICAgd2lkdGg6IDEwMCU7CiAgICAgb3ZlcmZsb3c6 IGhpZGRlbjsKQEAgLTMyMSwxNSArMzIxLDE1IEBAIGJvZHkud2luZG93LWluYWN0aXZlIC50YWIt YmFyID4gLnRhYnMgPiAuaXRlbSA+IC50aXRsZSB7CiAgICAgd2hpdGUtc3BhY2U6IG5vd3JhcDsK IH0KIAotLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm5vdCguc2VsZWN0ZWQpOmhvdmVyID4gLnRp dGxlIHsKKy50YWItYmFyID4gLnRhYnMgPiAuaXRlbTpub3QoLnNlbGVjdGVkKTpob3ZlciA+IC5u YW1lIHsKICAgICBjb2xvcjogaHNsYSgwLCAwJSwgdmFyKC0tZm9yZWdyb3VuZC1saWdodG5lc3Mp LCAwLjcpOwogfQogCi0udGFiLWJhciA+IC50YWJzID4gLml0ZW06bm90KC5kaXNhYmxlZCkuc2Vs ZWN0ZWQgPiAudGl0bGUgeworLnRhYi1iYXIgPiAudGFicyA+IC5pdGVtOm5vdCguZGlzYWJsZWQp LnNlbGVjdGVkID4gLm5hbWUgewogICAgIGNvbG9yOiBoc2xhKDAsIDAlLCB2YXIoLS1mb3JlZ3Jv dW5kLWxpZ2h0bmVzcyksIDAuOCk7CiB9CiAKLWJvZHkud2luZG93LWluYWN0aXZlIC50YWItYmFy ID4gLnRhYnMgPiAuaXRlbTpub3QoLmRpc2FibGVkKS5zZWxlY3RlZCA+IC50aXRsZSB7Citib2R5 LndpbmRvdy1pbmFjdGl2ZSAudGFiLWJhciA+IC50YWJzID4gLml0ZW06bm90KC5kaXNhYmxlZCku c2VsZWN0ZWQgPiAubmFtZSB7CiAgICAgY29sb3I6IGhzbGEoMCwgMCUsIHZhcigtLWZvcmVncm91 bmQtbGlnaHRuZXNzKSwgMC41KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQmFySXRlbS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJhckl0ZW0uanMKaW5kZXggOTU2NzY2ZmM2ZGFi NzZiY2FmNjFkMWM4MTE5YTliOTc3ODA3MTZhYy4uMzM5N2VkOTMzMjhmOWFiMTQxZjJmMjNlNjA0 ZmRjNmRlOTg2ZGVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvVGFiQmFySXRlbS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UYWJCYXJJdGVtLmpzCkBAIC0yNiw3ICsyNiw3IEBACiAKIFdJLlRh YkJhckl0ZW0gPSBjbGFzcyBUYWJCYXJJdGVtCiB7Ci0gICAgY29uc3RydWN0b3IocmVwcmVzZW50 ZWRPYmplY3QsIGltYWdlLCB0aXRsZSkKKyAgICBjb25zdHJ1Y3RvcihyZXByZXNlbnRlZE9iamVj dCwgaW1hZ2UsIGRpc3BsYXlOYW1lLCB0aXRsZSkKICAgICB7CiAgICAgICAgIHRoaXMuX3JlcHJl c2VudGVkT2JqZWN0ID0gcmVwcmVzZW50ZWRPYmplY3QgfHwgbnVsbDsKICAgICAgICAgdGhpcy5f cGFyZW50VGFiQmFyID0gbnVsbDsKQEAgLTQ1LDcgKzQ1LDggQEAgV0kuVGFiQmFySXRlbSA9IGNs YXNzIFRhYkJhckl0ZW0KIAogICAgICAgICB0aGlzLl9lbGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYi LCAiZmxleC1zcGFjZSIpOwogCi0gICAgICAgIHRoaXMudGl0bGUgPSB0aXRsZTsKKyAgICAgICAg dGhpcy5kaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lOworICAgICAgICB0aGlzLnRpdGxlID0gdGl0 bGUgfHwgZGlzcGxheU5hbWU7CiAgICAgICAgIHRoaXMuaW1hZ2UgPSBpbWFnZTsKICAgICB9CiAK QEAgLTEwMiw2ICsxMDMsMjAgQEAgV0kuVGFiQmFySXRlbSA9IGNsYXNzIFRhYkJhckl0ZW0KICAg ICBnZXQgaW1hZ2UoKSB7IHJldHVybiB0aGlzLl9pY29uRWxlbWVudC5zcmM7IH0KICAgICBzZXQg aW1hZ2UodXJsKSB7IHRoaXMuX2ljb25FbGVtZW50LnNyYyA9IHVybCB8fCAiIjsgfQogCisgICAg Z2V0IGRpc3BsYXlOYW1lKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9kaXNwbGF5TmFt ZTsKKyAgICB9CisKKyAgICBzZXQgZGlzcGxheU5hbWUoZGlzcGxheU5hbWUpCisgICAgeworICAg ICAgICBkaXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lIHx8ICIiOworICAgICAgICBpZiAodGhpcy5f ZGlzcGxheU5hbWUgPT09IGRpc3BsYXlOYW1lKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAg ICAgIHRoaXMuX2Rpc3BsYXlOYW1lID0gZGlzcGxheU5hbWU7CisgICAgfQorCiAgICAgZ2V0IHRp dGxlKCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl90aXRsZTsKQEAgLTExNCwxNCArMTI5 LDggQEAgV0kuVGFiQmFySXRlbSA9IGNsYXNzIFRhYkJhckl0ZW0KICAgICAgICAgICAgIHJldHVy bjsKIAogICAgICAgICB0aGlzLl90aXRsZSA9IHRpdGxlOwotICAgICAgICB0aGlzLnRpdGxlRGlk Q2hhbmdlKCk7Ci0gICAgfQogCi0gICAgLy8gUHJvdGVjdGVkCi0KLSAgICB0aXRsZURpZENoYW5n ZSgpCi0gICAgewotICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzLgorICAgICAg ICB0aGlzLl9lbGVtZW50LnRpdGxlID0gdGhpcy5fdGl0bGU7CiAgICAgfQogfTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVU YWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lVGFiQ29udGVudFZpZXcuanMKaW5kZXggMjYyZDRlZDMxODhiMGE5NTIxZjEx MWZlNmE4MDkyOWZmOWRkZjg3Ny4uMGI1YmJlM2JiMmFhM2Q2MjllMzFiYWVmYTdkZDVlNjk2YjJk MGUzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVGltZWxpbmVUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0xMDMsNyAr MTAzLDcgQEAgV0kuVGltZWxpbmVUYWJDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5lVGFiQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICAgICAgcmV0dXJuIHsKICAgICAg ICAgICAgIGlkZW50aWZpZXI6IFRpbWVsaW5lVGFiQ29udGVudFZpZXcuVHlwZSwKICAgICAgICAg ICAgIGltYWdlOiAiSW1hZ2VzL1RpbWVsaW5lLnN2ZyIsCi0gICAgICAgICAgICB0aXRsZTogV0ku VUlTdHJpbmcoIlRpbWVsaW5lcyIpLAorICAgICAgICAgICAgZGlzcGxheU5hbWU6IFdJLlVJU3Ry aW5nKCJUaW1lbGluZXMiLCAiVGltZWxpbmVzIFRhYiBOYW1lIiwgIk5hbWUgb2YgVGltZWxpbmVz IFRhYiIpLAogICAgICAgICB9OwogICAgIH0KIAo=