72060 2011-11-10 14:35:17 -0800 [CSS Line Grid] Add support for parsing of the line-grid-snap property. 2012-01-12 12:00:11 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eoconnor macpherson webkit.review.bot oldest_to_newest 500294 0 hyatt 2011-11-10 14:35:17 -0800 This property will control snapping to the grid. For now it's just in the block progression direction, but I may extend it to be a pair of values for character grid snapping in the future. 500296 1 114573 hyatt 2011-11-10 14:36:42 -0800 Created attachment 114573 Patch 500298 2 114573 mitz 2011-11-10 14:39:33 -0800 Comment on attachment 114573 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114573&action=review > Source/WebCore/rendering/style/StyleRareInheritedData.h:107 > + whoops 535028 3 hyatt 2012-01-12 12:00:11 -0800 Landed ages ago and just didn't get closed. 114573 2011-11-10 14:36:42 -0800 2011-11-10 14:39:33 -0800 Patch patch.txt text/plain 20614 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5ODk5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMTEtMTAgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MjA2MAorICAgICAgICAKKyAgICAgICAgW0NTUyBMaW5lIEdyaWRd IEFkZCBzdXBwb3J0IGZvciB0aGUgbGluZS1ncmlkLXNuYXAgcHJvcGVydHkgdG8gY29udHJvbCBz bmFwcGluZyB0byB0aGUgbmVhcmVzdAorICAgICAgICBlbmNsb3NpbmcgZ3JpZC4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBmYXN0L2xpbmUt Z3JpZC9saW5lLWdyaWQtc25hcC1wYXJzaW5nLmh0bWwuCisKKyAgICAgICAgKiBjc3MvQ1NTQ29t cHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NvbXB1dGVk U3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZSk6CisgICAgICAgICogY3NzL0NT U1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlVmFsdWUpOgor ICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJD b3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIExpbmVHcmlkU25hcCk6CisgICAgICAg ICogY3NzL0NTU1Byb3BlcnR5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5Ojpp c0luaGVyaXRlZFByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoK KyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD U1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgKiBjc3MvQ1NTVmFsdWVL ZXl3b3Jkcy5pbjoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmRpZmYpOgorICAgICAgICAqIHJlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oOgorICAgICAgICAoV2ViQ29yZTo6SW5oZXJpdGVkRmxhZ3M6 OmxpbmVHcmlkU25hcCk6CisgICAgICAgIChXZWJDb3JlOjpJbmhlcml0ZWRGbGFnczo6c2V0TGlu ZUdyaWRTbmFwKToKKyAgICAgICAgKFdlYkNvcmU6OkluaGVyaXRlZEZsYWdzOjppbml0aWFsTGlu ZUdyaWRTbmFwKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFu dHMuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVJ bmhlcml0ZWREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmFyZUluaGVyaXRlZERhdGE6 Om9wZXJhdG9yPT0pOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0 ZWREYXRhLmg6CisKIDIwMTEtMTEtMTAgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJr aXQub3JnPgogCiAgICAgICAgIERvIG5vdCBzaGFyZSBDU1Mgc3R5bGUgZm9yIE1lZGlhRWxlbWVu dCBiYWNrZWQgYnkgYSBwbHVnaW4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRl ZFN0eWxlRGVjbGFyYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9D U1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCShyZXZpc2lvbiA5OTg4NykKKysrIFNvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0yMjcsNiArMjI3LDcgQEAgc3RhdGljIGNvbnN0IGludCBjb21wdXRlZFByb3BlcnRp ZXNbXSA9IAogICAgIENTU1Byb3BlcnR5V2Via2l0TGluZUJyZWFrLAogICAgIENTU1Byb3BlcnR5 V2Via2l0TGluZUNsYW1wLAogICAgIENTU1Byb3BlcnR5V2Via2l0TGluZUdyaWQsCisgICAgQ1NT UHJvcGVydHlXZWJraXRMaW5lR3JpZFNuYXAsCiAgICAgQ1NTUHJvcGVydHlXZWJraXRMb2NhbGUs CiAgICAgQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5CZWZvcmVDb2xsYXBzZSwKICAgICBDU1NQcm9w ZXJ0eVdlYmtpdE1hcmdpbkFmdGVyQ29sbGFwc2UsCkBAIC0xOTk3LDYgKzE5OTgsOCBAQCBQYXNz UmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjCiAgICAgICAgICAgICBpZiAoc3R5 bGUtPmxpbmVHcmlkKCkuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHByaW1pdGl2 ZVZhbHVlQ2FjaGUtPmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vbmUpOwogICAgICAg ICAgICAgcmV0dXJuIHByaW1pdGl2ZVZhbHVlQ2FjaGUtPmNyZWF0ZVZhbHVlKHN0eWxlLT5saW5l R3JpZCgpLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1NUUklORyk7CisgICAgICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRMaW5lR3JpZFNuYXA6CisgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0 aXZlVmFsdWU6OmNyZWF0ZShzdHlsZS0+bGluZUdyaWRTbmFwKCkpOwogICAgICAgICBjYXNlIENT U1Byb3BlcnR5V2Via2l0V3JpdGluZ01vZGU6CiAgICAgICAgICAgICByZXR1cm4gcHJpbWl0aXZl VmFsdWVDYWNoZS0+Y3JlYXRlVmFsdWUoc3R5bGUtPndyaXRpbmdNb2RlKCkpOwogICAgICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dENvbWJpbmU6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmNwcAkocmV2aXNpb24gOTk4ODcpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2Vy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk0Miw2ICsxOTQyLDEwIEBAIGJvb2wgQ1NTUGFyc2Vy OjpwYXJzZVZhbHVlKGludCBwcm9wSWQsIGIKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICBicmVhazsKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TGluZUdyaWRTbmFwOgorICAg ICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVOb25lIHx8IGlkID09IENTU1ZhbHVlQmFzZWxpbmUgfHwg aWQgPT0gQ1NTVmFsdWVCb3VuZHMpCisgICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHRydWU7 CisgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMb2NhbGU6CiAgICAg ICAgIGlmIChpZCA9PSBDU1NWYWx1ZUF1dG8gfHwgdmFsdWUtPnVuaXQgPT0gQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU19TVFJJTkcpCiAgICAgICAgICAgICB2YWxpZFByaW1pdGl2ZSA9IHRydWU7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgJ KHJldmlzaW9uIDk5ODg3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVl TWFwcGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMzAxNCw2ICszMDE0LDM4IEBAIHRlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGUKICAgICB9CiB9CiAKK3RlbXBsYXRlPD4g aW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShMaW5lR3JpZFNuYXAg Z3JpZFNuYXApCisgICAgOiBDU1NWYWx1ZShQcmltaXRpdmVDbGFzcykKK3sKKyAgICBtX3ByaW1p dGl2ZVVuaXRUeXBlID0gQ1NTX0lERU5UOworICAgIHN3aXRjaCAoZ3JpZFNuYXApIHsKKyAgICBj YXNlIExpbmVHcmlkU25hcE5vbmU6CisgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU5v bmU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTGluZUdyaWRTbmFwQmFzZWxpbmU6CisgICAg ICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZUJhc2VsaW5lOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIExpbmVHcmlkU25hcEJvdW5kczoKKyAgICAgICAgbV92YWx1ZS5pZGVudCA9IENTU1Zh bHVlQm91bmRzOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3RlbXBsYXRlPD4gaW5saW5l IENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBMaW5lR3JpZFNuYXAoKSBjb25zdAoreworICAg IHN3aXRjaCAobV92YWx1ZS5pZGVudCkgeworICAgIGNhc2UgQ1NTVmFsdWVOb25lOgorICAgICAg ICByZXR1cm4gTGluZUdyaWRTbmFwTm9uZTsKKyAgICBjYXNlIENTU1ZhbHVlQmFzZWxpbmU6Cisg ICAgICAgIHJldHVybiBMaW5lR3JpZFNuYXBCYXNlbGluZTsKKyAgICBjYXNlIENTU1ZhbHVlQm91 bmRzOgorICAgICAgICByZXR1cm4gTGluZUdyaWRTbmFwQm91bmRzOworICAgIGRlZmF1bHQ6Cisg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gTGluZUdyaWRTbmFw Tm9uZTsKKyAgICB9Cit9CisKIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpD U1NQcmltaXRpdmVWYWx1ZShFU3BlYWsgZSkKICAgICA6IENTU1ZhbHVlKFByaW1pdGl2ZUNsYXNz KQogewpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHkuY3BwCShyZXZpc2lvbiA5OTg4NykK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMzNCw2ICszMzQsNyBAQCBib29sIENTU1Byb3BlcnR5Ojppc0luaGVyaXRlZFByb3BlcnR5KHVu CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVCb3hDb250YWluOgogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRMaW5lQnJlYWs6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVH cmlkOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lR3JpZFNuYXA6CiAgICAgY2FzZSBD U1NQcm9wZXJ0eVdlYmtpdE5ic3BNb2RlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRQcmlu dENvbG9yQWRqdXN0OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRSdGxPcmRlcmluZzoKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCShyZXZpc2lvbiA5OTg4NykK KysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCSh3b3JraW5nIGNvcHkp CkBAIC0yNzEsNiArMjcxLDcgQEAgei1pbmRleAogLXdlYmtpdC1saW5lLWJyZWFrCiAtd2Via2l0 LWxpbmUtY2xhbXAKIC13ZWJraXQtbGluZS1ncmlkCistd2Via2l0LWxpbmUtZ3JpZC1zbmFwCiAt d2Via2l0LWxvZ2ljYWwtd2lkdGgKIC13ZWJraXQtbG9naWNhbC1oZWlnaHQKIC13ZWJraXQtbWFy Z2luLWFmdGVyLWNvbGxhcHNlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwCShyZXZpc2lvbiA5OTg4NykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzQwMyw2ICszNDAzLDkgQEAgdm9pZCBDU1NT dHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICBlbHNlCiAgICAgICAgICAg ICBtX3N0eWxlLT5zZXRMaW5lR3JpZChwcmltaXRpdmVWYWx1ZS0+Z2V0U3RyaW5nVmFsdWUoKSk7 CiAgICAgICAgIHJldHVybjsKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TGluZUdyaWRTbmFw OgorICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKGxpbmVH cmlkU25hcCwgTGluZUdyaWRTbmFwKQorICAgICAgICByZXR1cm47CiAgICAgY2FzZSBDU1NQcm9w ZXJ0eVdlYmtpdFJlZ2lvbkJyZWFrQmVmb3JlOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRf SU5JVElBTF9BTkRfUFJJTUlUSVZFX1dJVEhfVkFMVUUocmVnaW9uQnJlYWtCZWZvcmUsIFJlZ2lv bkJyZWFrQmVmb3JlLCBQYWdlQnJlYWspCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCShyZXZpc2lvbiA5OTg4NykKKysrIFNvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NWYWx1ZUtleXdvcmRzLmluCSh3b3JraW5nIGNvcHkpCkBAIC04MjcsNiAr ODI3LDExIEBAIGdseXBocwogaW5saW5lLWJveAogcmVwbGFjZWQKIAorLy8gLXdlYmtpdC1saW5l LWdyaWQtc25hcAorLy9ub25lCisvL2Jhc2VsaW5lCitib3VuZHMKKwogLy8gLXdlYmtpdC1mb250 LWZlYXR1cmUtc2V0dGluZ3MKIG9uCiBvZmYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcAkocmV2aXNpb24gOTk4ODcpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC00NTQsNyArNDU0LDkgQEAgU3R5bGVEaWZmZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0 IAogICAgICAgICAgICAgfHwgcmFyZUluaGVyaXRlZERhdGEtPnRleHRFbXBoYXNpc01hcmsgIT0g b3RoZXItPnJhcmVJbmhlcml0ZWREYXRhLT50ZXh0RW1waGFzaXNNYXJrCiAgICAgICAgICAgICB8 fCByYXJlSW5oZXJpdGVkRGF0YS0+dGV4dEVtcGhhc2lzUG9zaXRpb24gIT0gb3RoZXItPnJhcmVJ bmhlcml0ZWREYXRhLT50ZXh0RW1waGFzaXNQb3NpdGlvbgogICAgICAgICAgICAgfHwgcmFyZUlu aGVyaXRlZERhdGEtPnRleHRFbXBoYXNpc0N1c3RvbU1hcmsgIT0gb3RoZXItPnJhcmVJbmhlcml0 ZWREYXRhLT50ZXh0RW1waGFzaXNDdXN0b21NYXJrCi0gICAgICAgICAgICB8fCByYXJlSW5oZXJp dGVkRGF0YS0+bV9saW5lQm94Q29udGFpbiAhPSBvdGhlci0+cmFyZUluaGVyaXRlZERhdGEtPm1f bGluZUJveENvbnRhaW4pCisgICAgICAgICAgICB8fCByYXJlSW5oZXJpdGVkRGF0YS0+bV9saW5l Qm94Q29udGFpbiAhPSBvdGhlci0+cmFyZUluaGVyaXRlZERhdGEtPm1fbGluZUJveENvbnRhaW4K KyAgICAgICAgICAgIHx8IHJhcmVJbmhlcml0ZWREYXRhLT5tX2xpbmVHcmlkICE9IG90aGVyLT5y YXJlSW5oZXJpdGVkRGF0YS0+bV9saW5lR3JpZAorICAgICAgICAgICAgfHwgcmFyZUluaGVyaXRl ZERhdGEtPm1fbGluZUdyaWRTbmFwICE9IG90aGVyLT5yYXJlSW5oZXJpdGVkRGF0YS0+bV9saW5l R3JpZFNuYXApCiAgICAgICAgICAgICByZXR1cm4gU3R5bGVEaWZmZXJlbmNlTGF5b3V0OwogCiAg ICAgICAgIGlmICghcmFyZUluaGVyaXRlZERhdGEtPnNoYWRvd0RhdGFFcXVpdmFsZW50KCpvdGhl ci0+cmFyZUluaGVyaXRlZERhdGEuZ2V0KCkpKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHJldmlzaW9uIDk5ODg3KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtpbmcgY29weSkKQEAgLTgx Miw3ICs4MTIsOCBAQCBwdWJsaWM6CiAgICAgUmVnaW9uT3ZlcmZsb3cgcmVnaW9uT3ZlcmZsb3co KSBjb25zdCB7IHJldHVybiBzdGF0aWNfY2FzdDxSZWdpb25PdmVyZmxvdz4ocmFyZU5vbkluaGVy aXRlZERhdGEtPm1fcmVnaW9uT3ZlcmZsb3cpOyB9CiAKICAgICBjb25zdCBBdG9taWNTdHJpbmcm IGxpbmVHcmlkKCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPm1fbGluZUdyaWQ7 IH0KLSAgICAKKyAgICBMaW5lR3JpZFNuYXAgbGluZUdyaWRTbmFwKCkgY29uc3QgeyByZXR1cm4g c3RhdGljX2Nhc3Q8TGluZUdyaWRTbmFwPihyYXJlSW5oZXJpdGVkRGF0YS0+bV9saW5lR3JpZFNu YXApOyB9CisKICAgICAvLyBBcHBsZS1zcGVjaWZpYyBwcm9wZXJ0eSBnZXR0ZXIgbWV0aG9kcwog ICAgIEVQb2ludGVyRXZlbnRzIHBvaW50ZXJFdmVudHMoKSBjb25zdCB7IHJldHVybiBzdGF0aWNf Y2FzdDxFUG9pbnRlckV2ZW50cz4oaW5oZXJpdGVkX2ZsYWdzLl9wb2ludGVyRXZlbnRzKTsgfQog ICAgIGNvbnN0IEFuaW1hdGlvbkxpc3QqIGFuaW1hdGlvbnMoKSBjb25zdCB7IHJldHVybiByYXJl Tm9uSW5oZXJpdGVkRGF0YS0+bV9hbmltYXRpb25zLmdldCgpOyB9CkBAIC0xMTkzLDYgKzExOTQs NyBAQCBwdWJsaWM6CiAgICAgLy8gRW5kIENTUzMgU2V0dGVycwogCiAgICAgdm9pZCBzZXRMaW5l R3JpZChjb25zdCBBdG9taWNTdHJpbmcmIGxpbmVHcmlkKSB7IFNFVF9WQVIocmFyZUluaGVyaXRl ZERhdGEsIG1fbGluZUdyaWQsIGxpbmVHcmlkKTsgfQorICAgIHZvaWQgc2V0TGluZUdyaWRTbmFw KExpbmVHcmlkU25hcCBsaW5lR3JpZFNuYXApIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwg bV9saW5lR3JpZFNuYXAsIGxpbmVHcmlkU25hcCk7IH0KIAogICAgIHZvaWQgc2V0Rmxvd1RocmVh ZChjb25zdCBBdG9taWNTdHJpbmcmIGZsb3dUaHJlYWQpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJp dGVkRGF0YSwgbV9mbG93VGhyZWFkLCBmbG93VGhyZWFkKTsgfQogICAgIHZvaWQgc2V0UmVnaW9u VGhyZWFkKGNvbnN0IEF0b21pY1N0cmluZyYgcmVnaW9uVGhyZWFkKSB7IFNFVF9WQVIocmFyZU5v bkluaGVyaXRlZERhdGEsIG1fcmVnaW9uVGhyZWFkLCByZWdpb25UaHJlYWQpOyB9CkBAIC0xNDc5 LDYgKzE0ODEsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFByaW50Q29sb3JBZGp1c3QgaW5pdGlh bFByaW50Q29sb3JBZGp1c3QoKSB7IHJldHVybiBQcmludENvbG9yQWRqdXN0RWNvbm9teTsgfQog CiAgICAgc3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgaW5pdGlhbExpbmVHcmlkKCkgeyByZXR1 cm4gbnVsbEF0b207IH0KKyAgICBzdGF0aWMgTGluZUdyaWRTbmFwIGluaXRpYWxMaW5lR3JpZFNu YXAoKSB7IHJldHVybiBMaW5lR3JpZFNuYXBOb25lOyB9CiAKICAgICBzdGF0aWMgY29uc3QgQXRv bWljU3RyaW5nJiBpbml0aWFsRmxvd1RocmVhZCgpIHsgcmV0dXJuIG51bGxBdG9tOyB9CiAgICAg c3RhdGljIGNvbnN0IEF0b21pY1N0cmluZyYgaW5pdGlhbFJlZ2lvblRocmVhZCgpIHsgcmV0dXJu IG51bGxBdG9tOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVy U3R5bGVDb25zdGFudHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAkocmV2aXNpb24gOTk4ODcpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAkod29ya2luZyBj b3B5KQpAQCAtNDU3LDYgKzQ1Nyw4IEBAIGVudW0gUmVnaW9uT3ZlcmZsb3cgeyBBdXRvUmVnaW9u T3ZlcmZsb3cKIAogZW51bSBDb2x1bW5BeGlzIHsgSG9yaXpvbnRhbENvbHVtbkF4aXMsIFZlcnRp Y2FsQ29sdW1uQXhpcywgQXV0b0NvbHVtbkF4aXMgfTsKIAorZW51bSBMaW5lR3JpZFNuYXAgeyBM aW5lR3JpZFNuYXBOb25lLCBMaW5lR3JpZFNuYXBCYXNlbGluZSwgTGluZUdyaWRTbmFwQm91bmRz IH07CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmIC8vIFJlbmRlclN0eWxlQ29u c3RhbnRzX2gKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJ bmhlcml0ZWREYXRhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv c3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHAJKHJldmlzaW9uIDk5ODg3KQorKysgU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC01Myw2ICs1Myw3IEBAIFN0eWxlUmFyZUluaGVyaXRlZERhdGE6OlN0 eWxlUmFyZUluaGVyaXQKICAgICAsIHRleHRFbXBoYXNpc1Bvc2l0aW9uKFRleHRFbXBoYXNpc1Bv c2l0aW9uT3ZlcikKICAgICAsIG1fbGluZUJveENvbnRhaW4oUmVuZGVyU3R5bGU6OmluaXRpYWxM aW5lQm94Q29udGFpbigpKQogICAgICwgbV9pbWFnZVJlbmRlcmluZyhSZW5kZXJTdHlsZTo6aW5p dGlhbEltYWdlUmVuZGVyaW5nKCkpCisgICAgLCBtX2xpbmVHcmlkU25hcChSZW5kZXJTdHlsZTo6 aW5pdGlhbExpbmVHcmlkU25hcCgpKQogICAgICwgaHlwaGVuYXRpb25MaW1pdEJlZm9yZSgtMSkK ICAgICAsIGh5cGhlbmF0aW9uTGltaXRBZnRlcigtMSkKICAgICAsIGh5cGhlbmF0aW9uTGltaXRM aW5lcygtMSkKQEAgLTk2LDYgKzk3LDcgQEAgU3R5bGVSYXJlSW5oZXJpdGVkRGF0YTo6U3R5bGVS YXJlSW5oZXJpdAogICAgICwgdGV4dEVtcGhhc2lzUG9zaXRpb24oby50ZXh0RW1waGFzaXNQb3Np dGlvbikKICAgICAsIG1fbGluZUJveENvbnRhaW4oby5tX2xpbmVCb3hDb250YWluKQogICAgICwg bV9pbWFnZVJlbmRlcmluZyhvLm1faW1hZ2VSZW5kZXJpbmcpCisgICAgLCBtX2xpbmVHcmlkU25h cChvLm1fbGluZUdyaWRTbmFwKQogICAgICwgaHlwaGVuYXRpb25TdHJpbmcoby5oeXBoZW5hdGlv blN0cmluZykKICAgICAsIGh5cGhlbmF0aW9uTGltaXRCZWZvcmUoby5oeXBoZW5hdGlvbkxpbWl0 QmVmb3JlKQogICAgICwgaHlwaGVuYXRpb25MaW1pdEFmdGVyKG8uaHlwaGVuYXRpb25MaW1pdEFm dGVyKQpAQCAtMTY1LDcgKzE2Nyw4IEBAIGJvb2wgU3R5bGVSYXJlSW5oZXJpdGVkRGF0YTo6b3Bl cmF0b3I9PSgKICAgICAgICAgJiYgdGV4dEVtcGhhc2lzQ3VzdG9tTWFyayA9PSBvLnRleHRFbXBo YXNpc0N1c3RvbU1hcmsKICAgICAgICAgJiYgUXVvdGVzRGF0YTo6ZXF1YWwocXVvdGVzLmdldCgp LCBvLnF1b3Rlcy5nZXQoKSkKICAgICAgICAgJiYgbV9saW5lR3JpZCA9PSBvLm1fbGluZUdyaWQK LSAgICAgICAgJiYgbV9pbWFnZVJlbmRlcmluZyA9PSBvLm1faW1hZ2VSZW5kZXJpbmc7CisgICAg ICAgICYmIG1faW1hZ2VSZW5kZXJpbmcgPT0gby5tX2ltYWdlUmVuZGVyaW5nCisgICAgICAgICYm IG1fbGluZUdyaWRTbmFwID09IG8ubV9saW5lR3JpZFNuYXA7CiB9CiAKIGJvb2wgU3R5bGVSYXJl SW5oZXJpdGVkRGF0YTo6c2hhZG93RGF0YUVxdWl2YWxlbnQoY29uc3QgU3R5bGVSYXJlSW5oZXJp dGVkRGF0YSYgbykgY29uc3QKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9T dHlsZVJhcmVJbmhlcml0ZWREYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuaAkocmV2aXNpb24gOTk4ODcpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5o CSh3b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw3IEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBt X2xpbmVCb3hDb250YWluOiA3OyAvLyBMaW5lQm94Q29udGFpbgogICAgIC8vIENTUyBJbWFnZSBW YWx1ZXMgTGV2ZWwgMwogICAgIHVuc2lnbmVkIG1faW1hZ2VSZW5kZXJpbmcgOiAyOyAvLyBFSW1h Z2VSZW5kZXJpbmcKLQorICAgIHVuc2lnbmVkIG1fbGluZUdyaWRTbmFwIDogMjsgLy8gTGluZUdy aWRTbmFwCiAKICAgICBBdG9taWNTdHJpbmcgaHlwaGVuYXRpb25TdHJpbmc7CiAgICAgc2hvcnQg aHlwaGVuYXRpb25MaW1pdEJlZm9yZTsKQEAgLTEwNCw3ICsxMDQsNyBAQCBwdWJsaWM6CiAgICAg UmVmUHRyPFF1b3Rlc0RhdGE+IHF1b3RlczsKICAgICAKICAgICBBdG9taWNTdHJpbmcgbV9saW5l R3JpZDsKLQorICAgIAogI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCiAgICAgQ29sb3IgdGFwSGln aGxpZ2h0Q29sb3I7CiAjZW5kaWYKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5ODk5KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMTEt MTAgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjA2MAorICAgICAgICAKKyAgICAgICAgQWRk IHRlc3RzIGZvciBsaW5lLWdyaWQtc25hcCBwYXJzaW5nLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9j b21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9jc3MvZ2V0Q29tcHV0 ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4dDoKKyAg ICAgICAgKiBmYXN0L2xpbmUtZ3JpZC9saW5lLWdyaWQtc25hcC1wYXJzaW5nLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogZmFzdC9saW5lLWdyaWQvbGluZS1ncmlkLXNuYXAtcGFyc2lu Zy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xpbmUtZ3JpZC9zY3JpcHQtdGVzdHMvbGlu ZS1ncmlkLXNuYXAtcGFyc2luZy5qczogQWRkZWQuCisgICAgICAgICogc3ZnL2Nzcy9nZXRDb21w dXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dDoKKwogMjAxMS0xMS0xMCAgU3RlcGhlbiBXaGl0 ZSAgPHNlbm9yYmxhbmNvQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFByZS1l bXB0aXZlbHkgbWFyayBhIGNhbnZhcyB0ZXN0IGFzIGZhaWxpbmcgZm9yIG5leHQgU2tpYSByb2xs LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1z dHlsZS1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0 Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDk5ODg3 KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHls ZS1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTE1Myw2ICsxNTMsNyBAQCB6b29tOiAx OwogLXdlYmtpdC1saW5lLWJyZWFrOiBub3JtYWw7CiAtd2Via2l0LWxpbmUtY2xhbXA6IG5vbmU7 CiAtd2Via2l0LWxpbmUtZ3JpZDogbm9uZTsKKy13ZWJraXQtbGluZS1ncmlkLXNuYXA6IG5vbmU7 CiAtd2Via2l0LWxvY2FsZTogYXV0bzsKIC13ZWJraXQtbWFyZ2luLWJlZm9yZS1jb2xsYXBzZTog Y29sbGFwc2U7CiAtd2Via2l0LW1hcmdpbi1hZnRlci1jb2xsYXBzZTogY29sbGFwc2U7CkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9nZXRDb21wdXRlZFN0eWxlL2NvbXB1dGVkLXN0eWxlLXdp dGhvdXQtcmVuZGVyZXItZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zh c3QvY3NzL2dldENvbXB1dGVkU3R5bGUvY29tcHV0ZWQtc3R5bGUtd2l0aG91dC1yZW5kZXJlci1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDk5ODg3KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvZ2V0 Q29tcHV0ZWRTdHlsZS9jb21wdXRlZC1zdHlsZS13aXRob3V0LXJlbmRlcmVyLWV4cGVjdGVkLnR4 dAkod29ya2luZyBjb3B5KQpAQCAtMTUyLDYgKzE1Miw3IEBAIENvbXB1dGVkIHN0eWxlIG9mIGFu IGVsZW1lbnQgd2hvc2UgcGFyZW4KICAgICAtd2Via2l0LWxpbmUtYnJlYWs6IG5vcm1hbAogICAg IC13ZWJraXQtbGluZS1jbGFtcDogbm9uZQogICAgIC13ZWJraXQtbGluZS1ncmlkOiBub25lCisg ICAgLXdlYmtpdC1saW5lLWdyaWQtc25hcDogbm9uZQogICAgIC13ZWJraXQtbG9jYWxlOiBhdXRv CiAgICAgLXdlYmtpdC1tYXJnaW4tYmVmb3JlLWNvbGxhcHNlOiBjb2xsYXBzZQogICAgIC13ZWJr aXQtbWFyZ2luLWFmdGVyLWNvbGxhcHNlOiBjb2xsYXBzZQpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC9saW5lLWdyaWQvbGluZS1ncmlkLXNuYXAtcGFyc2luZy1leHBlY3RlZC50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQvbGluZS1ncmlkLXNuYXAtcGFyc2luZy1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xpbmUtZ3JpZC9s aW5lLWdyaWQtc25hcC1wYXJzaW5nLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSwyMyBAQAorVGVzdCBwYXJzaW5nIG9mIHRoZSBDU1MgbGluZS1ncmlkIHByb3BlcnR5LgorCitP biBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xs b3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyB0ZXN0KCItd2Via2l0LWxpbmUtZ3Jp ZC1zbmFwOiBub25lIikgaXMgIm5vbmUiCitQQVNTIHRlc3QoIi13ZWJraXQtbGluZS1ncmlkLXNu YXA6IGJhc2VsaW5lIikgaXMgImJhc2VsaW5lIgorUEFTUyB0ZXN0KCItd2Via2l0LWxpbmUtZ3Jp ZC1zbmFwOiBib3VuZHMiKSBpcyAiYm91bmRzIgorUEFTUyB0ZXN0KCItd2Via2l0LWxpbmUtZ3Jp ZC1zbmFwOiA7IikgaXMgIiIKK1BBU1MgdGVzdCgiLXdlYmtpdC1saW5lLWdyaWQtc25hcDogMSIp IGlzICIiCitQQVNTIHRlc3QoIi13ZWJraXQtbGluZS1ncmlkLXNuYXA6IDEuMiIpIGlzICIiCitQ QVNTIHRlc3QoIi13ZWJraXQtbGluZS1ncmlkLXNuYXA6IC0xIikgaXMgIiIKK1BBU1MgdGVzdCgi LXdlYmtpdC1saW5lLWdyaWQtc25hcDogMTJweCIpIGlzICIiCitQQVNTIHRlc3RDb21wdXRlZFN0 eWxlKCJub25lIikgaXMgIm5vbmUiCitQQVNTIHRlc3RDb21wdXRlZFN0eWxlKCIiKSBpcyAibm9u ZSIKK1BBU1MgdGVzdENvbXB1dGVkU3R5bGUoIjEycHgiKSBpcyAibm9uZSIKK1BBU1MgdGVzdElu aGVyaXRlZCgibm9uZSIpIGlzICJub25lIgorUEFTUyB0ZXN0SW5oZXJpdGVkKCJiYXNlbGluZSIp IGlzICJiYXNlbGluZSIKK1BBU1MgdGVzdEluaGVyaXRlZCgiYm91bmRzIikgaXMgImJvdW5kcyIK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L2xpbmUtZ3JpZC9saW5lLWdyaWQtc25hcC1wYXJzaW5nLmh0bWwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQvbGluZS1ncmlkLXNuYXAt cGFyc2luZy5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQv bGluZS1ncmlkLXNuYXAtcGFyc2luZy5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEwIEBA Cis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4K KzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJl LmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0 cy9saW5lLWdyaWQtc25hcC1wYXJzaW5nLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8u Li9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5Pgor PC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQvc2NyaXB0LXRlc3RzL2xp bmUtZ3JpZC1zbmFwLXBhcnNpbmcuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9s aW5lLWdyaWQvc2NyaXB0LXRlc3RzL2xpbmUtZ3JpZC1zbmFwLXBhcnNpbmcuanMJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xpbmUtZ3JpZC9zY3JpcHQtdGVzdHMvbGluZS1ncmlk LXNuYXAtcGFyc2luZy5qcwkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0OSBAQAorZGVzY3JpcHRp b24oJ1Rlc3QgcGFyc2luZyBvZiB0aGUgQ1NTIGxpbmUtZ3JpZCBwcm9wZXJ0eS4nKTsKKworZnVu Y3Rpb24gdGVzdChkZWNsYXJhdGlvbikgeworICAgIHZhciBkaXYgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKKyAgICBkaXYuc2V0QXR0cmlidXRlKCJzdHlsZSIsIGRlY2xhcmF0aW9u KTsKKyAgICByZXR1cm4gZGl2LnN0eWxlLndlYmtpdExpbmVHcmlkU25hcDsKK30KKworZnVuY3Rp b24gdGVzdENvbXB1dGVkU3R5bGUodmFsdWUpIHsKKyAgICB2YXIgZGl2ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChkaXYpOwor ICAgIGRpdi5zdHlsZS5zZXRQcm9wZXJ0eSgiLXdlYmtpdC1saW5lLWdyaWQtc25hcCIsIHZhbHVl KTsKKyAgICB2YXIgd2Via2l0Rmxvd0NvbXB1dGVkVmFsdWUgPSBnZXRDb21wdXRlZFN0eWxlKGRp dikuZ2V0UHJvcGVydHlWYWx1ZSgiLXdlYmtpdC1saW5lLWdyaWQtc25hcCIpOworICAgIGRvY3Vt ZW50LmJvZHkucmVtb3ZlQ2hpbGQoZGl2KTsKKyAgICByZXR1cm4gd2Via2l0Rmxvd0NvbXB1dGVk VmFsdWU7Cit9CisKK2Z1bmN0aW9uIHRlc3RJbmhlcml0ZWQocGFyZW50VmFsdWUpIHsKKyAgICB2 YXIgcGFyZW50RGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgZG9jdW1l bnQuYm9keS5hcHBlbmRDaGlsZChwYXJlbnREaXYpOworICAgIHBhcmVudERpdi5zdHlsZS5zZXRQ cm9wZXJ0eSgiLXdlYmtpdC1saW5lLWdyaWQtc25hcCIsIHBhcmVudFZhbHVlKTsKKworICAgIHZh ciBjaGlsZERpdiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIHBhcmVudERp di5hcHBlbmRDaGlsZChjaGlsZERpdik7CisKKyAgICB2YXIgY2hpbGRXZWJLaXRGbG93Q29tcHV0 ZWRWYWx1ZSA9IGdldENvbXB1dGVkU3R5bGUoY2hpbGREaXYpLmdldFByb3BlcnR5VmFsdWUoIi13 ZWJraXQtbGluZS1ncmlkLXNuYXAiKTsKKworICAgIHBhcmVudERpdi5yZW1vdmVDaGlsZChjaGls ZERpdik7CisgICAgZG9jdW1lbnQuYm9keS5yZW1vdmVDaGlsZChwYXJlbnREaXYpOworCisgICAg cmV0dXJuIGNoaWxkV2ViS2l0Rmxvd0NvbXB1dGVkVmFsdWU7Cit9CisKK3Nob3VsZEJlRXF1YWxU b1N0cmluZygndGVzdCgiLXdlYmtpdC1saW5lLWdyaWQtc25hcDogbm9uZSIpJywgIm5vbmUiKTsK K3Nob3VsZEJlRXF1YWxUb1N0cmluZygndGVzdCgiLXdlYmtpdC1saW5lLWdyaWQtc25hcDogYmFz ZWxpbmUiKScsICJiYXNlbGluZSIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Vi a2l0LWxpbmUtZ3JpZC1zbmFwOiBib3VuZHMiKScsICJib3VuZHMiKTsKK3Nob3VsZEJlRXF1YWxU b1N0cmluZygndGVzdCgiLXdlYmtpdC1saW5lLWdyaWQtc25hcDogOyIpJywgIiIpOworc2hvdWxk QmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0LWxpbmUtZ3JpZC1zbmFwOiAxIiknLCAiIik7 CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3Rlc3QoIi13ZWJraXQtbGluZS1ncmlkLXNuYXA6IDEu MiIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0LWxpbmUtZ3Jp ZC1zbmFwOiAtMSIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0 LWxpbmUtZ3JpZC1zbmFwOiAxMnB4IiknLCAiIik7CisKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygn dGVzdENvbXB1dGVkU3R5bGUoIm5vbmUiKScsICJub25lIik7CitzaG91bGRCZUVxdWFsVG9TdHJp bmcoJ3Rlc3RDb21wdXRlZFN0eWxlKCIiKScsICJub25lIik7CitzaG91bGRCZUVxdWFsVG9TdHJp bmcoJ3Rlc3RDb21wdXRlZFN0eWxlKCIxMnB4IiknLCAibm9uZSIpOworCitzaG91bGRCZUVxdWFs VG9TdHJpbmcoJ3Rlc3RJbmhlcml0ZWQoIm5vbmUiKScsICJub25lIik7CitzaG91bGRCZUVxdWFs VG9TdHJpbmcoJ3Rlc3RJbmhlcml0ZWQoImJhc2VsaW5lIiknLCAiYmFzZWxpbmUiKTsKK3Nob3Vs ZEJlRXF1YWxUb1N0cmluZygndGVzdEluaGVyaXRlZCgiYm91bmRzIiknLCAiYm91bmRzIik7Cklu ZGV4OiBMYXlvdXRUZXN0cy9zdmcvY3NzL2dldENvbXB1dGVkU3R5bGUtYmFzaWMtZXhwZWN0ZWQu dHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3N2Zy9jc3MvZ2V0Q29tcHV0ZWRTdHlsZS1i YXNpYy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDk5ODg3KQorKysgTGF5b3V0VGVzdHMvc3ZnL2Nz cy9nZXRDb21wdXRlZFN0eWxlLWJhc2ljLWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAt MzA0LDYgKzMwNCw4IEBAIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1saW4K IHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1saW5lLWNsYW1wKSA6IFtv YmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCiByZWN0OiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13 ZWJraXQtbGluZS1ncmlkKSA6IG5vbmUKIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUo LXdlYmtpdC1saW5lLWdyaWQpIDogW29iamVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KK3JlY3Q6IHN0 eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtpdC1saW5lLWdyaWQtc25hcCkgOiBub25lCityZWN0 OiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1ncmlkLXNuYXApIDogW29i amVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIHJlY3Q6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdl YmtpdC1sb2NhbGUpIDogYXV0bwogcmVjdDogc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZSgtd2Vi a2l0LWxvY2FsZSkgOiBbb2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogcmVjdDogc3R5bGUuZ2V0 UHJvcGVydHlWYWx1ZSgtd2Via2l0LW1hcmdpbi1iZWZvcmUtY29sbGFwc2UpIDogY29sbGFwc2UK QEAgLTc5MCw2ICs3OTIsOCBAQCBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtbGlu ZS1jCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJraXQtbGluZS1jbGFtcCkgOiBb b2JqZWN0IENTU1ByaW1pdGl2ZVZhbHVlXQogZzogc3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgtd2Vi a2l0LWxpbmUtZ3JpZCkgOiBub25lCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKC13ZWJr aXQtbGluZS1ncmlkKSA6IFtvYmplY3QgQ1NTUHJpbWl0aXZlVmFsdWVdCitnOiBzdHlsZS5nZXRQ cm9wZXJ0eVZhbHVlKC13ZWJraXQtbGluZS1ncmlkLXNuYXApIDogbm9uZQorZzogc3R5bGUuZ2V0 UHJvcGVydHlDU1NWYWx1ZSgtd2Via2l0LWxpbmUtZ3JpZC1zbmFwKSA6IFtvYmplY3QgQ1NTUHJp bWl0aXZlVmFsdWVdCiBnOiBzdHlsZS5nZXRQcm9wZXJ0eVZhbHVlKC13ZWJraXQtbG9jYWxlKSA6 IGF1dG8KIGc6IHN0eWxlLmdldFByb3BlcnR5Q1NTVmFsdWUoLXdlYmtpdC1sb2NhbGUpIDogW29i amVjdCBDU1NQcmltaXRpdmVWYWx1ZV0KIGc6IHN0eWxlLmdldFByb3BlcnR5VmFsdWUoLXdlYmtp dC1tYXJnaW4tYmVmb3JlLWNvbGxhcHNlKSA6IGNvbGxhcHNlCg==