87988 2012-05-31 10:26:15 -0700 [Qt] Add a custom Color Chooser widget to MiniBrowser 2012-06-21 06:13:07 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 87749 87989 1 tmpsantos tmpsantos hausmann kenneth menard vestbo webkit.review.bot oldest_to_newest 638541 0 tmpsantos 2012-05-31 10:26:15 -0700 For handling input fields type="color. 638655 1 145139 tmpsantos 2012-05-31 13:01:42 -0700 Created attachment 145139 Patch 654383 2 145139 menard 2012-06-21 04:47:04 -0700 Comment on attachment 145139 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=145139&action=review Overall it's ok, the basic color picker is fine for testing :). Could you please fix the style? thanks > Tools/MiniBrowser/qt/qml/ColorChooser.qml:41 > + width: parent.width / 4 ; height: parent.height / 4 one statement per line and no ; needed then. > Tools/MiniBrowser/qt/qml/ColorChooser.qml:46 > + anchors.left: parent.left; anchors.top: parent.top same here. > Tools/MiniBrowser/qt/qml/ColorChooser.qml:48 > + width: parent.width / 2 - dialog.spacing; height: parent.height / 2 - dialog.spacing here. > Tools/MiniBrowser/qt/qml/ColorChooser.qml:60 > + width: parent.width / 2 - dialog.spacing; height: parent.height / 2 - dialog.spacing same here > Tools/MiniBrowser/qt/qml/ColorChooser.qml:70 > + anchors.bottom: parent.bottom; anchors.left: parent.left ditto > Tools/MiniBrowser/qt/qml/ColorChooser.qml:72 > + width: parent.width / 2 - dialog.spacing; height: parent.height / 2 - dialog.spacing ditto. > Tools/MiniBrowser/qt/qml/ColorChooser.qml:82 > + anchors.bottom: parent.bottom; anchors.right: parent.right ditto. 654411 3 148773 tmpsantos 2012-06-21 05:32:24 -0700 Created attachment 148773 Patch v2 Updated patch addressing the comments. Thanks for reviewing. 654413 4 148773 menard 2012-06-21 05:36:03 -0700 Comment on attachment 148773 Patch v2 LGTM 654433 5 148773 webkit.review.bot 2012-06-21 06:13:00 -0700 Comment on attachment 148773 Patch v2 Clearing flags on attachment: 148773 Committed r120921: <http://trac.webkit.org/changeset/120921> 654434 6 webkit.review.bot 2012-06-21 06:13:07 -0700 All reviewed patches have been landed. Closing bug. 145139 2012-05-31 13:01:42 -0700 2012-06-21 05:32:14 -0700 Patch bug-87988-20120531230141.patch text/plain 5723 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MDgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmI3MWI3YzYzNWJkN2E3MzJhNjRiZjVmZThiYWIxZGVk MDA5MWU4OC4uZTRjYzEzMzVjNzM4ZmY4ZWRkYWYyZTM4MzRmOWYyNDg2NTUyOGZiNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA1LTMxICBUaGlhZ28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NA aW50ZWwuY29tPgorCisgICAgICAgIFtRdF0gQWRkIGEgY3VzdG9tIENvbG9yIENob29zZXIgd2lk Z2V0IHRvIE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04Nzk4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIGN1c3RvbSBjb2xvciBjaG9vc2VyIGV4YW1wbGUgZm9yIHRoZSBNaW5p QnJvd3Nlci4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFyYzoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWw6CisgICAgICAgICog TWluaUJyb3dzZXIvcXQvcW1sL0NvbG9yQ2hvb3Nlci5xbWw6IEFkZGVkLgorCiAyMDEyLTA1LTMx ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFtRdF0gRG9u J3QgZW5mb3JjZSB0aGUgdmVyc2lvbiBvZiBsaWJwbmcgZm9yIHRoZSBjb25maWcgdGVzdCB3aGVu IHBhc3NpbmcgdGhlIG9wdGlvbiB0byB0aGUgbGlua2VyCmRpZmYgLS1naXQgYS9Ub29scy9NaW5p QnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5xcmMgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3Nlci5xcmMKaW5kZXggYjU0OTBiZWMxYzdjY2ZiNWMzZjhjYjA4YWQ5OWRmMmJmZTFiNzRkNi4u MzliYWIzZjg3OWM1ODk0MmNhMjViNmI4Njc1MDEzZmFhOWU2NDRmNSAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucXJjCisrKyBiL1Rvb2xzL01pbmlCcm93c2Vy L3F0L01pbmlCcm93c2VyLnFyYwpAQCAtMTksNiArMTksNyBAQAogICAgICAgICA8ZmlsZT5xbWwv QXV0aGVudGljYXRpb25EaWFsb2cucW1sPC9maWxlPgogICAgICAgICA8ZmlsZT5xbWwvQnJvd3Nl cldpbmRvdy5xbWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnFtbC9DaGVja0JveC5xbWw8L2ZpbGU+ CisgICAgICAgIDxmaWxlPnFtbC9Db2xvckNob29zZXIucW1sPC9maWxlPgogICAgICAgICA8Zmls ZT5xbWwvQ29uZmlybURpYWxvZy5xbWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnFtbC9EaWFsb2cu cW1sPC9maWxlPgogICAgICAgICA8ZmlsZT5xbWwvRGlhbG9nQnV0dG9uLnFtbDwvZmlsZT4KZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93LnFtbCBiL1Rv b2xzL01pbmlCcm93c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93LnFtbAppbmRleCAwZWJmMDI4NjA2 YmY2Y2E4YTZhMjYwNzEwMzAzNzFkYmZkZTI0NzM2Li42YzI2ZjI4YTAyNmNjYTNlZTdjMDVkYWZj ZmNlMmI3MTdiYjI3ZTk3IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJv d3NlcldpbmRvdy5xbWwKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5k b3cucW1sCkBAIC0zNTUsNiArMzU1LDcgQEAgUmVjdGFuZ2xlIHsKICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KKyAgICAgICAgZXhwZXJpbWVudGFsLmNvbG9yQ2hv b3NlcjogQ29sb3JDaG9vc2VyIHsgfQogICAgICAgICBleHBlcmltZW50YWwub25FbnRlckZ1bGxT Y3JlZW5SZXF1ZXN0ZWQgOiB7CiAgICAgICAgICAgICBuYXZpZ2F0aW9uQmFyLnZpc2libGUgPSBm YWxzZTsKICAgICAgICAgICAgIFdpbmRvdy5zaG93RnVsbFNjcmVlbigpOwpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0NvbG9yQ2hvb3Nlci5xbWwgYi9Ub29scy9NaW5pQnJv d3Nlci9xdC9xbWwvQ29sb3JDaG9vc2VyLnFtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kZjU5NTI1NDhhZjg5ZmJl YTkxOGEzYjM4Yzk0MWVhYzE0MzkxNTViCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvcXQvcW1sL0NvbG9yQ2hvb3Nlci5xbWwKQEAgLTAsMCArMSw5MyBAQAorLyoKKyAqIENv cHlyaWdodCAoQykgMjAxMiBJbnRlbCBDb3Jwb3JhdGlvbi4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQ09NUFVURVIsIElOQy4gYGBBUyBJUycnIEFORCBBTlkK KyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJ TiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgorICogQ09OVFJJQlVUT1JT IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUws CisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICog KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK2ltcG9ydCBRdFF1aWNrIDIuMAor CitNb3VzZUFyZWEgeworICAgIGFuY2hvcnMuZmlsbDogcGFyZW50CisgICAgb25DbGlja2VkOiBt b2RlbC5yZWplY3QoKQorCisgICAgUmVjdGFuZ2xlIHsKKyAgICAgICAgaWQ6IGRpYWxvZworICAg ICAgICBwcm9wZXJ0eSBpbnQgc3BhY2luZzogMTAKKworICAgICAgICBjb2xvcjogImdhaW5zYm9y byIKKyAgICAgICAgb3BhY2l0eTogMC44CisgICAgICAgIHJhZGl1czogNQorICAgICAgICB3aWR0 aDogcGFyZW50LndpZHRoIC8gNCA7IGhlaWdodDogcGFyZW50LmhlaWdodCAvIDQKKyAgICAgICAg YW5jaG9ycy5jZW50ZXJJbjogcGFyZW50CisKKyAgICAgICAgUmVjdGFuZ2xlIHsKKyAgICAgICAg ICAgIGNvbG9yOiAicmVkIgorICAgICAgICAgICAgYW5jaG9ycy5sZWZ0OiBwYXJlbnQubGVmdDsg YW5jaG9ycy50b3A6IHBhcmVudC50b3AKKyAgICAgICAgICAgIGFuY2hvcnMubWFyZ2luczogZGlh bG9nLnNwYWNpbmcKKyAgICAgICAgICAgIHdpZHRoOiBwYXJlbnQud2lkdGggLyAyIC0gZGlhbG9n LnNwYWNpbmc7IGhlaWdodDogcGFyZW50LmhlaWdodCAvIDIgLSBkaWFsb2cuc3BhY2luZworCisg ICAgICAgICAgICBNb3VzZUFyZWEgeworICAgICAgICAgICAgICAgIGFuY2hvcnMuZmlsbDogcGFy ZW50CisgICAgICAgICAgICAgICAgb25DbGlja2VkOiBtb2RlbC5hY2NlcHQocGFyZW50LmNvbG9y KQorICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgUmVjdGFuZ2xlIHsKKyAgICAg ICAgICAgIGNvbG9yOiAiYmx1ZSIKKyAgICAgICAgICAgIGFuY2hvcnMucmlnaHQ6IHBhcmVudC5y aWdodDsgYW5jaG9ycy50b3A6IHBhcmVudC50b3AKKyAgICAgICAgICAgIGFuY2hvcnMubWFyZ2lu czogZGlhbG9nLnNwYWNpbmcKKyAgICAgICAgICAgIHdpZHRoOiBwYXJlbnQud2lkdGggLyAyIC0g ZGlhbG9nLnNwYWNpbmc7IGhlaWdodDogcGFyZW50LmhlaWdodCAvIDIgLSBkaWFsb2cuc3BhY2lu ZworCisgICAgICAgICAgICBNb3VzZUFyZWEgeworICAgICAgICAgICAgICAgIGFuY2hvcnMuZmls bDogcGFyZW50CisgICAgICAgICAgICAgICAgb25DbGlja2VkOiBtb2RlbC5hY2NlcHQocGFyZW50 LmNvbG9yKQorICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgUmVjdGFuZ2xlIHsK KyAgICAgICAgICAgIGNvbG9yOiAiZ3JlZW4iCisgICAgICAgICAgICBhbmNob3JzLmJvdHRvbTog cGFyZW50LmJvdHRvbTsgYW5jaG9ycy5sZWZ0OiBwYXJlbnQubGVmdAorICAgICAgICAgICAgYW5j aG9ycy5tYXJnaW5zOiBkaWFsb2cuc3BhY2luZworICAgICAgICAgICAgd2lkdGg6IHBhcmVudC53 aWR0aCAvIDIgLSBkaWFsb2cuc3BhY2luZzsgaGVpZ2h0OiBwYXJlbnQuaGVpZ2h0IC8gMiAtIGRp YWxvZy5zcGFjaW5nCisKKyAgICAgICAgICAgIE1vdXNlQXJlYSB7CisgICAgICAgICAgICAgICAg YW5jaG9ycy5maWxsOiBwYXJlbnQKKyAgICAgICAgICAgICAgICBvbkNsaWNrZWQ6IG1vZGVsLmFj Y2VwdChwYXJlbnQuY29sb3IpCisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBS ZWN0YW5nbGUgeworICAgICAgICAgICAgY29sb3I6IG1vZGVsLmN1cnJlbnRDb2xvcgorICAgICAg ICAgICAgYW5jaG9ycy5ib3R0b206IHBhcmVudC5ib3R0b207IGFuY2hvcnMucmlnaHQ6IHBhcmVu dC5yaWdodAorICAgICAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiBkaWFsb2cuc3BhY2luZyAqIDIK KyAgICAgICAgICAgIHdpZHRoOiBwYXJlbnQud2lkdGggLyAyIC0gZGlhbG9nLnNwYWNpbmcgKiA0 OyBoZWlnaHQ6IHBhcmVudC5oZWlnaHQgLyAyIC0gZGlhbG9nLnNwYWNpbmcgKiA0CisKKyAgICAg ICAgICAgIFRleHQgeworICAgICAgICAgICAgICAgIHRleHQ6ICJDdXJyZW50IgorICAgICAgICAg ICAgICAgIGFuY2hvcnMuYm90dG9tOiBwYXJlbnQudG9wCisgICAgICAgICAgICAgICAgYW5jaG9y cy5ob3Jpem9udGFsQ2VudGVyOiBwYXJlbnQuaG9yaXpvbnRhbENlbnRlcgorICAgICAgICAgICAg fQorICAgICAgICB9CisgICAgfQorfQo= 148773 2012-06-21 05:32:24 -0700 2012-06-21 06:13:00 -0700 Patch v2 bug-87988-20120621153410.patch text/plain 5809 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwOTE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDQwMjVjNTZjZDM4ZWIzYmEwMmM1Mjc3OWVlODRiNjkz OTllMzUwNi4uYjU5NDFhNDIzZDQ2N2ZjMzIwYWNlYzFmYTQwOGVlYmIwMTlmMWQxZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTA2LTIxICBUaGlhZ28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NA aW50ZWwuY29tPgorCisgICAgICAgIFtRdF0gQWRkIGEgY3VzdG9tIENvbG9yIENob29zZXIgd2lk Z2V0IHRvIE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04Nzk4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIGN1c3RvbSBjb2xvciBjaG9vc2VyIGV4YW1wbGUgZm9yIHRoZSBNaW5p QnJvd3Nlci4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFyYzoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWw6CisgICAgICAgICog TWluaUJyb3dzZXIvcXQvcW1sL0NvbG9yQ2hvb3Nlci5xbWw6IEFkZGVkLgorCiAyMDEyLTA2LTIw ICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgU3BlZWNoIEph dmFTY3JpcHQgQVBJOiBTcGVlY2hSZWNvZ25pdGlvbiBzaG91bGQgaG9vayB1cCB3aXRoIEFjdGl2 ZURPTU9iamVjdCBtb3JlCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3Nlci5xcmMgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5xcmMKaW5kZXggMzdm YjlhMzdjZmIyMDkzNGI3N2E4YjA4YmFmYzU5OGYxOWUxYzFhMy4uZTIxZWVmMzQxMDQ3YzVkMDgy MzllZjM3MTEyNGQ3Nzk4ODU1ZGU2ZiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvcXQv TWluaUJyb3dzZXIucXJjCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFy YwpAQCAtMjAsNiArMjAsNyBAQAogICAgICAgICA8ZmlsZT5xbWwvQXV0aGVudGljYXRpb25EaWFs b2cucW1sPC9maWxlPgogICAgICAgICA8ZmlsZT5xbWwvQnJvd3NlcldpbmRvdy5xbWw8L2ZpbGU+ CiAgICAgICAgIDxmaWxlPnFtbC9DaGVja0JveC5xbWw8L2ZpbGU+CisgICAgICAgIDxmaWxlPnFt bC9Db2xvckNob29zZXIucW1sPC9maWxlPgogICAgICAgICA8ZmlsZT5xbWwvQ29uZmlybURpYWxv Zy5xbWw8L2ZpbGU+CiAgICAgICAgIDxmaWxlPnFtbC9EaWFsb2cucW1sPC9maWxlPgogICAgICAg ICA8ZmlsZT5xbWwvRGlhbG9nQnV0dG9uLnFtbDwvZmlsZT4KZGlmZiAtLWdpdCBhL1Rvb2xzL01p bmlCcm93c2VyL3F0L3FtbC9Ccm93c2VyV2luZG93LnFtbCBiL1Rvb2xzL01pbmlCcm93c2VyL3F0 L3FtbC9Ccm93c2VyV2luZG93LnFtbAppbmRleCA3N2I2YzM2OWZjNzcwMGIzMjYzMjg3MmM4NzYz NzFiMTYwOWM3OGI2Li44Y2Q1OGViOGE4NDczNzEwMzllYjhkZDRmYzZmMmJiZmFjMDZlN2IxIDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQnJvd3NlcldpbmRvdy5xbWwKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0Jyb3dzZXJXaW5kb3cucW1sCkBAIC0zNzcsNiAr Mzc3LDcgQEAgUmVjdGFuZ2xlIHsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KKyAgICAgICAgZXhwZXJpbWVudGFsLmNvbG9yQ2hvb3NlcjogQ29sb3JDaG9vc2Vy IHsgfQogICAgICAgICBleHBlcmltZW50YWwub25FbnRlckZ1bGxTY3JlZW5SZXF1ZXN0ZWQgOiB7 CiAgICAgICAgICAgICBuYXZpZ2F0aW9uQmFyLnZpc2libGUgPSBmYWxzZTsKICAgICAgICAgICAg IFdpbmRvdy5zaG93RnVsbFNjcmVlbigpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIv cXQvcW1sL0NvbG9yQ2hvb3Nlci5xbWwgYi9Ub29scy9NaW5pQnJvd3Nlci9xdC9xbWwvQ29sb3JD aG9vc2VyLnFtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kNTlmOGRhMTc4NTNlOGYxNDNjMThjOTY0M2ZhMjY1YjYw ODEzOTM5Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvcW1sL0NvbG9y Q2hvb3Nlci5xbWwKQEAgLTAsMCArMSwxMDIgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTIg SW50ZWwgQ29ycG9yYXRpb24uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogQWxsIHJpZ2h0 cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoK KyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJv dmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0 aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0 aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRo ZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdp dGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZ IEFQUExFIENPTVBVVEVSLCBJTkMuIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICog SU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQ QVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwg QVBQTEUgQ09NUFVURVIsIElOQy4gT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFO WSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBP UiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAor ICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBV U0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4g Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElH RU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICog T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KKyAqLworCitpbXBvcnQgUXRRdWljayAyLjAKKworTW91c2VBcmVhIHsKKyAg ICBhbmNob3JzLmZpbGw6IHBhcmVudAorICAgIG9uQ2xpY2tlZDogbW9kZWwucmVqZWN0KCkKKwor ICAgIFJlY3RhbmdsZSB7CisgICAgICAgIGlkOiBkaWFsb2cKKyAgICAgICAgcHJvcGVydHkgaW50 IHNwYWNpbmc6IDEwCisKKyAgICAgICAgY29sb3I6ICJnYWluc2Jvcm8iCisgICAgICAgIG9wYWNp dHk6IDAuOAorICAgICAgICByYWRpdXM6IDUKKyAgICAgICAgd2lkdGg6IHBhcmVudC53aWR0aCAv IDQKKyAgICAgICAgaGVpZ2h0OiBwYXJlbnQuaGVpZ2h0IC8gNAorICAgICAgICBhbmNob3JzLmNl bnRlckluOiBwYXJlbnQKKworICAgICAgICBSZWN0YW5nbGUgeworICAgICAgICAgICAgY29sb3I6 ICJyZWQiCisgICAgICAgICAgICBhbmNob3JzLmxlZnQ6IHBhcmVudC5sZWZ0CisgICAgICAgICAg ICBhbmNob3JzLnRvcDogcGFyZW50LnRvcAorICAgICAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiBk aWFsb2cuc3BhY2luZworICAgICAgICAgICAgd2lkdGg6IHBhcmVudC53aWR0aCAvIDIgLSBkaWFs b2cuc3BhY2luZworICAgICAgICAgICAgaGVpZ2h0OiBwYXJlbnQuaGVpZ2h0IC8gMiAtIGRpYWxv Zy5zcGFjaW5nCisKKyAgICAgICAgICAgIE1vdXNlQXJlYSB7CisgICAgICAgICAgICAgICAgYW5j aG9ycy5maWxsOiBwYXJlbnQKKyAgICAgICAgICAgICAgICBvbkNsaWNrZWQ6IG1vZGVsLmFjY2Vw dChwYXJlbnQuY29sb3IpCisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICBSZWN0 YW5nbGUgeworICAgICAgICAgICAgY29sb3I6ICJibHVlIgorICAgICAgICAgICAgYW5jaG9ycy5y aWdodDogcGFyZW50LnJpZ2h0CisgICAgICAgICAgICBhbmNob3JzLnRvcDogcGFyZW50LnRvcAor ICAgICAgICAgICAgYW5jaG9ycy5tYXJnaW5zOiBkaWFsb2cuc3BhY2luZworICAgICAgICAgICAg d2lkdGg6IHBhcmVudC53aWR0aCAvIDIgLSBkaWFsb2cuc3BhY2luZworICAgICAgICAgICAgaGVp Z2h0OiBwYXJlbnQuaGVpZ2h0IC8gMiAtIGRpYWxvZy5zcGFjaW5nCisKKyAgICAgICAgICAgIE1v dXNlQXJlYSB7CisgICAgICAgICAgICAgICAgYW5jaG9ycy5maWxsOiBwYXJlbnQKKyAgICAgICAg ICAgICAgICBvbkNsaWNrZWQ6IG1vZGVsLmFjY2VwdChwYXJlbnQuY29sb3IpCisgICAgICAgICAg ICB9CisgICAgICAgIH0KKworICAgICAgICBSZWN0YW5nbGUgeworICAgICAgICAgICAgY29sb3I6 ICJncmVlbiIKKyAgICAgICAgICAgIGFuY2hvcnMuYm90dG9tOiBwYXJlbnQuYm90dG9tCisgICAg ICAgICAgICBhbmNob3JzLmxlZnQ6IHBhcmVudC5sZWZ0CisgICAgICAgICAgICBhbmNob3JzLm1h cmdpbnM6IGRpYWxvZy5zcGFjaW5nCisgICAgICAgICAgICB3aWR0aDogcGFyZW50LndpZHRoIC8g MiAtIGRpYWxvZy5zcGFjaW5nCisgICAgICAgICAgICBoZWlnaHQ6IHBhcmVudC5oZWlnaHQgLyAy IC0gZGlhbG9nLnNwYWNpbmcKKworICAgICAgICAgICAgTW91c2VBcmVhIHsKKyAgICAgICAgICAg ICAgICBhbmNob3JzLmZpbGw6IHBhcmVudAorICAgICAgICAgICAgICAgIG9uQ2xpY2tlZDogbW9k ZWwuYWNjZXB0KHBhcmVudC5jb2xvcikKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAg ICAgIFJlY3RhbmdsZSB7CisgICAgICAgICAgICBjb2xvcjogbW9kZWwuY3VycmVudENvbG9yCisg ICAgICAgICAgICBhbmNob3JzLmJvdHRvbTogcGFyZW50LmJvdHRvbQorICAgICAgICAgICAgYW5j aG9ycy5yaWdodDogcGFyZW50LnJpZ2h0CisgICAgICAgICAgICBhbmNob3JzLm1hcmdpbnM6IGRp YWxvZy5zcGFjaW5nICogMgorICAgICAgICAgICAgd2lkdGg6IHBhcmVudC53aWR0aCAvIDIgLSBk aWFsb2cuc3BhY2luZyAqIDQKKyAgICAgICAgICAgIGhlaWdodDogcGFyZW50LmhlaWdodCAvIDIg LSBkaWFsb2cuc3BhY2luZyAqIDQKKworICAgICAgICAgICAgVGV4dCB7CisgICAgICAgICAgICAg ICAgdGV4dDogIkN1cnJlbnQiCisgICAgICAgICAgICAgICAgYW5jaG9ycy5ib3R0b206IHBhcmVu dC50b3AKKyAgICAgICAgICAgICAgICBhbmNob3JzLmhvcml6b250YWxDZW50ZXI6IHBhcmVudC5o b3Jpem9udGFsQ2VudGVyCisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9Cit9Cg==