151874 2015-12-04 10:49:11 -0800 Address UX issues with the Contribute menu 2015-12-07 11:48:58 -0800 1 1 1 Unclassified WebKit WebKit Website WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jond jond commit-queue jond timothy oldest_to_newest 1146335 0 jond 2015-12-04 10:49:11 -0800 On desktop, hovering over the area where the contribute menu would render causes it to appear. On iOS, once the contribute menu is opened it cannot be closed again. 1146883 1 266783 jond 2015-12-07 09:42:28 -0800 Created attachment 266783 Patch 1146929 2 266783 commit-queue 2015-12-07 11:48:56 -0800 Comment on attachment 266783 Patch Clearing flags on attachment: 266783 Committed r193642: <http://trac.webkit.org/changeset/193642> 1146930 3 commit-queue 2015-12-07 11:48:58 -0800 All reviewed patches have been landed. Closing bug. 266783 2015-12-07 09:42:28 -0800 2015-12-07 11:48:56 -0800 Patch bug-151874-20151207094159.patch text/plain 13364 jond SW5kZXg6IFdlYnNpdGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNp dGVzL3dlYmtpdC5vcmcvQ2hhbmdlTG9nCShyZXZpc2lvbiAxOTM2MzMpCisrKyBXZWJzaXRlcy93 ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU3IEBACisyMDE1 LTEyLTA3ICBKb25hdGhhbiBEYXZpcyAgPGpvbmRAYXBwbGUuY29tPgorCisgICAgICAgIEFkZHJl c3MgVVggaXNzdWVzIHdpdGggdGhlIENvbnRyaWJ1dGUgbWVudS4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTg3NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogd3AtY29udGVudC90aGVtZXMvd2Via2l0 L2Z1bmN0aW9ucy5waHA6CisgICAgICAgICogd3AtY29udGVudC90aGVtZXMvd2Via2l0L2hlYWRl ci5waHA6CisgICAgICAgICogd3AtY29udGVudC90aGVtZXMvd2Via2l0L3N0eWxlLmNzczoKKyAg ICAgICAgKHRpbWUsIG1hcmssIGF1ZGlvLCB2aWRlbyk6CisgICAgICAgIChmb290ZXIsIGhlYWRl ciwgaGdyb3VwLCBtZW51LCBuYXYsIHNlY3Rpb24pOgorICAgICAgICAoaHRtbCk6CisgICAgICAg IChib2R5KToKKyAgICAgICAgKG9sLCB1bCk6CisgICAgICAgIChibG9ja3F1b3RlLCBxKToKKyAg ICAgICAgKHE6YmVmb3JlLCBxOmFmdGVyKToKKyAgICAgICAgKHRhYmxlKToKKyAgICAgICAgKHA6 ZW1wdHkpOgorICAgICAgICAoLmFkbWluLWJhciBwID4gYVtuYW1lXTo6YmVmb3JlKToKKyAgICAg ICAgKC5zY3JlZW4tcmVhZGVyLXRleHQpOgorICAgICAgICAoLnNjcmVlbi1yZWFkZXItdGV4dDpm b2N1cyk6CisgICAgICAgIChwcmUpOgorICAgICAgICAoY29kZSk6CisgICAgICAgICguZmVhdHVy ZS1oZWFkZXI6YWZ0ZXIpOgorICAgICAgICAoLmZlYXR1cmUub3BlbmVkIC5mZWF0dXJlLWhlYWRl cjphZnRlcik6CisgICAgICAgIChmb290ZXIgbmF2IGE6aG92ZXIpOgorICAgICAgICAoaGVhZGVy IC5tZW51LWl0ZW0taGFzLWNoaWxkcmVuIC5sYWJlbC10b2dnbGU6OmFmdGVyKToKKyAgICAgICAg KGhlYWRlciAubWVudS1pdGVtKToKKyAgICAgICAgKC5zdWItbWVudS1sYXllcik6CisgICAgICAg ICguc3ViLW1lbnUtbGF5ZXIgLm1lbnUtaXRlbTpmaXJzdC1jaGlsZCk6CisgICAgICAgICgubWVu dSA+IC5tZW51LWl0ZW0gPiAubWVudS10b2dnbGU6Y2hlY2tlZCArIC5zdWItbWVudSk6CisgICAg ICAgIChAbWVkaWEgb25seSBzY3JlZW4gYW5kIChtYXgtd2lkdGg6IDkyMHB4KSk6CisgICAgICAg IChoZWFkZXIgLm1lbnUtaXRlbSA+IC5tZW51LXRvZ2dsZTpjaGVja2VkICsgYSA+IC5sYWJlbC10 b2dnbGU6OmFmdGVyKToKKyAgICAgICAgKGhlYWRlciAubWVudSk6CisgICAgICAgIChoZWFkZXIg Lm1lbnUtdG9nZ2xlOmNoZWNrZWQgfiB1bCk6CisgICAgICAgIChoZWFkZXIgLnN1Yi1tZW51LWxh eWVyOmJlZm9yZSk6CisgICAgICAgIChoZWFkZXIgLm1lbnUgPiAubWVudS1pdGVtID4gLm1lbnUt dG9nZ2xlOmNoZWNrZWQgfiAuc3ViLW1lbnUpOgorICAgICAgICAoZm9vdGVyIG5hdiBsaSk6Cisg ICAgICAgIChAbWVkaWEgb25seSBzY3JlZW4gYW5kIChtYXgtd2lkdGg6IDY5MHB4KSk6CisgICAg ICAgICguZmVhdHVyZS1maWx0ZXJzOmFmdGVyKToKKyAgICAgICAgKC5mZWF0dXJlLWZpbHRlcnMu b3BlbmVkOmFmdGVyKToKKyAgICAgICAgKCN3cGFkbWluYmFyKToKKyAgICAgICAgKC50YWJsZS1v Zi1jb250ZW50cyBsYWJlbDphZnRlcik6CisgICAgICAgICgubWVudS10b2dnbGU6Y2hlY2tlZCB+ IC50YWJsZS1vZi1jb250ZW50cyBsYWJlbDphZnRlcik6CisgICAgICAgICgudGFibGUtb2YtY29u dGVudHMgaDYpOgorICAgICAgICAoaGVhZGVyIG5hdiAubWVudS1pdGVtLWhhcy1jaGlsZHJlbiAu bGFiZWwtdG9nZ2xlKTogRGVsZXRlZC4KKyAgICAgICAgKGhlYWRlciBuYXYgLm1lbnUtaXRlbSk6 IERlbGV0ZWQuCisgICAgICAgIChoZWFkZXIgLm1lbnUgPiAubWVudS1pdGVtLWhhcy1jaGlsZHJl bjpob3ZlciA+IGE6OmJlZm9yZSk6IERlbGV0ZWQuCisgICAgICAgICgubWVudSA+IC5tZW51LWl0 ZW0gPiAubWVudS10b2dnbGU6Y2hlY2tlZCB+IC5zdWItbWVudSk6IERlbGV0ZWQuCisgICAgICAg IChoZWFkZXIgbmF2IC5tZW51LXRvZ2dsZTpjaGVja2VkIH4gdWwpOiBEZWxldGVkLgorICAgICAg ICAoaGVhZGVyIC5tZW51LXRvZ2dsZTpjaGVja2VkIH4gLnN1Yi1tZW51KTogRGVsZXRlZC4KKyAg ICAgICAgKEBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKG1heC13aWR0aDogNzgycHgpKTogRGVsZXRl ZC4KKwogMjAxNS0xMi0wNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAK ICAgICAgICAgT25lIGxhc3QgZml4IGZvciBodHRwcyByZWRpcmVjdC4KSW5kZXg6IFdlYnNpdGVz L3dlYmtpdC5vcmcvd3AtY29udGVudC90aGVtZXMvd2Via2l0L2Z1bmN0aW9ucy5waHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3RoZW1lcy93ZWJraXQvZnVu Y3Rpb25zLnBocAkocmV2aXNpb24gMTkzNTM2KQorKysgV2Vic2l0ZXMvd2Via2l0Lm9yZy93cC1j b250ZW50L3RoZW1lcy93ZWJraXQvZnVuY3Rpb25zLnBocAkod29ya2luZyBjb3B5KQpAQCAtMjEw LDggKzIxMCw2IEBAIGNsYXNzIFJlc3BvbnNpdmVfVG9nZ2xlX1dhbGtlcl9OYXZfTWVudSAKIAog ICAgIHB1YmxpYyBmdW5jdGlvbiBzdGFydF9sdmwoICYkb3V0cHV0LCAkZGVwdGggPSAwLCAkYXJn cyA9IGFycmF5KCkgKSB7CiAgICAgICAgICRvdXRwdXQgLj0gIlxuIiAuIHN0cl9yZXBlYXQoIlx0 IiwgJGRlcHRoKTsKLSAgICAgICAgaWYgKCAhIGVtcHR5KCR0aGlzLT50b2dnbGVpZCkgKQotICAg ICAgICAgICAgJG91dHB1dCAuPSAiPGlucHV0IHR5cGU9XCJjaGVja2JveFwiIGlkPVwidG9nZ2xl LXskdGhpcy0+dG9nZ2xlaWR9XCIgY2xhc3M9XCJtZW51LXRvZ2dsZVwiIC8+IjsKICAgICAgICAg JGNsYXNzZXMgPSBhcnJheSgic3ViLW1lbnUiKTsKICAgICAgICAgaWYgKCAwID09ICRkZXB0aCAp IHsKICAgICAgICAgICAgICRjbGFzc2VzW10gPSAic3ViLW1lbnUtbGF5ZXIiOwpAQCAtMjMyLDkg KzIzMCwxMCBAQCBjbGFzcyBSZXNwb25zaXZlX1RvZ2dsZV9XYWxrZXJfTmF2X01lbnUgCiAgICAg ICAgICRhZnRlciA9ICRhcmdzLT5saW5rX2FmdGVyOwogCiAgICAgICAgIGlmICggaW5fYXJyYXko J21lbnUtaXRlbS1oYXMtY2hpbGRyZW4nLCAkaXRlbS0+Y2xhc3NlcykgJiYgMCA9PSAkZGVwdGgg KSB7CisgICAgICAgICAgICAkdGhpcy0+dG9nZ2xlaWQgPSAkaXRlbS0+SUQ7CisgICAgICAgICAg ICAkYXJncy0+YmVmb3JlIC49ICI8aW5wdXQgdHlwZT1cImNoZWNrYm94XCIgaWQ9XCJ0b2dnbGUt eyRpdGVtLT5JRH1cIiBjbGFzcz1cIm1lbnUtdG9nZ2xlXCIgLz4iOwogICAgICAgICAgICAgJGFy Z3MtPmxpbmtfYmVmb3JlID0gIjxsYWJlbCBmb3I9XCJ0b2dnbGUteyRpdGVtLT5JRH1cIiBjbGFz cz1cImxhYmVsLXRvZ2dsZVwiPiIgLiAkYXJncy0+bGlua19iZWZvcmU7CiAgICAgICAgICAgICAk YXJncy0+bGlua19hZnRlciAuPSAiPC9sYWJlbD4iOwotICAgICAgICAgICAgJHRoaXMtPnRvZ2ds ZWlkID0gJGl0ZW0tPklEOwogICAgICAgICAgICAgJGl0ZW0tPnVybCA9ICcjbmF2LXN1Yi1tZW51 JzsKICAgICAgICAgfSBlbHNlaWYgKCBpbl9hcnJheSgnbWVudS1pdGVtLWhhcy1jaGlsZHJlbics ICRpdGVtLT5jbGFzc2VzKSAmJiAxID09ICRkZXB0aCApIHsKICAgICAgICAgICAgIC8vICRpdGVt LT5yb2xlID0gInByZXNlbnRhdGlvbiI7CkluZGV4OiBXZWJzaXRlcy93ZWJraXQub3JnL3dwLWNv bnRlbnQvdGhlbWVzL3dlYmtpdC9oZWFkZXIucGhwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3dl YmtpdC5vcmcvd3AtY29udGVudC90aGVtZXMvd2Via2l0L2hlYWRlci5waHAJKHJldmlzaW9uIDE5 MzUzNikKKysrIFdlYnNpdGVzL3dlYmtpdC5vcmcvd3AtY29udGVudC90aGVtZXMvd2Via2l0L2hl YWRlci5waHAJKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcgQEAKIDw/cGhwIHdwX25hdl9t ZW51KCBhcnJheSgKICd3YWxrZXInICAgICAgICAgID0+IG5ldyBSZXNwb25zaXZlX1RvZ2dsZV9X YWxrZXJfTmF2X01lbnUoKSwKICd0aGVtZV9sb2NhdGlvbicgID0+ICdzaXRlLW5hdicsCi0naXRl bXNfd3JhcCcgICAgICA9PiAnPGxhYmVsIGZvcj0iJTEkcy10b2dnbGUiIGNsYXNzPSJsYWJlbC10 b2dnbGUgbWFpbi1tZW51IiBkYXRhLW9wZW49Ik1haW4gTWVudSIgZGF0YS1jbG9zZT0iQ2xvc2Ug TWVudSIgb25jbGljaz48L2xhYmVsPjxpbnB1dCB0eXBlPSJjaGVja2JveCIgaWQ9IiUxJHMtdG9n Z2xlIiBjbGFzcz0ibWVudS10b2dnbGUiIC8+PHVsIGlkPSIlMSRzIiBjbGFzcz0iJTIkcyIgcm9s ZT0ibWVudWJhciI+JTMkczwvdWw+JywKKydpdGVtc193cmFwJyAgICAgID0+ICc8aW5wdXQgdHlw ZT0iY2hlY2tib3giIGlkPSIlMSRzLXRvZ2dsZSIgY2xhc3M9Im1lbnUtdG9nZ2xlIiAvPjxsYWJl bCBmb3I9IiUxJHMtdG9nZ2xlIiBjbGFzcz0ibGFiZWwtdG9nZ2xlIG1haW4tbWVudSIgZGF0YS1v cGVuPSJNYWluIE1lbnUiIGRhdGEtY2xvc2U9IkNsb3NlIE1lbnUiPjwvbGFiZWw+PHVsIGlkPSIl MSRzIiBjbGFzcz0iJTIkcyIgcm9sZT0ibWVudWJhciI+JTMkczwvdWw+JywKICkgKTsgPz48L25h dj4KICAgICAgICAgPC9kaXY+CiAgICAgPC9oZWFkZXI+CkluZGV4OiBXZWJzaXRlcy93ZWJraXQu b3JnL3dwLWNvbnRlbnQvdGhlbWVzL3dlYmtpdC9zdHlsZS5jc3MKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi c2l0ZXMvd2Via2l0Lm9yZy93cC1jb250ZW50L3RoZW1lcy93ZWJraXQvc3R5bGUuY3NzCShyZXZp c2lvbiAxOTM1MzYpCisrKyBXZWJzaXRlcy93ZWJraXQub3JnL3dwLWNvbnRlbnQvdGhlbWVzL3dl YmtpdC9zdHlsZS5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTIwLDE2ICsyMCwxNiBAQCBhcnRpY2xl LCBhc2lkZSwgY2FudmFzLCBkZXRhaWxzLAogZmlndXJlLCBmaWdjYXB0aW9uLCBmb290ZXIsIGhl YWRlciwgaGdyb3VwLAogbWVudSwgbmF2LCBvdXRwdXQsIHNlY3Rpb24sIHN1bW1hcnksCiB0aW1l LCBtYXJrLCBhdWRpbywgdmlkZW8gewotCW1hcmdpbjogMDsKLQlwYWRkaW5nOiAwOwotCWJvcmRl cjogMDsKLQlmb250OiBpbmhlcml0OwotCXZlcnRpY2FsLWFsaWduOiBiYXNlbGluZTsKKyAgICBt YXJnaW46IDA7CisgICAgcGFkZGluZzogMDsKKyAgICBib3JkZXI6IDA7CisgICAgZm9udDogaW5o ZXJpdDsKKyAgICB2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7CiB9CiAvKiBIVE1MNSBkaXNwbGF5 LXJvbGUgcmVzZXQgZm9yIG9sZGVyIGJyb3dzZXJzICovCiBhcnRpY2xlLCBhc2lkZSwgZGV0YWls cywgZmlnY2FwdGlvbiwgZmlndXJlLAogZm9vdGVyLCBoZWFkZXIsIGhncm91cCwgbWVudSwgbmF2 LCBzZWN0aW9uIHsKLQlkaXNwbGF5OiBibG9jazsKKyAgICBkaXNwbGF5OiBibG9jazsKIH0KIGh0 bWwgewogICAgIGZvbnQtZmFtaWx5OiAiTXlyaWFkIFNldCBQcm8iLCJIZWx2ZXRpY2EgTmV1ZSIs c2Fucy1zZXJpZjsKQEAgLTQwLDIyICs0MCwyMiBAQCBib2R5IHsKICAgICBiYWNrZ3JvdW5kLWNv bG9yOiAjZjdmN2Y3OwogICAgIGZvbnQtc2l6ZTogMS42cmVtOwogICAgIGZvbnQtd2VpZ2h0OiA0 MDA7Ci0JbGluZS1oZWlnaHQ6IDEuNDsKKyAgICBsaW5lLWhlaWdodDogMS40OwogfQogb2wsIHVs IHsKLQlsaXN0LXN0eWxlOiBub25lOworICAgIGxpc3Qtc3R5bGU6IG5vbmU7CiB9CiBibG9ja3F1 b3RlLCBxIHsKLQlxdW90ZXM6IG5vbmU7CisgICAgcXVvdGVzOiBub25lOwogfQogYmxvY2txdW90 ZTpiZWZvcmUsIGJsb2NrcXVvdGU6YWZ0ZXIsCiBxOmJlZm9yZSwgcTphZnRlciB7Ci0JY29udGVu dDogJyc7Ci0JY29udGVudDogbm9uZTsKKyAgICBjb250ZW50OiAnJzsKKyAgICBjb250ZW50OiBu b25lOwogfQogdGFibGUgewotCWJvcmRlci1jb2xsYXBzZTogY29sbGFwc2U7Ci0JYm9yZGVyLXNw YWNpbmc6IDA7CisgICAgYm9yZGVyLWNvbGxhcHNlOiBjb2xsYXBzZTsKKyAgICBib3JkZXItc3Bh Y2luZzogMDsKIH0KIHA6ZW1wdHkgewogICAgIGRpc3BsYXk6IG5vbmU7CkBAIC0xMzYsMzEgKzEz NiwzMSBAQCBoNiBhW25hbWVdIHsKIH0KIAogLnNjcmVlbi1yZWFkZXItdGV4dCB7Ci0JY2xpcDog cmVjdCgxcHgsIDFweCwgMXB4LCAxcHgpOwotCXBvc2l0aW9uOiBhYnNvbHV0ZSAhaW1wb3J0YW50 OwotCWhlaWdodDogMXB4OwotCXdpZHRoOiAxcHg7Ci0Jb3ZlcmZsb3c6IGhpZGRlbjsKKyAgICBj bGlwOiByZWN0KDFweCwgMXB4LCAxcHgsIDFweCk7CisgICAgcG9zaXRpb246IGFic29sdXRlICFp bXBvcnRhbnQ7CisgICAgaGVpZ2h0OiAxcHg7CisgICAgd2lkdGg6IDFweDsKKyAgICBvdmVyZmxv dzogaGlkZGVuOwogfQogCiAuc2NyZWVuLXJlYWRlci10ZXh0OmZvY3VzIHsKLQliYWNrZ3JvdW5k LWNvbG9yOiAjZjFmMWYxOwotCWJvcmRlci1yYWRpdXM6IDNweDsKLQlib3gtc2hhZG93OiAwIDAg MnB4IDJweCByZ2JhKDAsIDAsIDAsIDAuNik7Ci0JY2xpcDogYXV0byAhaW1wb3J0YW50OwotCWNv bG9yOiAjMjE3NTliOwotCWRpc3BsYXk6IGJsb2NrOwotCWZvbnQtc2l6ZTogMTRweDsKLQlmb250 LXNpemU6IDAuODc1cmVtOwotCWZvbnQtd2VpZ2h0OiBib2xkOwotCWhlaWdodDogYXV0bzsKLQls ZWZ0OiA1cHg7Ci0JbGluZS1oZWlnaHQ6IG5vcm1hbDsKLQlwYWRkaW5nOiAxNXB4IDIzcHggMTRw eDsKLQl0ZXh0LWRlY29yYXRpb246IG5vbmU7Ci0JdG9wOiA1cHg7Ci0Jd2lkdGg6IGF1dG87Ci0J ei1pbmRleDogMTAwMDAwOyAvKiBBYm92ZSBXUCB0b29sYmFyLiAqLworICAgIGJhY2tncm91bmQt Y29sb3I6ICNmMWYxZjE7CisgICAgYm9yZGVyLXJhZGl1czogM3B4OworICAgIGJveC1zaGFkb3c6 IDAgMCAycHggMnB4IHJnYmEoMCwgMCwgMCwgMC42KTsKKyAgICBjbGlwOiBhdXRvICFpbXBvcnRh bnQ7CisgICAgY29sb3I6ICMyMTc1OWI7CisgICAgZGlzcGxheTogYmxvY2s7CisgICAgZm9udC1z aXplOiAxNHB4OworICAgIGZvbnQtc2l6ZTogMC44NzVyZW07CisgICAgZm9udC13ZWlnaHQ6IGJv bGQ7CisgICAgaGVpZ2h0OiBhdXRvOworICAgIGxlZnQ6IDVweDsKKyAgICBsaW5lLWhlaWdodDog bm9ybWFsOworICAgIHBhZGRpbmc6IDE1cHggMjNweCAxNHB4OworICAgIHRleHQtZGVjb3JhdGlv bjogbm9uZTsKKyAgICB0b3A6IDVweDsKKyAgICB3aWR0aDogYXV0bzsKKyAgICB6LWluZGV4OiAx MDAwMDA7IC8qIEFib3ZlIFdQIHRvb2xiYXIuICovCiB9CiAKIC8qKiBQYWdlIExheW91dCAqKi8K QEAgLTY5MCwxMSArNjkwLDExIEBAIGZvb3RlciAubWVudSB7CiAvKiogQ29kZSBTeW50YXggSGln aGxpZ2h0aW5nICoqLwogcHJlIHsKICAgICB3aWR0aDogY2FsYygxMDAlICsgNnJlbSk7Ci0Jb3Zl cmZsb3c6IGF1dG87CisgICAgb3ZlcmZsb3c6IGF1dG87CiAgICAgLXdlYmtpdC1vdmVyZmxvdy1z Y3JvbGxpbmc6IHRvdWNoOwogICAgIGJhY2tncm91bmQ6ICNmMmYyZjI7Ci0JYm9yZGVyOiAxcHgg c29saWQgI0U2RTZFNjsKLQlib3JkZXItcmFkaXVzOiAzcHg7CisgICAgYm9yZGVyOiAxcHggc29s aWQgI0U2RTZFNjsKKyAgICBib3JkZXItcmFkaXVzOiAzcHg7CiAKICAgICBib3gtc2l6aW5nOiBi b3JkZXItYm94OwogICAgIHBhZGRpbmc6IDNyZW07CkBAIC03MDMsNyArNzAzLDcgQEAgcHJlIHsK IAogY29kZSB7CiAgICAgY29sb3I6ICM1NTU1NTU7Ci0JZm9udC1zaXplOiAxLjZyZW07CisgICAg Zm9udC1zaXplOiAxLjZyZW07CiAgICAgbGluZS1oZWlnaHQ6IDIuNXJlbTsKIH0KIApAQCAtMTI5 MSw5ICsxMjkxLDkgQEAgYXJ0aWNsZSwKIH0KIAogLmZlYXR1cmUub3BlbmVkIC5mZWF0dXJlLWhl YWRlcjphZnRlciB7Ci0JLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7Ci0JLW1v ei10cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7Ci0JdHJhbnNmb3JtOiByb3RhdGVYKC0xODBk ZWcpOworICAgIC13ZWJraXQtdHJhbnNmb3JtOiByb3RhdGVYKC0xODBkZWcpOworICAgIC1tb3ot dHJhbnNmb3JtOiByb3RhdGVYKC0xODBkZWcpOworICAgIHRyYW5zZm9ybTogcm90YXRlWCgtMTgw ZGVnKTsKICAgICBwZXJzcGVjdGl2ZTogNjAwOwogfQogCkBAIC0xMzQ5LDE5ICsxMzQ5LDI3IEBA IGZvb3RlciBuYXYgYTpob3ZlciB7CiAgICAgdGV4dC1kZWNvcmF0aW9uOiBub25lOwogfQogCi1o ZWFkZXIgbmF2IC5tZW51LWl0ZW0taGFzLWNoaWxkcmVuIC5sYWJlbC10b2dnbGUgewotICAgIGJh Y2tncm91bmQ6IHVybCgnaW1hZ2VzL21lbnUtZG93bi5zdmcnKSByaWdodCAwLjdyZW0gbm8tcmVw ZWF0OwotICAgIGJhY2tncm91bmQtc2l6ZTogMXJlbTsKK2hlYWRlciAubWVudS1pdGVtLWhhcy1j aGlsZHJlbiAubGFiZWwtdG9nZ2xlOjphZnRlciB7CisgICAgYmFja2dyb3VuZDogdXJsKCdpbWFn ZXMvbWVudS1kb3duLnN2ZycpIG5vLXJlcGVhdDsKKyAgICBiYWNrZ3JvdW5kLXNpemU6IDEuMnJl bTsKICAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7Ci0gICAgcGFkZGluZy1yaWdodDogMS41cmVt OworICAgIHBhZGRpbmctcmlnaHQ6IDEuMnJlbTsKKyAgICBwYWRkaW5nLXRvcDogMC44cmVtOwor ICAgIG1hcmdpbi1sZWZ0OiAwLjVyZW07CisgICAgbWFyZ2luLXRvcDogLTAuMXJlbTsKKyAgICBj b250ZW50OiAnJzsKKyAgICAKKyAgICAtd2Via2l0LXRyYW5zaXRpb246IHRyYW5zZm9ybSAwLjNz IGVhc2Utb3V0OworICAgIC1tb3otdHJhbnNpdGlvbjogdHJhbnNmb3JtIDAuM3MgZWFzZS1vdXQ7 CisgICAgdHJhbnNpdGlvbjogdHJhbnNmb3JtIDAuM3MgZWFzZS1vdXQ7CiB9CiAKLWhlYWRlciBu YXYgLm1lbnUtaXRlbSB7IC8qIGFkZCBib3R0b20gZGltZW5zaW9uIHRvIG1haW4gbWVudSBpdGVt cyAqLworaGVhZGVyIC5tZW51LWl0ZW0geyAvKiBhZGQgYm90dG9tIGRpbWVuc2lvbiB0byBtYWlu IG1lbnUgaXRlbXMgKi8KICAgICBwYWRkaW5nLWJvdHRvbTogM3JlbTsKIH0KIAogLyogSW1wcm92 ZXMgbW91c2UgYWNjZXNzaWJpbGl0eSBvZiBtZW51cyAqLwotaGVhZGVyIC5tZW51ID4gLm1lbnUt aXRlbS1oYXMtY2hpbGRyZW46aG92ZXIgPiBhOjpiZWZvcmUgeworLypoZWFkZXIgLm1lbnUgPiAu bWVudS1pdGVtLWhhcy1jaGlsZHJlbjpob3ZlciA+IGE6OmJlZm9yZSB7CiAgICAgcG9zaXRpb246 IGFic29sdXRlOwogICAgIGNvbnRlbnQ6ICcnOwogICAgIHdpZHRoOiAxMDAlOwpAQCAtMTM3MCwx NCArMTM3OCwxNSBAQCBoZWFkZXIgLm1lbnUgPiAubWVudS1pdGVtLWhhcy1jaGlsZHJlbjpoCiAg ICAgdG9wOiAycmVtOwogICAgIHJpZ2h0OiAtM3JlbTsKIH0KLQorKi8KIC5zdWItbWVudS1sYXll ciB7CiAgICAgdGV4dC1hbGlnbjogY2VudGVyOwogICAgIHBhZGRpbmc6IDNyZW07CiAgICAgYm94 LXNpemluZzogYm9yZGVyLWJveDsKIAotICAgIHdpZHRoOiAyMTBweDsKLSAgICBtYXJnaW4tbGVm dDogLTExMHB4OworICAgIHdpZHRoOiAyMXJlbTsKKyAgICBtYXJnaW4tbGVmdDogLTExcmVtOwor ICAgIG1hcmdpbi10b3A6IC05OXJlbTsKICAgICAKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CiAg ICAgdG9wOiA3cmVtOyAgICAKQEAgLTE0MjYsMTQgKzE0MzUsMTUgQEAgaGVhZGVyIC5tZW51ID4g Lm1lbnUtaXRlbS1oYXMtY2hpbGRyZW46aAogfQogCiAubWVudSA+IC5tZW51LWl0ZW0gPiBhOmZv Y3VzIH4gLnN1Yi1tZW51LAotLm1lbnUgPiAubWVudS1pdGVtLm9wZW4tbWVudT4gLnN1Yi1tZW51 LAorLm1lbnUgPiAubWVudS1pdGVtLm9wZW4tbWVudSA+IC5zdWItbWVudSwKIC5tZW51ID4gLm1l bnUtaXRlbTpob3ZlciA+IC5zdWItbWVudSwKLS5tZW51ID4gLm1lbnUtaXRlbSA+IC5tZW51LXRv Z2dsZTpjaGVja2VkIH4gLnN1Yi1tZW51IHsKKy5tZW51ID4gLm1lbnUtaXRlbSA+IC5tZW51LXRv Z2dsZTpjaGVja2VkICsgLnN1Yi1tZW51IHsKICAgICBkaXNwbGF5OiBibG9jazsKICAgICBib3gt c2l6aW5nOiBib3JkZXItYm94OwogICAgIHotaW5kZXg6IDE7CiAgICAgb3BhY2l0eTogMTsKICAg ICB0b3A6IDhyZW07ICAgIAorICAgIG1hcmdpbi10b3A6IDA7CiB9CiAKIC8qKiBTY3JlZW4gQnJl YWtwb2ludHMgKiovCkBAIC0xNDg3LDEzICsxNDk3LDI1IEBAIGhlYWRlciAubWVudSA+IC5tZW51 LWl0ZW0taGFzLWNoaWxkcmVuOmgKIAogQG1lZGlhIG9ubHkgc2NyZWVuIGFuZCAobWF4LXdpZHRo OiA5MjBweCkgewogICAgIAotICAgIGhlYWRlciBuYXYgLm1haW4tbWVudS5sYWJlbC10b2dnbGUg eworICAgIC5tYWluLW1lbnUubGFiZWwtdG9nZ2xlIHsKICAgICAgICAgZGlzcGxheTogaW5saW5l LWJsb2NrOwogICAgICAgICBtYXJnaW46IDEuNXJlbSAwIDIuNXJlbTsKICAgICAgICAgaGVpZ2h0 OiAzcmVtOwogICAgICAgICB3aWR0aDogM3JlbTsKICAgICAgICAgYmFja2dyb3VuZDogdXJsKCdp bWFnZXMvbWVudS1kb3duLnN2ZycpIG5vLXJlcGVhdCA1MCU7CiAgICAgICAgIGN1cnNvcjogcG9p bnRlcjsKKyAgICAgICAgCisgICAgICAgIC13ZWJraXQtdHJhbnNpdGlvbjogdHJhbnNmb3JtIDAu M3MgZWFzZS1vdXQ7CisgICAgICAgIC1tb3otdHJhbnNpdGlvbjogdHJhbnNmb3JtIDAuM3MgZWFz ZS1vdXQ7CisgICAgICAgIHRyYW5zaXRpb246IHRyYW5zZm9ybSAwLjNzIGVhc2Utb3V0OworICAg IH0KKyAgICAKKyAgICAubWVudS10b2dnbGU6Y2hlY2tlZCArIC5tYWluLW1lbnUubGFiZWwtdG9n Z2xlLAorICAgIGhlYWRlciAubWVudS1pdGVtID4gLm1lbnUtdG9nZ2xlOmNoZWNrZWQgKyBhID4g LmxhYmVsLXRvZ2dsZTo6YWZ0ZXIgeworICAgICAgICAtd2Via2l0LXRyYW5zZm9ybTogcm90YXRl WCgtMTgwZGVnKTsKKyAgICAgICAgLW1vei10cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7Cisg ICAgICAgIHRyYW5zZm9ybTogcm90YXRlWCgtMTgwZGVnKTsKKyAgICAgICAgcGVyc3BlY3RpdmU6 IDYwMDsKICAgICB9CiAKICAgICBoZWFkZXIgLm1lbnUgewpAQCAtMTUxMSw3ICsxNTMzLDcgQEAg aGVhZGVyIC5tZW51ID4gLm1lbnUtaXRlbS1oYXMtY2hpbGRyZW46aAogICAgICAgICBiYWNrZ3Jv dW5kOiByZ2JhKDI1NSwyNTUsMjU1LDAuOCk7CiAgICAgfQogCi0gICAgaGVhZGVyIG5hdiAubWVu dS10b2dnbGU6Y2hlY2tlZCB+IHVsIHsKKyAgICBoZWFkZXIgLm1lbnUtdG9nZ2xlOmNoZWNrZWQg fiB1bCB7CiAgICAgICAgIGRpc3BsYXk6IGJsb2NrOwogICAgICAgICBvcGFjaXR5OiAxOwogICAg IH0KQEAgLTE1NzAsMjMgKzE1OTIsMTkgQEAgaGVhZGVyIC5tZW51ID4gLm1lbnUtaXRlbS1oYXMt Y2hpbGRyZW46aAogICAgICAgICBtYXJnaW4tbGVmdDogLTExcHg7CiAgICAgfQogICAgIAotICAg IGhlYWRlciAubWVudS10b2dnbGU6Y2hlY2tlZCB+IC5zdWItbWVudSB7Ci0gICAgICAgIHRleHQt YWxpZ246IGxlZnQ7Ci0gICAgfQotCi0gICAgaGVhZGVyIC5tZW51ID4gLm1lbnUtaXRlbTpob3Zl ciA+IC5zdWItbWVudSwKICAgICBoZWFkZXIgLm1lbnUgPiAubWVudS1pdGVtID4gLm1lbnUtdG9n Z2xlOmNoZWNrZWQgfiAuc3ViLW1lbnUgewogICAgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CiAg ICAgICAgIHRvcDogMS41cmVtOworICAgICAgICBtYXJnaW4tdG9wOiAwOwogICAgIH0KLSAgICAK KyAgICAgICAgCiAgICAgZm9vdGVyIG5hdiBsaSB7CiAgICAgICAgIHBhZGRpbmc6IDAgM3JlbSAz cmVtIDA7CiAgICAgfQogCiB9CiAKLUBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKG1heC13aWR0aDog NzgycHgpIHsKK0BtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKG1heC13aWR0aDogNjkwcHgpIHsKICAg ICAKICAgICAuZmVhdHVyZWQtdGlsZSB7CiAgICAgICAgIHBhZGRpbmc6IDA7CkBAIC0xNjk4LDkg KzE3MTYsOSBAQCBoZWFkZXIgLm1lbnUgPiAubWVudS1pdGVtLWhhcy1jaGlsZHJlbjpoCiAgICAg fQogCiAgICAgLmZlYXR1cmUtZmlsdGVycy5vcGVuZWQ6YWZ0ZXIgewotICAgIAktd2Via2l0LXRy YW5zZm9ybTogcm90YXRlWCgtMTgwZGVnKTsKLSAgICAJLW1vei10cmFuc2Zvcm06IHJvdGF0ZVgo LTE4MGRlZyk7Ci0gICAgCXRyYW5zZm9ybTogcm90YXRlWCgtMTgwZGVnKTsKKyAgICAgICAgLXdl YmtpdC10cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7CisgICAgICAgIC1tb3otdHJhbnNmb3Jt OiByb3RhdGVYKC0xODBkZWcpOworICAgICAgICB0cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7 CiAgICAgfQogICAgIAogICAgICN3cGFkbWluYmFyIHsKQEAgLTE3MzgsOSArMTc1Niw5IEBAIGhl YWRlciAubWVudSA+IC5tZW51LWl0ZW0taGFzLWNoaWxkcmVuOmgKICAgICB9CiAgICAgCiAgICAg Lm1lbnUtdG9nZ2xlOmNoZWNrZWQgfiAudGFibGUtb2YtY29udGVudHMgbGFiZWw6YWZ0ZXIgewot ICAgIAktd2Via2l0LXRyYW5zZm9ybTogcm90YXRlWCgtMTgwZGVnKTsKLSAgICAJLW1vei10cmFu c2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7Ci0gICAgCXRyYW5zZm9ybTogcm90YXRlWCgtMTgwZGVn KTsKKyAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7CisgICAgICAg IC1tb3otdHJhbnNmb3JtOiByb3RhdGVYKC0xODBkZWcpOworICAgICAgICB0cmFuc2Zvcm06IHJv dGF0ZVgoLTE4MGRlZyk7CiAgICAgfQogICAgIAogICAgIC50YWJsZS1vZi1jb250ZW50cyBoNiB7 CkBAIC0xODU2LDkgKzE4NzQsOSBAQCBoZWFkZXIgLm1lbnUgPiAubWVudS1pdGVtLWhhcy1jaGls ZHJlbjpoCiAgICAgfQogICAgIAogICAgIC5tZW51LXRvZ2dsZTpjaGVja2VkIH4gLnRhYmxlLW9m LWNvbnRlbnRzIGxhYmVsOmFmdGVyIHsKLSAgICAJLXdlYmtpdC10cmFuc2Zvcm06IHJvdGF0ZVgo LTE4MGRlZyk7Ci0gICAgCS1tb3otdHJhbnNmb3JtOiByb3RhdGVYKC0xODBkZWcpOwotICAgIAl0 cmFuc2Zvcm06IHJvdGF0ZVgoLTE4MGRlZyk7CisgICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiBy b3RhdGVYKC0xODBkZWcpOworICAgICAgICAtbW96LXRyYW5zZm9ybTogcm90YXRlWCgtMTgwZGVn KTsKKyAgICAgICAgdHJhbnNmb3JtOiByb3RhdGVYKC0xODBkZWcpOwogICAgIH0KICAgICAKICAg ICAudGFibGUtb2YtY29udGVudHMgaDYgewo=