52822 2011-01-20 10:40:14 -0800 [Qt] Clean up the Media Controls CSS for Qt 2011-01-28 11:55:59 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) PC All RESOLVED FIXED P3 Normal --- 51543 1 max.hong.shen max.hong.shen ademar commit-queue eric.carlson eric keith.rosenblatt nancy.piedra oldest_to_newest 337436 0 max.hong.shen 2011-01-20 10:40:14 -0800 As discussed in https://bugs.webkit.org/show_bug.cgi?id=52315, need to clean up the mediaControlsQt.css by splitting the audio::-webkit-media-xxx and video::-webkit-media-xxx rules, and remove the duplicate audio::-webkit-media-xxx rules from mediaControlsQtFullscreen.css. 337440 1 79616 max.hong.shen 2011-01-20 10:44:14 -0800 Created attachment 79616 first try 337448 2 79616 eric.carlson 2011-01-20 11:00:19 -0800 Comment on attachment 79616 first try View in context: https://bugs.webkit.org/attachment.cgi?id=79616&action=review Marking r+ but cq- as it doesn't look like this is quite right (or I am not looking at it correctly ;-) ) > Source/WebCore/css/mediaControlsQtFullscreen.css:62 > +video::-webkit-media-controls-time-remaining-display { > display: none; > } Does this change anything? > Source/WebCore/css/mediaControlsQtFullscreen.css:80 > +video::-webkit-media-controls-seek-back-button { > display: none; > } Or this? > Source/WebCore/css/mediaControlsQtFullscreen.css:84 > +video::-webkit-media-controls-seek-forward-button { > display: none; > } Ditto. > Source/WebCore/css/mediaControlsQtFullscreen.css:92 > +video::-webkit-media-controls-rewind-button { > display: none; > } Ditto. > Source/WebCore/css/mediaControlsQtFullscreen.css:96 > +video::-webkit-media-controls-return-to-realtime-button { > display: none; > } Ditto. > Source/WebCore/css/mediaControlsQtFullscreen.css:100 > +video::-webkit-media-controls-toggle-closed-captions-button { > display: none; > } Ditto. 337460 3 max.hong.shen 2011-01-20 11:21:06 -0800 (In reply to comment #2) > (From update of attachment 79616 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=79616&action=review > > Marking r+ but cq- as it doesn't look like this is quite right (or I am not looking at it correctly ;-) ) > > > Source/WebCore/css/mediaControlsQtFullscreen.css:62 > > +video::-webkit-media-controls-time-remaining-display { > > display: none; > > } > > Does this change anything? > > > Source/WebCore/css/mediaControlsQtFullscreen.css:80 > > +video::-webkit-media-controls-seek-back-button { > > display: none; > > } > > Or this? > > > Source/WebCore/css/mediaControlsQtFullscreen.css:84 > > +video::-webkit-media-controls-seek-forward-button { > > display: none; > > } > > Ditto. > > > Source/WebCore/css/mediaControlsQtFullscreen.css:92 > > +video::-webkit-media-controls-rewind-button { > > display: none; > > } > > Ditto. > > > Source/WebCore/css/mediaControlsQtFullscreen.css:96 > > +video::-webkit-media-controls-return-to-realtime-button { > > display: none; > > } > > Ditto. > > > Source/WebCore/css/mediaControlsQtFullscreen.css:100 > > +video::-webkit-media-controls-toggle-closed-captions-button { > > display: none; > > } > > Ditto. Thanks for reviewing, Eric :) I don't think these rules changed anything (they are exactly the same as in mediaControlsQt.css). I preserve these rules in mediaControlsQtFullscreen.css, so that it won't be affected if someone changes the style for video in mediaControlsQt.css. If you don't like them, I can remove those from mediaControlsQtFullscreen.css :) 337493 4 eric.carlson 2011-01-20 12:09:13 -0800 (In reply to comment #3) > Thanks for reviewing, Eric :) I don't think these rules changed anything (they are exactly the same as in mediaControlsQt.css). I preserve these rules in mediaControlsQtFullscreen.css, so that it won't be affected if someone changes the style for video in mediaControlsQt.css. > > If you don't like them, I can remove those from mediaControlsQtFullscreen.css :) Right, my point was that they don't do anything and therefore aren't needed. I marked r+ so you can submit as-is if you want. 337496 5 max.hong.shen 2011-01-20 12:13:09 -0800 (In reply to comment #4) > (In reply to comment #3) > > Thanks for reviewing, Eric :) I don't think these rules changed anything (they are exactly the same as in mediaControlsQt.css). I preserve these rules in mediaControlsQtFullscreen.css, so that it won't be affected if someone changes the style for video in mediaControlsQt.css. > > > > If you don't like them, I can remove those from mediaControlsQtFullscreen.css :) > > Right, my point was that they don't do anything and therefore aren't needed. I marked r+ so you can submit as-is if you want. Thanks :-) 337518 6 79616 commit-queue 2011-01-20 12:41:47 -0800 Comment on attachment 79616 first try Clearing flags on attachment: 79616 Committed r76272: <http://trac.webkit.org/changeset/76272> 337520 7 commit-queue 2011-01-20 12:41:53 -0800 All reviewed patches have been landed. Closing bug. 338223 8 keith.rosenblatt 2011-01-21 11:52:55 -0800 *** Bug 52474 has been marked as a duplicate of this bug. *** 341592 9 ademar 2011-01-28 11:55:59 -0800 Revision r76272 cherry-picked into qtwebkit-2.1.x with commit 7623b93 <http://gitorious.org/webkit/qtwebkit/commit/7623b93> 79616 2011-01-20 10:44:14 -0800 2011-01-20 12:41:47 -0800 first try 52822.patch text/plain 13299 max.hong.shen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2MjY2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTMgQEAKKzIwMTEtMDEtMjAgIFlpIFNoZW4g IDx5aS40LnNoZW5Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENsZWFuIHVwIHRoZSBNZWRpYSBDb250cm9scyBDU1MgZm9yIFF0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjgyMgorCisg ICAgICAgIFNwbGl0IHRoZSBhdWRpbzo6LXdlYmtpdC1tZWRpYS14eHggYW5kIHZpZGVvOjotd2Vi a2l0LW1lZGlhLXh4eCBydWxlcyAKKyAgICAgICAgaW4gbWVkaWFDb250cm9sc1F0LmNzcywgYW5k IHJlbW92ZSB0aGUgZHVwbGljYXRlIGF1ZGlvOjotd2Via2l0LW1lZGlhLXh4eAorICAgICAgICBy dWxlcyBmcm9tIG1lZGlhQ29udHJvbHNRdEZ1bGxzY3JlZW4uY3NzLgorCisgICAgICAgICogY3Nz L21lZGlhQ29udHJvbHNRdC5jc3M6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy1wYW5lbCk6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5l bCk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbik6 CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbik6Cisg ICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5LWJ1dHRvbik6CisgICAg ICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wbGF5LWJ1dHRvbik6CisgICAgICAg IChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZS1jb250YWluZXIpOgorICAg ICAgICAodmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyKToK KyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNw bGF5KToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGlt ZS1kaXNwbGF5KToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUt cmVtYWluaW5nLWRpc3BsYXkpOgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtdGltZS1yZW1haW5pbmctZGlzcGxheSk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRp YS1jb250cm9scy10aW1lbGluZSk6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy10aW1lbGluZSk6CisgICAgICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy12 b2x1bWUtc2xpZGVyLWNvbnRhaW5lcik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lcik6CisgICAgICAgIChhdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyKToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0 LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXIpOgorICAgICAgICAoYXVkaW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtc2Vlay1iYWNrLWJ1dHRvbik6CisgICAgICAgICh2aWRlbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1zZWVrLWJhY2stYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Vi a2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstZm9yd2FyZC1idXR0b24pOgorICAgICAgICAodmlkZW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1mb3J3YXJkLWJ1dHRvbik6CisgICAgICAgIChh dWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLWJ1dHRvbik6CisgICAgICAg ICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxsc2NyZWVuLWJ1dHRvbik6CisgICAg ICAgIChhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXdpbmQtYnV0dG9uKToKKyAgICAg ICAgKHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24pOgorICAgICAg ICAoYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1dHRv bik6CisgICAgICAgICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXR1cm4tdG8tcmVh bHRpbWUtYnV0dG9uKToKKyAgICAgICAgKGF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRv Z2dsZS1jbG9zZWQtY2FwdGlvbnMtYnV0dG9uKToKKyAgICAgICAgKHZpZGVvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXRvZ2dsZS1jbG9zZWQtY2FwdGlvbnMtYnV0dG9uKToKKyAgICAgICAgKiBj c3MvbWVkaWFDb250cm9sc1F0RnVsbHNjcmVlbi5jc3M6CisgICAgICAgICh2aWRlbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5KToKKyAgICAgICAgKHZpZGVv Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstYmFjay1idXR0b24pOgorICAgICAgICAodmlk ZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1mb3J3YXJkLWJ1dHRvbik6CisgICAgICAg ICh2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXdpbmQtYnV0dG9uKToKKyAgICAgICAg KHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVybi10by1yZWFsdGltZS1idXR0b24p OgorICAgICAgICAodmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdG9nZ2xlLWNsb3NlZC1j YXB0aW9ucy1idXR0b24pOgorCiAyMDExLTAxLTIwICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxv dkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzUXQuY3NzCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzUXQuY3NzCShyZXZpc2lvbiA3NjI0NikK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzUXQuY3NzCSh3b3JraW5nIGNvcHkp CkBAIC0zMiw3ICszMiwyMSBAQCBhdWRpbyB7CiAgICAgd2lkdGg6IDQwMHB4OwogfQogCi1hdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1wYW5lbCwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29u dHJvbHMtcGFuZWwgeworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGFuZWwgeworICAg IGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LW9yaWVudDogaG9yaXpvbnRh bDsKKyAgICAtd2Via2l0LWJveC1hbGlnbjogZW5kOworICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6 IG5vbmU7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGJvdHRvbTogMDsKKyAgICB3aWR0 aDogMTAwJTsKKyAgICB6LWluZGV4OiAwOworICAgIG92ZXJmbG93OiB2aXNpYmxlOworICAgIGhl aWdodDogMTAwJTsKKyAgICB0ZXh0LWFsaWduOiByaWdodDsKK30KKwordmlkZW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtcGFuZWwgewogICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OwogICAgIC13 ZWJraXQtYm94LW9yaWVudDogaG9yaXpvbnRhbDsKICAgICAtd2Via2l0LWJveC1hbGlnbjogZW5k OwpAQCAtNTAsMjUgKzY0LDYxIEBAIHZpZGVvOi13ZWJraXQtZnVsbC1wYWdlLW1lZGlhOjotd2Vi a2l0LW0KICAgICBib3R0b206IDBweDsKIH0KIAotYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtbXV0ZS1idXR0b24sIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLW11dGUtYnV0dG9u IHsKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLW11dGUtYnV0dG9uIHsKICAgICB3aWR0 aDogMTJweDsKICAgICBoZWlnaHQ6IDEycHg7CiAgICAgcGFkZGluZzogNnB4OwogICAgIG1hcmdp bjogNXB4IDVweCA1cHggM3B4OwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1w bGF5LWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24gewor dmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0ZS1idXR0b24geworICAgIHdpZHRoOiAx MnB4OworICAgIGhlaWdodDogMTJweDsKKyAgICBwYWRkaW5nOiA2cHg7CisgICAgbWFyZ2luOiA1 cHggNXB4IDVweCAzcHg7Cit9CisKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXkt YnV0dG9uIHsKICAgICB3aWR0aDogOXB4OwogICAgIGhlaWdodDogMTJweDsKICAgICBwYWRkaW5n OiA2cHggMTJweCA2cHggMTFweDsKICAgICBtYXJnaW46IDVweCAzcHggNXB4IDVweDsKIH0KIAot YXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyLCB2aWRlbzo6 LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZS1jb250YWluZXIgewordmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24geworICAgIHdpZHRoOiA5cHg7CisgICAgaGVp Z2h0OiAxMnB4OworICAgIHBhZGRpbmc6IDZweCAxMnB4IDZweCAxMXB4OworICAgIG1hcmdpbjog NXB4IDNweCA1cHggNXB4OworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1l bGluZS1jb250YWluZXIgeworICAgIGhlaWdodDogMzRweDsKK30KKwordmlkZW86Oi13ZWJraXQt bWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyIHsKICAgICBoZWlnaHQ6IDM0cHg7CiB9 CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5LCB2 aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSB7CithdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlzcGxheSB7CisgICAgLXdl YmtpdC1hcHBlYXJhbmNlOiBtZWRpYS1jdXJyZW50LXRpbWUtZGlzcGxheTsKKyAgICAtd2Via2l0 LXVzZXItc2VsZWN0OiBub25lOworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBoZWln aHQ6IDEycHg7CisgICAgcGFkZGluZzogNnB4OworICAgIG1hcmdpbjogNXB4IDNweDsKKworICAg IG92ZXJmbG93OiBoaWRkZW47CisgICAgY3Vyc29yOiBkZWZhdWx0OworCisgICAgdGV4dC1hbGln bjogY2VudGVyOworICAgIGZvbnQtc2l6ZTogMTBweDsKKyAgICBmb250LWZhbWlseTogVmVyZGFu YTsKKyAgICBmb250LXdlaWdodDogYm9sZDsKKyAgICBjb2xvcjogd2hpdGU7Cit9CisKK3ZpZGVv Ojotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNwbGF5IHsKICAgICAtd2Vi a2l0LWFwcGVhcmFuY2U6IG1lZGlhLWN1cnJlbnQtdGltZS1kaXNwbGF5OwogICAgIC13ZWJraXQt dXNlci1zZWxlY3Q6IG5vbmU7CiAgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwpAQCAtODYsMjQg KzEzNiw0MSBAQCBhdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpCiAgICAg Y29sb3I6IHdoaXRlOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJl bWFpbmluZy1kaXNwbGF5LCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFp bmluZy1kaXNwbGF5IHsKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWlu aW5nLWRpc3BsYXkgeworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKK3ZpZGVvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXRpbWUtcmVtYWluaW5nLWRpc3BsYXkgewogICAgIGRpc3BsYXk6IG5vbmU7 CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRpbWVsaW5lLCB2aWRlbzo6LXdl YmtpdC1tZWRpYS1jb250cm9scy10aW1lbGluZSB7CithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy10aW1lbGluZSB7CiAgICAgaGVpZ2h0OiAxMnB4OwogICAgIHBhZGRpbmc6IDZweCA4cHg7 CiAgICAgbWFyZ2luOiA1cHggM3B4OwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy12b2x1bWUtc2xpZGVyLWNvbnRhaW5lciwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt dm9sdW1lLXNsaWRlci1jb250YWluZXIgewordmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt dGltZWxpbmUgeworICAgIGhlaWdodDogMTJweDsKKyAgICBwYWRkaW5nOiA2cHggOHB4OworICAg IG1hcmdpbjogNXB4IDNweDsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9s dW1lLXNsaWRlci1jb250YWluZXIgeworICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtdm9s dW1lLXNsaWRlci1jb250YWluZXI7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGhlaWdo dDogMTAzcHg7CisgICAgd2lkdGg6IDI0cHg7Cit9CisKK3ZpZGVvOjotd2Via2l0LW1lZGlhLWNv bnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVyIHsKICAgICAtd2Via2l0LWFwcGVhcmFuY2U6 IG1lZGlhLXZvbHVtZS1zbGlkZXItY29udGFpbmVyOwogICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsK ICAgICBoZWlnaHQ6IDEwM3B4OwogICAgIHdpZHRoOiAyNHB4OwogfQogCi1hdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy12b2x1bWUtc2xpZGVyLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy12b2x1bWUtc2xpZGVyIHsKK2F1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVt ZS1zbGlkZXIgewogICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtdm9sdW1lLXNsaWRlcjsK ICAgICBkaXNwbGF5OiBpbmxpbmU7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwpAQCAtMTE0LDI3 ICsxODEsNjIgQEAgYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaQogICAg IG1hcmdpbjogMCAwIDNweCAwOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1z ZWVrLWJhY2stYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWJhY2st YnV0dG9uIHsKK3ZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXIgewor ICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtdm9sdW1lLXNsaWRlcjsKKyAgICBkaXNwbGF5 OiBpbmxpbmU7CisgICAgcG9zaXRpb246IGFic29sdXRlOworCisgICAgd2lkdGg6IDEycHg7Cisg ICAgcGFkZGluZzogNnB4OworICAgIGhlaWdodDogODhweDsKKyAgICBtYXJnaW46IDAgMCAzcHgg MDsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1iYWNrLWJ1dHRvbiB7 CisgICAgZGlzcGxheTogbm9uZTsKK30KKwordmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMt c2Vlay1iYWNrLWJ1dHRvbiB7CisgICAgZGlzcGxheTogbm9uZTsKK30KKworYXVkaW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtc2Vlay1mb3J3YXJkLWJ1dHRvbiB7CisgICAgZGlzcGxheTogbm9u ZTsKK30KKwordmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1mb3J3YXJkLWJ1dHRv biB7CisgICAgZGlzcGxheTogbm9uZTsKK30KKworYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtZnVsbHNjcmVlbi1idXR0b24geworICAgIGRpc3BsYXk6IG5vbmU7Cit9CisKK3ZpZGVvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLWZ1bGxzY3JlZW4tYnV0dG9uIHsKKyAgICBkaXNwbGF5OiBu b25lOworfQorCithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXdpbmQtYnV0dG9uIHsK ICAgICBkaXNwbGF5OiBub25lOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1z ZWVrLWZvcndhcmQtYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWZv cndhcmQtYnV0dG9uIHsKK3ZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0 b24gewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLWZ1bGxzY3JlZW4tYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxs c2NyZWVuLWJ1dHRvbiB7CithdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXR1cm4tdG8t cmVhbHRpbWUtYnV0dG9uIHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCi1hdWRpbzo6LXdlYmtp dC1tZWRpYS1jb250cm9scy1yZXdpbmQtYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250 cm9scy1yZXdpbmQtYnV0dG9uIHsKK3ZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVy bi10by1yZWFsdGltZS1idXR0b24gewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLWF1ZGlvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVybi10by1yZWFsdGltZS1idXR0b24sIHZpZGVvOjot d2Via2l0LW1lZGlhLWNvbnRyb2xzLXJldHVybi10by1yZWFsdGltZS1idXR0b24geworYXVkaW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24gewog ICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXRv Z2dsZS1jbG9zZWQtY2FwdGlvbnMtYnV0dG9uLCB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbiB7Cit2aWRlbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbiB7CiAgICAgZGlzcGxheTogbm9u ZTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL21lZGlhQ29udHJvbHNRdEZ1bGxzY3Jl ZW4uY3NzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9tZWRpYUNvbnRyb2xzUXRG dWxsc2NyZWVuLmNzcwkocmV2aXNpb24gNzYyNDYpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvbWVk aWFDb250cm9sc1F0RnVsbHNjcmVlbi5jc3MJKHdvcmtpbmcgY29weSkKQEAgLTIxLDI2ICsyMSw2 IEBACiAgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UKICAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KLQotYXVkaW8gewotICAg IGhlaWdodDogMzRweDsKLSAgICB3aWR0aDogNDAwcHg7Ci19Ci0KLWF1ZGlvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXBhbmVsIHsKLSAgICBkaXNwbGF5OiAtd2Via2l0LWJveDsKLSAgICAtd2Vi a2l0LWJveC1vcmllbnQ6IGhvcml6b250YWw7Ci0gICAgLXdlYmtpdC1ib3gtYWxpZ246IGVuZDsK LSAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwotICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsK LSAgICBib3R0b206IDA7Ci0gICAgd2lkdGg6IDEwMCU7Ci0gICAgei1pbmRleDogMDsKLSAgICBv dmVyZmxvdzogdmlzaWJsZTsKLSAgICBoZWlnaHQ6IDEwMCU7Ci0gICAgdGV4dC1hbGlnbjogcmln aHQ7Ci19Ci0KIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBhbmVsIHsKIC8qICBUaGUg Y29udHJvbCBwYW5lbCBpcyBvbmx5IHBsYXkgYnV0dG9uIGZvciBmdWxsIHNjcmVlbiAqLwogICAg IGRpc3BsYXk6IC13ZWJraXQtYm94OwpAQCAtNTQsMjQgKzM0LDEwIEBAIHZpZGVvOi13ZWJraXQt ZnVsbC1wYWdlLW1lZGlhOjotd2Via2l0LW0KICAgICBkaXNwbGF5OiBub25lOwogfQogCi1hdWRp bzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1tdXRlLWJ1dHRvbiB7Ci0gICAgd2lkdGg6IDEycHg7 Ci0gICAgaGVpZ2h0OiAxMnB4OwotICAgIHBhZGRpbmc6IDZweDsKLSAgICBtYXJnaW46IDVweCA1 cHggNXB4IDNweDsKLX0KLQogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtbXV0ZS1idXR0 b24gewogICAgIGRpc3BsYXk6IG5vbmU7CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRy b2xzLXBsYXktYnV0dG9uIHsKLSAgICB3aWR0aDogOXB4OwotICAgIGhlaWdodDogMTJweDsKLSAg ICBwYWRkaW5nOiA2cHggMTJweCA2cHggMTFweDsKLSAgICBtYXJnaW46IDVweCAzcHggNXB4IDVw eDsKLX0KLQogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcGxheS1idXR0b24gewogICAg IGRpc3BsYXk6IC13ZWJraXQtYm94OwogICAgIC13ZWJraXQtYm94LWFsaWduOiBjZW50ZXI7CkBA IC04MSwxMTAgKzQ3LDU1IEBAIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXBsYXktYnV0 dG8KICAgICBwYWRkaW5nOiAyMHB4OwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9s cy10aW1lbGluZS1jb250YWluZXIgewotICAgIGhlaWdodDogMzRweDsKLX0KLQogdmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZWxpbmUtY29udGFpbmVyIHsKICAgICBkaXNwbGF5OiBu b25lOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1jdXJyZW50LXRpbWUtZGlz cGxheSB7Ci0gICAgLXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS1jdXJyZW50LXRpbWUtZGlzcGxh eTsKLSAgICAtd2Via2l0LXVzZXItc2VsZWN0OiBub25lOwotICAgIGRpc3BsYXk6IGlubGluZS1i bG9jazsKLSAgICBoZWlnaHQ6IDEycHg7Ci0gICAgcGFkZGluZzogNnB4OwotICAgIG1hcmdpbjog NXB4IDNweDsKLQotICAgIG92ZXJmbG93OiBoaWRkZW47Ci0gICAgY3Vyc29yOiBkZWZhdWx0Owot Ci0gICAgdGV4dC1hbGlnbjogY2VudGVyOwotICAgIGZvbnQtc2l6ZTogMTBweDsKLSAgICBmb250 LWZhbWlseTogVmVyZGFuYTsKLSAgICBmb250LXdlaWdodDogYm9sZDsKLSAgICBjb2xvcjogd2hp dGU7Ci19Ci0KIHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLWN1cnJlbnQtdGltZS1kaXNw bGF5IHsKICAgICAtd2Via2l0LWFwcGVhcmFuY2U6IG1lZGlhLWN1cnJlbnQtdGltZS1kaXNwbGF5 OwogICAgIC13ZWJraXQtdXNlci1zZWxlY3Q6IG5vbmU7CiAgICAgZGlzcGxheTogbm9uZTsKIH0K IAotYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZS1yZW1haW5pbmctZGlzcGxheSwg dmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdGltZS1yZW1haW5pbmctZGlzcGxheSB7Cit2 aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lLXJlbWFpbmluZy1kaXNwbGF5IHsKICAg ICBkaXNwbGF5OiBub25lOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1l bGluZSB7Ci0gICAgaGVpZ2h0OiAxMnB4OwotICAgIHBhZGRpbmc6IDZweCA4cHg7Ci0gICAgbWFy Z2luOiA1cHggM3B4OwotfQotCiB2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy10aW1lbGlu ZSB7CiAgICAgZGlzcGxheTogbm9uZTsKIH0KIAotYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJv bHMtdm9sdW1lLXNsaWRlci1jb250YWluZXIgewotICAgIC13ZWJraXQtYXBwZWFyYW5jZTogbWVk aWEtdm9sdW1lLXNsaWRlci1jb250YWluZXI7Ci0gICAgcG9zaXRpb246IGFic29sdXRlOwotICAg IGhlaWdodDogMTAzcHg7Ci0gICAgd2lkdGg6IDI0cHg7Ci19Ci0KIHZpZGVvOjotd2Via2l0LW1l ZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXItY29udGFpbmVyIHsKICAgICAtd2Via2l0LWFwcGVh cmFuY2U6IG1lZGlhLXZvbHVtZS1zbGlkZXItY29udGFpbmVyOwogICAgIGRpc3BsYXk6IG5vbmU7 CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXZvbHVtZS1zbGlkZXIgewotICAg IC13ZWJraXQtYXBwZWFyYW5jZTogbWVkaWEtdm9sdW1lLXNsaWRlcjsKLSAgICBkaXNwbGF5OiBp bmxpbmU7Ci0gICAgcG9zaXRpb246IGFic29sdXRlOwotCi0gICAgd2lkdGg6IDEycHg7Ci0gICAg cGFkZGluZzogNnB4OwotICAgIGhlaWdodDogODhweDsKLSAgICBtYXJnaW46IDAgMCAzcHggMDsK LX0KLQogdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtdm9sdW1lLXNsaWRlciB7CiAgICAg LXdlYmtpdC1hcHBlYXJhbmNlOiBtZWRpYS12b2x1bWUtc2xpZGVyOwogICAgIGRpc3BsYXk6IG5v bmU7CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstYmFjay1idXR0b24s IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXNlZWstYmFjay1idXR0b24gewordmlkZW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1iYWNrLWJ1dHRvbiB7CiAgICAgZGlzcGxheTog bm9uZTsKIH0KIAotYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1mb3J3YXJkLWJ1 dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtc2Vlay1mb3J3YXJkLWJ1dHRvbiB7 Cit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1zZWVrLWZvcndhcmQtYnV0dG9uIHsKICAg ICBkaXNwbGF5OiBub25lOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1mdWxs c2NyZWVuLWJ1dHRvbiB7Ci0gICAgcG9zaXRpb246IGFic29sdXRlOwotICAgIHRvcDogMHB4Owot ICAgIHJpZ2h0OiAwcHg7Ci0gICAgd2lkdGg6IDEycHg7Ci0gICAgaGVpZ2h0OiAxMnB4OwotICAg IHBhZGRpbmc6IDZweDsKLSAgICBtYXJnaW46IDVweCA1cHggNXB4IDNweDsKLX0KLQogdmlkZW86 Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtZnVsbHNjcmVlbi1idXR0b24gewogICAgIGRpc3BsYXk6 IG5vbmU7CiB9CiAKLWF1ZGlvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24s IHZpZGVvOjotd2Via2l0LW1lZGlhLWNvbnRyb2xzLXJld2luZC1idXR0b24gewordmlkZW86Oi13 ZWJraXQtbWVkaWEtY29udHJvbHMtcmV3aW5kLWJ1dHRvbiB7CiAgICAgZGlzcGxheTogbm9uZTsK IH0KIAotYXVkaW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1 dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVkaWEtY29udHJvbHMtcmV0dXJuLXRvLXJlYWx0aW1lLWJ1 dHRvbiB7Cit2aWRlbzo6LXdlYmtpdC1tZWRpYS1jb250cm9scy1yZXR1cm4tdG8tcmVhbHRpbWUt YnV0dG9uIHsKICAgICBkaXNwbGF5OiBub25lOwogfQogCi1hdWRpbzo6LXdlYmtpdC1tZWRpYS1j b250cm9scy10b2dnbGUtY2xvc2VkLWNhcHRpb25zLWJ1dHRvbiwgdmlkZW86Oi13ZWJraXQtbWVk aWEtY29udHJvbHMtdG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24gewordmlkZW86Oi13ZWJr aXQtbWVkaWEtY29udHJvbHMtdG9nZ2xlLWNsb3NlZC1jYXB0aW9ucy1idXR0b24gewogICAgIGRp c3BsYXk6IG5vbmU7CiB9CisK