199109 2019-06-21 09:59:18 -0700 Web Inspector: remove .legacy-mac/.latest-mac CSS classes, standardize on .latest-mac UI 2019-06-23 14:16:03 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=199136 InRadar P4 Normal --- 1 mattbaker mattbaker commit-queue inspector-bugzilla-changes timothy webkit-bug-importer oldest_to_newest 1546897 0 mattbaker 2019-06-21 09:59:18 -0700 Declutter CSS by dropping legacy version support. 1546900 1 webkit-bug-importer 2019-06-21 09:59:49 -0700 <rdar://problem/51991129> 1546901 2 372632 mattbaker 2019-06-21 10:02:49 -0700 Created attachment 372632 Patch 1546918 3 372632 commit-queue 2019-06-21 10:53:39 -0700 Comment on attachment 372632 Patch Clearing flags on attachment: 372632 Committed r246684: <https://trac.webkit.org/changeset/246684> 1546919 4 commit-queue 2019-06-21 10:53:40 -0700 All reviewed patches have been landed. Closing bug. 372632 2019-06-21 10:02:49 -0700 2019-06-21 10:53:39 -0700 Patch bug-199109-20190621100249.patch text/plain 12369 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 YTk2MGI5MTFiYTdiN2ZiOGRmMDAwNWQ4YWM0NTc4ODdkYTMzM2M2Li5hMTZkNDk4OGQ4NDIyZTll NTY5NTczYzAyMzExNGVlNzI2NTg5YTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSw0OCBAQAorMjAxOS0wNi0yMSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIC5sZWdhY3ktbWFjLy5sYXRlc3QtbWFj IENTUyBjbGFzc2VzLCBzdGFuZGFyZGl6ZSBvbiAubGF0ZXN0LW1hYyBVSQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MTA5CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS81MTk5MTEyOT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBEcm9wIGxlZ2FjeSBtYWNPUyB2ZXJzaW9uIHN1cHBvcnQgZnJvbSBXZWIg SW5zcGVjdG9yIFVJLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisK KyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RlZmF1bHREYXNoYm9hcmRWaWV3LmNzczoK KyAgICAgICAgKEBtZWRpYSAocHJlZmVycy1jb2xvci1zY2hlbWU6IGRhcmspKToKKyAgICAgICAg KGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuZGFzaGJvYXJkIC5pdGVtLmJ1dHRvbik6IERlbGV0 ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzOgorICAgICAg ICAoLnRvb2xiYXIpOgorICAgICAgICAoLnRvb2xiYXIgLml0ZW0uYnV0dG9uLCk6CisgICAgICAg ICgudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKToKKyAgICAgICAg KC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMpOgorICAg ICAgICAoQG1lZGlhICgtd2Via2l0LW1pbi1kZXZpY2UtcGl4ZWwtcmF0aW86IDIpKToKKyAgICAg ICAgKC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUpOgorICAgICAgICAoYm9keS53aW5kb3ct aW5hY3RpdmUgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLCk6CisgICAgICAgIChAbWVkaWEgKHByZWZl cnMtY29sb3Itc2NoZW1lOiBkYXJrKSk6CisgICAgICAgICgudG9vbGJhciAuc2VhcmNoLWJhciA+ IGlucHV0W3R5cGU9InNlYXJjaCJdOjpwbGFjZWhvbGRlcik6CisgICAgICAgIChib2R5LndpbmRv dy1pbmFjdGl2ZSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOjpw bGFjZWhvbGRlcik6CisgICAgICAgIChib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0LXNlYXJjaC1yZXN1bHRzLWJ1 dHRvbik6CisgICAgICAgICgudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lcik6CisgICAgICAg IChib2R5IC50b29sYmFyKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkubGVnYWN5LW1hYyAudG9v bGJhciAuaXRlbS5idXR0b24sKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkubGVnYWN5LW1hYyAu dG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdKTogRGVsZXRlZC4KKyAg ICAgICAgKGJvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9 InNlYXJjaCJdOmZvY3VzKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkubGVnYWN5LW1hYyAudG9v bGJhciAuaXRlbS5idXR0b246YWN0aXZlKTogRGVsZXRlZC4KKyAgICAgICAgKGJvZHkud2luZG93 LWluYWN0aXZlLmxlZ2FjeS1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLCk6IERlbGV0ZWQuCisg ICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLCk6IERlbGV0ZWQu CisgICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0 eXBlPSJzZWFyY2giXSk6IERlbGV0ZWQuCisgICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xi YXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTpmb2N1cyk6IERlbGV0ZWQuCisg ICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uOmFjdGl2ZSk6IERl bGV0ZWQuCisgICAgICAgIChib2R5LmxhdGVzdC1tYWMud2luZG93LWluYWN0aXZlIC50b29sYmFy IC5pdGVtLmJ1dHRvbiwpOiBEZWxldGVkLgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjIC50b29s YmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06OnBsYWNlaG9sZGVyKTogRGVs ZXRlZC4KKyAgICAgICAgKGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIg LnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTo6cGxhY2Vob2xkZXIpOiBEZWxldGVk LgorICAgICAgICAoYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuc2Vh cmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOjotd2Via2l0LXNlYXJjaC1yZXN1bHRzLWJ1 dHRvbik6IERlbGV0ZWQuCisgICAgICAgIChib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLmRhc2hi b2FyZC1jb250YWluZXIpOiBEZWxldGVkLgorCiAyMDE5LTA2LTIwICBNYXR0IEJha2VyICA8bWF0 dGJha2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW5hbWUgc2hhZG93 Um9vdFB1c2hlZCBwYXJhbWV0ZXIgdG8gbWF0Y2ggcHJvdG9jb2wKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCA1ZmQ4MTEyZGQwNTM4 MDc0NDM2OGMyYWE2Yzc0N2IxZjNiMGYxYmVlLi41YmZkZTUxNTQ4ZjdmMjZhN2JhZWQxYjlhNDQ3 ZThkNTJjYjY2NTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzCkBAIC0yOTAsMTUgKzI5MCw5IEBAIFdJLmNvbnRlbnRMb2FkZWQgPSBm dW5jdGlvbigpCiAgICAgaWYgKFdJLlBsYXRmb3JtLmlzTmlnaHRseUJ1aWxkKQogICAgICAgICBk b2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKIAotICAgIGlmIChX SS5QbGF0Zm9ybS5uYW1lID09PSAibWFjIikgeworICAgIGlmIChXSS5QbGF0Zm9ybS5uYW1lID09 PSAibWFjIikKICAgICAgICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKFdJLlBsYXRmb3Jt LnZlcnNpb24ubmFtZSk7CiAKLSAgICAgICAgaWYgKFdJLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFz ZSA+PSAxMSkKLSAgICAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgibGF0ZXN0 LW1hYyIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlz dC5hZGQoImxlZ2FjeS1tYWMiKTsKLSAgICB9Ci0KICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlz dC5hZGQoV0kuc2hhcmVkQXBwLmRlYnVnZ2FibGVUeXBlKTsKICAgICBkb2N1bWVudC5ib2R5LnNl dEF0dHJpYnV0ZSgiZGlyIiwgV0kucmVzb2x2ZWRMYXlvdXREaXJlY3Rpb24oKSk7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RlZmF1bHRE YXNoYm9hcmRWaWV3LmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0RlZmF1bHREYXNoYm9hcmRWaWV3LmNzcwppbmRleCBiOWU1MTdmZmYzNzVhMDRkMDgwN2Jm YjMxZjQ2M2M4NGU5MjU5MGJhLi5lNzA1ODY3NDJlMWMyNTgyZTY5YTIxNWNjYWRkYmVlNWFhOGUz NWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9EZWZhdWx0RGFzaGJvYXJkVmlldy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvRGVmYXVsdERhc2hib2FyZFZpZXcuY3NzCkBAIC0yMDAsMTAgKzIw MCw2IEBAIGJvZHk6bm90KC53ZWIpIC50b29sYmFyIC5kYXNoYm9hcmQuZGVmYXVsdCA+IDptYXRj aGVzKC5yZXNvdXJjZXNDb3VudCwgLnJlc291cmNlCiAgICAgICAgIGZpbHRlcjogdmFyKC0tZmls dGVyLWludmVydCk7CiAgICAgfQogCi0gICAgYm9keS5sYXRlc3QtbWFjIC50b29sYmFyIC5kYXNo Ym9hcmQgLml0ZW0uYnV0dG9uIHsKLSAgICAgICAgYmFja2dyb3VuZDogdW5zZXQ7Ci0gICAgfQot CiAgICAgLmRhc2hib2FyZC1jb250YWluZXIgLmFkdmFuY2UtYXJyb3cgewogICAgICAgICBmaWx0 ZXI6IHZhcigtLWZpbHRlci1pbnZlcnQpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rvb2xiYXIuY3NzIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKaW5kZXggMzI5N2Y4YWZi ZGU3NTJmMTFmZTU0Y2QyZmI2ZWIwNzFmOTRkNTNkYy4uNGFhMTkyNWI0Y2FkMjc4ODE2ZDY5NmJk ZGI1YTJjZjNmZmEzNGU5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVG9vbGJhci5jc3MKQEAgLTM4LDkgKzM4LDcgQEAKICAgICBvdmVy ZmxvdzogaGlkZGVuOwogCiAgICAgb3V0bGluZTogbm9uZTsKLX0KIAotYm9keSAudG9vbGJhciB7 CiAgICAgYmFja2dyb3VuZC1pbWFnZTogbGluZWFyLWdyYWRpZW50KHRvIGJvdHRvbSwgaHNsKDAs IDAlLCA5MiUpLCBoc2woMCwgMCUsIDg3JSkpOwogICAgIGJveC1zaGFkb3c6IGluc2V0IGhzbGEo MCwgMCUsIDEwMCUsIDAuNSkgMCAxcHggMXB4OwogfQpAQCAtMTE2LDQxICsxMTQsOSBAQCBib2R5 Lm1hYy1wbGF0Zm9ybTpub3QoLmRvY2tlZCkgewogICAgIG1hcmdpbi1sZWZ0OiA0cHg7CiB9CiAK LWJvZHkubGVnYWN5LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b24sCi1ib2R5LmxlZ2FjeS1tYWMg LnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLWJvZHkubGVnYWN5 LW1hYyAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7Ci0gICAgYmFja2dyb3VuZC1jb2xv cjogaHNsKDAsIDAlLCA5OSUpOwotICAgIGJvcmRlcjogMXB4IHNvbGlkIHRyYW5zcGFyZW50Owot ICAgIGJvcmRlci10b3AtY29sb3I6IGhzbCgwLCAwJSwgMTAwJSk7Ci0gICAgYm94LXNoYWRvdzog aHNsYSgwLCAwJSwgMCUsIDAuMTUpIDAgMXB4IDA7Ci0gICAgYm9yZGVyLXJhZGl1czogNHB4Owot fQotCi1ib2R5LmxlZ2FjeS1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJz ZWFyY2giXSB7Ci0gICAgYm94LXNoYWRvdzogMCAwIDAgN3B4IGhzbGEoMjExLCA5NiUsIDQ4JSwg MCk7Ci0gICAgdHJhbnNpdGlvbjogYm94LXNoYWRvdyAuMjVzIGN1YmljLWJlemllcigwLjE2NSwg MC44NDAsIDAuNDQwLCAxKSAvKiBlYXNlT3V0UXVhcnQgKi87Ci19Ci0KLWJvZHkubGVnYWN5LW1h YyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzIHsKLSAg ICBib3gtc2hhZG93OiBoc2xhKDAsIDAlLCAwJSwgMC4xNSkgMCAxcHggMCwgMCAwIDAgM3B4IGhz bGEoMjExLCA5NiUsIDQ4JSwgMC40KTsKLX0KLQotYm9keS5sZWdhY3ktbWFjIC50b29sYmFyIC5p dGVtLmJ1dHRvbjphY3RpdmUgewotICAgIGJvcmRlci10b3AtY29sb3I6IGhzbCgwLCAwJSwgOTQl KTsKLSAgICBiYWNrZ3JvdW5kLWNvbG9yOiBoc2woMCwgMCUsIDg5JSk7Ci19Ci0KLWJvZHkud2lu ZG93LWluYWN0aXZlLmxlZ2FjeS1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAotYm9keS53aW5k b3ctaW5hY3RpdmUubGVnYWN5LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9 InNlYXJjaCJdLAotYm9keS53aW5kb3ctaW5hY3RpdmUubGVnYWN5LW1hYyAudG9vbGJhciAuZGFz aGJvYXJkLWNvbnRhaW5lciB7Ci0gICAgYm9yZGVyOiAxcHggc29saWQgaHNsKDAsIDAlLCA4NiUp OwotICAgIGJhY2tncm91bmQtY29sb3I6IGhzbCgwLCAwJSwgOTYlKTsKLSAgICBib3gtc2hhZG93 OiBub25lOwotfQotCi1ib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAotYm9k eS5sYXRlc3QtbWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0s Ci1ib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIgeworLnRvb2xi YXIgLml0ZW0uYnV0dG9uLAorLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFy Y2giXSwKKy50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKICAgICBiYWNrZ3JvdW5kLWlt YWdlOiBsaW5lYXItZ3JhZGllbnQoaHNsKDAsIDAlLCA5OSUpLCB2YXIoLS1wYW5lbC1iYWNrZ3Jv dW5kLWNvbG9yKSk7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMykgMCAxcHgg MXB4IC0xcHg7CiAKQEAgLTE2MCwzMyArMTI2LDMzIEBAIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJh ciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgYm9yZGVyLWJvdHRvbS1jb2xvcjogaHNsKDAs IDAlLCA3NiUpOwogfQogCi1ib2R5LmxhdGVzdC1tYWMgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBp bnB1dFt0eXBlPSJzZWFyY2giXSB7CisudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9 InNlYXJjaCJdIHsKICAgICBib3gtc2hhZG93OiBoc2xhKDAsIDAlLCAwJSwgMC4zKSAwIDFweCAx cHggLTFweCwgMCAwIDAgN3B4IGhzbGEoMjExLCA5NiUsIDQ4JSwgMCk7CiAgICAgdHJhbnNpdGlv bjogYm94LXNoYWRvdyAuMjVzIGN1YmljLWJlemllcigwLjE2NSwgMC44NDAsIDAuNDQwLCAxKSAv KiBlYXNlT3V0UXVhcnQgKi87CiB9CiAKLWJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuc2VhcmNo LWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzIHsKKy50b29sYmFyIC5zZWFyY2gtYmFy ID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06Zm9jdXMgewogICAgIGJveC1zaGFkb3c6IGhzbGEoMCwg MCUsIDAlLCAwLjE1KSAwIDFweCAwLCAwIDAgMCAzcHggaHNsYSgyMTEsIDk2JSwgNDglLCAwLjQp OwogfQogCiBAbWVkaWEgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzogMikgewotICAg IGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b24sCi0gICAgYm9keS5sYXRlc3Qt bWFjIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0sCi0gICAgYm9k eS5sYXRlc3QtbWFjIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKyAgICAudG9vbGJh ciAuaXRlbS5idXR0b24sCisgICAgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJz ZWFyY2giXSwKKyAgICAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgICAgIGJv cmRlcjogMC41cHggc29saWQgaHNsKDAsIDAlLCA3OCUpOwogICAgICAgICBib3JkZXItdG9wLWNv bG9yOiBoc2woMCwgMCUsIDgwJSk7CiAgICAgICAgIGJvcmRlci1ib3R0b20tY29sb3I6IGhzbCgw LCAwJSwgNjUlKTsKICAgICB9CiB9CiAKLWJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuaXRlbS5i dXR0b246YWN0aXZlIHsKKy50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUgewogICAgIGJhY2tn cm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudChoc2woMCwgMCUsIDg5JSksIGhzbCgwLCAwJSwg ODYlKSk7CiAgICAgYm94LXNoYWRvdzogaHNsYSgwLCAwJSwgMCUsIDAuMykgMCAxcHggMXB4IC0x cHgsIGluc2V0IDAgMXB4IDFweCAtMXB4IHdoaXRlOwogfQogCi1ib2R5LmxhdGVzdC1tYWMud2lu ZG93LWluYWN0aXZlIC50b29sYmFyIC5pdGVtLmJ1dHRvbiwKLWJvZHkubGF0ZXN0LW1hYy53aW5k b3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwK LWJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250 YWluZXIgeworYm9keS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLml0ZW0uYnV0dG9uLAorYm9k eS53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFy Y2giXSwKK2JvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVy IHsKICAgICBvcGFjaXR5OiAwLjY1OwogICAgIGJvcmRlci1jb2xvcjogaHNsYSgwLCAwJSwgMCUs IDAuMTUpOwogICAgIGJhY2tncm91bmQtY29sb3I6IHRyYW5zcGFyZW50OwpAQCAtMTk0LDkgKzE2 MCw5IEBAIGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2Fy ZC1jb250YWluZXIgewogfQogCiBAbWVkaWEgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRp bzogMikgewotICAgIGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLml0 ZW0uYnV0dG9uLAotICAgIGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIg LnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKLSAgICBib2R5LmxhdGVzdC1tYWMu d2luZG93LWluYWN0aXZlIC50b29sYmFyIC5kYXNoYm9hcmQtY29udGFpbmVyIHsKKyAgICBib2R5 LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuaXRlbS5idXR0b24sCisgICAgYm9keS53aW5kb3ct aW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXSwKKyAg ICBib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAg ICAgICAgIGJveC1zaGFkb3c6IGluc2V0IDAgMCAxcHggMCBoc2xhKDAsIDAlLCAwJSwgMC4xKTsK ICAgICB9CiB9CkBAIC0yMDgsNyArMTc0LDcgQEAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFj dGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiB9CiAKIEBtZWRpYSAocHJlZmVy cy1jb2xvci1zY2hlbWU6IGRhcmspIHsKLSAgICBib2R5IC50b29sYmFyIHsKKyAgICAudG9vbGJh ciB7CiAgICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCh0byBib3R0b20s IGhzbCgwLCAwJSwgMjYlKSwgaHNsKDAsIDAlLCAyMyUpKTsKICAgICAgICAgYm94LXNoYWRvdzog bm9uZTsKICAgICB9CkBAIC0yMTcsOCArMTgzLDggQEAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1p bmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgICAgIGJhY2tncm91 bmQtY29sb3I6IHZhcigtLWJhY2tncm91bmQtY29sb3IpOwogICAgIH0KIAotICAgIGJvZHkubGF0 ZXN0LW1hYyAudG9vbGJhciAuaXRlbS5idXR0b24sCi0gICAgYm9keS5sYXRlc3QtbWFjIC50b29s YmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl0geworICAgIC50b29sYmFyIC5p dGVtLmJ1dHRvbiwKKyAgICAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJj aCJdIHsKICAgICAgICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZTsKICAgICAgICAgYmFja2dyb3Vu ZC1jb2xvcjogdmFyKC0tYnV0dG9uLWJhY2tncm91bmQtY29sb3IpOwogICAgICAgICBib3JkZXIt Y29sb3I6IHZhcigtLWJ1dHRvbi1iYWNrZ3JvdW5kLWNvbG9yKTsKQEAgLTIyNiwxMSArMTkyLDEx IEBAIGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2FyZC1j b250YWluZXIgewogICAgICAgICBib3gtc2hhZG93OiBub25lOwogICAgIH0KIAotICAgIGJvZHku bGF0ZXN0LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsK KyAgICAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdIHsKICAgICAg ICAgY29sb3I6IHZhcigtLXRleHQtY29sb3IpOwogICAgIH0KIAotICAgIGJvZHkubGF0ZXN0LW1h YyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzIHsKKyAg ICAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJdOmZvY3VzIHsKICAg ICAgICAgY29sb3I6IHZhcigtLXRleHQtY29sb3ItYWN0aXZlKTsKIAogICAgICAgICAvKiBGSVhN RTogVXNlIG5hdGl2ZSBvdXRsaW5lIGZvciB0aGUgZGVmYXVsdCB0aGVtZSBhcyB3ZWxsLiAqLwpA QCAtMjQwLDIwICsyMDYsMjAgQEAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9v bGJhciAuZGFzaGJvYXJkLWNvbnRhaW5lciB7CiAgICAgICAgIG91dGxpbmUtb2Zmc2V0OiAtM3B4 OwogICAgIH0KIAotICAgIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlu cHV0W3R5cGU9InNlYXJjaCJdOjpwbGFjZWhvbGRlciB7CisgICAgLnRvb2xiYXIgLnNlYXJjaC1i YXIgPiBpbnB1dFt0eXBlPSJzZWFyY2giXTo6cGxhY2Vob2xkZXIgewogICAgICAgICBjb2xvcjog dmFyKC0tdGV4dC1jb2xvci1zZWNvbmRhcnkpOwogICAgIH0KIAotICAgIGJvZHkubGF0ZXN0LW1h Yy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBlPSJzZWFy Y2giXTo6cGxhY2Vob2xkZXIgeworICAgIGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5z ZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06OnBsYWNlaG9sZGVyIHsKICAgICAgICAg Y29sb3I6IHZhcigtLXRleHQtY29sb3ItdGVydGlhcnkpOwogICAgIH0KIAotICAgIGJvZHkubGF0 ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLnNlYXJjaC1iYXIgPiBpbnB1dFt0eXBl PSJzZWFyY2giXTo6LXdlYmtpdC1zZWFyY2gtcmVzdWx0cy1idXR0b24geworICAgIGJvZHkud2lu ZG93LWluYWN0aXZlIC50b29sYmFyIC5zZWFyY2gtYmFyID4gaW5wdXRbdHlwZT0ic2VhcmNoIl06 Oi13ZWJraXQtc2VhcmNoLXJlc3VsdHMtYnV0dG9uIHsKICAgICAgICAgLyogU2V0dGluZyBgY29s b3JgIGhhcyBubyBlZmZlY3Qgb24gdGhlIG1hZ25pZnlpbmcgZ2xhc3MgaWNvbi4gKi8KICAgICAg ICAgb3BhY2l0eTogMC41OwogICAgIH0KIAotICAgIGJvZHkubGF0ZXN0LW1hYyAudG9vbGJhciAu ZGFzaGJvYXJkLWNvbnRhaW5lciB7CisgICAgLnRvb2xiYXIgLmRhc2hib2FyZC1jb250YWluZXIg ewogICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiBub25lOwogICAgICAgICBiYWNrZ3JvdW5kLWNv bG9yOiB2YXIoLS1kYXNoYm9hcmQtYmFja2dyb3VuZC1jb2xvcik7CiAgICAgICAgIGJvcmRlci1j b2xvcjogdmFyKC0tZGFzaGJvYXJkLWJhY2tncm91bmQtY29sb3IpOwpAQCAtMjYxLDE1ICsyMjcs MTUgQEAgYm9keS5sYXRlc3QtbWFjLndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuZGFzaGJvYXJk LWNvbnRhaW5lciB7CiAgICAgICAgIGJveC1zaGFkb3c6IG5vbmU7CiAgICAgfQogCi0gICAgYm9k eS5sYXRlc3QtbWFjIC50b29sYmFyIC5pdGVtLmJ1dHRvbjphY3RpdmUgeworICAgIC50b29sYmFy IC5pdGVtLmJ1dHRvbjphY3RpdmUgewogICAgICAgICBiYWNrZ3JvdW5kLWltYWdlOiBub25lOwog ICAgICAgICBib3JkZXItdG9wLWNvbG9yOiBoc2xhKDAsIDEwMCUsIDEwMCUsIDAuMik7CiAgICAg ICAgIGJveC1zaGFkb3c6IG5vbmU7CiAgICAgfQogCi0gICAgYm9keS5sYXRlc3QtbWFjLndpbmRv dy1pbmFjdGl2ZSAudG9vbGJhciAuaXRlbS5idXR0b24sCi0gICAgYm9keS5sYXRlc3QtbWFjLndp bmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlucHV0W3R5cGU9InNlYXJjaCJd LAotICAgIGJvZHkubGF0ZXN0LW1hYy53aW5kb3ctaW5hY3RpdmUgLnRvb2xiYXIgLmRhc2hib2Fy ZC1jb250YWluZXIgeworICAgIGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5pdGVtLmJ1 dHRvbiwKKyAgICBib2R5LndpbmRvdy1pbmFjdGl2ZSAudG9vbGJhciAuc2VhcmNoLWJhciA+IGlu cHV0W3R5cGU9InNlYXJjaCJdLAorICAgIGJvZHkud2luZG93LWluYWN0aXZlIC50b29sYmFyIC5k YXNoYm9hcmQtY29udGFpbmVyIHsKICAgICAgICAgb3BhY2l0eTogMTsKICAgICAgICAgY29sb3I6 IHZhcigtLWdseXBoLWNvbG9yKTsKICAgICAgICAgYm9yZGVyLWNvbG9yOiB0cmFuc3BhcmVudDsK