194883 2019-02-20 16:43:32 -0800 Web Inspector: eliminate manual syncing of numeric constants used by JavaScript and CSS 2019-03-13 11:51:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P5 Normal --- 195689 1 mattbaker hi commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1508354 0 mattbaker 2019-02-20 16:43:32 -0800 Summary: Eliminate manual syncing of numeric constants used by JavaScript and CSS. Web Inspector CSS occasionally uses numeric constants that must also be available to code. Currently we rely on the developer to keep the JavaScript and CSS worlds in sync. These custom properties should have their values set by Web Inspector code so that can't get out of sync. Note: The CSS custom property `--recording-auto-capture-input-margin` in CanvasOverviewContentView.css has already become out of sync. Let's fix this! 1508356 1 webkit-bug-importer 2019-02-20 16:44:00 -0800 <rdar://problem/48257785> 1514650 2 364220 hi 2019-03-10 19:31:29 -0700 Created attachment 364220 Patch 1514920 3 364220 joepeck 2019-03-11 12:21:26 -0700 Comment on attachment 364220 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364220&action=review r=me > Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.js:117 > + static get _memoryCategoryViewheight() { return 75; } Typo: "...Viewheight" => "...ViewHeight" I also really dislike _ prefixed getters. They are very confusing / unexpected to work work and this is a constant that doesn't need to be "private". > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.css:119 > +.network-table .cell.name > .status { > + -webkit-margin-left: 4px; > +} Seems like this should be `-webkit-margin-start` not `-webkit-margin-left`. The sync changes and the -webkit-margin changes should really be different patches. They are almost entirely unrelated changes each with their own possibility of causing regressions. > Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js:201 > + static get _nodeWaterfallDOMEventSize() { return 8; } Same, this doesn't need to be underscore prefixed. 1514952 4 364280 hi 2019-03-11 13:05:25 -0700 Created attachment 364280 Patch 1514969 5 364280 commit-queue 2019-03-11 13:35:27 -0700 Comment on attachment 364280 Patch Clearing flags on attachment: 364280 Committed r242737: <https://trac.webkit.org/changeset/242737> 1514970 6 commit-queue 2019-03-11 13:35:29 -0700 All reviewed patches have been landed. Closing bug. 364220 2019-03-10 19:31:29 -0700 2019-03-11 13:05:24 -0700 Patch 194883.diff text/plain 19180 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDljMDI5MTQ4NjRlLi45M2MxYzAzODgzMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjEgQEAKKzIwMTktMDMtMTAgIERldmlu IFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGVs aW1pbmF0ZSBtYW51YWwgc3luY2luZyBvZiBudW1lcmljIGNvbnN0YW50cyB1c2VkIGJ5IEphdmFT Y3JpcHQgYW5kIENTUworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk0ODgzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODI1Nzc4NT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkNhbnZhc092 ZXJ2aWV3Q29udGVudFZpZXcpOgorICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmll dy5zdGF0aWMgZ2V0IF9yZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0TWFyZ2luKTogQWRkZWQuCisg ICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LnByb3RvdHlwZS5fdXBkYXRlUmVj b3JkaW5nQXV0b0NhcHR1cmVJbnB1dEVsZW1lbnRTaXplKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcuY3NzOgorICAgICAgICAoLm5hdmln YXRpb24tYmFyID4gLml0ZW0uY2FudmFzLXJlY29yZGluZy1hdXRvLWNhcHR1cmUgPiBsYWJlbCA+ IGlucHV0KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVW aWV3LmpzOgorICAgICAgICAoV0kuTWVtb3J5VGltZWxpbmVWaWV3LnN0YXRpYyBnZXQgX21lbW9y eUNhdGVnb3J5Vmlld2hlaWdodCk6IEFkZGVkLgorICAgICAgICAoV0kuTWVtb3J5VGltZWxpbmVW aWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KTogQWRkZWQuCisgICAgICAgIChXSS5NZW1vcnlU aW1lbGluZVZpZXcucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9NZW1vcnlDYXRlZ29yeVZpZXcuY3NzOgorICAgICAgICAoLm1lbW9yeS1jYXRlZ29yeS12 aWV3KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5zdGF0aWMgZ2V0 IF9ub2RlV2F0ZXJmYWxsRE9NRXZlbnRTaXplKTogQWRkZWQuCisgICAgICAgIChXSS5OZXR3b3Jr VGFibGVDb250ZW50Vmlldy5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3M6CisgICAgICAgICgu bmV0d29yay10YWJsZSAuY2VsbC5uYW1lID4gLnN0YXR1cyk6IEFkZGVkLgorICAgICAgICAoYm9k eVtkaXI9bHRyXSAubmV0d29yay10YWJsZSAuY2VsbC5uYW1lID4gLnN0YXR1cyk6CisgICAgICAg IChib2R5W2Rpcj1ydGxdIC5uZXR3b3JrLXRhYmxlIC5jZWxsLm5hbWUgPiAuc3RhdHVzKToKKyAg ICAgICAgKC5jb250ZW50LXZpZXcubmV0d29yayAubmV0d29yay10YWJsZSk6IERlbGV0ZWQuCisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50 LmNzczoKKyAgICAgICAgKC5pdGVtLmFjdGlvbjpub3QoLmluaXRpYWwtc3RhdGUpOjpiZWZvcmUp OgorICAgICAgICAoYm9keVtkaXI9bHRyXSAuaXRlbS5hY3Rpb246OmJlZm9yZSk6CisgICAgICAg IChib2R5W2Rpcj1ydGxdIC5pdGVtLmFjdGlvbjo6YmVmb3JlKToKKyAgICAgICAgKC50cmVlLW91 dGxpbmU6bm90KC5oaWRlLWRpc2Nsb3N1cmUtYnV0dG9ucykgLml0ZW0uYWN0aW9uOm5vdCguaW5p dGlhbC1zdGF0ZSwgLnBhcmVudCkgPiAuaWNvbik6IEFkZGVkZS4KKyAgICAgICAgKGJvZHlbZGly PWx0cl0gLnRyZWUtb3V0bGluZTpub3QoLmhpZGUtZGlzY2xvc3VyZS1idXR0b25zKSAuaXRlbS5h Y3Rpb246bm90KC5pbml0aWFsLXN0YXRlLCAucGFyZW50KSA+IC5pY29uKTogRGVsZXRlZC4KKyAg ICAgICAgKGJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZTpub3QoLmhpZGUtZGlzY2xvc3VyZS1i dXR0b25zKSAuaXRlbS5hY3Rpb246bm90KC5pbml0aWFsLXN0YXRlLCAucGFyZW50KSA+IC5pY29u KTogRGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUu anM6CisgICAgICAgIChXSS5UcmVlT3V0bGluZS5fZ2VuZXJhdGVTdHlsZVJ1bGVzSWZOZWVkZWQp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuY3NzOgorICAgICAg ICAoLnRyZWUtb3V0bGluZSwgLnRyZWUtb3V0bGluZSAuY2hpbGRyZW4pOgorICAgICAgICAoLnRy ZWUtb3V0bGluZSAuaXRlbSk6CisgICAgICAgICgudHJlZS1vdXRsaW5lOm5vdCguaGlkZS1kaXNj bG9zdXJlLWJ1dHRvbnMpIC5pdGVtOm5vdCgucGFyZW50KSA+IC5pY29uKTogQWRkZWQuCisgICAg ICAgICgudHJlZS1vdXRsaW5lIC5pdGVtIC5pY29uKToKKyAgICAgICAgKC50cmVlLW91dGxpbmUg Lml0ZW0gLnN0YXR1cyk6IEFkZGVkLgorICAgICAgICAoYm9keVtkaXI9bHRyXSAudHJlZS1vdXRs aW5lIC5pdGVtIC5zdGF0dXMpOgorICAgICAgICAoYm9keVtkaXI9cnRsXSAudHJlZS1vdXRsaW5l IC5pdGVtIC5zdGF0dXMpOgorICAgICAgICAoYm9keVtkaXI9bHRyXSAudHJlZS1vdXRsaW5lOm5v dCguaGlkZS1kaXNjbG9zdXJlLWJ1dHRvbnMpIC5pdGVtOm5vdCgucGFyZW50KSA+IC5pY29uKTog RGVsZXRlZC4KKyAgICAgICAgKGJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZTpub3QoLmhpZGUt ZGlzY2xvc3VyZS1idXR0b25zKSAuaXRlbTpub3QoLnBhcmVudCkgPiAuaWNvbik6IERlbGV0ZWQu CisgICAgICAgIChib2R5W2Rpcj1sdHJdIC50cmVlLW91dGxpbmUgLml0ZW0gLmljb24pOiBEZWxl dGVkLgorICAgICAgICAoYm9keVtkaXI9cnRsXSAudHJlZS1vdXRsaW5lIC5pdGVtIC5pY29uKTog RGVsZXRlZC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFu YWdlci5qczoKKyAgICAgICAgKFdJLkNhbnZhc01hbmFnZXIuc3VwcG9ydHNSZWNvcmRpbmdBdXRv Q2FwdHVyZSk6CisgICAgICAgIERyaXZlLWJ5OiBmaXggdXNhZ2Ugb2YgSW5zcGVjdG9yQmFja2Vu ZC5kb21haW5zLntDYW52YXNBZ2VudCA9PiBDYW52YXN9CisKIDIwMTktMDMtMDcgIE5pa2l0YSBW YXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3Rvcjog U3R5bGVzOiBvdmVycmlkZGVuIENTUyBwcm9wZXJ0eSBzaG91bGQgaGF2ZSBnby10byBidXR0b24g dG8ganVtcCB0byBlZmZlY3RpdmUgcHJvcGVydHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01hbmFnZXIuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2Vy LmpzCmluZGV4IDlkMzkxMWZlMjhlLi5lNzMwNjQwZDgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52 YXNNYW5hZ2VyLmpzCkBAIC01NCw3ICs1NCw3IEBAIFdJLkNhbnZhc01hbmFnZXIgPSBjbGFzcyBD YW52YXNNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBzdGF0aWMgc3VwcG9ydHNSZWNv cmRpbmdBdXRvQ2FwdHVyZSgpCiAgICAgewotICAgICAgICByZXR1cm4gSW5zcGVjdG9yQmFja2Vu ZC5kb21haW5zLkNhbnZhc0FnZW50ICYmIEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DYW52YXNB Z2VudC5zZXRSZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnQ7CisgICAgICAgIHJldHVybiBJ bnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMuQ2FudmFzICYmIEluc3BlY3RvckJhY2tlbmQuZG9tYWlu cy5DYW52YXMuc2V0UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50OwogICAgIH0KIAogICAg IC8vIFB1YmxpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcwpp bmRleCAyNGRlYmEyODE4NS4uNzg0NGQwZDAzODcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092 ZXJ2aWV3Q29udGVudFZpZXcuY3NzCkBAIC0xODMsOCArMTgzLDYgQEAKICAgICBtaW4td2lkdGg6 IDEuNWVtOwogICAgIG1hcmdpbjogMCB2YXIoLS1yZWNvcmRpbmctYXV0by1jYXB0dXJlLWlucHV0 LW1hcmdpbik7IAogICAgIHRleHQtYWxpZ246IGNlbnRlcjsKLQotICAgIC0tcmVjb3JkaW5nLWF1 dG8tY2FwdHVyZS1pbnB1dC1tYXJnaW46IDRweDsgLyogS2VlcCB0aGlzIGluIHN5bmMgd2l0aCBg cmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dE1hcmdpbmAuICovCiB9CiAKIC5uYXZpZ2F0aW9uLWJh ciA+IC5pdGVtLmNhbnZhcy1yZWNvcmRpbmctYXV0by1jYXB0dXJlID4gbGFiZWwgPiBpbnB1dDo6 LXdlYmtpdC1pbm5lci1zcGluLWJ1dHRvbiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdD b250ZW50Vmlldy5qcwppbmRleCA5MjgzZDI2YzU2NS4uYmM0OGQwZTY5OTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3 Q29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qcwpAQCAtNDgsNiArNDgsNyBAQCBXSS5D YW52YXNPdmVydmlld0NvbnRlbnRWaWV3ID0gY2xhc3MgQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbGxlYwogICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1 cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaW5wdXQi KTsKICAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0 RWxlbWVudC50eXBlID0gIm51bWJlciI7CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdBdXRv Q2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQubWluID0gMDsKKyAgICAgICAgICAgIHRoaXMu X3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVudC5zdHlsZS5zZXRQcm9w ZXJ0eSgiLS1yZWNvcmRpbmctYXV0by1jYXB0dXJlLWlucHV0LW1hcmdpbiIsIENhbnZhc092ZXJ2 aWV3Q29udGVudFZpZXcuX3JlY29yZGluZ0F1dG9DYXB0dXJlSW5wdXRNYXJnaW4gKyAicHgiKTsK ICAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxl bWVudC5hZGRFdmVudExpc3RlbmVyKCJpbnB1dCIsIHRoaXMuX2hhbmRsZVJlY29yZGluZ0F1dG9D YXB0dXJlSW5wdXQuYmluZCh0aGlzKSk7CiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdBdXRv Q2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnRWYWx1ZSA9IFdJLnNldHRpbmdzLmNhbnZhc1Jl Y29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudC52YWx1ZTsKIApAQCAtNzgsNiArNzksMTAgQEAg V0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50VmlldyA9IGNsYXNzIENhbnZhc092ZXJ2aWV3Q29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db2xsZWMKICAgICAgICAgdGhpcy5faW1wb3J0QnV0dG9uTmF2aWdh dGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5D bGlja2VkLCB0aGlzLl9oYW5kbGVJbXBvcnRCdXR0b25OYXZpZ2F0aW9uSXRlbUNsaWNrZWQsIHRo aXMpOwogICAgIH0KIAorICAgIC8vIFN0YXRpYworCisgICAgc3RhdGljIGdldCBfcmVjb3JkaW5n QXV0b0NhcHR1cmVJbnB1dE1hcmdpbigpIHsgcmV0dXJuIDQ7IH0KKwogICAgIC8vIFB1YmxpYwog CiAgICAgZ2V0IG5hdmlnYXRpb25JdGVtcygpCkBAIC0yNDgsMTEgKzI1Myw5IEBAIFdJLkNhbnZh c092ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4 dGVuZHMgV0kuQ29sbGVjCiAgICAgICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1 cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50Ll9fY2FjaGVkRm9udCA9IGNvbXB1dGVkU3R5bGUuZm9u dDsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgY29uc3QgcmVjb3JkaW5nQXV0b0NhcHR1 cmVJbnB1dE1hcmdpbiA9IDg7IC8vIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggYC0tcmVjb3JkaW5n LWF1dG8tY2FwdHVyZS1pbnB1dC1tYXJnaW5gLgotCiAgICAgICAgICAgICBjb250ZXh0LmZvbnQg PSB0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQuX19jYWNo ZWRGb250OwogICAgICAgICAgICAgbGV0IHRleHRNZXRyaWNzID0gY29udGV4dC5tZWFzdXJlVGV4 dCh0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQudmFsdWUg fHwgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnBsYWNl aG9sZGVyKTsKLSAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3Vu dElucHV0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgid2lkdGgiLCAodGV4dE1ldHJpY3Mud2lk dGggKyByZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0TWFyZ2luKSArICJweCIpOworICAgICAgICAg ICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnN0eWxl LnNldFByb3BlcnR5KCJ3aWR0aCIsICh0ZXh0TWV0cmljcy53aWR0aCArICgyICogQ2FudmFzT3Zl cnZpZXdDb250ZW50Vmlldy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dE1hcmdpbikpICsgInB4 Iik7CiAgICAgICAgIH0pOwogCiAgICAgICAgIHJldHVybiBmcmFtZUNvdW50OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5Q2F0ZWdv cnlWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01l bW9yeUNhdGVnb3J5Vmlldy5jc3MKaW5kZXggY2Y0YmQ2ZDQ4NTEuLjNjYjJiYzQ1NDE2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlD YXRlZ29yeVZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL01lbW9yeUNhdGVnb3J5Vmlldy5jc3MKQEAgLTI2LDcgKzI2LDcgQEAKIC5tZW1vcnkt Y2F0ZWdvcnktdmlldyB7CiAgICAgZGlzcGxheTogZmxleDsKICAgICB3aWR0aDogMTAwJTsKLSAg ICBoZWlnaHQ6IDc2cHg7IC8qIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggbWVtb3J5Q2F0ZWdvcnlW aWV3SGVpZ2h0ICsgMSAoZm9yIGJvcmRlci1ib3R0b20pICovCisgICAgaGVpZ2h0OiBjYWxjKHZh cigtLW1lbW9yeS1jYXRlZ29yeS12aWV3LWhlaWdodCkgKyAxcHgpOwogICAgIGJvcmRlci1ib3R0 b206IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1l bGluZVZpZXcuanMKaW5kZXggODY2YzcyY2JkYTguLmQxN2IxMWM0NTk4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVt b3J5VGltZWxpbmVWaWV3LmpzCkBAIC0xMTQsNiArMTE0LDggQEAgV0kuTWVtb3J5VGltZWxpbmVW aWV3ID0gY2xhc3MgTWVtb3J5VGltZWxpbmVWaWV3IGV4dGVuZHMgV0kuVGltZWxpbmVWaWV3CiAg ICAgICAgIH0KICAgICB9CiAKKyAgICBzdGF0aWMgZ2V0IF9tZW1vcnlDYXRlZ29yeVZpZXdoZWln aHQoKSB7IHJldHVybiA3NTsgfQorCiAgICAgLy8gUHVibGljCiAKICAgICBzaG93bigpCkBAIC0x NjUsNiArMTY3LDEzIEBAIFdJLk1lbW9yeVRpbWVsaW5lVmlldyA9IGNsYXNzIE1lbW9yeVRpbWVs aW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogCiAgICAgZ2V0IHNob3dzRmlsdGVyQmFy KCkgeyByZXR1cm4gZmFsc2U7IH0KIAorICAgIGluaXRpYWxMYXlvdXQoKQorICAgIHsKKyAgICAg ICAgc3VwZXIuaW5pdGlhbExheW91dCgpOworCisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS5z ZXRQcm9wZXJ0eSgiLS1tZW1vcnktY2F0ZWdvcnktdmlldy1oZWlnaHQiLCBNZW1vcnlUaW1lbGlu ZVZpZXcuX21lbW9yeUNhdGVnb3J5Vmlld2hlaWdodCArICJweCIpOworICAgIH0KKwogICAgIGxh eW91dCgpCiAgICAgewogICAgICAgICBpZiAodGhpcy5sYXlvdXRSZWFzb24gPT09IFdJLlZpZXcu TGF5b3V0UmVhc29uLlJlc2l6ZSkKQEAgLTE3OCw4ICsxODcsNiBAQCBXSS5NZW1vcnlUaW1lbGlu ZVZpZXcgPSBjbGFzcyBNZW1vcnlUaW1lbGluZVZpZXcgZXh0ZW5kcyBXSS5UaW1lbGluZVZpZXcK ICAgICAgICAgaWYgKCF0aGlzLl9kaWRJbml0aWFsaXplQ2F0ZWdvcmllcykKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICBjb25zdCBtZW1vcnlDYXRlZ29yeVZpZXdIZWlnaHQgPSA3NTsg Ly8gS2VlcCB0aGlzIGluIHN5bmMgd2l0aCAubWVtb3J5LWNhdGVnb3J5LXZpZXcKLQogICAgICAg ICBsZXQgZ3JhcGhTdGFydFRpbWUgPSB0aGlzLnN0YXJ0VGltZTsKICAgICAgICAgbGV0IGdyYXBo RW5kVGltZSA9IHRoaXMuZW5kVGltZTsKICAgICAgICAgbGV0IHNlY29uZHNQZXJQaXhlbCA9IHRo aXMuX3RpbWVsaW5lUnVsZXIuc2Vjb25kc1BlclBpeGVsOwpAQCAtMjY1LDcgKzI3Miw3IEBAIFdJ Lk1lbW9yeVRpbWVsaW5lVmlldyA9IGNsYXNzIE1lbW9yeVRpbWVsaW5lVmlldyBleHRlbmRzIFdJ LlRpbWVsaW5lVmlldwogICAgICAgICAgICAgICAgIHJldHVybiAodGltZSAtIGdyYXBoU3RhcnRU aW1lKSAvIHNlY29uZHNQZXJQaXhlbDsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgbGV0 IHNpemUgPSBuZXcgV0kuU2l6ZSh4U2NhbGUoZ3JhcGhFbmRUaW1lKSwgbWVtb3J5Q2F0ZWdvcnlW aWV3SGVpZ2h0KTsKKyAgICAgICAgICAgIGxldCBzaXplID0gbmV3IFdJLlNpemUoeFNjYWxlKGdy YXBoRW5kVGltZSksIE1lbW9yeVRpbWVsaW5lVmlldy5fbWVtb3J5Q2F0ZWdvcnlWaWV3aGVpZ2h0 KTsKIAogICAgICAgICAgICAgZnVuY3Rpb24geVNjYWxlKHZhbHVlKSB7CiAgICAgICAgICAgICAg ICAgcmV0dXJuIHNpemUuaGVpZ2h0IC0gKCgodmFsdWUgLSBncmFwaE1pbikgLyBncmFwaE1heCkg KiBzaXplLmhlaWdodCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MK aW5kZXggNGNiMDE4ZTZkNGUuLmMwYTI2YTA3MDE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5jc3MK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Rh YmxlQ29udGVudFZpZXcuY3NzCkBAIC0yMywxMCArMjMsNiBAQAogICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogICovCiAKLS5jb250ZW50LXZpZXcubmV0d29yayAubmV0d29yay10 YWJsZSB7Ci0gICAgLS1ub2RlLXdhdGVyZmFsbC1kb20tZXZlbnQtc2l6ZTogOHB4OyAvKiBLZWVw IHRoaXMgaW4gc3luYyB3aXRoIGBkb21FdmVudEVsZW1lbnRTaXplYC4gKi8KLX0KLQogLmNvbnRl bnQtdmlldy5uZXR3b3JrIC5uYXZpZ2F0aW9uLWJhciAuZmlsdGVyLWJhciB7CiAgICAgYmFja2dy b3VuZDogbm9uZTsKIH0KQEAgLTExOCwxNCArMTE0LDE2IEBAIGJvZHlbZGlyPXJ0bF0gLm5ldHdv cmstdGFibGUgLmNlbGwuZG9tLW5vZGUubmFtZSAuZGlzY2xvc3VyZSB7CiAgICAgZmlsdGVyOiBp bnZlcnQoKTsKIH0KIAorLm5ldHdvcmstdGFibGUgLmNlbGwubmFtZSA+IC5zdGF0dXMgeworICAg IC13ZWJraXQtbWFyZ2luLWxlZnQ6IDRweDsKK30KKwogYm9keVtkaXI9bHRyXSAubmV0d29yay10 YWJsZSAuY2VsbC5uYW1lID4gLnN0YXR1cyB7CiAgICAgZmxvYXQ6IHJpZ2h0OwotICAgIG1hcmdp bi1sZWZ0OiA0cHg7CiB9CiAKIGJvZHlbZGlyPXJ0bF0gLm5ldHdvcmstdGFibGUgLmNlbGwubmFt ZSA+IC5zdGF0dXMgewogICAgIGZsb2F0OiBsZWZ0OwotICAgIG1hcmdpbi1yaWdodDogNHB4Owog fQogCiAubmV0d29yay10YWJsZSAuY2VsbC5uYW1lID4gLnN0YXR1cyAuaW5kZXRlcm1pbmF0ZS1w cm9ncmVzcy1zcGlubmVyIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMK aW5kZXggMzZiN2QwZTZmN2IuLmEzMDhmNzIzZmNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFi bGVDb250ZW50Vmlldy5qcwpAQCAtMTk4LDYgKzE5OCw4IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRl bnRWaWV3ID0gY2xhc3MgTmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmllCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBzdGF0aWMgZ2V0IF9ub2RlV2F0ZXJmYWxsRE9N RXZlbnRTaXplKCkgeyByZXR1cm4gODsgfQorCiAgICAgLy8gUHVibGljCiAKICAgICBnZXQgc2Vs ZWN0aW9uUGF0aENvbXBvbmVudHMoKQpAQCAtNjc3LDE0ICs2NzksMTIgQEAgV0kuTmV0d29ya1Rh YmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRWaWUKIAogICAgICAgICBsZXQgZG9tTm9kZSA9IGVudHJ5LmRvbU5vZGU7CiAgICAg ICAgIGlmIChkb21Ob2RlKSB7Ci0gICAgICAgICAgICBjb25zdCBkb21FdmVudEVsZW1lbnRTaXpl ID0gODsgLy8gS2VlcCB0aGlzIGluIHN5bmMgd2l0aCBgLS1ub2RlLXdhdGVyZmFsbC1kb20tZXZl bnQtc2l6ZWAuCi0KICAgICAgICAgICAgIGxldCBncm91cGVkRE9NRXZlbnRzID0gW107CiAgICAg ICAgICAgICBmb3IgKGxldCBkb21FdmVudCBvZiBkb21Ob2RlLmRvbUV2ZW50cykgewogICAgICAg ICAgICAgICAgIGlmIChkb21FdmVudC5vcmlnaW5hdG9yKQogICAgICAgICAgICAgICAgICAgICBj b250aW51ZTsKIAotICAgICAgICAgICAgICAgIGlmICghZ3JvdXBlZERPTUV2ZW50cy5sZW5ndGgg fHwgKGRvbUV2ZW50LnRpbWVzdGFtcCAtIGdyb3VwZWRET01FdmVudHMubGFzdFZhbHVlLmVuZFRp bWVzdGFtcCkgPj0gKGRvbUV2ZW50RWxlbWVudFNpemUgKiBzZWNvbmRzUGVyUGl4ZWwpKSB7Cisg ICAgICAgICAgICAgICAgaWYgKCFncm91cGVkRE9NRXZlbnRzLmxlbmd0aCB8fCAoZG9tRXZlbnQu dGltZXN0YW1wIC0gZ3JvdXBlZERPTUV2ZW50cy5sYXN0VmFsdWUuZW5kVGltZXN0YW1wKSA+PSAo TmV0d29ya1RhYmxlQ29udGVudFZpZXcuX25vZGVXYXRlcmZhbGxET01FdmVudFNpemUgKiBzZWNv bmRzUGVyUGl4ZWwpKSB7CiAgICAgICAgICAgICAgICAgICAgIGdyb3VwZWRET01FdmVudHMucHVz aCh7CiAgICAgICAgICAgICAgICAgICAgICAgICBzdGFydFRpbWVzdGFtcDogZG9tRXZlbnQudGlt ZXN0YW1wLAogICAgICAgICAgICAgICAgICAgICAgICAgZG9tRXZlbnRzOiBbXSwKQEAgLTc2Miw3 ICs3NjIsNyBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogICAgICAgICAgICAgICAgIGNyZWF0 ZURPTUV2ZW50TGluZShncm91cGVkRE9NRXZlbnRzLmxhc3RWYWx1ZS5kb21FdmVudHMsIGdyb3Vw ZWRET01FdmVudHMubGFzdFZhbHVlLmVuZFRpbWVzdGFtcCwgdGhpcy5fd2F0ZXJmYWxsRW5kVGlt ZSk7CiAKICAgICAgICAgICAgIGZvciAobGV0IHtzdGFydFRpbWVzdGFtcCwgZW5kVGltZXN0YW1w LCBkb21FdmVudHN9IG9mIGdyb3VwZWRET01FdmVudHMpIHsKLSAgICAgICAgICAgICAgICBsZXQg cGFkZGluZ0ZvckNlbnRlcmluZyA9IGRvbUV2ZW50RWxlbWVudFNpemUgKiBzZWNvbmRzUGVyUGl4 ZWwgLyAyOworICAgICAgICAgICAgICAgIGxldCBwYWRkaW5nRm9yQ2VudGVyaW5nID0gTmV0d29y a1RhYmxlQ29udGVudFZpZXcuX25vZGVXYXRlcmZhbGxET01FdmVudFNpemUgKiBzZWNvbmRzUGVy UGl4ZWwgLyAyOwogCiAgICAgICAgICAgICAgICAgbGV0IGV2ZW50RWxlbWVudCA9IGNvbnRhaW5l ci5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CiAgICAgICAgICAg ICAgICAgZXZlbnRFbGVtZW50LmNsYXNzTGlzdC5hZGQoImRvbS1ldmVudCIpOwpAQCAtOTcyLDYg Kzk3MiwxMCBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJs ZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogCiAgICAgaW5pdGlhbExheW91dCgp CiAgICAgeworICAgICAgICBzdXBlci5pbml0aWFsTGF5b3V0KCk7CisKKyAgICAgICAgdGhpcy5l bGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCItLW5vZGUtd2F0ZXJmYWxsLWRvbS1ldmVudC1zaXpl IiwgTmV0d29ya1RhYmxlQ29udGVudFZpZXcuX25vZGVXYXRlcmZhbGxET01FdmVudFNpemUgKyAi cHgiKTsKKwogICAgICAgICB0aGlzLl93YXRlcmZhbGxUaW1lbGluZVJ1bGVyID0gbmV3IFdJLlRp bWVsaW5lUnVsZXI7CiAgICAgICAgIHRoaXMuX3dhdGVyZmFsbFRpbWVsaW5lUnVsZXIuYWxsb3dz Q2xpcHBlZExhYmVscyA9IHRydWU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0FjdGlvblRyZWVFbGVtZW50LmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0FjdGlvblRy ZWVFbGVtZW50LmNzcwppbmRleCBkODhlNTcyZmJmYi4uN2MxNTY1N2FjM2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0FjdGlv blRyZWVFbGVtZW50LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZWNvcmRpbmdBY3Rpb25UcmVlRWxlbWVudC5jc3MKQEAgLTMwLDYgKzMwLDggQEAK IC5pdGVtLmFjdGlvbjpub3QoLmluaXRpYWwtc3RhdGUpOjpiZWZvcmUgewogICAgIHBvc2l0aW9u OiByZWxhdGl2ZTsKICAgICB0b3A6IDNweDsKKyAgICAtd2Via2l0LW1hcmdpbi1zdGFydDogMDsK KyAgICAtd2Via2l0LW1hcmdpbi1lbmQ6IHZhcigtLXRyZWUtb3V0bGluZS1pY29uLW1hcmdpbi1l bmQpOwogICAgIGNvbnRlbnQ6IGF0dHIoZGF0YS1pbmRleCk7CiAgICAgZm9udC1mYW1pbHk6IC13 ZWJraXQtc3lzdGVtLWZvbnQsIHNhbnMtc2VyaWY7CiAgICAgZm9udC1zaXplOiA5cHg7CkBAIC00 MiwxNCArNDQsMTAgQEAKIAogYm9keVtkaXI9bHRyXSAuaXRlbS5hY3Rpb246OmJlZm9yZSB7CiAg ICAgZmxvYXQ6IGxlZnQ7Ci0gICAgbWFyZ2luLXJpZ2h0OiB2YXIoLS10cmVlLW91dGxpbmUtaWNv bi1tYXJnaW4tZW5kKTsKLSAgICBtYXJnaW4tbGVmdDogMDsKIH0KIAogYm9keVtkaXI9cnRsXSAu aXRlbS5hY3Rpb246OmJlZm9yZSB7CiAgICAgZmxvYXQ6IHJpZ2h0OwotICAgIG1hcmdpbi1yaWdo dDogMDsKLSAgICBtYXJnaW4tbGVmdDogdmFyKC0tdHJlZS1vdXRsaW5lLWljb24tbWFyZ2luLWVu ZCk7CiB9CiAKIC50cmVlLW91dGxpbmU6Zm9jdXMgLml0ZW0uYWN0aW9uLnNlbGVjdGVkOm5vdCgu aW52YWxpZCwgLmluaXRpYWwtc3RhdGUsIC5oYXMtY29udGV4dC1yZXBsYWNlcikgPiAuaWNvbiB7 CkBAIC05NywxMiArOTUsOCBAQCBib2R5Om5vdCgud2luZG93LWluYWN0aXZlLCAud2luZG93LWRv Y2tlZC1pbmFjdGl2ZSkgLnRyZWUtb3V0bGluZTpmb2N1cyAuaXRlbS5hYwogICAgIG1pbi13aWR0 aDogY2FsYyh2YXIoLS1kYXRhLWluZGVudCkgKiAzLjUpOwogfQogCi1ib2R5W2Rpcj1sdHJdIC50 cmVlLW91dGxpbmU6bm90KC5oaWRlLWRpc2Nsb3N1cmUtYnV0dG9ucykgLml0ZW0uYWN0aW9uOm5v dCguaW5pdGlhbC1zdGF0ZSwgLnBhcmVudCkgPiAuaWNvbiB7Ci0gICAgbWFyZ2luLWxlZnQ6IDA7 Ci19Ci0KLWJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZTpub3QoLmhpZGUtZGlzY2xvc3VyZS1i dXR0b25zKSAuaXRlbS5hY3Rpb246bm90KC5pbml0aWFsLXN0YXRlLCAucGFyZW50KSA+IC5pY29u IHsKLSAgICBtYXJnaW4tcmlnaHQ6IDA7CisudHJlZS1vdXRsaW5lOm5vdCguaGlkZS1kaXNjbG9z dXJlLWJ1dHRvbnMpIC5pdGVtLmFjdGlvbjpub3QoLmluaXRpYWwtc3RhdGUsIC5wYXJlbnQpID4g Lmljb24geworICAgIC13ZWJraXQtbWFyZ2luLXN0YXJ0OiAwOwogfQogCiAuaXRlbS5hY3Rpb24u dmlzdWFsOm5vdCguc2VsZWN0ZWQsIC5pbnZhbGlkKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5jc3MgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5jc3MKaW5kZXgg MjI5MTQ1OWJiZWUuLmRjMzg4NjRjMjkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5jc3MKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuY3NzCkBAIC0zMCwxMCAr MzAsMTAgQEAKICAgICBsaXN0LXN0eWxlOiBub25lOwogICAgIG91dGxpbmU6IG5vbmU7CiAKKyAg ICAtLXRyZWUtb3V0bGluZS1pdGVtLXBhZGRpbmc6IDVweDsKKwogICAgIC0tdHJlZS1vdXRsaW5l LWljb24tbWFyZ2luLXN0YXJ0OiAxNnB4OwogICAgIC0tdHJlZS1vdXRsaW5lLWljb24tbWFyZ2lu LWVuZDogM3B4OwotCi0gICAgLS10cmVlLW91dGxpbmUtc3RhdHVzLW1hcmdpbi1zdGFydDogNHB4 OwogfQogCiAudHJlZS1vdXRsaW5lIC5jaGlsZHJlbiB7CkBAIC00Nyw3ICs0Nyw3IEBACiAudHJl ZS1vdXRsaW5lIC5pdGVtIHsKICAgICBoZWlnaHQ6IDIwcHg7CiAKLSAgICBwYWRkaW5nOiAwIDVw eDsKKyAgICBwYWRkaW5nOiAwIHZhcigtLXRyZWUtb3V0bGluZS1pdGVtLXBhZGRpbmcpOwogCiAg ICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogCkBAIC04NSwxMiArODUsOCBA QCBib2R5W2Rpcj1ydGxdIC50cmVlLW91dGxpbmUgLml0ZW0gOm1hdGNoZXMoLmRpc2Nsb3N1cmUt YnV0dG9uLCAuaWNvbikgewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLWJvZHlbZGlyPWx0cl0g LnRyZWUtb3V0bGluZTpub3QoLmhpZGUtZGlzY2xvc3VyZS1idXR0b25zKSAuaXRlbTpub3QoLnBh cmVudCkgPiAuaWNvbiB7Ci0gICAgbWFyZ2luLWxlZnQ6IHZhcigtLXRyZWUtb3V0bGluZS1pY29u LW1hcmdpbi1zdGFydCk7Ci19Ci0KLWJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZTpub3QoLmhp ZGUtZGlzY2xvc3VyZS1idXR0b25zKSAuaXRlbTpub3QoLnBhcmVudCkgPiAuaWNvbiB7Ci0gICAg bWFyZ2luLXJpZ2h0OiB2YXIoLS10cmVlLW91dGxpbmUtaWNvbi1tYXJnaW4tc3RhcnQpOworLnRy ZWUtb3V0bGluZTpub3QoLmhpZGUtZGlzY2xvc3VyZS1idXR0b25zKSAuaXRlbTpub3QoLnBhcmVu dCkgPiAuaWNvbiB7CisgICAgLXdlYmtpdC1tYXJnaW4tc3RhcnQ6IHZhcigtLXRyZWUtb3V0bGlu ZS1pY29uLW1hcmdpbi1zdGFydCk7CiB9CiAKIC50cmVlLW91dGxpbmUgLml0ZW0gLmRpc2Nsb3N1 cmUtYnV0dG9uIHsKQEAgLTEzNSwxNCArMTMxLDcgQEAgYm9keVtkaXI9cnRsXSAudHJlZS1vdXRs aW5lIC5pdGVtIC5kaXNjbG9zdXJlLWJ1dHRvbiB7CiAgICAgd2lkdGg6IDE2cHg7CiAgICAgaGVp Z2h0OiAxNnB4OwogICAgIG1hcmdpbi10b3A6IDFweDsKLX0KLQotYm9keVtkaXI9bHRyXSAudHJl ZS1vdXRsaW5lIC5pdGVtIC5pY29uIHsKLSAgICBtYXJnaW4tcmlnaHQ6IHZhcigtLXRyZWUtb3V0 bGluZS1pY29uLW1hcmdpbi1lbmQpOwotfQotCi1ib2R5W2Rpcj1ydGxdIC50cmVlLW91dGxpbmUg Lml0ZW0gLmljb24gewotICAgIG1hcmdpbi1sZWZ0OiB2YXIoLS10cmVlLW91dGxpbmUtaWNvbi1t YXJnaW4tZW5kKTsKKyAgICAtd2Via2l0LW1hcmdpbi1lbmQ6IHZhcigtLXRyZWUtb3V0bGluZS1p Y29uLW1hcmdpbi1lbmQpOwogfQogCiAudHJlZS1vdXRsaW5lLmNvbXBhY3QgLml0ZW0gLmljb24g ewpAQCAtMTU3LDE3ICsxNDYsMTYgQEAgYm9keVtkaXI9cnRsXSAudHJlZS1vdXRsaW5lIC5pdGVt IC5pY29uIHsKIAogLnRyZWUtb3V0bGluZSAuaXRlbSAuc3RhdHVzIHsKICAgICBtYXJnaW4tdG9w OiAxcHg7CisgICAgLXdlYmtpdC1tYXJnaW4tc3RhcnQ6IDRweDsKICAgICBsaW5lLWhlaWdodDog MWVtOwogfQogCiBib2R5W2Rpcj1sdHJdIC50cmVlLW91dGxpbmUgLml0ZW0gLnN0YXR1cyB7CiAg ICAgZmxvYXQ6IHJpZ2h0OwotICAgIG1hcmdpbi1sZWZ0OiB2YXIoLS10cmVlLW91dGxpbmUtc3Rh dHVzLW1hcmdpbi1zdGFydCk7CiB9CiAKIGJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZSAuaXRl bSAuc3RhdHVzIHsKICAgICBmbG9hdDogbGVmdDsKLSAgICBtYXJnaW4tcmlnaHQ6IHZhcigtLXRy ZWUtb3V0bGluZS1zdGF0dXMtbWFyZ2luLXN0YXJ0KTsKIH0KIAogLnRyZWUtb3V0bGluZS5sYXJn ZSAuaXRlbSAuc3RhdHVzIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKaW5kZXggYzYzMmVmZTAxZjIuLjhkMWJl ZmIyOGVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpAQCAtOTQ2LDcgKzk0Niw2IEBAIFdJLlRyZWVPdXRs aW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgV0kuVHJl ZU91dGxpbmUuX3N0eWxlRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInN0eWxlIik7 CiAKICAgICAgICAgbGV0IG1heGltdW1UcmVlRGVwdGggPSAzMjsKLSAgICAgICAgbGV0IGJhc2VM ZWZ0UGFkZGluZyA9IDU7IC8vIE1hdGNoZXMgdGhlIHBhZGRpbmcgaW4gVHJlZU91dGxpbmUuY3Nz IGZvciB0aGUgaXRlbSBjbGFzcy4gS2VlcCBpbiBzeW5jLgogICAgICAgICBsZXQgZGVwdGhQYWRk aW5nID0gMTA7CiAKICAgICAgICAgbGV0IHN0eWxlVGV4dCA9ICIiOwpAQCAtOTU1LDEzICs5NTQs OCBAQCBXSS5UcmVlT3V0bGluZSA9IGNsYXNzIFRyZWVPdXRsaW5lIGV4dGVuZHMgV0kuT2JqZWN0 CiAgICAgICAgICAgICAvLyBLZWVwIGFsbCB0aGUgZWxlbWVudHMgYXQgdGhlIHNhbWUgZGVwdGgg b25jZSB0aGUgbWF4aW11bSBpcyByZWFjaGVkLgogICAgICAgICAgICAgY2hpbGRyZW5TdWJzdHJp bmcgKz0gaSA9PT0gbWF4aW11bVRyZWVEZXB0aCA/ICIgLmNoaWxkcmVuIiA6ICIgPiAuY2hpbGRy ZW4iOwogICAgICAgICAgICAgc3R5bGVUZXh0ICs9IGAuJHtXSS5UcmVlT3V0bGluZS5FbGVtZW50 U3R5bGVDbGFzc05hbWV9Om5vdCguJHtXSS5UcmVlT3V0bGluZS5DdXN0b21JbmRlbnRTdHlsZUNs YXNzTmFtZX0pJHtjaGlsZHJlblN1YnN0cmluZ30gPiAuaXRlbSB7IGA7Ci0KLSAgICAgICAgICAg IGlmIChXSS5yZXNvbHZlZExheW91dERpcmVjdGlvbigpID09PSBXSS5MYXlvdXREaXJlY3Rpb24u UlRMKQotICAgICAgICAgICAgICAgIHN0eWxlVGV4dCArPSAicGFkZGluZy1yaWdodDogIjsKLSAg ICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICBzdHlsZVRleHQgKz0gInBhZGRpbmctbGVm dDogIjsKLQotICAgICAgICAgICAgc3R5bGVUZXh0ICs9IChiYXNlTGVmdFBhZGRpbmcgKyAoZGVw dGhQYWRkaW5nICogaSkpICsgInB4OyB9XG4iOworICAgICAgICAgICAgc3R5bGVUZXh0ICs9IGAt d2Via2l0LXBhZGRpbmctc3RhcnQ6IGNhbGModmFyKC0tdHJlZS1vdXRsaW5lLWl0ZW0tcGFkZGlu ZykgKyAke2RlcHRoUGFkZGluZyAqIGl9cHgpO2A7CisgICAgICAgICAgICBzdHlsZVRleHQgKz0g YCB9O1xuYDsKICAgICAgICAgfQogCiAgICAgICAgIFdJLlRyZWVPdXRsaW5lLl9zdHlsZUVsZW1l bnQudGV4dENvbnRlbnQgPSBzdHlsZVRleHQ7Cg== 364280 2019-03-11 13:05:25 -0700 2019-03-11 13:35:27 -0700 Patch bug-194883-20190311130525.patch text/plain 14649 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDljMDI5MTQ4NjRlMTlhYThiMTg2ZTJlZGZkNDE5 ZjlkMGY0ODE5MzIuLjI3MzJlMjk4NjVmZmNlZTI3YjVhM2RiYjMwMGY3OGE4YzhkNGVhN2EgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE5LTAzLTExICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBl bGltaW5hdGUgbWFudWFsIHN5bmNpbmcgb2YgbnVtZXJpYyBjb25zdGFudHMgdXNlZCBieSBKYXZh U2NyaXB0IGFuZCBDU1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NDg4MworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDgyNTc3ODU+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuQ2FudmFz T3ZlcnZpZXdDb250ZW50Vmlldyk6CisgICAgICAgIChXSS5DYW52YXNPdmVydmlld0NvbnRlbnRW aWV3LnN0YXRpYyBnZXQgcmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dE1hcmdpbik6IEFkZGVkLgor ICAgICAgICAoV0kuQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5wcm90b3R5cGUuX3VwZGF0ZVJl Y29yZGluZ0F1dG9DYXB0dXJlSW5wdXRFbGVtZW50U2l6ZSk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5uYXZp Z2F0aW9uLWJhciA+IC5pdGVtLmNhbnZhcy1yZWNvcmRpbmctYXV0by1jYXB0dXJlID4gbGFiZWwg PiBpbnB1dCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeVRpbWVsaW5l Vmlldy5qczoKKyAgICAgICAgKFdJLk1lbW9yeVRpbWVsaW5lVmlldy5zdGF0aWMgZ2V0IG1lbW9y eUNhdGVnb3J5Vmlld0hlaWdodCk6IEFkZGVkLgorICAgICAgICAoV0kuTWVtb3J5VGltZWxpbmVW aWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KTogQWRkZWQuCisgICAgICAgIChXSS5NZW1vcnlU aW1lbGluZVZpZXcucHJvdG90eXBlLmxheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9W aWV3cy9NZW1vcnlDYXRlZ29yeVZpZXcuY3NzOgorICAgICAgICAoLm1lbW9yeS1jYXRlZ29yeS12 aWV3KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVu dFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrVGFibGVDb250ZW50Vmlldy5zdGF0aWMgZ2V0 IG5vZGVXYXRlcmZhbGxET01FdmVudFNpemUpOiBBZGRlZC4KKyAgICAgICAgKFdJLk5ldHdvcmtU YWJsZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKiBVc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5j b250ZW50LXZpZXcubmV0d29yayAubmV0d29yay10YWJsZSk6IERlbGV0ZWQuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV0kuVHJlZU91 dGxpbmUuX2dlbmVyYXRlU3R5bGVSdWxlc0lmTmVlZGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmNzczoKKyAgICAgICAgKC50cmVlLW91dGxpbmUsIC50cmVl LW91dGxpbmUgLmNoaWxkcmVuKToKKyAgICAgICAgKC50cmVlLW91dGxpbmUgLml0ZW0pOgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2VyLmpzOgorICAg ICAgICAoV0kuQ2FudmFzTWFuYWdlci5zdXBwb3J0c1JlY29yZGluZ0F1dG9DYXB0dXJlKToKKyAg ICAgICAgRHJpdmUtYnk6IGZpeCB1c2FnZSBvZiBJbnNwZWN0b3JCYWNrZW5kLmRvbWFpbnMue0Nh bnZhc0FnZW50ID0+IENhbnZhc30KKwogMjAxOS0wMy0wNyAgTmlraXRhIFZhc2lseWV2ICA8bnZh c2lseWV2QGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBTdHlsZXM6IG92ZXJy aWRkZW4gQ1NTIHByb3BlcnR5IHNob3VsZCBoYXZlIGdvLXRvIGJ1dHRvbiB0byBqdW1wIHRvIGVm ZmVjdGl2ZSBwcm9wZXJ0eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NhbnZhc01hbmFnZXIuanMKaW5kZXggOWQz OTExZmUyOGVhODBmNDkyMmJiODc3MDFlODhiYzg0ODZmMTE4ZS4uZTczMDY0MGQ4MTQ2ZGQxMDYx YzVkNzdiN2M0NWE2MzMyZTEyNjdhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ2FudmFzTWFuYWdlci5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DYW52YXNNYW5hZ2VyLmpz CkBAIC01NCw3ICs1NCw3IEBAIFdJLkNhbnZhc01hbmFnZXIgPSBjbGFzcyBDYW52YXNNYW5hZ2Vy IGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBzdGF0aWMgc3VwcG9ydHNSZWNvcmRpbmdBdXRvQ2Fw dHVyZSgpCiAgICAgewotICAgICAgICByZXR1cm4gSW5zcGVjdG9yQmFja2VuZC5kb21haW5zLkNh bnZhc0FnZW50ICYmIEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DYW52YXNBZ2VudC5zZXRSZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnQ7CisgICAgICAgIHJldHVybiBJbnNwZWN0b3JCYWNr ZW5kLmRvbWFpbnMuQ2FudmFzICYmIEluc3BlY3RvckJhY2tlbmQuZG9tYWlucy5DYW52YXMuc2V0 UmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50OwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2Fu dmFzT3ZlcnZpZXdDb250ZW50Vmlldy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcwppbmRleCAyNGRlYmEy ODE4NTlmZGFmZTUwNTJkMDA3NTAxNDdjZjY0ZTc3ODZhLi43ODQ0ZDBkMDM4NzBkMjU2NTRiMTgz N2RlZjhlMWUzNWE2MjFmYjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRlbnRWaWV3LmNzcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52YXNPdmVydmlld0NvbnRl bnRWaWV3LmNzcwpAQCAtMTgzLDggKzE4Myw2IEBACiAgICAgbWluLXdpZHRoOiAxLjVlbTsKICAg ICBtYXJnaW46IDAgdmFyKC0tcmVjb3JkaW5nLWF1dG8tY2FwdHVyZS1pbnB1dC1tYXJnaW4pOyAK ICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7Ci0KLSAgICAtLXJlY29yZGluZy1hdXRvLWNhcHR1cmUt aW5wdXQtbWFyZ2luOiA0cHg7IC8qIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggYHJlY29yZGluZ0F1 dG9DYXB0dXJlSW5wdXRNYXJnaW5gLiAqLwogfQogCiAubmF2aWdhdGlvbi1iYXIgPiAuaXRlbS5j YW52YXMtcmVjb3JkaW5nLWF1dG8tY2FwdHVyZSA+IGxhYmVsID4gaW5wdXQ6Oi13ZWJraXQtaW5u ZXItc3Bpbi1idXR0b24gewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NhbnZhc092ZXJ2aWV3Q29udGVudFZpZXcu anMKaW5kZXggOTI4M2QyNmM1NjU1M2VkNjVmZGEwYmUyOGZiNDVmOTUyZDUyMTIyYS4uOWM3ODUz NzJmMjQ4ZmEyNzAxNTlmMmU0NWJjZTEwMjA5NTZmYTc0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ2FudmFzT3ZlcnZpZXdDb250ZW50Vmll dy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9DYW52 YXNPdmVydmlld0NvbnRlbnRWaWV3LmpzCkBAIC00OCw2ICs0OCw3IEBAIFdJLkNhbnZhc092ZXJ2 aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ29sbGVjCiAgICAgICAgICAgICB0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291 bnRJbnB1dEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpbnB1dCIpOwogICAgICAg ICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnR5 cGUgPSAibnVtYmVyIjsKICAgICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJh bWVDb3VudElucHV0RWxlbWVudC5taW4gPSAwOworICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5n QXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCItLXJl Y29yZGluZy1hdXRvLWNhcHR1cmUtaW5wdXQtbWFyZ2luIiwgQ2FudmFzT3ZlcnZpZXdDb250ZW50 Vmlldy5yZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0TWFyZ2luICsgInB4Iik7CiAgICAgICAgICAg ICB0aGlzLl9yZWNvcmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQuYWRkRXZl bnRMaXN0ZW5lcigiaW5wdXQiLCB0aGlzLl9oYW5kbGVSZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0 LmJpbmQodGhpcykpOwogICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFt ZUNvdW50SW5wdXRFbGVtZW50VmFsdWUgPSBXSS5zZXR0aW5ncy5jYW52YXNSZWNvcmRpbmdBdXRv Q2FwdHVyZUZyYW1lQ291bnQudmFsdWU7CiAKQEAgLTc4LDYgKzc5LDEwIEBAIFdJLkNhbnZhc092 ZXJ2aWV3Q29udGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVu ZHMgV0kuQ29sbGVjCiAgICAgICAgIHRoaXMuX2ltcG9ydEJ1dHRvbk5hdmlnYXRpb25JdGVtLmFk ZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhp cy5faGFuZGxlSW1wb3J0QnV0dG9uTmF2aWdhdGlvbkl0ZW1DbGlja2VkLCB0aGlzKTsKICAgICB9 CiAKKyAgICAvLyBTdGF0aWMKKworICAgIHN0YXRpYyBnZXQgcmVjb3JkaW5nQXV0b0NhcHR1cmVJ bnB1dE1hcmdpbigpIHsgcmV0dXJuIDQ7IH0KKwogICAgIC8vIFB1YmxpYwogCiAgICAgZ2V0IG5h dmlnYXRpb25JdGVtcygpCkBAIC0yNDgsMTEgKzI1Myw5IEBAIFdJLkNhbnZhc092ZXJ2aWV3Q29u dGVudFZpZXcgPSBjbGFzcyBDYW52YXNPdmVydmlld0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29s bGVjCiAgICAgICAgICAgICAgICAgdGhpcy5fcmVjb3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50 SW5wdXRFbGVtZW50Ll9fY2FjaGVkRm9udCA9IGNvbXB1dGVkU3R5bGUuZm9udDsKICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgY29uc3QgcmVjb3JkaW5nQXV0b0NhcHR1cmVJbnB1dE1hcmdp biA9IDg7IC8vIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggYC0tcmVjb3JkaW5nLWF1dG8tY2FwdHVy ZS1pbnB1dC1tYXJnaW5gLgotCiAgICAgICAgICAgICBjb250ZXh0LmZvbnQgPSB0aGlzLl9yZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQuX19jYWNoZWRGb250OwogICAg ICAgICAgICAgbGV0IHRleHRNZXRyaWNzID0gY29udGV4dC5tZWFzdXJlVGV4dCh0aGlzLl9yZWNv cmRpbmdBdXRvQ2FwdHVyZUZyYW1lQ291bnRJbnB1dEVsZW1lbnQudmFsdWUgfHwgdGhpcy5fcmVj b3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnBsYWNlaG9sZGVyKTsKLSAg ICAgICAgICAgIHRoaXMuX3JlY29yZGluZ0F1dG9DYXB0dXJlRnJhbWVDb3VudElucHV0RWxlbWVu dC5zdHlsZS5zZXRQcm9wZXJ0eSgid2lkdGgiLCAodGV4dE1ldHJpY3Mud2lkdGggKyByZWNvcmRp bmdBdXRvQ2FwdHVyZUlucHV0TWFyZ2luKSArICJweCIpOworICAgICAgICAgICAgdGhpcy5fcmVj b3JkaW5nQXV0b0NhcHR1cmVGcmFtZUNvdW50SW5wdXRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5 KCJ3aWR0aCIsICh0ZXh0TWV0cmljcy53aWR0aCArICgyICogQ2FudmFzT3ZlcnZpZXdDb250ZW50 Vmlldy5yZWNvcmRpbmdBdXRvQ2FwdHVyZUlucHV0TWFyZ2luKSkgKyAicHgiKTsKICAgICAgICAg fSk7CiAKICAgICAgICAgcmV0dXJuIGZyYW1lQ291bnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlDYXRlZ29yeVZpZXcuY3NzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5Q2F0ZWdvcnlW aWV3LmNzcwppbmRleCBjZjRiZDZkNDg1MTgwODI3Mjc0MTEwNDkwZTY2YTg0YjgzOWIyMzQ0Li4z Y2IyYmM0NTQxNmIwYzBjZmQ2YmNiNjAxMjhiOWRiM2IyZTg5MGMzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlDYXRlZ29yeVZpZXcu Y3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9y eUNhdGVnb3J5Vmlldy5jc3MKQEAgLTI2LDcgKzI2LDcgQEAKIC5tZW1vcnktY2F0ZWdvcnktdmll dyB7CiAgICAgZGlzcGxheTogZmxleDsKICAgICB3aWR0aDogMTAwJTsKLSAgICBoZWlnaHQ6IDc2 cHg7IC8qIEtlZXAgdGhpcyBpbiBzeW5jIHdpdGggbWVtb3J5Q2F0ZWdvcnlWaWV3SGVpZ2h0ICsg MSAoZm9yIGJvcmRlci1ib3R0b20pICovCisgICAgaGVpZ2h0OiBjYWxjKHZhcigtLW1lbW9yeS1j YXRlZ29yeS12aWV3LWhlaWdodCkgKyAxcHgpOwogICAgIGJvcmRlci1ib3R0b206IDFweCBzb2xp ZCB2YXIoLS1ib3JkZXItY29sb3IpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9NZW1vcnlUaW1lbGluZVZpZXcuanMK aW5kZXggODY2YzcyY2JkYTgxYjg3M2NiM2I0YWE3OGM0ZWIxZDUzOWYxM2FhYi4uNDQyYjdkYTdk MjU4NDBjNmJkMzgzNzlhZjY4OGM5OWE3YmIxY2M1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTWVtb3J5VGltZWxpbmVWaWV3LmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL01lbW9yeVRpbWVsaW5l Vmlldy5qcwpAQCAtMTE0LDYgKzExNCw4IEBAIFdJLk1lbW9yeVRpbWVsaW5lVmlldyA9IGNsYXNz IE1lbW9yeVRpbWVsaW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogICAgICAgICB9CiAg ICAgfQogCisgICAgc3RhdGljIGdldCBtZW1vcnlDYXRlZ29yeVZpZXdIZWlnaHQoKSB7IHJldHVy biA3NTsgfQorCiAgICAgLy8gUHVibGljCiAKICAgICBzaG93bigpCkBAIC0xNjUsNiArMTY3LDEz IEBAIFdJLk1lbW9yeVRpbWVsaW5lVmlldyA9IGNsYXNzIE1lbW9yeVRpbWVsaW5lVmlldyBleHRl bmRzIFdJLlRpbWVsaW5lVmlldwogCiAgICAgZ2V0IHNob3dzRmlsdGVyQmFyKCkgeyByZXR1cm4g ZmFsc2U7IH0KIAorICAgIGluaXRpYWxMYXlvdXQoKQorICAgIHsKKyAgICAgICAgc3VwZXIuaW5p dGlhbExheW91dCgpOworCisgICAgICAgIHRoaXMuZWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgi LS1tZW1vcnktY2F0ZWdvcnktdmlldy1oZWlnaHQiLCBNZW1vcnlUaW1lbGluZVZpZXcubWVtb3J5 Q2F0ZWdvcnlWaWV3SGVpZ2h0ICsgInB4Iik7CisgICAgfQorCiAgICAgbGF5b3V0KCkKICAgICB7 CiAgICAgICAgIGlmICh0aGlzLmxheW91dFJlYXNvbiA9PT0gV0kuVmlldy5MYXlvdXRSZWFzb24u UmVzaXplKQpAQCAtMTc4LDggKzE4Nyw2IEBAIFdJLk1lbW9yeVRpbWVsaW5lVmlldyA9IGNsYXNz IE1lbW9yeVRpbWVsaW5lVmlldyBleHRlbmRzIFdJLlRpbWVsaW5lVmlldwogICAgICAgICBpZiAo IXRoaXMuX2RpZEluaXRpYWxpemVDYXRlZ29yaWVzKQogICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgIGNvbnN0IG1lbW9yeUNhdGVnb3J5Vmlld0hlaWdodCA9IDc1OyAvLyBLZWVwIHRoaXMg aW4gc3luYyB3aXRoIC5tZW1vcnktY2F0ZWdvcnktdmlldwotCiAgICAgICAgIGxldCBncmFwaFN0 YXJ0VGltZSA9IHRoaXMuc3RhcnRUaW1lOwogICAgICAgICBsZXQgZ3JhcGhFbmRUaW1lID0gdGhp cy5lbmRUaW1lOwogICAgICAgICBsZXQgc2Vjb25kc1BlclBpeGVsID0gdGhpcy5fdGltZWxpbmVS dWxlci5zZWNvbmRzUGVyUGl4ZWw7CkBAIC0yNjUsNyArMjcyLDcgQEAgV0kuTWVtb3J5VGltZWxp bmVWaWV3ID0gY2xhc3MgTWVtb3J5VGltZWxpbmVWaWV3IGV4dGVuZHMgV0kuVGltZWxpbmVWaWV3 CiAgICAgICAgICAgICAgICAgcmV0dXJuICh0aW1lIC0gZ3JhcGhTdGFydFRpbWUpIC8gc2Vjb25k c1BlclBpeGVsOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBsZXQgc2l6ZSA9IG5ldyBX SS5TaXplKHhTY2FsZShncmFwaEVuZFRpbWUpLCBtZW1vcnlDYXRlZ29yeVZpZXdIZWlnaHQpOwor ICAgICAgICAgICAgbGV0IHNpemUgPSBuZXcgV0kuU2l6ZSh4U2NhbGUoZ3JhcGhFbmRUaW1lKSwg TWVtb3J5VGltZWxpbmVWaWV3Lm1lbW9yeUNhdGVnb3J5Vmlld0hlaWdodCk7CiAKICAgICAgICAg ICAgIGZ1bmN0aW9uIHlTY2FsZSh2YWx1ZSkgewogICAgICAgICAgICAgICAgIHJldHVybiBzaXpl LmhlaWdodCAtICgoKHZhbHVlIC0gZ3JhcGhNaW4pIC8gZ3JhcGhNYXgpICogc2l6ZS5oZWlnaHQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RhYmxlQ29udGVudFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYmxlQ29udGVudFZpZXcuY3NzCmluZGV4IDRjYjAxOGU2 ZDRlYjVlMThhODFiYjFkYTJkOGU0ZjMxNDJjOTJjOTYuLjFiYzE3OWYzZWFhOTRlMTViYTU5OWVk ZTdhMmQxOTk3ODM2ZTRjYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmll dy5jc3MKQEAgLTIzLDEwICsyMyw2IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAgKi8KIAotLmNvbnRlbnQtdmlldy5uZXR3b3JrIC5uZXR3b3JrLXRhYmxlIHsKLSAgICAt LW5vZGUtd2F0ZXJmYWxsLWRvbS1ldmVudC1zaXplOiA4cHg7IC8qIEtlZXAgdGhpcyBpbiBzeW5j IHdpdGggYGRvbUV2ZW50RWxlbWVudFNpemVgLiAqLwotfQotCiAuY29udGVudC12aWV3Lm5ldHdv cmsgLm5hdmlnYXRpb24tYmFyIC5maWx0ZXItYmFyIHsKICAgICBiYWNrZ3JvdW5kOiBub25lOwog fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv TmV0d29ya1RhYmxlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcwppbmRleCAzNmI3ZDBlNmY3 Yjk5MGE0YzhhYzZlMDg2MDUwNzlmNDBjOTJiZTQ5Li44YWM0MzZiMGJlYjZlNzA3YmE2MGEwODUw ZWVhMGEzYWFhZDU1MzAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFibGVDb250ZW50Vmlldy5q cwpAQCAtMTk4LDYgKzE5OCw4IEBAIFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gY2xhc3Mg TmV0d29ya1RhYmxlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmllCiAgICAgICAgIH0K ICAgICB9CiAKKyAgICBzdGF0aWMgZ2V0IG5vZGVXYXRlcmZhbGxET01FdmVudFNpemUoKSB7IHJl dHVybiA4OyB9CisKICAgICAvLyBQdWJsaWMKIAogICAgIGdldCBzZWxlY3Rpb25QYXRoQ29tcG9u ZW50cygpCkBAIC02NzcsMTQgKzY3OSwxMiBAQCBXSS5OZXR3b3JrVGFibGVDb250ZW50VmlldyA9 IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZQogCiAg ICAgICAgIGxldCBkb21Ob2RlID0gZW50cnkuZG9tTm9kZTsKICAgICAgICAgaWYgKGRvbU5vZGUp IHsKLSAgICAgICAgICAgIGNvbnN0IGRvbUV2ZW50RWxlbWVudFNpemUgPSA4OyAvLyBLZWVwIHRo aXMgaW4gc3luYyB3aXRoIGAtLW5vZGUtd2F0ZXJmYWxsLWRvbS1ldmVudC1zaXplYC4KLQogICAg ICAgICAgICAgbGV0IGdyb3VwZWRET01FdmVudHMgPSBbXTsKICAgICAgICAgICAgIGZvciAobGV0 IGRvbUV2ZW50IG9mIGRvbU5vZGUuZG9tRXZlbnRzKSB7CiAgICAgICAgICAgICAgICAgaWYgKGRv bUV2ZW50Lm9yaWdpbmF0b3IpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAg ICAgICAgICAgICAgaWYgKCFncm91cGVkRE9NRXZlbnRzLmxlbmd0aCB8fCAoZG9tRXZlbnQudGlt ZXN0YW1wIC0gZ3JvdXBlZERPTUV2ZW50cy5sYXN0VmFsdWUuZW5kVGltZXN0YW1wKSA+PSAoZG9t RXZlbnRFbGVtZW50U2l6ZSAqIHNlY29uZHNQZXJQaXhlbCkpIHsKKyAgICAgICAgICAgICAgICBp ZiAoIWdyb3VwZWRET01FdmVudHMubGVuZ3RoIHx8IChkb21FdmVudC50aW1lc3RhbXAgLSBncm91 cGVkRE9NRXZlbnRzLmxhc3RWYWx1ZS5lbmRUaW1lc3RhbXApID49IChOZXR3b3JrVGFibGVDb250 ZW50Vmlldy5ub2RlV2F0ZXJmYWxsRE9NRXZlbnRTaXplICogc2Vjb25kc1BlclBpeGVsKSkgewog ICAgICAgICAgICAgICAgICAgICBncm91cGVkRE9NRXZlbnRzLnB1c2goewogICAgICAgICAgICAg ICAgICAgICAgICAgc3RhcnRUaW1lc3RhbXA6IGRvbUV2ZW50LnRpbWVzdGFtcCwKICAgICAgICAg ICAgICAgICAgICAgICAgIGRvbUV2ZW50czogW10sCkBAIC03NjIsNyArNzYyLDcgQEAgV0kuTmV0 d29ya1RhYmxlQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFibGVDb250ZW50VmlldyBleHRl bmRzIFdJLkNvbnRlbnRWaWUKICAgICAgICAgICAgICAgICBjcmVhdGVET01FdmVudExpbmUoZ3Jv dXBlZERPTUV2ZW50cy5sYXN0VmFsdWUuZG9tRXZlbnRzLCBncm91cGVkRE9NRXZlbnRzLmxhc3RW YWx1ZS5lbmRUaW1lc3RhbXAsIHRoaXMuX3dhdGVyZmFsbEVuZFRpbWUpOwogCiAgICAgICAgICAg ICBmb3IgKGxldCB7c3RhcnRUaW1lc3RhbXAsIGVuZFRpbWVzdGFtcCwgZG9tRXZlbnRzfSBvZiBn cm91cGVkRE9NRXZlbnRzKSB7Ci0gICAgICAgICAgICAgICAgbGV0IHBhZGRpbmdGb3JDZW50ZXJp bmcgPSBkb21FdmVudEVsZW1lbnRTaXplICogc2Vjb25kc1BlclBpeGVsIC8gMjsKKyAgICAgICAg ICAgICAgICBsZXQgcGFkZGluZ0ZvckNlbnRlcmluZyA9IE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3 Lm5vZGVXYXRlcmZhbGxET01FdmVudFNpemUgKiBzZWNvbmRzUGVyUGl4ZWwgLyAyOwogCiAgICAg ICAgICAgICAgICAgbGV0IGV2ZW50RWxlbWVudCA9IGNvbnRhaW5lci5hcHBlbmRDaGlsZChkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CiAgICAgICAgICAgICAgICAgZXZlbnRFbGVtZW50 LmNsYXNzTGlzdC5hZGQoImRvbS1ldmVudCIpOwpAQCAtOTcyLDYgKzk3MiwxMCBAQCBXSS5OZXR3 b3JrVGFibGVDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3IGV4dGVu ZHMgV0kuQ29udGVudFZpZQogCiAgICAgaW5pdGlhbExheW91dCgpCiAgICAgeworICAgICAgICBz dXBlci5pbml0aWFsTGF5b3V0KCk7CisKKyAgICAgICAgdGhpcy5lbGVtZW50LnN0eWxlLnNldFBy b3BlcnR5KCItLW5vZGUtd2F0ZXJmYWxsLWRvbS1ldmVudC1zaXplIiwgTmV0d29ya1RhYmxlQ29u dGVudFZpZXcubm9kZVdhdGVyZmFsbERPTUV2ZW50U2l6ZSArICJweCIpOworCiAgICAgICAgIHRo aXMuX3dhdGVyZmFsbFRpbWVsaW5lUnVsZXIgPSBuZXcgV0kuVGltZWxpbmVSdWxlcjsKICAgICAg ICAgdGhpcy5fd2F0ZXJmYWxsVGltZWxpbmVSdWxlci5hbGxvd3NDbGlwcGVkTGFiZWxzID0gdHJ1 ZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvVHJlZU91dGxpbmUuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvVHJlZU91dGxpbmUuY3NzCmluZGV4IDIyOTE0NTliYmVlMWM4MzBjNjhjY2QyZDY5ZDE0 OThjZTg0NWE1OGYuLmJmNzE1MTA2YmRlNmM5Mjg3YzNmYWY0NTg5ZTMwOTNhZjc4NTE4ZmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVP dXRsaW5lLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9UcmVlT3V0bGluZS5jc3MKQEAgLTMwLDYgKzMwLDggQEAKICAgICBsaXN0LXN0eWxlOiBub25l OwogICAgIG91dGxpbmU6IG5vbmU7CiAKKyAgICAtLXRyZWUtb3V0bGluZS1pdGVtLXBhZGRpbmc6 IDVweDsKKwogICAgIC0tdHJlZS1vdXRsaW5lLWljb24tbWFyZ2luLXN0YXJ0OiAxNnB4OwogICAg IC0tdHJlZS1vdXRsaW5lLWljb24tbWFyZ2luLWVuZDogM3B4OwogCkBAIC00Nyw3ICs0OSw3IEBA CiAudHJlZS1vdXRsaW5lIC5pdGVtIHsKICAgICBoZWlnaHQ6IDIwcHg7CiAKLSAgICBwYWRkaW5n OiAwIDVweDsKKyAgICBwYWRkaW5nOiAwIHZhcigtLXRyZWUtb3V0bGluZS1pdGVtLXBhZGRpbmcp OwogCiAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5l LmpzCmluZGV4IGM2MzJlZmUwMWYyMjE1NjJiMjRhZDg3YTM1ZmM5YWJhMTA5OGY2NWIuLjhkMWJl ZmIyOGVjZDc4NDc5ZDVhYjRlYjcxODIzYTdhYTJiYTU2NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzCkBA IC05NDYsNyArOTQ2LDYgQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBleHRl bmRzIFdJLk9iamVjdAogICAgICAgICBXSS5UcmVlT3V0bGluZS5fc3R5bGVFbGVtZW50ID0gZG9j dW1lbnQuY3JlYXRlRWxlbWVudCgic3R5bGUiKTsKIAogICAgICAgICBsZXQgbWF4aW11bVRyZWVE ZXB0aCA9IDMyOwotICAgICAgICBsZXQgYmFzZUxlZnRQYWRkaW5nID0gNTsgLy8gTWF0Y2hlcyB0 aGUgcGFkZGluZyBpbiBUcmVlT3V0bGluZS5jc3MgZm9yIHRoZSBpdGVtIGNsYXNzLiBLZWVwIGlu IHN5bmMuCiAgICAgICAgIGxldCBkZXB0aFBhZGRpbmcgPSAxMDsKIAogICAgICAgICBsZXQgc3R5 bGVUZXh0ID0gIiI7CkBAIC05NTUsMTMgKzk1NCw4IEBAIFdJLlRyZWVPdXRsaW5lID0gY2xhc3Mg VHJlZU91dGxpbmUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgICAgIC8vIEtlZXAgYWxsIHRo ZSBlbGVtZW50cyBhdCB0aGUgc2FtZSBkZXB0aCBvbmNlIHRoZSBtYXhpbXVtIGlzIHJlYWNoZWQu CiAgICAgICAgICAgICBjaGlsZHJlblN1YnN0cmluZyArPSBpID09PSBtYXhpbXVtVHJlZURlcHRo ID8gIiAuY2hpbGRyZW4iIDogIiA+IC5jaGlsZHJlbiI7CiAgICAgICAgICAgICBzdHlsZVRleHQg Kz0gYC4ke1dJLlRyZWVPdXRsaW5lLkVsZW1lbnRTdHlsZUNsYXNzTmFtZX06bm90KC4ke1dJLlRy ZWVPdXRsaW5lLkN1c3RvbUluZGVudFN0eWxlQ2xhc3NOYW1lfSkke2NoaWxkcmVuU3Vic3RyaW5n fSA+IC5pdGVtIHsgYDsKLQotICAgICAgICAgICAgaWYgKFdJLnJlc29sdmVkTGF5b3V0RGlyZWN0 aW9uKCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEwpCi0gICAgICAgICAgICAgICAgc3R5bGVU ZXh0ICs9ICJwYWRkaW5nLXJpZ2h0OiAiOwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgIHN0eWxlVGV4dCArPSAicGFkZGluZy1sZWZ0OiAiOwotCi0gICAgICAgICAgICBzdHlsZVRl eHQgKz0gKGJhc2VMZWZ0UGFkZGluZyArIChkZXB0aFBhZGRpbmcgKiBpKSkgKyAicHg7IH1cbiI7 CisgICAgICAgICAgICBzdHlsZVRleHQgKz0gYC13ZWJraXQtcGFkZGluZy1zdGFydDogY2FsYyh2 YXIoLS10cmVlLW91dGxpbmUtaXRlbS1wYWRkaW5nKSArICR7ZGVwdGhQYWRkaW5nICogaX1weCk7 YDsKKyAgICAgICAgICAgIHN0eWxlVGV4dCArPSBgIH07XG5gOwogICAgICAgICB9CiAKICAgICAg ICAgV0kuVHJlZU91dGxpbmUuX3N0eWxlRWxlbWVudC50ZXh0Q29udGVudCA9IHN0eWxlVGV4dDsK