142355 2015-03-05 12:23:40 -0800 Implement new fullscreen media controls on Mac 2015-03-05 16:54:17 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 roger_fong webkit-unassigned dino roger_fong oldest_to_newest 1074632 0 roger_fong 2015-03-05 12:23:40 -0800 Implement new fullscreen media controls on Mac rdar://problem/16175787 1074686 1 248000 roger_fong 2015-03-05 14:25:44 -0800 Created attachment 248000 patch 1074695 2 248000 dino 2015-03-05 14:51:32 -0800 Comment on attachment 248000 patch View in context: https://bugs.webkit.org/attachment.cgi?id=248000&action=review > Source/WebCore/Modules/mediacontrols/mediaControlsApple.css:528 > + background-color: black; I think we should make it slightly transparent while we wait for the blurry background. 1074759 3 roger_fong 2015-03-05 16:54:17 -0800 Committed: http://trac.webkit.org/changeset/181120 w/a change to set all control backgrounds to a slightly transparent black. 248000 2015-03-05 14:25:44 -0800 2015-03-05 14:51:32 -0800 patch patch.patch text/plain 13560 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTEwMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE1LTAzLTA1ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgSW1wbGVtZW50IG5ldyBmdWxs c2NyZWVuIG1lZGlhIGNvbnRyb2xzIG9uIE1hYy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjM1NS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2 MTc1Nzg3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkanVzdCBzaXplcyBhbmQgcG9zaXRpb25pbmcgb2YgYWxsIGZ1bGxzY3JlZW4gbWVkaWEgY29u dHJvbCBlbGVtZW50cy4KKyAgICAgICAgKiBNb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250 cm9sc0FwcGxlLmNzczoKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1 bGxzY3JlZW4tYnV0dG9uLmV4aXQpOiBVcGRhdGUgdG8gbWF0Y2ggZW50ZXJpbmcgZnVsbHNjcmVl biBidXR0b24uCisgICAgICAgICh2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXBhbmVsKToKKyAgICAgICAgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgLnZvbHVtZS1ib3gpOgorICAgICAgICAodmlk ZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xp ZGVyKToKKyAgICAgICAgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdm9sdW1lLW1heC1idXR0b24pOgorICAgICAgICAodmlkZW86LXdlYmtpdC1mdWxs LXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtbWluLWJ1dHRvbik6CisgICAg ICAgICh2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBs YXktYnV0dG9uKToKKyAgICAgICAgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtcGxheS1idXR0b24ucGF1c2VkKToKKyAgICAgICAgKHZpZGVvOi13ZWJr aXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1iYWNrLWJ1dHRvbik6 CisgICAgICAgICh2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXNlZWstZm9yd2FyZC1idXR0b24pOgorICAgICAgICAodmlkZW86LXdlYmtpdC1mdWxsLXNj cmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZS1jb250YWluZXIpOgorICAgICAg ICAodmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJy ZW50LXRpbWUtZGlzcGxheSk6CisgICAgICAgICh2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWluaW5nLWRpc3BsYXkpOgorICAgICAgICAo YXVkaW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10b2dnbGUt Y2xvc2VkLWNhcHRpb25zLWJ1dHRvbik6CisgICAgICAgICh2aWRlbzotd2Via2l0LWZ1bGwtc2Ny ZWVuOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXI6Oi13ZWJraXQtc2xpZGVy LXRodW1iKTogRGVsZXRlZC4KKyAgICAgICAgKHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtcmV3aW5kLWJ1dHRvbik6IERlbGV0ZWQuIE5vdCB1c2VkIGlu IGZ1bGwgc2NyZWVuLgorCiAyMDE1LTAzLTA1ICBSb2dlciBGb25nICA8cm9nZXJfZm9uZ0BhcHBs ZS5jb20+CiAKICAgICAgICAgTWlub3IgdG91Y2h1cHMgdG8gaW5saW5lIG1lZGlhIGNvbnRyb2wg aWNvbnMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFD b250cm9sc0FwcGxlLmNzcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmNzcwkocmV2aXNpb24gMTgxMTAwKQorKysg U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5j c3MJKHdvcmtpbmcgY29weSkKQEAgLTMzOSw4ICszMzksMTEgQEAgYXVkaW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtZnVsbHNjcmVlbgogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1m dWxsc2NyZWVuLWJ1dHRvbi5leGl0LAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVs bHNjcmVlbi1idXR0b24uZXhpdCB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmlt YWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdC b3g9IjAgMCAxNSAxNSIgdHJhbnNmb3JtPSJyb3RhdGUoOTAsMCwwKSI+PGxpbmVhckdyYWRpZW50 IGlkPSJncmFkaWVudCIgeDI9IjAiIHkyPSIxMDAlIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VP blVzZSI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSJyZ2IoMjE2LCAyMTYsIDIxNikiLz48 c3RvcCBvZmZzZXQ9IjAuNDM3NSIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2LCAyMTYpIi8+PHN0 b3Agb2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9InJnYigyMDgsIDIwOCwgMjA4KSIvPjxzdG9w IG9mZnNldD0iMC41IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48c3RvcCBvZmZz ZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIwMCwgMjAwLCAyMDApIi8+PHN0b3Agb2Zmc2V0PSIx IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48L2xpbmVhckdyYWRpZW50PjxwYXRo IGQ9Ik0gNyw4IG0gMCw2IC0yLC0yIC0yLDIgYyAwLDAgLTEsMSAtMiwwIC0xLC0xIDAsLTIgMCwt MiBsIDIsLTIgLTIsLTIgNiwwIHoiIHN0eWxlPSJmaWxsOnVybCgjZ3JhZGllbnQpICIvPjxwYXRo IGQ9Ik0gOCw3IG0gMCwtNiAyLDIgMiwtMiBjIDAsMCAxLC0xIDIsMCAxLDEgMCwyIDAsMiBsIC0y LDIgMiwyIC02LDAgeiIgc3R5bGU9ImZpbGw6dXJsKCNncmFkaWVudCkgIi8+PC9zdmc+Jyk7Cisg ICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0i aHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNCAxNSIgc3Ryb2tlPSJ3 aGl0ZSIgc3Ryb2tlLXdpZHRoPSIxLjI1Ij48cGF0aCBkPSJNIDcuNSwwLjUgTCA3LjUsNiBMIDEz LDYiLz48cGF0aCBkPSJNIDAsOCBMIDUuNSw4IEwgNS41LDEzLjUiLz48cGF0aCBzdHJva2UtbGlu ZWNhcD0icm91bmQiIGQ9Ik0gNy41LDYgTCAxMi41LDEiLz48cGF0aCBzdHJva2UtbGluZWNhcD0i cm91bmQiIGQ9Ik0gNS41LDggTCAwLjUsMTMiLz48L3N2Zz4nKTsKKyAgICBtYXJnaW4tcmlnaHQ6 IDExcHg7CisgICAgbWFyZ2luLXRvcDogNnB4OwogfQorCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1vcHRpbWl6ZWQtZnVsbHNjcmVlbi1idXR0b24sCiBhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy1vcHRpbWl6ZWQtZnVsbHNjcmVlbi1idXR0b24gewogICAgIGJhY2tncm91bmQt aW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMu b3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTUgMTUiIHRyYW5zZm9ybT0icm90YXRlKDkwLDAs MCkiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIHgyPSIwIiB5Mj0iMTAwJSIgZ3JhZGll bnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0icmdi KDIxNiwgMjE2LCAyMTYpIi8+PHN0b3Agb2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9InJnYigy MTYsIDIxNiwgMjE2KSIvPjxzdG9wIG9mZnNldD0iMC40Mzc1IiBzdG9wLWNvbG9yPSJyZ2IoMjA4 LCAyMDgsIDIwOCkiLz48c3RvcCBvZmZzZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4 LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIwLjUiIHN0b3AtY29sb3I9InJnYigyMDAsIDIwMCwgMjAw KSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PC9s aW5lYXJHcmFkaWVudD48cGF0aCBkPSJNIDcsOCBtIDAsNiAtMiwtMiAtMiwyIGMgMCwwIC0xLDEg LTIsMCAtMSwtMSAwLC0yIDAsLTIgbCAyLC0yIC0yLC0yIDYsMCB6IiBzdHlsZT0iZmlsbDp1cmwo I2dyYWRpZW50KSAiLz48cGF0aCBkPSJNIDgsNyBtIDAsLTYgMiwyIDIsLTIgYyAwLDAgMSwtMSAy LDAgMSwxIDAsMiAwLDIgbCAtMiwyIDIsMiAtNiwwIHoiIHN0eWxlPSJmaWxsOnVybCgjZ3JhZGll bnQpICIvPjwvc3ZnPicpOwpAQCAtNTE4LDI1ICs1MjEsMTIgQEAgdmlkZW86LXdlYmtpdC1mdWxs LXNjcmVlbjo6LXdlYmtpdC1tZWRpYQogICAgIC13ZWJraXQtanVzdGlmeS1jb250ZW50OiBmbGV4 LWVuZCAhaW1wb3J0YW50OwogCiAgICAgd2lkdGg6IDQ0MHB4ICFpbXBvcnRhbnQ7Ci0gICAgaGVp Z2h0OiA2MHB4ICFpbXBvcnRhbnQ7Ci0gICAgbWFyZ2luOiAwIGF1dG8gNTBweCBhdXRvICFpbXBv cnRhbnQ7CisgICAgaGVpZ2h0OiA2NHB4ICFpbXBvcnRhbnQ7CisgICAgbWFyZ2luOiAwIGF1dG8g MzJweCBhdXRvICFpbXBvcnRhbnQ7CiAgICAgcGFkZGluZy10b3A6IDEwcHggIWltcG9ydGFudDsK IAotICAgIGJhY2tncm91bmQ6IC13ZWJraXQtbGluZWFyLWdyYWRpZW50KHRvcCwKLSAgICAgICAg cmdiYSg0NSwgNDUsIDQ1LCAuOTcpIDAsCi0gICAgICAgIHJnYmEoMzAsIDMwLCAzMCwgLjk3KSAx OXB4LAotICAgICAgICByZ2JhKDI1LCAyNSwgMjUsIC45NykgMTlweCwKLSAgICAgICAgcmdiYSgy NSwgMjUsIDI1LCAuOTcpIDIwcHgsCi0gICAgICAgIHJnYmEoMTksIDE5LCAxOSwgLjk3KSAyMHB4 LAotICAgICAgICByZ2JhKDEyLCAxMiwgMTIsIC45NykgMTAwJQotICAgICkgIWltcG9ydGFudDsK LQotICAgIGJveC1zaGFkb3c6IAotICAgICAgICBpbnNldCAwIC0xcHggMXB4IHJnYmEoMCwgMCwg MCwgMC41KSwKLSAgICAgICAgaW5zZXQgMCAgMXB4IDAgMHB4ICAgcmdiYSgyNTUsIDI1NSwgMjU1 LCAwLjE1KSwKLSAgICAgICAgaW5zZXQgMCAtMXB4IDAgMHB4ICAgcmdiYSgyMDIsIDIwMiwgMjAy LCAwLjA5KSwKLSAgICAgICAgMCAgMCAgIDAgMXB4IHJnYmEoMCwgMCwgMCwgMC41KTsKLSAgICBi b3JkZXItcmFkaXVzOiA4cHggIWltcG9ydGFudDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibGFj azsKKyAgICBib3JkZXItcmFkaXVzOiA2cHggIWltcG9ydGFudDsKIAogICAgIHRyYW5zaXRpb246 IG9wYWNpdHkgMC4zcyBsaW5lYXIgIWltcG9ydGFudDsKIH0KQEAgLTU0OSwxMCArNTM5LDEwIEBA IHZpZGVvOi13ZWJraXQtYW5pbWF0aW5nLWZ1bGwtc2NyZWVuLXRyYW4KIHZpZGVvOi13ZWJraXQt ZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgLnZvbHVtZS1ib3ggewog ICAgIC13ZWJraXQtdHJhbnNmb3JtOiBub25lOwogICAgIG9wYWNpdHk6IDE7Ci0gICAgbGVmdDog MTFweDsKLSAgICB0b3A6IDEzcHg7Ci0gICAgd2lkdGg6IDkwcHg7Ci0gICAgaGVpZ2h0OiAxNHB4 OworICAgIGxlZnQ6IDEycHg7CisgICAgdG9wOiAxNnB4OworICAgIHdpZHRoOiA5NnB4OworICAg IGhlaWdodDogMTVweDsKICAgICBkaXNwbGF5OiAtd2Via2l0LWZsZXg7CiAgICAgLXdlYmtpdC1m bGV4LWRpcmVjdGlvbjogcm93OwogICAgIC13ZWJraXQtYWxpZ24taXRlbXM6IGNlbnRlcjsKQEAg LTU2MSw2MCArNTUxLDUxIEBAIHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVk aWEKIH0KIAogdmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy12b2x1bWUtc2xpZGVyIHsKLSAgICBoZWlnaHQ6IDZweCAhaW1wb3J0YW50OwotICAgIGJvcmRl ci1yYWRpdXM6IDNweCAhaW1wb3J0YW50OwotICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQt bGluZWFyLWdyYWRpZW50KHRvcCwKLSAgICAgICAgcmdiYSgxNiwgMTYsIDE2LCAuMzAwKSAwLAot ICAgICAgICByZ2JhKDksICA5LCAgOSwgIC42MjkpIDEwMCUKLSAgICApICFpbXBvcnRhbnQ7Ci0g ICAgYm94LXNoYWRvdzogaW5zZXQgLTFweCAwIDAgcmdiYSgwLCAwLCAwLCAuNjgpLCAwIDFweCBy Z2JhKDI1NSwgMjU1LCAyNTUsIC4wOCkgIWltcG9ydGFudDsKKyAgICB3aWR0aDogNjBweCAhaW1w b3J0YW50OworICAgIG1hcmdpbjogMCAhaW1wb3J0YW50OwogfQogCi12aWRlbzotd2Via2l0LWZ1 bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXI6Oi13ZWJraXQt c2xpZGVyLXRodW1iIHsKK3ZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtbXV0ZS1idXR0b24sCithdWRpbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLW11dGUtYnV0dG9uLAordmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtbWF4LWJ1dHRvbiB7CisgICAgd2lkdGg6IDE0 cHggIWltcG9ydGFudDsKKyAgICBtYXJnaW4tbGVmdDogNnB4ICFpbXBvcnRhbnQ7CisgICAgYmFj a2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDov L3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNSAxNSIgc3Ryb2tlPSJ3aGl0ZSIg ZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxLjI1IiBzdHJva2UtbGluZWNhcD0icm91bmQiPjxw YXRoIGZpbGw9IndoaXRlIiBzdHJva2U9InJnYmEoMjU1LDI1NSwyNTUsMC42NykiIGQ9Ik0gMCw5 IDAsNSAzLDUgNiwyIDYsMTIgMyw5IDAsOSB6Ii8+PHBhdGggZD0iTSA5LDUgQyAxMC43NSw2LjUg MTAuNzUsNy41IDksOSIvPjxwYXRoIGQ9Ik0gMTAsMyBDIDEzLDQgMTMsMTAgMTAsMTEiIC8+PHBh dGggZD0iTSAxMSwxIEMgMTUuNjcsMyAxNS42NywxMSAxMSwxMyIvPjwvc3ZnPicpOworfQordmlk ZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRv biwKK2F1ZGlvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0 ZS1idXR0b24sCit2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXZvbHVtZS1taW4tYnV0dG9uIHsKICAgICB3aWR0aDogMTBweCAhaW1wb3J0YW50OwotICAg IGhlaWdodDogMTBweCAhaW1wb3J0YW50OwotICAgIGJvcmRlci1yYWRpdXM6IDVweCAhaW1wb3J0 YW50OwotCi0gICAgLyogcm90YXRlWigpIGZvcmNlcyB0aGUgbGF5ZXIgaW50byBjb21wb3NpdGlu ZyBtb2RlLgotICAgIFNsaWRlciB0aHVtYnMgYXJlIHNtYWxsLCBzbyBmb3JjaW5nIGEgY29tcG9z aXRpbmcgbGF5ZXIgaXMgaW5leHBlbnNpdmUsCi0gICAgICAgYW5kIGl0IGtlZXBzIHRoZSBzbGlk ZXIgZnJvbSBoYXZpbmcgdG8gcmVwYWludCB3aGlsZSBzbGlkaW5nLiAqLwotICAgIC13ZWJraXQt dHJhbnNmb3JtOiByb3RhdGVaKDI3MGRlZykgIWltcG9ydGFudDsKKyAgICBtYXJnaW4tcmlnaHQ6 IDZweCAhaW1wb3J0YW50OworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9z dmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIw IDAgMTEgMTUiIHN0cm9rZT0id2hpdGUiIGZpbGw9Im5vbmUiIHN0cm9rZS13aWR0aD0iMS4yNSIg c3Ryb2tlLWxpbmVjYXA9InJvdW5kIj48cGF0aCBmaWxsPSJ3aGl0ZSIgc3Ryb2tlPSJyZ2JhKDI1 NSwyNTUsMjU1LDAuNjcpIiBkPSJNIDAsOSAwLDUgMyw1IDYsMiA2LDEyIDMsOSAwLDkgeiIvPjxw YXRoIGQ9Ik0gOSw1IEMgMTAuNzUsNi41IDEwLjc1LDcuNSA5LDkiLz48L3N2Zz4nKTsKIH0KIAog dmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5LWJ1 dHRvbiB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIAotICAgIGJhY2tncm91bmQtaW1h Z2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3Jn LzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjEgMjIiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGll bnQiIHgyPSIwIiB5Mj0iMTAwJSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9w IG9mZnNldD0iMCIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2LCAyMTYpIi8+PHN0b3Agb2Zmc2V0 PSIwLjQ3OCIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2LCAyMTYpIi8+PHN0b3Agb2Zmc2V0PSIw LjQ3OCIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIwLjUy MiIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIwLjUyMiIg c3RvcC1jb2xvcj0icmdiKDIwMCwgMjAwLCAyMDApIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNv bG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48L2xpbmVhckdyYWRpZW50PjxwYXRoIGQ9Ik0gMCww IDAsMjIgOCwyMiA4LDAgeiIgZmlsbD0idXJsKCNncmFkaWVudCkiLz48cGF0aCBkPSJNIDEzLDAg MTMsMjIgMjEsMjIgMjEsMCB6IiBmaWxsPSJ1cmwoI2dyYWRpZW50KSIvPjwvc3ZnPicpOworICAg IGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0 dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjEgMjMiIGZpbGw9IndoaXRl Ij48cGF0aCBkPSJNIDAsMCAwLDIyIDgsMjIgOCwwIHoiLz48cGF0aCBkPSJNIDEzLDAgMTMsMjIg MjEsMjIgMjEsMCB6Ii8+PC9zdmc+Jyk7CiAKLSAgICB3aWR0aDogMjJweDsKKyAgICB3aWR0aDog MjFweDsKICAgICBoZWlnaHQ6IDIzcHg7Ci0gICAgbGVmdDogMjA5cHg7Ci0gICAgdG9wOiA5cHg7 CisgICAgbGVmdDogMjEwcHg7CisgICAgdG9wOiAxMnB4OwogICAgIG1hcmdpbjogMDsKICAgICBw YWRkaW5nOiAwOwogfQogCiB2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlh LWNvbnRyb2xzLXBsYXktYnV0dG9uLnBhdXNlZCB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJs KCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9z dmciIHZpZXdCb3g9IjAgMCAyMSAyMiI+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkaWVudCIgeDI9 IjAiIHkyPSIxMDAlIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0 PSIwIiBzdG9wLWNvbG9yPSJyZ2IoMjE2LCAyMTYsIDIxNikiLz48c3RvcCBvZmZzZXQ9IjAuNDc4 IiBzdG9wLWNvbG9yPSJyZ2IoMjE2LCAyMTYsIDIxNikiLz48c3RvcCBvZmZzZXQ9IjAuNDc4IiBz dG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48c3RvcCBvZmZzZXQ9IjAuNTIyIiBzdG9w LWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48c3RvcCBvZmZzZXQ9IjAuNTIyIiBzdG9wLWNv bG9yPSJyZ2IoMjAwLCAyMDAsIDIwMCkiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9InJn YigyMDgsIDIwOCwgMjA4KSIvPjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZD0iTSAwLDAgMjEsMTEg MCwyMiB6IiBmaWxsPSJ1cmwoI2dyYWRpZW50KSIvPjwvc3ZnPicpOwotfQotCi12aWRlbzotd2Vi a2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24gewot ICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKLSAgICBsZWZ0OiAxNjJweDsKLSAgICB0b3A6IDEzcHg7 Ci0gICAgd2lkdGg6IDE4cHg7Ci0gICAgaGVpZ2h0OiAxOHB4OworICAgIGJhY2tncm91bmQtaW1h Z2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3Jn LzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMjEgMjMiIGZpbGw9IndoaXRlIj48cGF0aCBkPSJNIDAs MCAyMSwxMS41IDAsMjMgeiIvPjwvc3ZnPicpOwogfQogCiB2aWRlbzotd2Via2l0LWZ1bGwtc2Ny ZWVuOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstYmFjay1idXR0b24gewogICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKIAotICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9z dmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIw IDAgMjIgMTUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIHgyPSIwIiB5Mj0iMTAwJSIg Z3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xv cj0icmdiKDIxNiwgMjE2LCAyMTYpIi8+PHN0b3Agb2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9 InJnYigyMTYsIDIxNiwgMjE2KSIvPjxzdG9wIG9mZnNldD0iMC40Mzc1IiBzdG9wLWNvbG9yPSJy Z2IoMjA4LCAyMDgsIDIwOCkiLz48c3RvcCBvZmZzZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIw OCwgMjA4LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIwLjUiIHN0b3AtY29sb3I9InJnYigyMDAsIDIw MCwgMjAwKSIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgp Ii8+PC9saW5lYXJHcmFkaWVudD48cGF0aCBkPSJNIDIyLDAgMTEsNyAyMiwxNSB6IiBmaWxsPSJ1 cmwoI2dyYWRpZW50KSIvPjxwYXRoIGQ9Ik0gMTEsMCAwLDcgMTEsMTUgeiIgZmlsbD0idXJsKCNn cmFkaWVudCkiLz48L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1h Z2Uvc3ZnK3htbCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0Jv eD0iMCAwIDI0IDE1IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZD0iTSAyNCwwIDEyLDcgMjQsMTUgeiIv PjxwYXRoIGQ9Ik0gMTIsMCAwLDcgMTIsMTUgeiIvPjwvc3ZnPicpOwogCi0gICAgd2lkdGg6IDIz cHg7Ci0gICAgaGVpZ2h0OiAxNnB4OworICAgIHdpZHRoOiAyNHB4OworICAgIGhlaWdodDogMTVw eDsKICAgICBsZWZ0OiAxNTZweDsKLSAgICB0b3A6IDEzcHg7CisgICAgdG9wOiAxNnB4OwogfQog CiB2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVy bi10by1yZWFsdGltZS1idXR0b24gewpAQCAtNjI5LDIxICs2MTAsMjggQEAgdmlkZW86LXdlYmtp dC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYQogdmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWZvcndhcmQtYnV0dG9uIHsKICAgICBwb3NpdGlv bjogYWJzb2x1dGU7CiAKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3Zn K3htbCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAw IDIyIDE1Ij48bGluZWFyR3JhZGllbnQgaWQ9ImdyYWRpZW50IiB4Mj0iMCIgeTI9IjEwMCUiIGdy YWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9 InJnYigyMTYsIDIxNiwgMjE2KSIvPjxzdG9wIG9mZnNldD0iMC40Mzc1IiBzdG9wLWNvbG9yPSJy Z2IoMjE2LCAyMTYsIDIxNikiLz48c3RvcCBvZmZzZXQ9IjAuNDM3NSIgc3RvcC1jb2xvcj0icmdi KDIwOCwgMjA4LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIwLjUiIHN0b3AtY29sb3I9InJnYigyMDgs IDIwOCwgMjA4KSIvPjxzdG9wIG9mZnNldD0iMC41IiBzdG9wLWNvbG9yPSJyZ2IoMjAwLCAyMDAs IDIwMCkiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9InJnYigyMDgsIDIwOCwgMjA4KSIv PjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZD0iTSAwLDAgMTEsNyAwLDE1IHoiIGZpbGw9InVybCgj Z3JhZGllbnQpIi8+PHBhdGggZD0iTSAxMSwwIDIyLDcgMTEsMTUgeiIgZmlsbD0idXJsKCNncmFk aWVudCkiLz48L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uv c3ZnK3htbCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0i MCAwIDI0IDE1IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZD0iTSAwLDAgMTIsNyAwLDE1IHoiLz48cGF0 aCBkPSJNIDEyLDAgMjQsNyAxMiwxNSB6Ii8+PC9zdmc+Jyk7CiAKLSAgICB3aWR0aDogMjNweDsK LSAgICBoZWlnaHQ6IDE2cHg7Ci0gICAgbGVmdDogMjU2cHg7Ci0gICAgdG9wOiAxM3B4OworICAg IHdpZHRoOiAyNHB4OworICAgIGhlaWdodDogMTVweDsKKyAgICBsZWZ0OiAyNTVweDsKKyAgICB0 b3A6IDE2cHg7CiB9CiAKIHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEt Y29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyIHsKICAgICBoZWlnaHQ6IGF1dG87Ci0gICAgd2lk dGg6IDQyMHB4OworICAgIHdpZHRoOiA0NDBweDsKICAgICBwb3NpdGlvbjogYWJzb2x1dGU7Ci0g ICAgYm90dG9tOiA5cHg7Ci0gICAgbGVmdDogOHB4OwotICAgIHJpZ2h0OiA4cHg7CisgICAgYm90 dG9tOiA4cHg7CisgICAgbGVmdDogMHB4OworfQorCit2aWRlbzotd2Via2l0LWZ1bGwtc2NyZWVu Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5IHsKKyAgICBtYXJn aW4tbGVmdDogMTJweDsKK30KKwordmlkZW86LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5IHsKKyAgICBtYXJnaW4tcmlnaHQ6 IDEycHg7CiB9CiAKIHZpZGVvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtc3RhdHVzLWRpc3BsYXkgewpAQCAtNjU0LDYgKzY0MiwxMiBAQCB2aWRlbzotd2Via2l0 LWZ1bGwtc2NyZWVuOjotd2Via2l0LW1lZGlhCiAgICAgcmlnaHQ6IDhweDsKIH0KIAordmlkZW86 LXdlYmtpdC1mdWxsLXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10b2dnbGUtY2xvc2Vk LWNhcHRpb25zLWJ1dHRvbiwKK2F1ZGlvOi13ZWJraXQtZnVsbC1zY3JlZW46Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtdG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24geworICAgIG1hcmdpbi10 b3A6IDZweDsKKyAgICBtYXJnaW4tcmlnaHQ6MjRweDsKK30KKwogdmlkZW86LXdlYmtpdC1mdWxs LXNjcmVlbjo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jbG9zZWQtY2FwdGlvbnMtY29udGFpbmVy IHsKICAgICBib3R0b206IDExNHB4OwogICAgIHJpZ2h0OiBjYWxjKDUwJSAtIDE4M3B4KTsgLyog MTgzcHggaXMgMjIxcHggKGhhbGYgdGhlIG1lZGlhIGNvbnRyb2xsZXIncyB3aWR0aCkgbWludXMg MzhweCAodGhlIHJpZ2h0IHBvc2l0aW9uIG9mIHRoZSBjYXB0aW9ucyBpY29uKS4gKi8K