142305 2015-03-04 13:21:17 -0800 Update inline media control icons for OSX 2015-03-05 13:11:34 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 142318 1 roger_fong webkit-unassigned commit-queue dino roger_fong oldest_to_newest 1074197 0 roger_fong 2015-03-04 13:21:17 -0800 Update inline media control icons for OSX This change will include the play button, volume button, fullscreen button, and caption button. 1074198 1 roger_fong 2015-03-04 13:21:39 -0800 rdar://problem/19997484 1074257 2 247901 roger_fong 2015-03-04 15:13:29 -0800 Created attachment 247901 patch 1074263 3 247901 dino 2015-03-04 15:31:27 -0800 Comment on attachment 247901 patch View in context: https://bugs.webkit.org/attachment.cgi?id=247901&action=review > Source/WebCore/Modules/mediacontrols/mediaControlsApple.css:134 > + background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="white"><path d="M 0,1 v 13 h 4 v -13 h -4 z"/><path d="M 8,1 v 13 h 4 v -13 h -4 z"/></svg>'); Did you create this image? This is fine, but it should be possible to use two <rect> elements. 1074264 4 roger_fong 2015-03-04 15:34:07 -0800 (In reply to comment #3) > Comment on attachment 247901 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=247901&action=review > > > Source/WebCore/Modules/mediacontrols/mediaControlsApple.css:134 > > + background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 15" fill="white"><path d="M 0,1 v 13 h 4 v -13 h -4 z"/><path d="M 8,1 v 13 h 4 v -13 h -4 z"/></svg>'); > > Did you create this image? This is fine, but it should be possible to use > two <rect> elements. I just followed what they were already doing in the previous pause svg code. I can use rects too though. 1074278 5 roger_fong 2015-03-04 16:06:33 -0800 With rects: http://trac.webkit.org/changeset/181046 1074289 6 ap 2015-03-04 16:43:38 -0800 This broke two tests: https://build.webkit.org/results/Apple%20Yosemite%20Release%20WK2%20(Tests)/r181049%20(3326)/results.html I'm sure that EWS would have told so if you could wait for it. 1074331 7 commit-queue 2015-03-04 18:20:22 -0800 Re-opened since this is blocked by bug 142318 1074659 8 roger_fong 2015-03-05 13:11:34 -0800 Recommitted after skipping the two test failures. http://trac.webkit.org/changeset/181096 247901 2015-03-04 15:13:29 -0800 2015-03-04 15:31:27 -0800 patch patch.patch text/plain 11878 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTAzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE1LTAzLTA0ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIGlubGluZSBtZWRp YSBjb250cm9sIGljb25zIGZvciBPU1guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNDIzMDUuCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xOTk5NzQ4 ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaGFu Z2VzIGluY2x1ZGU6IG5ldyB2b2x1bWUgYnV0dG9uLCBuZXcgZnVsbCBzY3JlZW4gYnV0dG9uLCBu ZXcgcGxheS9wYXVzZSBidXR0b24uCisgICAgICAgIFJlcG9zaXRpb25pbmcgb2YgMzAgc2Vjb25k IGFuZCBwbGF5IGJ1dHRvbnMuCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlh Q29udHJvbHNBcHBsZS5jc3M6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy1wYW5lbCBidXR0b24pOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt cmV3aW5kLWJ1dHRvbik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1w bGF5LWJ1dHRvbik6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5 LWJ1dHRvbi5wYXVzZWQpOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt cGFuZWwgLm11dGUtYm94KToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xz LXZvbHVtZS1tYXgtYnV0dG9uKToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXZvbHVtZS1taW4tYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLXRvZ2dsZS1jbG9zZWQtY2FwdGlvbnMtYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tYnV0dG9uKToKKyAgICAgICAgKGF1ZGlv Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5KToKKyAgICAgICAg KiBNb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzOgorICAgICAgICAo Q29udHJvbGxlci5wcm90b3R5cGUuY29uZmlndXJlSW5saW5lQ29udHJvbHMpOiBTd2FwIHBvc2l0 aW9ucyBvZiByZXdpbmQgYW5kIHBsYXkgYnV0dG9ucy4KKyAgICAgICAgKENvbnRyb2xsZXIucHJv dG90eXBlLmhhbmRsZU11dGVCdXR0b25DbGlja2VkKTogUmVtZW1iZXIgdG8gdXBkYXRlIHZvbHVt ZSBzbGlkZXIgd2hlbiBuZWNlc3NhcnkuCisgICAgICAgIChDb250cm9sbGVyLnByb3RvdHlwZS51 cGRhdGVWb2x1bWUpOiBEaXR0bzsKKwogMjAxNS0wMy0wMyAgQW5keSBFc3RlcyAgPGFlc3Rlc0Bh cHBsZS5jb20+CiAKICAgICAgICAgW0NvbnRlbnQgRmlsdGVyaW5nXSBNYWtlIGl0IGVhc2llciB0 byBhZGQgbmV3IGNvbnRlbnQgZmlsdGVycwpJbmRleDogU291cmNlL1dlYkNvcmUvTW9kdWxlcy9t ZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5jc3MKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29udHJvbHNBcHBsZS5jc3MJKHJl dmlzaW9uIDE4MTAxOCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9t ZWRpYUNvbnRyb2xzQXBwbGUuY3NzCSh3b3JraW5nIGNvcHkpCkBAIC0xMDYsOCArMTA2LDcgQEAg YXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgYnV0dAogICAgIGRpc3BsYXk6IGJs b2NrOwogICAgIHBhZGRpbmc6IDA7CiAgICAgYm9yZGVyOiAwOwotICAgIGhlaWdodDogMTZweDsK LSAgICB3aWR0aDogMTZweDsKKyAgICBoZWlnaHQ6IDE1cHg7CiAgICAgYmFja2dyb3VuZC1jb2xv cjogdHJhbnNwYXJlbnQ7CiAgICAgY29sb3I6IHdoaXRlOwogICAgIGJhY2tncm91bmQtb3JpZ2lu OiBjb250ZW50LWJveDsKQEAgLTEyNywyNCArMTI2LDI2IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlh LWNvbnRyb2xzLXJld2luZC1idXQKICAgICB3aWR0aDogMTZweDsKICAgICBoZWlnaHQ6IDE4cHg7 CiAgICAgbWFyZ2luLWJvdHRvbTogMXB4OwotICAgIG1hcmdpbi1sZWZ0OiA4cHg7CisgICAgbWFy Z2luLWxlZnQ6IDE2cHg7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXkt YnV0dG9uLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24gewotICAg IGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0 dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTUgMTUiPjxsaW5lYXJHcmFk aWVudCBpZD0iZ3JhZGllbnQiIHgyPSIwIiB5Mj0iMTAwJSIgZ3JhZGllbnRVbml0cz0idXNlclNw YWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2LCAyMTYp Ii8+PHN0b3Agb2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9InJnYigyMTYsIDIxNiwgMjE2KSIv PjxzdG9wIG9mZnNldD0iMC40Mzc1IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48 c3RvcCBvZmZzZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PHN0b3Ag b2Zmc2V0PSIwLjUiIHN0b3AtY29sb3I9InJnYigyMDAsIDIwMCwgMjAwKSIvPjxzdG9wIG9mZnNl dD0iMSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PC9saW5lYXJHcmFkaWVudD48 cGF0aCBkPSJNIDAsMCB2IDE2IGggNiB2IC0xNiBoIC02IHoiIGZpbGw9InVybCgjZ3JhZGllbnQp Ii8+PHBhdGggZD0iTSA5LDAgdiAxNiBoIDYgdiAtMTYgaCAtNiB6IiBmaWxsPSJ1cmwoI2dyYWRp ZW50KSIvPjwvc3ZnPicpOworICAgIGJhY2tncm91bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9z dmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIw IDAgMTIgMTUiIGZpbGw9IndoaXRlIj48cGF0aCBkPSJNIDAsMSB2IDEzIGggNCB2IC0xMyBoIC00 IHoiLz48cGF0aCBkPSJNIDgsMSB2IDEzIGggNCB2IC0xMyBoIC00IHoiLz48L3N2Zz4nKTsKICAg ICBtYXJnaW4tbGVmdDogMTZweDsKKyAgICB3aWR0aDogMTJweDsKIH0KIAogdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24ucGF1c2VkLAogYXVkaW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtcGxheS1idXR0b24ucGF1c2VkIHsKLSAgICBiYWNrZ3JvdW5kLWltYWdlOiB1 cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAw L3N2ZyIgdmlld0JveD0iMCAwIDE1IDE1Ij48bGluZWFyR3JhZGllbnQgaWQ9ImdyYWRpZW50IiB4 Mj0iMCIgeTI9IjEwMCUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZz ZXQ9IjAiIHN0b3AtY29sb3I9InJnYigyMTYsIDIxNiwgMjE2KSIvPjxzdG9wIG9mZnNldD0iMC40 Mzc1IiBzdG9wLWNvbG9yPSJyZ2IoMjE2LCAyMTYsIDIxNikiLz48c3RvcCBvZmZzZXQ9IjAuNDM3 NSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIwLjUiIHN0 b3AtY29sb3I9InJnYigyMDgsIDIwOCwgMjA4KSIvPjxzdG9wIG9mZnNldD0iMC41IiBzdG9wLWNv bG9yPSJyZ2IoMjAwLCAyMDAsIDIwMCkiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9InJn YigyMDgsIDIwOCwgMjA4KSIvPjwvbGluZWFyR3JhZGllbnQ+PHBhdGggZD0iTSAwLDAgMTUsNyAw LDE1IHoiIGZpbGw9InVybCgjZ3JhZGllbnQpIi8+PC9zdmc+Jyk7CisgICAgYmFja2dyb3VuZC1p bWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMiAxNSIgZmlsbD0id2hpdGUiPjxwYXRoIGQ9Ik0g MCwxIDExLDcgMCwxMyB6Ii8+PC9zdmc+Jyk7CisgICAgd2lkdGg6IDEycHg7CiB9CiAKIHZpZGVv Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIC5tdXRlLWJveCwKIGF1ZGlvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXBhbmVsIC5tdXRlLWJveCB7Ci0gICAgd2lkdGg6IDE2cHg7Ci0gICAg aGVpZ2h0OiAxNnB4OworICAgIHdpZHRoOiAxNHB4OworICAgIGhlaWdodDogMTVweDsKICAgICBt YXJnaW4tcmlnaHQ6IDE2cHg7CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIGRpc3BsYXk6 IC13ZWJraXQtZmxleDsKQEAgLTE1Niw3ICsxNTcsOCBAQCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy1wYW5lbCAubXV0CiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1 dHRvbiwKIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLW11dGUtYnV0dG9uLAogdmlkZW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLW1heC1idXR0b24gewotICAgIGJhY2tncm91 bmQtaW1hZ2U6IHVybCgnZGF0YTppbWFnZS9zdmcreG1sLDxzdmcgeG1sbnM9Imh0dHA6Ly93d3cu dzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgMTUgMTUiPjxsaW5lYXJHcmFkaWVudCBpZD0i Z3JhZGllbnQiIHgyPSIwIiB5Mj0iMTAwJSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2Ui PjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2LCAyMTYpIi8+PHN0b3Ag b2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9InJnYigyMTYsIDIxNiwgMjE2KSIvPjxzdG9wIG9m ZnNldD0iMC40Mzc1IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48c3RvcCBvZmZz ZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PHN0b3Agb2Zmc2V0PSIw LjUiIHN0b3AtY29sb3I9InJnYigyMDAsIDIwMCwgMjAwKSIvPjxzdG9wIG9mZnNldD0iMSIgc3Rv cC1jb2xvcj0icmdiKDIwOCwgMjA4LCAyMDgpIi8+PC9saW5lYXJHcmFkaWVudD48cGF0aCBkPSJt IDAsOSAwLC00IDMsMCAzLC0zIDAsMTAgLTMsLTMgLTMsMCB6IiBzdHlsZT0iZmlsbDp1cmwoI2dy YWRpZW50KSAiLz48cGF0aCBkPSJtIDEwLjQ0OSwxLjA4NyBjIDEuOTYzLDEuMDU1IDMuMzIyLDMu MjkxIDMuMzIyLDUuODgxIDAsMi42NDIgLTEuNDAyLDQuOTEzIC0zLjQyNCw1Ljk0NSIgc3R5bGU9 ImZpbGw6bm9uZTtzdHJva2U6dXJsKCNncmFkaWVudCk7c3Ryb2tlLXdpZHRoOjEuMjU7c3Ryb2tl LWxpbmVjYXA6cm91bmQ7Ii8+PHBhdGggZD0ibSA5LjEzLDMuMTM0IGMgMS4yODksMC42ODEgMi4x ODEsMi4xNDIgMi4xODEsMy44MzUgMCwxLjc0MzAwMSAtMC45MzksMy4yNCAtMi4yODUsMy44OTci IHN0eWxlPSJmaWxsOm5vbmU7c3Ryb2tlOnVybCgjZ3JhZGllbnQpO3N0cm9rZS13aWR0aDoxLjI1 O3N0cm9rZS1saW5lY2FwOnJvdW5kOyIvPjxwYXRoIGQ9Ik0gNy43OTQsNS4xNzUgQyA4LjQwMzAw MSw1LjQ5MSA4LjgyNzAwMSw2LjE2NyA4LjgyNzAwMSw2Ljk3MSA4LjgyNzAwMSw3LjgxOCA4LjM1 Niw4LjUzNzAwMSA3LjY4OCw4LjgyNiIgc3R5bGU9ImZpbGw6bm9uZTtzdHJva2U6dXJsKCNncmFk aWVudCk7c3Ryb2tlLXdpZHRoOjEuMjU7c3Ryb2tlLWxpbmVjYXA6cm91bmQ7Ii8+PC9zdmc+Jyk7 CisgICAgd2lkdGg6IDE0cHg7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdl L3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9 IjAgMCAxNSAxNSIgc3Ryb2tlPSJ3aGl0ZSIgZmlsbD0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxLjI1 IiBzdHJva2UtbGluZWNhcD0icm91bmQiPjxwYXRoIGZpbGw9IndoaXRlIiBzdHJva2U9InJnYmEo MjU1LDI1NSwyNTUsMC42NykiIGQ9Ik0gMCw5IDAsNSAzLDUgNiwyIDYsMTIgMyw5IDAsOSB6Ii8+ PHBhdGggZD0iTSA5LDUgQyAxMC43NSw2LjUgMTAuNzUsNy41IDksOSIvPjxwYXRoIGQ9Ik0gMTAs MyBDIDEzLDQgMTMsMTAgMTAsMTEiIC8+PHBhdGggZD0iTSAxMSwxIEMgMTUuNjcsMyAxNS42Nywx MSAxMSwxMyIvPjwvc3ZnPicpOwogfQogCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1w YW5lbCAudm9sdW1lLWJveCwKQEAgLTIyMSwxNSArMjIzLDE0IEBAIGF1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGkKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLW11 dGUtYnV0dG9uLm11dGVkLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0ZS1idXR0 b24ubXV0ZWQsCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12b2x1bWUtbWluLWJ1dHRv biB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4 bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNSAxNSI+PGxp bmVhckdyYWRpZW50IGlkPSJncmFkaWVudCIgeDI9IjAiIHkyPSIxMDAlIiBncmFkaWVudFVuaXRz PSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSJyZ2IoMjE2LCAy MTYsIDIxNikiLz48c3RvcCBvZmZzZXQ9IjAuNDM3NSIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2 LCAyMTYpIi8+PHN0b3Agb2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9InJnYigyMDgsIDIwOCwg MjA4KSIvPjxzdG9wIG9mZnNldD0iMC41IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCki Lz48c3RvcCBvZmZzZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIwMCwgMjAwLCAyMDApIi8+PHN0 b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48L2xpbmVhckdy YWRpZW50PjxwYXRoIGQ9Im0gMCw5IDAsLTQgMywwIDMsLTMgMCwxMCAtMywtMyAtMywwIHoiIGZp bGw9InVybCgjZ3JhZGllbnQpIi8+PC9zdmc+Jyk7CisgICAgYmFja2dyb3VuZC1pbWFnZTogdXJs KCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9z dmciIHZpZXdCb3g9IjAgMCAxNSAxNSIgPjxwYXRoIGZpbGw9IndoaXRlIiBzdHJva2U9InJnYmEo MjU1LDI1NSwyNTUsMC42NykiIGQ9Ik0gMCw5IDAsNSAzLDUgNiwyIDYsMTIgMyw5IDAsOSB6Ii8+ PC9zdmc+Jyk7CiB9CiAKIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRvZ2dsZS1jbG9z ZWQtY2FwdGlvbnMtYnV0dG9uLAogYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdG9nZ2xl LWNsb3NlZC1jYXB0aW9ucy1idXR0b24gewotICAgIHdpZHRoOiAxNnB4OwotICAgIGhlaWdodDog MTZweDsKKyAgICB3aWR0aDogMTVweDsKICAgICBtYXJnaW4tcmlnaHQ6IDE2cHg7Ci0gICAgYmFj a2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDov L3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDIgMTA1Ij48bGluZWFyR3JhZGll bnQgaWQ9ImdyYWRpZW50IiB4Mj0iMCIgeTI9IjEwMCUiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFj ZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9InJnYigyMTYsIDIxNiwgMjE2KSIv PjxzdG9wIG9mZnNldD0iMC40Njg3NSIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2LCAyMTYpIi8+ PHN0b3Agb2Zmc2V0PSIwLjQ2ODc1IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48 c3RvcCBvZmZzZXQ9IjAuNTMxMjUiIHN0b3AtY29sb3I9InJnYigyMDgsIDIwOCwgMjA4KSIvPjxz dG9wIG9mZnNldD0iMC41MzEyNSIgc3RvcC1jb2xvcj0icmdiKDIwMCwgMjAwLCAyMDApIi8+PHN0 b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48L2xpbmVhckdy YWRpZW50PjxwYXRoIGQ9Ik05OC43NjYsNDMuMjI0YzAtMjMuMTYzLTIxLjc3NS00MS45NC00OC42 MzctNDEuOTRjLTI2Ljg1OSwwLTQ4LjYzNSwxOC43NzctNDguNjM1LDQxLjk0YzAsMTguMjY2LDEz LjU0NiwzMy43OTYsMzIuNDQ0LDM5LjU0OWMxLjEzMSw4LjM1NiwyNi4wMzcsMjQuMjU1LDIyLjg2 NCwxOS45MjFjLTQuNDYyLTYuMDk2LTUuMTU5LTEzLjE4My01LjA3LTE3LjU2NkM3Ny44NSw4NC4z OTcsOTguNzY2LDY1LjkyMyw5OC43NjYsNDMuMjI0eiIgZmlsbD0idXJsKCNncmFkaWVudCkiLz48 L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8 c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDEwMiAx MDUiIGZpbGw9IndoaXRlIj48cGF0aCBkPSJNOTguNzY2LDQzLjIyNGMwLTIzLjE2My0yMS43NzUt NDEuOTQtNDguNjM3LTQxLjk0Yy0yNi44NTksMC00OC42MzUsMTguNzc3LTQ4LjYzNSw0MS45NGMw LDE4LjI2NiwxMy41NDYsMzMuNzk2LDMyLjQ0NCwzOS41NDljMS4xMzEsOC4zNTYsMjYuMDM3LDI0 LjI1NSwyMi44NjQsMTkuOTIxYy00LjQ2Mi02LjA5Ni01LjE1OS0xMy4xODMtNS4wNy0xNy41NjZD NzcuODUsODQuMzk3LDk4Ljc2Niw2NS45MjMsOTguNzY2LDQzLjIyNHoiIGZpbGw9InVybCgjZ3Jh ZGllbnQpIi8+PC9zdmc+Jyk7CiAgICAgb3V0bGluZTogMDsKIH0KIApAQCAtMzMxLDggKzMzMiw5 IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWNsb3NlZC1jYXAKIAogdmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24sCiBhdWRpbzo6LXdlYmtpdC1t ZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLWJ1dHRvbiB7Ci0gICAgYmFja2dyb3VuZC1pbWFnZTog dXJsKCdkYXRhOmltYWdlL3N2Zyt4bWwsPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAw MC9zdmciIHZpZXdCb3g9IjAgMCAxNSAxNSIgdHJhbnNmb3JtPSJyb3RhdGUoOTAsMCwwKSI+PGxp bmVhckdyYWRpZW50IGlkPSJncmFkaWVudCIgeDI9IjAiIHkyPSIxMDAlIiBncmFkaWVudFVuaXRz PSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSJyZ2IoMjE2LCAy MTYsIDIxNikiLz48c3RvcCBvZmZzZXQ9IjAuNDM3NSIgc3RvcC1jb2xvcj0icmdiKDIxNiwgMjE2 LCAyMTYpIi8+PHN0b3Agb2Zmc2V0PSIwLjQzNzUiIHN0b3AtY29sb3I9InJnYigyMDgsIDIwOCwg MjA4KSIvPjxzdG9wIG9mZnNldD0iMC41IiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCki Lz48c3RvcCBvZmZzZXQ9IjAuNSIgc3RvcC1jb2xvcj0icmdiKDIwMCwgMjAwLCAyMDApIi8+PHN0 b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSJyZ2IoMjA4LCAyMDgsIDIwOCkiLz48L2xpbmVhckdy YWRpZW50PjxwYXRoIGQ9Ik0gMTQsMSBtIDAsNiAtMiwtMiAtMiwyIGMgMCwwIC0xLDEgLTIsMCAt MSwtMSAwLC0yIDAsLTIgbCAyLC0yIC0yLC0yIDYsMCB6IiBzdHlsZT0iZmlsbDp1cmwoI2dyYWRp ZW50KSAiLz48cGF0aCBkPSJNIDEsMTQgbSAwLC02IDIsMiAyLC0yIGMgMCwwIDEsLTEgMiwwIDEs MSAwLDIgMCwyIGwgLTIsMiAyLDIgLTYsMCB6IiBzdHlsZT0iZmlsbDp1cmwoI2dyYWRpZW50KSAi Lz48L3N2Zz4nKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3ht bCw8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDEz IDE1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCwwLDApIiBzdHJva2U9IndoaXRlIiBzaGFwZS1yZW5k ZXJpbmc9Imdlb21ldHJpY1ByZWNpc2lvbiI+PHBhdGggZD0iTSA2LjUsMS41IEwgMTEuNSwxLjUg TCAgMTEuNSw2LjUgTSAxMS41LDEuNSBMIDYuNzUsNi4yNSIvPjxwYXRoIGQ9Ik0gMC41LDcuNSBM IDAuNSwxMi41IEwgNS41LDEyLjUgTSAwLjUsMTIuNSBMIDUuMjUsNy43NSIvPjwvc3ZnPicpOwog ICAgIG1hcmdpbi1yaWdodDogOHB4OworICAgIHdpZHRoOiAxM3B4OwogfQogdmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24uZXhpdCwKIGF1ZGlvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tYnV0dG9uLmV4aXQgewpAQCAtNDA2LDcgKzQwOCw3 IEBAIGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWkKIAogdmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtY3VycmVudC10aW1lLWRpc3BsYXksCiBhdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSB7Ci0gICAgbWFyZ2luLWxlZnQ6 IDE2cHg7CisgICAgbWFyZ2luLWxlZnQ6IDhweDsKICAgICBtYXJnaW4tcmlnaHQ6IDhweDsKICAg ICB3aWR0aDogMjhweDsKICAgICBtaW4td2lkdGg6IDI4cHg7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBw bGUuanMJKHJldmlzaW9uIDE4MTAxOCkKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFj b250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMJKHdvcmtpbmcgY29weSkKQEAgLTQ1OSw5ICs0 NTksOSBAQCBDb250cm9sbGVyLnByb3RvdHlwZSA9IHsKIAogICAgIGNvbmZpZ3VyZUlubGluZUNv bnRyb2xzOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLmFw cGVuZENoaWxkKHRoaXMuY29udHJvbHMucGxheUJ1dHRvbik7CiAgICAgICAgIGlmICghdGhpcy5p c0xpdmUpCiAgICAgICAgICAgICB0aGlzLmNvbnRyb2xzLnBhbmVsLmFwcGVuZENoaWxkKHRoaXMu Y29udHJvbHMucmV3aW5kQnV0dG9uKTsKLSAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5hcHBl bmRDaGlsZCh0aGlzLmNvbnRyb2xzLnBsYXlCdXR0b24pOwogICAgICAgICB0aGlzLmNvbnRyb2xz LnBhbmVsLmFwcGVuZENoaWxkKHRoaXMuY29udHJvbHMuc3RhdHVzRGlzcGxheSk7CiAgICAgICAg IGlmICghdGhpcy5pc0xpdmUpIHsKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMucGFuZWwuYXBw ZW5kQ2hpbGQodGhpcy5jb250cm9scy50aW1lbGluZUJveCk7CkBAIC04MzMsNiArODMzLDcgQEAg Q29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMudmlkZW8ubXV0ZWQgPSAhdGhp cy52aWRlby5tdXRlZDsKICAgICAgICAgaWYgKHRoaXMudmlkZW8ubXV0ZWQpCiAgICAgICAgICAg ICB0aGlzLmNvbnRyb2xzLm11dGVCdXR0b24uc2V0QXR0cmlidXRlKCdhcmlhLWxhYmVsJywgdGhp cy5VSVN0cmluZygnVW5tdXRlJykpOworICAgICAgICB0aGlzLmRyYXdWb2x1bWVCYWNrZ3JvdW5k KCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKQEAgLTE1NjQsNiArMTU2NSw3IEBA IENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5jb250cm9scy5tdXRl QnV0dG9uLmNsYXNzTGlzdC5yZW1vdmUodGhpcy5DbGFzc05hbWVzLm11dGVkKTsKICAgICAgICAg ICAgIHRoaXMuY29udHJvbHMudm9sdW1lLnZhbHVlID0gdGhpcy52aWRlby52b2x1bWU7CiAgICAg ICAgIH0KKyAgICAgICAgdGhpcy5kcmF3Vm9sdW1lQmFja2dyb3VuZCgpOwogICAgIH0sCiAKICAg ICBpc0F1ZGlvOiBmdW5jdGlvbigpCg==