189766 2018-09-19 15:29:52 -0700 Web Inspector: Dark Mode: use the same CSS variables for dark and light modes 2018-10-01 18:31:45 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 189673 1 nvasilyev nvasilyev commit-queue inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1461141 0 nvasilyev 2018-09-19 15:29:52 -0700 With the dark mode, I added several dozen CSS variables. Currently, they are *only* used by the dark mode. The goal was to not break anything in the light mode while working on the dark mode. This is what it often looks like in the code: .cm-s-default { color: black; } @media (prefers-dark-interface) { :root { --text-color: hsl(0, 0%, 88%); } .cm-s-default { color: var(--text-color); } } Now that we don't expect many changes in the dark mode, it makes sense to start using the same variables for the light mode as well: :root { --text-color: black; } @media (prefers-dark-interface) { :root { --text-color: hsl(0, 0%, 88%); } } .cm-s-default { color: var(--text-color); } 1461143 1 webkit-bug-importer 2018-09-19 15:30:16 -0700 <rdar://problem/44619650> 1462459 2 350543 nvasilyev 2018-09-22 19:35:58 -0700 Created attachment 350543 Patch This patch focuses on --text-color and --background-color. There's more to be done, but I plan to complete the refactoring in 3-4 patches. 1465343 3 nvasilyev 2018-10-01 18:04:58 -0700 *** Bug 190181 has been marked as a duplicate of this bug. *** 1465344 4 350543 mattbaker 2018-10-01 18:06:19 -0700 Comment on attachment 350543 Patch r=me 1465351 5 350543 commit-queue 2018-10-01 18:31:44 -0700 Comment on attachment 350543 Patch Clearing flags on attachment: 350543 Committed r236705: <https://trac.webkit.org/changeset/236705> 1465352 6 commit-queue 2018-10-01 18:31:45 -0700 All reviewed patches have been landed. Closing bug. 350543 2018-09-22 19:35:58 -0700 2018-10-01 18:31:44 -0700 Patch patch.txt text/plain 29716 nvasilyev ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGJiYzIwMGRmOWM0Li5iZjZhYzQ1OGQ0YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTEyIEBACisyMDE4LTA5LTIyICBOaWtp dGEgVmFzaWx5ZXYgIDxudmFzaWx5ZXZAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERhcmsgTW9kZTogdXNlIHRoZSBzYW1lIENTUyB2YXJpYWJsZXMgZm9yIGRhcmsgYW5kIGxp Z2h0IG1vZGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODk3NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ0NjE5NjUwPgorCisgICAgICAgIFVz ZSAtLXRleHQtY29sb3IgYW5kIC0tYmFja2dyb3VuZC1jb2xvciBDU1MgdmFyaWFibGVzIGZvciBi b3RoIGRhcmsgYW5kIGxpZ2h0IG1vZGVzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50UG9wb3Zl ckNvbnRyb2xsZXIuY3NzOgorICAgICAgICAoLnBvcG92ZXIgLmVkaXQtYnJlYWtwb2ludC1wb3Bv dmVyLWNvbnRlbnQgPiBsYWJlbC50b2dnbGUpOgorICAgICAgICBDb2xvciBvZiB0aGUgbGFiZWwg bWF0Y2hlcyB0aGUgY29sb3Igb2YgdGhlIHBvcG92ZXIsIG5vIG5lZWQgdG8gc3BlY2lmeSBpdC4K KworICAgICAgICAoLmVkaXQtYnJlYWtwb2ludC1wb3BvdmVyLWNvbmRpdGlvbik6CisgICAgICAg IChAbWVkaWEgKHByZWZlcnMtZGFyay1pbnRlcmZhY2UpKToKKyAgICAgICAgKC5wb3BvdmVyIC5l ZGl0LWJyZWFrcG9pbnQtcG9wb3Zlci1jb250ZW50ID4gdGFibGUgPiB0ciA+IHRoKToKKyAgICAg ICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcuY3NzOgor ICAgICAgICAoLmNvbXBsZXRpb24tc3VnZ2VzdGlvbnMtY29udGFpbmVyID4gLml0ZW0pOgorICAg ICAgICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICguY29tcGxl dGlvbi1zdWdnZXN0aW9ucyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRl ZFN0eWxlRGV0YWlsc1BhbmVsLmNzczoKKyAgICAgICAgKC5kZXRhaWxzLXNlY3Rpb246bWF0Y2hl cyguY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllcywgLmNvbXB1dGVkLXN0eWxlLWJveC1tb2RlbCk6 bm90KC5jb2xsYXBzZWQpID4gOm1hdGNoZXMoLmhlYWRlciwgLmNvbnRlbnQpKToKKyAgICAgICAg KC5jb21wdXRlZC1zdHlsZS1wcm9wZXJ0aWVzIC5wcm9wZXJ0eTpob3ZlciAuZ28tdG8tYXJyb3cp OgorICAgICAgICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6IERlbGV0ZWQuCisg ICAgICAgICguY29tcHV0ZWQtc3R5bGUtcHJvcGVydGllcy5kZXRhaWxzLXNlY3Rpb24pOiBEZWxl dGVkLgorICAgICAgICAoLmRldGFpbHMtc2VjdGlvbi5zdHlsZS1ib3gtbW9kZWw6bm90KC5jb2xs YXBzZWQpID4gOm1hdGNoZXMoLmhlYWRlciwgLmNvbnRlbnQpKTogRGVsZXRlZC4KKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVRyZWVPdXRsaW5lLmNzczoKKyAgICAgICAgKC50cmVl LW91dGxpbmUuZG9tKToKKyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1kYXJrLWludGVyZmFjZSkp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzOgorICAgICAgICAo LmRhdGEtZ3JpZCB0aCk6CisgICAgICAgIChib2R5Om5vdCgud2luZG93LWluYWN0aXZlLCAud2lu ZG93LWRvY2tlZC1pbmFjdGl2ZSkgLmRhdGEtZ3JpZDptYXRjaGVzKDpmb2N1cywgLmZvcmNlLWZv Y3VzKSB0ci5lZGl0YWJsZS5zZWxlY3RlZCAuY2VsbC1jb250ZW50ID4gaW5wdXQpOgorICAgICAg ICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzczoKKyAgICAgICAg KC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlID4gLmNvbnRlbnQgfiAub3B0aW9u cy1jb250YWluZXIgPiAudG9nZ2xlLWNsYXNzLXRvZ2dsZSk6CisgICAgICAgIChAbWVkaWEgKHBy ZWZlcnMtZGFyay1pbnRlcmZhY2UpKToKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFp bHMuY3NzLXN0eWxlID4gLmNvbnRlbnQgfiAub3B0aW9ucy1jb250YWluZXIgPiAubmV3LXJ1bGUp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmNzczoKKyAgICAg ICAgKC5pbmxpbmUtc3dhdGNoKToKKyAgICAgICAgKC5pbmxpbmUtc3dhdGNoLXZhcmlhYmxlLXBv cG92ZXIgLkNvZGVNaXJyb3IgcHJlKToKKyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1kYXJrLWlu dGVyZmFjZSkpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a1Jlc291cmNlRGV0YWlsVmlldy5jc3M6CisgICAgICAgICgubmV0d29yay1yZXNvdXJjZS1kZXRh aWwpOgorICAgICAgICAoLm5ldHdvcmsgLm5ldHdvcmstcmVzb3VyY2UtZGV0YWlsIC5uYXZpZ2F0 aW9uLWJhciAuaXRlbS5yYWRpby5idXR0b24udGV4dC1vbmx5LnNlbGVjdGVkKToKKyAgICAgICAg KEBtZWRpYSAocHJlZmVycy1kYXJrLWludGVyZmFjZSkpOgorICAgICAgICAoLnJlc291cmNlLWhl YWRlcnMgLnZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgTW92ZSB0aGlzIHJ1bGUgdG8gUmVzb3Vy Y2VIZWFkZXJzQ29udGVudFZpZXcuY3NzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9PYmplY3RQcmV2aWV3Vmlldy5jc3M6CisgICAgICAgICgub2JqZWN0LXByZXZpZXcpOgorICAg ICAgICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICgub2JqZWN0 LXByZXZpZXcgLm5hbWUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJl ZVZpZXcuY3NzOgorICAgICAgICAoLm9iamVjdC10cmVlKToKKyAgICAgICAgKC5vYmplY3QtdHJl ZS1wcm9wZXJ0eSA6bWF0Y2hlcyguZm9ybWF0dGVkLXN0cmluZywgLmZvcm1hdHRlZC1yZWdleHAp KToKKyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1kYXJrLWludGVyZmFjZSkpOiBEZWxldGVkLgor ICAgICAgICAoLm9iamVjdC10cmVlLCk6IERlbGV0ZWQuCisKKyAgICAgICAgKC5vYmplY3QtcHJl dmlldyAubmFtZSk6IERlbGV0ZWQuCisgICAgICAgICgub2JqZWN0LXByZXZpZXcgPiAuc2l6ZSk6 IERlbGV0ZWQuCisgICAgICAgIE1vdmUgdGhlc2UgcnVsZXMgdG8gT2JqZWN0UHJldmlld1ZpZXcu Y3NzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuY3NzOgor ICAgICAgICAoLnF1aWNrLWNvbnNvbGUpOgorICAgICAgICAoQG1lZGlhIChwcmVmZXJzLWRhcmst aW50ZXJmYWNlKSk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUhlYWRl cnNDb250ZW50Vmlldy5jc3M6CisgICAgICAgICgucmVzb3VyY2UtaGVhZGVycyAudmFsdWUpOgor ICAgICAgICAoLnJlc291cmNlLWhlYWRlcnMuc2hvd2luZy1maW5kLWJhbm5lciAuc2VhcmNoLWhp Z2hsaWdodCk6CisgICAgICAgIChAbWVkaWEgKHByZWZlcnMtZGFyay1pbnRlcmZhY2UpKTogRGVs ZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQnJlYWtk b3duVmlldy5jc3M6CisgICAgICAgICgucmVzb3VyY2UtdGltaW5nLWJyZWFrZG93biA+IHRhYmxl ID4gdHIuaGVhZGVyOm5vdCgudG90YWwtcm93KSA+IHRkKToKKyAgICAgICAgKEBtZWRpYSAocHJl ZmVycy1kYXJrLWludGVyZmFjZSkpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3By ZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmNzczoKKyAgICAgICAgKC5zcHJlYWRz aGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5Om5vdCguZGlzYWJsZWQpIC52 YWx1ZSk6CisgICAgICAgICguc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5w cm9wZXJ0eTptYXRjaGVzKC5pbnZhbGlkLW5hbWUsIC5vdGhlci12ZW5kb3IsIC5vdmVycmlkZGVu KTpub3QoLmRpc2FibGVkKSAuY29udGVudCA+ICopOgorICAgICAgICAoQG1lZGlhIChwcmVmZXJz LWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICguc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRp b24tZWRpdG9yIC5wcm9wZXJ0eS5oYXMtd2FybmluZyAud2FybmluZyk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNz czoKKyAgICAgICAgKC5zcHJlYWRzaGVldC1jc3MtZGVjbGFyYXRpb24gLm1lZGlhLWxhYmVsKToK KyAgICAgICAgKC5zcHJlYWRzaGVldC1jc3MtZGVjbGFyYXRpb24gLnNlbGVjdG9yOmZvY3VzLCk6 CisgICAgICAgIChAbWVkaWEgKHByZWZlcnMtZGFyay1pbnRlcmZhY2UpKToKKyAgICAgICAgKC5z cHJlYWRzaGVldC1jc3MtZGVjbGFyYXRpb24gLm9yaWdpbiAuZ28tdG8tbGluaywpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVs LmNzczoKKyAgICAgICAgKC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlID4gLmNv bnRlbnQgPiAucnVsZXMgLnNlY3Rpb24taGVhZGVyIC5ub2RlLWxpbms6aG92ZXIpOgorICAgICAg ICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICguc2lkZWJhciA+ IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250ZW50ID4gLnJ1bGVzIC5zZWN0aW9uLWhl YWRlcik6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TeW50YXhIaWdobGlnaHRpbmdE ZWZhdWx0VGhlbWUuY3NzOgorICAgICAgICAoLmNtLXMtZGVmYXVsdCwpOgorICAgICAgICAoQG1l ZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICguc3ludGF4LWhpZ2hsaWdo dGVkLCk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UYWJsZS5jc3M6 CisgICAgICAgICgudGFibGUpOgorICAgICAgICAoLnRhYmxlID4gLmhlYWRlcik6CisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmNzczoKKyAgICAgICAgKC50 aW1lbGluZS1vdmVydmlldyA+IC5uYXZpZ2F0aW9uLWJhci50aW1lbGluZXMpOgorICAgICAgICAo QG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmNzczoKKyAgICAgICAgKC5jb250 ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtYnJvd3NlciA+IC5uYXZpZ2F0 aW9uLWJhciA+IC5pdGVtLnNjb3BlLWJhci5kZWZhdWx0LWl0ZW0tc2VsZWN0ZWQgPiAubXVsdGlw bGUpOgorICAgICAgICAoLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRpbmcgPiAuY29udGVu dC1icm93c2VyID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0uc2NvcGUtYmFyLmRlZmF1bHQtaXRl bS1zZWxlY3RlZCA+IC5tdWx0aXBsZSAuYXJyb3dzKToKKyAgICAgICAgKC5jb250ZW50LXZpZXcu dGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtYnJvd3NlciAucmVjb3JkaW5nLXByb2dyZXNz ID4gLnN0YXR1cyA+IC5pbmRldGVybWluYXRlLXByb2dyZXNzLXNwaW5uZXIpOgorICAgICAgICAo QG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6IERlbGV0ZWQuCisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzOgorICAgICAgICAoOnJvb3QpOgorICAgICAg ICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisgICAgICAgICogVXNlckludGVy ZmFjZS9WaWV3cy9YSFJCcmVha3BvaW50UG9wb3Zlci5jc3M6CisgICAgICAgICgucG9wb3ZlciAu eGhyLWJyZWFrcG9pbnQtY29udGVudCA+IC5lZGl0b3Itd3JhcHBlciA+IC5lZGl0b3IpOgorICAg ICAgICAoQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSk6CisKIDIwMTgtMDktMjEgIE5p a2l0YSBWYXNpbHlldiAgPG52YXNpbHlldkBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lP TihyMjM2MjM3KTogV2ViIEluc3BlY3RvcjogRGFya01vZGU6IHdoaXRlIGJhY2tncm91bmQgaW4g RWxlbWVudHMgYW5kIFRpbWVsaW5lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQnJlYWtwb2ludFBvcG92ZXJDb250cm9sbGVyLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0JyZWFrcG9pbnRQb3BvdmVy Q29udHJvbGxlci5jc3MKaW5kZXggNGFkYjg4YzU1ZDQuLjkzMGRhZGI2YWY2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9CcmVha3BvaW50UG9w b3ZlckNvbnRyb2xsZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0JyZWFrcG9pbnRQb3BvdmVyQ29udHJvbGxlci5jc3MKQEAgLTM1LDcgKzM1LDYg QEAKIH0KIAogLnBvcG92ZXIgLmVkaXQtYnJlYWtwb2ludC1wb3BvdmVyLWNvbnRlbnQgPiBsYWJl bC50b2dnbGUgewotICAgIGNvbG9yOiBibGFjazsKICAgICBmb250LXdlaWdodDogYm9sZDsKICAg ICB0ZXh0LW92ZXJmbG93OiBlbGxpcHNpczsKICAgICB3aGl0ZS1zcGFjZTogbm93cmFwOwpAQCAt NjQsNyArNjMsNyBAQAogICAgIHBhZGRpbmc6IDRweCAwIDJweCAwOwogICAgIC13ZWJraXQtYXBw ZWFyYW5jZTogdGV4dGZpZWxkOwogICAgIGJvcmRlcjogMXB4IHNvbGlkIGhzbCgwLCAwJSwgNzgl KTsKLSAgICBiYWNrZ3JvdW5kOiB3aGl0ZTsKKyAgICBiYWNrZ3JvdW5kOiB2YXIoLS1iYWNrZ3Jv dW5kLWNvbG9yLWNvZGUpOwogfQogCiAuZWRpdC1icmVha3BvaW50LXBvcG92ZXItY29uZGl0aW9u ID4gLkNvZGVNaXJyb3IgewpAQCAtOTEsMTUgKzkwLDcgQEAgYm9keVtkaXI9cnRsXSA6bWF0Y2hl cygjZWRpdC1icmVha3BvaW50LXBvcG92ZXItaWdub3JlLCAjZWRpdC1icmVha3BvaW50LXBvcG92 ZXIKIH0KIAogQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSB7Ci0gICAgLnBvcG92ZXIg LmVkaXQtYnJlYWtwb2ludC1wb3BvdmVyLWNvbnRlbnQgPiBsYWJlbC50b2dnbGUgewotICAgICAg ICBjb2xvcjogdW5zZXQ7Ci0gICAgfQotCiAgICAgLnBvcG92ZXIgLmVkaXQtYnJlYWtwb2ludC1w b3BvdmVyLWNvbnRlbnQgPiB0YWJsZSA+IHRyID4gdGggewogICAgICAgICBjb2xvcjogdmFyKC0t dGV4dC1jb2xvci1zZWNvbmRhcnkpOwogICAgIH0KLQotICAgIC5lZGl0LWJyZWFrcG9pbnQtcG9w b3Zlci1jb25kaXRpb24gewotICAgICAgICBiYWNrZ3JvdW5kOiB2YXIoLS1iYWNrZ3JvdW5kLWNv bG9yLWNvZGUpOwotICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0NvbXBsZXRpb25TdWdnZXN0aW9uc1ZpZXcuY3NzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcGxldGlvblN1Z2dlc3Rpb25z Vmlldy5jc3MKaW5kZXggNzQ3MDkwMzQ3ZjguLjUwNzE5NmEyMjBlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wbGV0aW9uU3VnZ2VzdGlv bnNWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db21wbGV0aW9uU3VnZ2VzdGlvbnNWaWV3LmNzcwpAQCAtNjcsNyArNjcsNyBAQAogICAgIG92 ZXJmbG93OiBoaWRkZW47CiAgICAgdGV4dC1vdmVyZmxvdzogZWxsaXBzaXM7CiAKLSAgICBjb2xv cjogYmxhY2s7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogfQogCiAuY29tcGxldGlv bi1zdWdnZXN0aW9ucy1jb250YWluZXI6bm90KDphY3RpdmUpID4gLml0ZW0uc2VsZWN0ZWQsCkBA IC04MCw4ICs4MCw0IEBACiAgICAgLmNvbXBsZXRpb24tc3VnZ2VzdGlvbnMgewogICAgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1vdmVybGF5LWJhY2tncm91bmQpOwogICAgIH0KLQotICAg IC5jb21wbGV0aW9uLXN1Z2dlc3Rpb25zLWNvbnRhaW5lciA+IC5pdGVtIHsKLSAgICAgICAgY29s b3I6IHZhcigtLXRleHQtY29sb3IpOwotICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwu Y3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRT dHlsZURldGFpbHNQYW5lbC5jc3MKaW5kZXggNDM3OTdlODliY2EuLmY1NmZlMmJiZTQzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRl ZFN0eWxlRGV0YWlsc1BhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmNzcwpAQCAtMjQsNyArMjQs NyBAQAogICovCiAKIC5kZXRhaWxzLXNlY3Rpb246bWF0Y2hlcyguY29tcHV0ZWQtc3R5bGUtcHJv cGVydGllcywgLmNvbXB1dGVkLXN0eWxlLWJveC1tb2RlbCk6bm90KC5jb2xsYXBzZWQpID4gOm1h dGNoZXMoLmhlYWRlciwgLmNvbnRlbnQpIHsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsK KyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yKTsKIH0KIAogLmNv bXB1dGVkLXN0eWxlLXByb3BlcnRpZXMgLnByb3BlcnR5IC5nby10by1hcnJvdyB7CkBAIC0zOCwx MyArMzgsMyBAQAogLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXMgLnByb3BlcnR5OmhvdmVyIC5n by10by1hcnJvdyB7CiAgICAgZGlzcGxheTogaW5pdGlhbDsKIH0KLQotQG1lZGlhIChwcmVmZXJz LWRhcmstaW50ZXJmYWNlKSB7Ci0gICAgLmNvbXB1dGVkLXN0eWxlLXByb3BlcnRpZXMuZGV0YWls cy1zZWN0aW9uIHsKLSAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tYmFja2dyb3VuZC1j b2xvcik7Ci0gICAgfQotCi0gICAgLmRldGFpbHMtc2VjdGlvbi5zdHlsZS1ib3gtbW9kZWw6bm90 KC5jb2xsYXBzZWQpID4gOm1hdGNoZXMoLmhlYWRlciwgLmNvbnRlbnQpIHsKLSAgICAgICAgYmFj a2dyb3VuZC1jb2xvcjogdmFyKC0tYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgfQotfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91 dGxpbmUuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9N VHJlZU91dGxpbmUuY3NzCmluZGV4IDZiZDQ5ZTk2Mzc4Li43NzRiOGQyM2M3YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NVHJlZU91dGxp bmUuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RP TVRyZWVPdXRsaW5lLmNzcwpAQCAtMzYsNyArMzYsNyBAQAogCiAgLyogTmVlZGVkIHRvIG1ha2Ug dGhlIG5lZ2F0aXZlIHotaW5kZXggb24gLnNlbGVjdGlvbi1hcmVhIHdvcmtzLiBPdGhlcndpc2Ug dGhlIGJhY2tncm91bmQtY29sb3IgZnJvbSAuc3ludGF4LWhpZ2hsaWdodGVkIGhpZGVzIHRoZSBz ZWxlY3Rpb24uICovCiAgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQgIWltcG9ydGFu dDsKLSAgICBjb2xvcjogYmxhY2s7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogCiAg ICAgLS1pdGVtLXBhcmVudC1tYXJnaW4tc3RhcnQ6IC0xNXB4OwogCkBAIC0zMDgsMTAgKzMwOCw2 IEBAIGJvZHlbZGlyPXJ0bF0gLnRyZWUtb3V0bGluZS5kb20gbGkucGFyZW50LnNoYWRvdzo6YWZ0 ZXIgewogfQogCiBAbWVkaWEgKHByZWZlcnMtZGFyay1pbnRlcmZhY2UpIHsKLSAgICAudHJlZS1v dXRsaW5lLmRvbSB7Ci0gICAgICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKLSAgICB9Ci0K ICAgICAudHJlZS1vdXRsaW5lLmRvbSBsaS5lbGVtZW50cy1kcmFnLW92ZXIgLnNlbGVjdGlvbi1h cmVhIHsKICAgICAgICAgYm9yZGVyLXRvcC1jb2xvcjogdmFyKC0tc2VsZWN0ZWQtYmFja2dyb3Vu ZC1jb2xvcik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRGF0YUdyaWQuY3NzCmluZGV4IDJmYWE3YmJmM2M3Li5jMjdjZTcyNzA0 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv RGF0YUdyaWQuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RhdGFHcmlkLmNzcwpAQCAtODQsNyArODQsNyBAQAogICAgIHZlcnRpY2FsLWFsaWduOiBt aWRkbGU7CiAgICAgZm9udC13ZWlnaHQ6IG5vcm1hbDsKICAgICB3aGl0ZS1zcGFjZTogbm93cmFw OwotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworICAgIGJhY2tncm91bmQtY29sb3I6IHZh cigtLWJhY2tncm91bmQtY29sb3IpOwogICAgIG92ZXJmbG93OiBoaWRkZW47CiB9CiAKQEAgLTQy NiwxNCArNDI2LDEwIEBAIGJvZHlbZGlyPXJ0bF0gLmRhdGEtZ3JpZCA6bWF0Y2hlcyh0aCwgdGQp OmZpcnN0LWNoaWxkIHsKIH0KIAogYm9keTpub3QoLndpbmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1k b2NrZWQtaW5hY3RpdmUpIC5kYXRhLWdyaWQ6bWF0Y2hlcyg6Zm9jdXMsIC5mb3JjZS1mb2N1cykg dHIuZWRpdGFibGUuc2VsZWN0ZWQgLmNlbGwtY29udGVudCA+IGlucHV0IHsKLSAgICBjb2xvcjog d2hpdGU7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogfQogCiBAbWVkaWEgKHByZWZl cnMtZGFyay1pbnRlcmZhY2UpIHsKLSAgICAuZGF0YS1ncmlkIHRoIHsKLSAgICAgICAgYmFja2dy b3VuZC1jb2xvcjogdmFyKC0tYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgfQotCiAgICAgLmRhdGEt Z3JpZCB0ZCAuc3VidGl0bGUgewogICAgICAgICBjb2xvcjogdmFyKC0tc2VsZWN0ZWQtc2Vjb25k YXJ5LXRleHQtY29sb3IpOwogICAgIH0KQEAgLTQ0MiwxMCArNDM4LDYgQEAgYm9keTpub3QoLndp bmRvdy1pbmFjdGl2ZSwgLndpbmRvdy1kb2NrZWQtaW5hY3RpdmUpIC5kYXRhLWdyaWQ6bWF0Y2hl cyg6Zm9jdXMsIC4KICAgICAgICAgY29sb3I6IGhzbGEoMCwgMCUsIHZhcigtLWZvcmVncm91bmQt bGlnaHRuZXNzKSwgMC45KTsKICAgICB9CiAKLSAgICBib2R5Om5vdCgud2luZG93LWluYWN0aXZl LCAud2luZG93LWRvY2tlZC1pbmFjdGl2ZSkgLmRhdGEtZ3JpZDptYXRjaGVzKDpmb2N1cywgLmZv cmNlLWZvY3VzKSB0ci5lZGl0YWJsZS5zZWxlY3RlZCAuY2VsbC1jb250ZW50ID4gaW5wdXQgewot ICAgICAgICBjb2xvcjogdmFyKC0tdGV4dC1jb2xvcik7Ci0gICAgfQotCiAgICAgLmRhdGEtZ3Jp ZCB0ci5lZGl0YWJsZSAuY2VsbC1jb250ZW50ID4gaW5wdXQgewogICAgICAgICBjb2xvcjogaW5o ZXJpdDsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9HZW5lcmFsU3R5bGVEZXRhaWxzU2lkZWJhclBhbmVsLmNzcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dlbmVyYWxTdHlsZURldGFpbHNTaWRl YmFyUGFuZWwuY3NzCmluZGV4IDlkMTUxZGM2NDU0Li4xOTFiNzM0NzBiMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR2VuZXJhbFN0eWxlRGV0 YWlsc1NpZGViYXJQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvR2VuZXJhbFN0eWxlRGV0YWlsc1NpZGViYXJQYW5lbC5jc3MKQEAgLTEwOSw2 ICsxMDksNyBAQCBib2R5W2Rpcj1ydGxdIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0 eWxlID4gLmNvbnRlbnQgfiAub3B0aW9ucy1jb250YWluZQogLnNpZGViYXIgPiAucGFuZWwuZGV0 YWlscy5jc3Mtc3R5bGUgPiAuY29udGVudCB+IC5vcHRpb25zLWNvbnRhaW5lciA+IC50b2dnbGUt Y2xhc3MtdG9nZ2xlIHsKICAgICBtYXJnaW46IDAgMCAxcHg7CiAgICAgcGFkZGluZzogMnB4IDRw eCAzcHg7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogICAgIGJhY2tncm91bmQ6IG5v bmU7CiAgICAgYm9yZGVyOiBub25lOwogICAgIGJvcmRlci1yYWRpdXM6IDNweDsKQEAgLTIyMiw4 ICsyMjMsNCBAQCBib2R5W2Rpcj1ydGxdIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0 eWxlID4gLmNvbnRlbnQgfiAuY2xhc3MtbGlzdC1jb250YQogICAgIC5zaWRlYmFyID4gLnBhbmVs LmRldGFpbHMuY3NzLXN0eWxlID4gLmNvbnRlbnQgfiAub3B0aW9ucy1jb250YWluZXIgPiAubmV3 LXJ1bGUgewogICAgICAgICBmaWx0ZXI6IHZhcigtLWZpbHRlci1pbnZlcnQpOwogICAgIH0KLQot ICAgIC5zaWRlYmFyID4gLnBhbmVsLmRldGFpbHMuY3NzLXN0eWxlID4gLmNvbnRlbnQgfiAub3B0 aW9ucy1jb250YWluZXIgPiAudG9nZ2xlLWNsYXNzLXRvZ2dsZXsKLSAgICAgICAgY29sb3I6IHZh cigtLXRleHQtY29sb3IpOwotICAgIH0KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0lubGluZVN3YXRjaC5jc3MgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guY3NzCmluZGV4IGUxZmM3 NjI2NGVjLi44OTBhOTQ1OTcwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvSW5saW5lU3dhdGNoLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9JbmxpbmVTd2F0Y2guY3NzCkBAIC0zMSw3ICszMSw3 IEBACiAgICAgaGVpZ2h0OiAxZW07CiAgICAgbWFyZ2luLXJpZ2h0OiAzcHg7CiAgICAgdmVydGlj YWwtYWxpZ246IC0ycHg7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7CisgICAgYmFja2dy b3VuZC1jb2xvcjogdmFyKC0tYmFja2dyb3VuZC1jb2xvcik7CiAgICAgYm9yZGVyLXJhZGl1czog MnB4OwogICAgIG92ZXJmbG93OiBoaWRkZW47CiAgICAgY3Vyc29yOiBkZWZhdWx0OwpAQCAtMTE4 LDkgKzExOCwzIEBACiAuaW5saW5lLXN3YXRjaC12YXJpYWJsZS1wb3BvdmVyIC5Db2RlTWlycm9y IHByZSB7CiAgICAgcGFkZGluZzogMCAzcHg7CiB9Ci0KLUBtZWRpYSAocHJlZmVycy1kYXJrLWlu dGVyZmFjZSkgewotICAgIC5pbmxpbmUtc3dhdGNoIHsKLSAgICAgICAgYmFja2dyb3VuZDogdmFy KC0tYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgfQotfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Jlc291cmNlRGV0YWlsVmlldy5j c3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrUmVz b3VyY2VEZXRhaWxWaWV3LmNzcwppbmRleCA3M2I1M2Q5OWZiYi4uZTU1ZTM0ZGI0MjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtS ZXNvdXJjZURldGFpbFZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtSZXNvdXJjZURldGFpbFZpZXcuY3NzCkBAIC0zMSw3ICszMSw3 IEBACiAgICAgYm90dG9tOiAwOwogICAgIC8qIGxlZnQgb3IgcmlnaHQgc2V0IGJ5IE5ldHdvcmtU YWJsZVZpZXcgb24gZGlzcGxheSAvIHJlc2l6ZSAqLwogICAgIHotaW5kZXg6IDEwOwotICAgIGJh Y2tncm91bmQtY29sb3I6IHdoaXRlOworICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWJhY2tn cm91bmQtY29sb3IpOwogfQogCiAubmV0d29yay1yZXNvdXJjZS1kZXRhaWwgLm5hdmlnYXRpb24t YmFyIHsKQEAgLTYxLDcgKzYxLDcgQEAKIAogLm5ldHdvcmsgLm5ldHdvcmstcmVzb3VyY2UtZGV0 YWlsIC5uYXZpZ2F0aW9uLWJhciAuaXRlbS5yYWRpby5idXR0b24udGV4dC1vbmx5LnNlbGVjdGVk IHsKICAgICBjb2xvcjogdmFyKC0tc2VsZWN0ZWQtYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgYmFj a2dyb3VuZC1jb2xvcjogd2hpdGU7CisgICAgYmFja2dyb3VuZC1jb2xvcjogdmFyKC0tYmFja2dy b3VuZC1jb2xvcik7CiB9CiAKIC5uZXR3b3JrLXJlc291cmNlLWRldGFpbCA+IC5jb250ZW50LWJy b3dzZXIgewpAQCAtODcsMTAgKzg3LDYgQEAKIH0KIAogQG1lZGlhIChwcmVmZXJzLWRhcmstaW50 ZXJmYWNlKSB7Ci0gICAgLm5ldHdvcmstcmVzb3VyY2UtZGV0YWlsIHsKLSAgICAgICAgYmFja2dy b3VuZC1jb2xvcjogdmFyKC0tYmFja2dyb3VuZC1jb2xvcik7Ci0gICAgfQotCiAgICAgLm5ldHdv cmstcmVzb3VyY2UtZGV0YWlsIC5pdGVtLmNsb3NlID4gLmdseXBoIHsKICAgICAgICAgYmFja2dy b3VuZC1jb2xvcjogaHNsYSgwLCAwJSwgMTAwJSwgMC4yKTsKICAgICB9CkBAIC05OSw4ICs5NSw0 IEBACiAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHVuc2V0OwogICAgICAgICBjb2xvcjogdmFy KC0tZ2x5cGgtY29sb3ItYWN0aXZlKTsKICAgICB9Ci0KLSAgICAucmVzb3VyY2UtaGVhZGVycyAu dmFsdWUgewotICAgICAgICBjb2xvcjogdmFyKC0tdGV4dC1jb2xvcik7Ci0gICAgfQogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0 UHJldmlld1ZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvT2JqZWN0UHJldmlld1ZpZXcuY3NzCmluZGV4IGRjNWUwYTk1OTlmLi4yODNjMzAyY2E3MSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2Jq ZWN0UHJldmlld1ZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL09iamVjdFByZXZpZXdWaWV3LmNzcwpAQCAtMjQsNyArMjQsNyBAQAogICovCiAK IC5vYmplY3QtcHJldmlldyB7Ci0gICAgY29sb3I6IGJsYWNrOworICAgIGNvbG9yOiB2YXIoLS10 ZXh0LWNvbG9yKTsKICAgICBmb250LXN0eWxlOiBpdGFsaWM7CiAgICAgZm9udC1mYW1pbHk6IE1l bmxvLCBtb25vc3BhY2U7CiAgICAgZm9udC1zaXplOiAxMXB4OwpAQCAtNDcsMyArNDcsOSBAQAog Lm9iamVjdC1wcmV2aWV3ID4gLnRpdGxlIHsKICAgICBsaW5lLWhlaWdodDogMTZweDsKIH0KKwor QG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSB7CisgICAgLm9iamVjdC1wcmV2aWV3IC5u YW1lIHsKKyAgICAgICAgY29sb3I6IHZhcigtLXN5bnRheC1oaWdobGlnaHQtYm9vbGVhbi1jb2xv cik7CisgICAgfQorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3NzCmluZGV4IDRlYWRhNjQ4Mjc5Li5i NTlkNjI0NzJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvT2JqZWN0VHJlZVZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVWaWV3LmNzcwpAQCAtMjYsNyArMjYsNyBAQAog Lm9iamVjdC10cmVlIHsKICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAgICAgZGlzcGxheTogaW5s aW5lLWJsb2NrOwotICAgIGNvbG9yOiBibGFjazsKKyAgICBjb2xvcjogdmFyKC0tdGV4dC1jb2xv cik7CiAgICAgZm9udC1mYW1pbHk6IE1lbmxvLCBtb25vc3BhY2U7CiAgICAgZm9udC1zaXplOiAx MXB4OwogfQpAQCAtMTMyLDE4ICsxMzIsMyBAQAogLm9iamVjdC10cmVlLXByb3BlcnR5IDptYXRj aGVzKC5mb3JtYXR0ZWQtc3RyaW5nLCAuZm9ybWF0dGVkLXJlZ2V4cCkgewogICAgIHdoaXRlLXNw YWNlOiBub3dyYXA7CiB9Ci0KLUBtZWRpYSAocHJlZmVycy1kYXJrLWludGVyZmFjZSkgewotICAg IC5vYmplY3QtdHJlZSwKLSAgICAub2JqZWN0LXByZXZpZXcgewotICAgICAgICBjb2xvcjogdmFy KC0tdGV4dC1jb2xvcik7Ci0gICAgfQotCi0gICAgLm9iamVjdC1wcmV2aWV3IC5uYW1lIHsKLSAg ICAgICAgY29sb3I6IHZhcigtLXN5bnRheC1oaWdobGlnaHQtYm9vbGVhbi1jb2xvcik7Ci0gICAg fQotCi0gICAgLm9iamVjdC1wcmV2aWV3ID4gLnNpemUgewotICAgICAgICBjb2xvcjogdmFyKC0t Y29uc29sZS1zZWNvbmRhcnktdGV4dC1jb2xvcik7Ci0gICAgfQotfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5j c3MKaW5kZXggNThkNGY3ZjI4MzAuLjVjNzk4NTk4ZmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuY3NzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5jc3MK QEAgLTMwLDcgKzMwLDggQEAKICAgICBkaXNwbGF5OiBmbGV4OwogICAgIGFsaWduLWl0ZW1zOiBm bGV4LWVuZDsKIAotICAgIGJhY2tncm91bmQtY29sb3I6IHdoaXRlOworICAgIGNvbG9yOiB2YXIo LS10ZXh0LWNvbG9yKTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNv bG9yLWNvZGUpOwogICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3Ip OwogICAgIHBhZGRpbmc6IDNweCAwIDRweDsKIApAQCAtMTA4LDEyICsxMDksNiBAQAogfQogCiBA bWVkaWEgKHByZWZlcnMtZGFyay1pbnRlcmZhY2UpIHsKLSAgICAucXVpY2stY29uc29sZSB7Ci0g ICAgICAgIGJhY2tncm91bmQtY29sb3I6IHZhcigtLWJhY2tncm91bmQtY29sb3ItY29kZSk7Ci0g ICAgICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKLSAgICAgICAgYm9yZGVyLXRvcDogMXB4 IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7Ci0gICAgfQotCiAgICAgLkNvZGVNaXJyb3IgLmp1 bXAtdG8tc3ltYm9sLWhpZ2hsaWdodCwKICAgICAubWV0YS1rZXktcHJlc3NlZCAuc3ByZWFkc2hl ZXQtY3NzLWRlY2xhcmF0aW9uOm5vdCgubG9ja2VkKSA6bWF0Y2hlcygubmFtZSwgLnZhbHVlKTpu b3QoLmVkaXRpbmcpOmhvdmVyIHsKICAgICAgICAgY29sb3I6IHZhcigtLXN5bnRheC1oaWdobGln aHQtbGluay1jb2xvcikgIWltcG9ydGFudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlSGVhZGVyc0NvbnRlbnRWaWV3LmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlSGVhZGVy c0NvbnRlbnRWaWV3LmNzcwppbmRleCA4MDY0NjZiMjVmZi4uMTNiYjUxMmEzYmQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlSGVh ZGVyc0NvbnRlbnRWaWV3LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZUhlYWRlcnNDb250ZW50Vmlldy5jc3MKQEAgLTYxLDcgKzYxLDcg QEAgYm9keVtkaXI9cnRsXSAucmVzb3VyY2UtaGVhZGVycyAuZGV0YWlscyAucGFpciB7CiB9CiAK IC5yZXNvdXJjZS1oZWFkZXJzIC52YWx1ZSB7Ci0gICAgY29sb3I6IGJsYWNrOworICAgIGNvbG9y OiB2YXIoLS10ZXh0LWNvbG9yKTsKIH0KIAogLnJlc291cmNlLWhlYWRlcnMgLmhlYWRlciA+IC5r ZXkgewpAQCAtODMsOSArODMsMyBAQCBib2R5W2Rpcj1ydGxdIC5yZXNvdXJjZS1oZWFkZXJzIC5k ZXRhaWxzIC5wYWlyIHsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2xhKDUzLCA4MyUsIDUzJSwg MC4yKTsKICAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgaHNsKDQ3LCA4MiUsIDYwJSk7CiB9 Ci0KLUBtZWRpYSAocHJlZmVycy1kYXJrLWludGVyZmFjZSkgewotICAgIC5yZXNvdXJjZS1oZWFk ZXJzIC52YWx1ZSB7Ci0gICAgICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKLSAgICB9Ci19 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZXNvdXJjZVRpbWluZ0JyZWFrZG93blZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1pbmdCcmVha2Rvd25WaWV3LmNzcwppbmRleCA3 ZjM5MjMwMTdlNy4uMGU5ODk2NDBkNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlVGltaW5nQnJlYWtkb3duVmlldy5jc3MKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VUaW1p bmdCcmVha2Rvd25WaWV3LmNzcwpAQCAtNTMsNyArNTMsNyBAQAogfQogCiAucmVzb3VyY2UtdGlt aW5nLWJyZWFrZG93biA+IHRhYmxlID4gdHIuaGVhZGVyOm5vdCgudG90YWwtcm93KSA+IHRkIHsK LSAgICBjb2xvcjogYmxhY2s7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogfQogCiAu cmVzb3VyY2UtdGltaW5nLWJyZWFrZG93biA+IHRhYmxlIGhyIHsKQEAgLTc3LDEwICs3Nyw2IEBA CiAgICAgICAgIC0tcG9wb3Zlci1iYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1wYW5lbC1iYWNrZ3Jv dW5kLWNvbG9yKTsKICAgICB9CiAKLSAgICAucmVzb3VyY2UtdGltaW5nLWJyZWFrZG93biA+IHRh YmxlID4gdHIuaGVhZGVyOm5vdCgudG90YWwtcm93KSA+IHRkIHsKLSAgICAgICAgY29sb3I6IHZh cigtLXRleHQtY29sb3IpOwotICAgIH0KLQogICAgIC5yZXNvdXJjZS10aW1pbmctYnJlYWtkb3du ID4gdGFibGUgPiB0ciA+IHRkLmxhYmVsLAogICAgIC5yZXNvdXJjZS10aW1pbmctYnJlYWtkb3du ID4gdGFibGUgPiB0ciA+IHRkLnRpbWUgewogICAgICAgICBjb2xvcjogdmFyKC0tdGV4dC1jb2xv ci1zZWNvbmRhcnkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NTdHlsZURlY2xhcmF0aW9uRWRpdG9yLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5 bGVEZWNsYXJhdGlvbkVkaXRvci5jc3MKaW5kZXggMmE0MmYyNDE4ZWQuLjI0YzVhYWE1OGNjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJl YWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25FZGl0b3IuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlv bkVkaXRvci5jc3MKQEAgLTQyLDcgKzQyLDcgQEAKIH0KIAogLnNwcmVhZHNoZWV0LXN0eWxlLWRl Y2xhcmF0aW9uLWVkaXRvciAucHJvcGVydHk6bm90KC5kaXNhYmxlZCkgLnZhbHVlIHsKLSAgICBj b2xvcjogYmxhY2s7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogfQogCiAuc3ByZWFk c2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIDptYXRjaGVzKC5uYW1lLCAudmFsdWUpLmVk aXRpbmcgewpAQCAtODMsNyArODMsNyBAQAogCiAuc3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRp b24tZWRpdG9yIC5wcm9wZXJ0eTptYXRjaGVzKC5pbnZhbGlkLW5hbWUsIC5vdGhlci12ZW5kb3Is IC5vdmVycmlkZGVuKTpub3QoLmRpc2FibGVkKSAuY29udGVudCA+ICogewogICAgIHRleHQtZGVj b3JhdGlvbjogbGluZS10aHJvdWdoOwotICAgIC13ZWJraXQtdGV4dC1kZWNvcmF0aW9uLWNvbG9y OiBoc2xhKDAsIDAlLCAwJSwgMC42KTsKKyAgICAtd2Via2l0LXRleHQtZGVjb3JhdGlvbi1jb2xv cjogaHNsYSgwLCAwJSwgdmFyKC0tZm9yZWdyb3VuZC1saWdodG5lc3MpLCAwLjYpOwogfQogCiAu c3ByZWFkc2hlZXQtc3R5bGUtZGVjbGFyYXRpb24tZWRpdG9yIC5wcm9wZXJ0eS5pbnZhbGlkLW5h bWU6bm90KC5kaXNhYmxlZCkgLmNvbnRlbnQgPiAqIHsKQEAgLTE1NiwxMCArMTU2LDYgQEAKIH0K IAogQG1lZGlhIChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSB7Ci0gICAgLnNwcmVhZHNoZWV0LXN0 eWxlLWRlY2xhcmF0aW9uLWVkaXRvciAucHJvcGVydHk6bm90KC5kaXNhYmxlZCkgLnZhbHVlIHsK LSAgICAgICAgY29sb3I6IHJnYigyMjcsIDIyNywgMjI3KQotICAgIH0KLQogICAgIC5zcHJlYWRz aGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgOm1hdGNoZXMoLm5hbWUsIC52YWx1ZSkuZWRp dGluZyB7CiAgICAgICAgIG91dGxpbmUtY29sb3I6IHZhcigtLWJhY2tncm91bmQtY29sb3Itc2Vj b25kYXJ5KSAhaW1wb3J0YW50OwogICAgIH0KQEAgLTE3MSw5ICsxNjcsNCBAQAogICAgIC5zcHJl YWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnByb3BlcnR5Lmhhcy13YXJuaW5nIC53 YXJuaW5nIHsKICAgICAgICAgZmlsdGVyOiBpbnZlcnQoMTAwJSkgaHVlLXJvdGF0ZSgxNTBkZWcp OwogICAgIH0KLQotICAgIC5zcHJlYWRzaGVldC1zdHlsZS1kZWNsYXJhdGlvbi1lZGl0b3IgLnBy b3BlcnR5Om1hdGNoZXMoLmludmFsaWQtbmFtZSwgLm90aGVyLXZlbmRvciwgLm92ZXJyaWRkZW4p Om5vdCguZGlzYWJsZWQpIC5jb250ZW50ID4gKiB7Ci0gICAgICAgIHRleHQtZGVjb3JhdGlvbjog bGluZS10aHJvdWdoOwotICAgICAgICAtd2Via2l0LXRleHQtZGVjb3JhdGlvbi1jb2xvcjogaHNs YSgwLCAwJSwgdmFyKC0tdGV4dC1jb2xvciksIDAuNik7Ci0gICAgfQogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRDU1NT dHlsZURlY2xhcmF0aW9uU2VjdGlvbi5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9TcHJlYWRzaGVldENTU1N0eWxlRGVjbGFyYXRpb25TZWN0aW9uLmNzcwpp bmRleCBkNTRlNzFhMjE5Ny4uZDE1ODY0NTg3YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlv blNlY3Rpb24uY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1NwcmVhZHNoZWV0Q1NTU3R5bGVEZWNsYXJhdGlvblNlY3Rpb24uY3NzCkBAIC00OCw3ICs0 OCw3IEBACiB9CiAKIC5zcHJlYWRzaGVldC1jc3MtZGVjbGFyYXRpb24gLm1lZGlhLWxhYmVsIHsK LSAgICBjb2xvcjogYmxhY2s7CisgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogfQogCiAu c3ByZWFkc2hlZXQtY3NzLWRlY2xhcmF0aW9uIC5vcmlnaW4gewpAQCAtMTAwLDcgKzEwMCw3IEBA CiAKIC5zcHJlYWRzaGVldC1jc3MtZGVjbGFyYXRpb24gLnNlbGVjdG9yOmZvY3VzLAogLnNwcmVh ZHNoZWV0LWNzcy1kZWNsYXJhdGlvbiAuc2VsZWN0b3IgPiAubWF0Y2hlZCB7Ci0gICAgY29sb3I6 IGJsYWNrOworICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKIH0KIAogLnNwcmVhZHNoZWV0 LWNzcy1kZWNsYXJhdGlvbi5sb2NrZWQgewpAQCAtMTQ0LDExICsxNDQsNiBAQAogICAgICAgICBj b2xvcjogdmFyKC0tdGV4dC1jb2xvci1zZWNvbmRhcnkpOwogICAgIH0KIAotICAgIC5zcHJlYWRz aGVldC1jc3MtZGVjbGFyYXRpb24gLnNlbGVjdG9yOmZvY3VzLAotICAgIC5zcHJlYWRzaGVldC1j c3MtZGVjbGFyYXRpb24gLnNlbGVjdG9yID4gLm1hdGNoZWQgewotICAgICAgICBjb2xvcjogdmFy KC0tdGV4dC1jb2xvcik7Ci0gICAgfQotCiAgICAgLnNwcmVhZHNoZWV0LWNzcy1kZWNsYXJhdGlv bi5sb2NrZWQgLm9yaWdpbjo6YWZ0ZXIgewogICAgICAgICBmaWx0ZXI6IHZhcigtLWZpbHRlci1p bnZlcnQpOwogICAgIH0KQEAgLTE1Nyw4ICsxNTIsNCBAQAogICAgIC5zcHJlYWRzaGVldC1jc3Mt ZGVjbGFyYXRpb24gLm9yaWdpbiAuZ28tdG8tbGluazpob3ZlciB7CiAgICAgICAgIGNvbG9yOiB2 YXIoLS10ZXh0LWNvbG9yLXNlY29uZGFyeSk7CiAgICAgfQotCi0gICAgLnNwcmVhZHNoZWV0LWNz cy1kZWNsYXJhdGlvbiAubWVkaWEtbGFiZWwgewotICAgICAgICBjb2xvcjogdmFyKC0tdGV4dC1j b2xvcik7Ci0gICAgfQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvU3ByZWFkc2hlZXRSdWxlc1N0eWxlRGV0YWlsc1BhbmVsLmNzcyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNT dHlsZURldGFpbHNQYW5lbC5jc3MKaW5kZXggODcxZWE4ZWEzM2QuLjcwYzQ3MmY0Y2E5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TcHJlYWRz aGVldFJ1bGVzU3R5bGVEZXRhaWxzUGFuZWwuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NwcmVhZHNoZWV0UnVsZXNTdHlsZURldGFpbHNQYW5lbC5j c3MKQEAgLTQxLDcgKzQxLDcgQEAKIH0KIAogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mt c3R5bGUgPiAuY29udGVudCA+IC5ydWxlcyAuc2VjdGlvbi1oZWFkZXIgLm5vZGUtbGluazpob3Zl ciB7Ci0gICAgY29sb3I6IGJsYWNrOworICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKIH0K IAogLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mtc3R5bGUgPiAuY29udGVudCA+IC5ydWxl cyA+IC5tZXNzYWdlLXRleHQtdmlldyB7CkBAIC01NSwxMCArNTUsNiBAQAogQG1lZGlhIChwcmVm ZXJzLWRhcmstaW50ZXJmYWNlKSB7CiAgICAgLnNpZGViYXIgPiAucGFuZWwuZGV0YWlscy5jc3Mt c3R5bGUgPiAuY29udGVudCA+IC5ydWxlcyAuc2VjdGlvbi1oZWFkZXIgewogICAgICAgICBjb2xv cjogdmFyKC0tdGV4dC1jb2xvci1zZWNvbmRhcnkpOwotICAgICAgICBib3JkZXItYm90dG9tOiAw LjVweCBzb2xpZCBoc2xhKDAsIDAlLCB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yKSwgMC4yKTsKLSAg ICB9Ci0KLSAgICAuc2lkZWJhciA+IC5wYW5lbC5kZXRhaWxzLmNzcy1zdHlsZSA+IC5jb250ZW50 ID4gLnJ1bGVzIC5zZWN0aW9uLWhlYWRlciAubm9kZS1saW5rOmhvdmVyIHsKLSAgICAgICAgY29s b3I6IHZhcigtLXRleHQtY29sb3IpOworICAgICAgICBib3JkZXItYm90dG9tLWNvbG9yOiBoc2xh KDAsIDAlLCB2YXIoLS1mb3JlZ3JvdW5kLWxpZ2h0bmVzcyksIDAuMik7CiAgICAgfQogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU3ludGF4 SGlnaGxpZ2h0aW5nRGVmYXVsdFRoZW1lLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1N5bnRheEhpZ2hsaWdodGluZ0RlZmF1bHRUaGVtZS5jc3MKaW5kZXgg NzBhODI0M2E0MWYuLmFlYTJkN2M0NjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9TeW50YXhIaWdobGlnaHRpbmdEZWZhdWx0VGhlbWUuY3Nz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1N5bnRheEhp Z2hsaWdodGluZ0RlZmF1bHRUaGVtZS5jc3MKQEAgLTI3LDcgKzI3LDcgQEAKIAogLmNtLXMtZGVm YXVsdCwKIC5zeW50YXgtaGlnaGxpZ2h0ZWQgewotICAgIGNvbG9yOiBibGFjazsKKyAgICBjb2xv cjogdmFyKC0tdGV4dC1jb2xvcik7CiAKICAgICBmb250LWZhbWlseTogTWVubG8sIG1vbm9zcGFj ZTsKICAgICBmb250LXNpemU6IDExcHg7CkBAIC0xMjYsOCArMTI2LDYgQEAKIH0KIAogQG1lZGlh IChwcmVmZXJzLWRhcmstaW50ZXJmYWNlKSB7Ci0gICAgLnN5bnRheC1oaWdobGlnaHRlZCwKLSAg ICAuY20tcy1kZWZhdWx0LAogICAgIC5Db2RlTWlycm9yIHsKICAgICAgICAgY29sb3I6IHZhcigt LXRleHQtY29sb3IpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1RhYmxlLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RhYmxlLmNzcwppbmRleCBiYzA5OTRhNjkxMi4uYTYzNjllNGM2ZTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rh YmxlLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9U YWJsZS5jc3MKQEAgLTI4LDcgKzI4LDcgQEAKICAgICBvdXRsaW5lOiBub25lOwogICAgIHdpZHRo OiAxMDAlOwogICAgIGhlaWdodDogMTAwJTsKLSAgICBiYWNrZ3JvdW5kOiB3aGl0ZTsKKyAgICBi YWNrZ3JvdW5kOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yKTsKIAogICAgIC0tdGFibGUtY29sdW1u LWJvcmRlci1zdGFydDogMXB4IHNvbGlkIHRyYW5zcGFyZW50OwogICAgIC0tdGFibGUtY29sdW1u LWJvcmRlci1lbmQ6IDAuNXB4IHNvbGlkIHZhcigtLWJvcmRlci1jb2xvcik7CkBAIC00MCw3ICs0 MCw3IEBACiAgICAgaGVpZ2h0OiB2YXIoLS1uYXZpZ2F0aW9uLWJhci1oZWlnaHQpOwogICAgIGxp bmUtaGVpZ2h0OiBjYWxjKHZhcigtLW5hdmlnYXRpb24tYmFyLWhlaWdodCkgLSAxcHgpOwogICAg IGJvcmRlci1ib3R0b206IDFweCBzb2xpZCB2YXIoLS1ib3JkZXItY29sb3IpOwotICAgIGJhY2tn cm91bmQ6IHdoaXRlOworICAgIGJhY2tncm91bmQ6IHZhcigtLWJhY2tncm91bmQtY29sb3IpOwog ICAgIG92ZXJmbG93LXg6IGhpZGRlbjsKICAgICB2ZXJ0aWNhbC1hbGlnbjogbWlkZGxlOwogICAg IHdoaXRlLXNwYWNlOiBub3dyYXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZU92ZXJ2aWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lT3ZlcnZpZXcuY3NzCmluZGV4IDUx ODEyMDdhZDg3Li5kZTRiNmQxOTk1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5jc3MKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVPdmVydmlldy5jc3MKQEAg LTUzLDcgKzUzLDcgQEAgYm9keVtkaXI9cnRsXSAudGltZWxpbmUtb3ZlcnZpZXc6bm90KC5mcmFt ZXMpID4gOm1hdGNoZXMoLnNjcm9sbC1jb250YWluZXIsIC50aW0KICAgICB6LWluZGV4OiB2YXIo LS16LWluZGV4LWhlYWRlcik7CiAgICAgd2lkdGg6IHZhcigtLXRpbWVsaW5lLXNpZGViYXItd2lk dGgpOwogICAgIGhlaWdodDogMjNweDsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0ZTsKKyAg ICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9yKTsKICAgICBib3JkZXIt Ym90dG9tOiAxcHggc29saWQgdmFyKC0tYm9yZGVyLWNvbG9yKTsKIH0KIApAQCAtMjM1LDEwICsy MzUsNiBAQCBib2R5W2Rpcj1ydGxdIC50aW1lbGluZS1vdmVydmlldyA+IC5zY3JvbGwtY29udGFp bmVyID4gLnNjcm9sbC13aWR0aC1zaXplciB7CiB9CiAKIEBtZWRpYSAocHJlZmVycy1kYXJrLWlu dGVyZmFjZSkgewotICAgIC50aW1lbGluZS1vdmVydmlldyA+IC5uYXZpZ2F0aW9uLWJhci50aW1l bGluZXMgewotICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB2YXIoLS1iYWNrZ3JvdW5kLWNvbG9y KTsKLSAgICB9Ci0KICAgICAudGltZWxpbmUtb3ZlcnZpZXc6bm90KC5mcmFtZXMpID4gLmdyYXBo cy1jb250YWluZXIgPiAudGltZWxpbmUtb3ZlcnZpZXctZ3JhcGg6bnRoLWNoaWxkKGV2ZW4pIHsK ICAgICAgICAgYmFja2dyb3VuZDogdmFyKC0tYmFja2dyb3VuZC1jb2xvci1hbHRlcm5hdGUpOwog ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuY3NzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5jc3MK aW5kZXggZTYzMWE2YzVlOTIuLmIwYzJkYTY4ZmFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3 LmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1l bGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmNzcwpAQCAtNTUsMTEgKzU1LDExIEBACiAKIC5jb250 ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtYnJvd3NlciA+IC5uYXZpZ2F0 aW9uLWJhciA+IC5pdGVtLnNjb3BlLWJhci5kZWZhdWx0LWl0ZW0tc2VsZWN0ZWQgPiAubXVsdGlw bGUgewogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwotICAgIGNvbG9yOiBibGFj azsKKyAgICBjb2xvcjogdmFyKC0tdGV4dC1jb2xvcik7CiB9CiAKIC5jb250ZW50LXZpZXcudGlt ZWxpbmUtcmVjb3JkaW5nID4gLmNvbnRlbnQtYnJvd3NlciA+IC5uYXZpZ2F0aW9uLWJhciA+IC5p dGVtLnNjb3BlLWJhci5kZWZhdWx0LWl0ZW0tc2VsZWN0ZWQgPiAubXVsdGlwbGUgLmFycm93cyB7 Ci0gICAgY29sb3I6IGJsYWNrOworICAgIGNvbG9yOiB2YXIoLS10ZXh0LWNvbG9yKTsKIH0KIAog LmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRpbmcgPiAuY29udGVudC1icm93c2VyIC5yZWNv cmRpbmctcHJvZ3Jlc3MgewpAQCAtODYsMTMgKzg2LDMgQEAKICAgICBtYXJnaW4tbGVmdDogOHB4 OwogICAgIHZlcnRpY2FsLWFsaWduOiBtaWRkbGU7CiB9Ci0KLUBtZWRpYSAocHJlZmVycy1kYXJr LWludGVyZmFjZSkgewotICAgIC5jb250ZW50LXZpZXcudGltZWxpbmUtcmVjb3JkaW5nID4gLmNv bnRlbnQtYnJvd3NlciA+IC5uYXZpZ2F0aW9uLWJhciA+IC5pdGVtLnNjb3BlLWJhci5kZWZhdWx0 LWl0ZW0tc2VsZWN0ZWQgPiAubXVsdGlwbGUgewotICAgICAgICBjb2xvcjogdmFyKC0tdGV4dC1j b2xvcik7Ci0gICAgfQotCi0gICAgLmNvbnRlbnQtdmlldy50aW1lbGluZS1yZWNvcmRpbmcgPiAu Y29udGVudC1icm93c2VyID4gLm5hdmlnYXRpb24tYmFyID4gLml0ZW0uc2NvcGUtYmFyLmRlZmF1 bHQtaXRlbS1zZWxlY3RlZCA+IC5tdWx0aXBsZSAuYXJyb3dzIHsKLSAgICAgICAgY29sb3I6IHVu c2V0OwotICAgIH0KLX0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1ZhcmlhYmxlcy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9WYXJpYWJsZXMuY3NzCmluZGV4IGE3NzRhYzY4MmY2Li5mNWM5YWZjZjlm MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv VmFyaWFibGVzLmNzcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9WYXJpYWJsZXMuY3NzCkBAIC0zMiw5ICszMiwxNSBAQAogICAgIC0tei1pbmRleC1nbGFz cy1wYW5lLWZvci1kcmFnOiAyMDQ4OwogICAgIC0tei1pbmRleC11bmNhdWdodC1leGNlcHRpb24t c2hlZXQ6IDQwOTY7CiAKKyAgICAtLWZvcmVncm91bmQtbGlnaHRuZXNzOiAwJTsKKworICAgIC0t dGV4dC1jb2xvcjogYmxhY2s7CiAgICAgLS10ZXh0LWNvbG9yLWFjdGl2ZTogYmxhY2s7CiAKKyAg ICAtLWJhY2tncm91bmQtY29sb3I6IHdoaXRlOworCiAgICAgLS1iYWNrZ3JvdW5kLWNvbG9yLWNv bnRlbnQ6IHdoaXRlOworICAgIC0tYmFja2dyb3VuZC1jb2xvci1jb2RlOiB3aGl0ZTsKIAogICAg IC0tc2VsZWN0ZWQtZm9yZWdyb3VuZC1jb2xvcjogd2hpdGU7CiAgICAgLS1zZWxlY3RlZC1zZWNv bmRhcnktdGV4dC1jb2xvcjogaHNsYSgwLCAxMDAlLCAxMDAlLCAwLjcpOwpAQCAtMTQ3LDYgKzE1 Myw4IEBAIGJvZHkud2luZG93LWluYWN0aXZlICogewogICAgIDpyb290IHsKICAgICAgICAgY29s b3I6IHZhcigtLXRleHQtY29sb3IpOwogCisgICAgICAgIC0tZm9yZWdyb3VuZC1saWdodG5lc3M6 IDEwMCU7CisKICAgICAgICAgLS10ZXh0LWNvbG9yOiBoc2woMCwgMCUsIDg4JSk7CiAgICAgICAg IC0tdGV4dC1jb2xvci1hY3RpdmU6IHdoaXRlOwogICAgICAgICAtLXRleHQtY29sb3Itc2Vjb25k YXJ5OiBoc2woMCwgMCUsIDY1JSk7CkBAIC0yNDgsOCArMjU2LDYgQEAgYm9keS53aW5kb3ctaW5h Y3RpdmUgKiB7CiAgICAgICAgIC8qIEludmVydCBjb2xvcnMgeWV0IHByZXNlcnZlIHRoZSBodWUg Ki8KICAgICAgICAgLS1maWx0ZXItaW52ZXJ0OiBpbnZlcnQoMTAwJSkgaHVlLXJvdGF0ZSgxODBk ZWcpOwogCi0gICAgICAgIC0tZm9yZWdyb3VuZC1saWdodG5lc3M6IDEwMCU7Ci0KICAgICAgICAg LyogVE9ETzogVXNlIHRoZSBzYW1lIHZhcmlhYmxlIGZvciB0aGUgZGVmYXVsdCB0aGVtZSAqLwog ICAgICAgICAtLW92ZXJsYXktYmFja2dyb3VuZDogaHNsYSgwLCAwJSwgMjQlLCAwLjkpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9YSFJC cmVha3BvaW50UG9wb3Zlci5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9YSFJCcmVha3BvaW50UG9wb3Zlci5jc3MKaW5kZXggOTc1ZjI4MjVhZDkuLmRmMDI5 OWQwZGY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9YSFJCcmVha3BvaW50UG9wb3Zlci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvWEhSQnJlYWtwb2ludFBvcG92ZXIuY3NzCkBAIC0zOSw3ICsz OSw3IEBACiAgICAgcGFkZGluZzogNHB4IDAgMnB4IDA7CiAgICAgLXdlYmtpdC1hcHBlYXJhbmNl OiB0ZXh0ZmllbGQ7CiAgICAgYm9yZGVyOiAxcHggc29saWQgaHNsKDAsIDAlLCA3OCUpOwotICAg IGJhY2tncm91bmQ6IHdoaXRlOworICAgIGJhY2tncm91bmQ6IHZhcigtLWJhY2tncm91bmQtY29s b3ItY29kZSk7CiAKICAgICAtLWVkaXRvci1tYXJnaW4tc3RhcnQ6IDRweDsKIH0KQEAgLTY2LDYg KzY2LDUgQEAgYm9keVtkaXI9cnRsXSAucG9wb3ZlciAueGhyLWJyZWFrcG9pbnQtY29udGVudCA+ IC5lZGl0b3Itd3JhcHBlciA+IC5lZGl0b3IgewogICAgIC5wb3BvdmVyIC54aHItYnJlYWtwb2lu dC1jb250ZW50ID4gLmVkaXRvci13cmFwcGVyID4gLmVkaXRvciB7CiAgICAgICAgIC13ZWJraXQt YXBwZWFyYW5jZTogdW5zZXQ7CiAgICAgICAgIGJvcmRlci1jb2xvcjogdmFyKC0tdGV4dC1jb2xv ci1xdWF0ZXJuYXJ5KTsKLSAgICAgICAgYmFja2dyb3VuZDogdmFyKC0tYmFja2dyb3VuZC1jb2xv ci1jb2RlKTsKICAgICB9CiB9Cg==