78934 2012-02-17 13:58:34 -0800 Add line-align property for character grid alignment to line grids 2012-02-18 04:52:18 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt ossy oldest_to_newest 559515 0 hyatt 2012-02-17 13:58:34 -0800 Add line-align property for character grid alignment to line grids. 559521 1 127653 hyatt 2012-02-17 14:03:02 -0800 Created attachment 127653 Patch 559530 2 127653 mitz 2012-02-17 14:12:28 -0800 Comment on attachment 127653 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=127653&action=review > Source/WebCore/css/CSSPrimitiveValueMappings.h:3193 > +template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineAlign gridAlign) Let’s call this parameter lineAlign ;-) 559576 3 hyatt 2012-02-17 15:13:53 -0800 Fixed in r108133. 559767 4 ossy 2012-02-18 04:52:18 -0800 (In reply to comment #3) > Fixed in r108133. And you missed to update layout test results. I did it instead of you - http://trac.webkit.org/changeset/108158 127653 2012-02-17 14:03:02 -0800 2012-02-17 14:12:28 -0800 Patch patch.txt text/plain 18172 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwODExOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAyLTE3ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Nzg5MzQKKyAgICAgICAgCisgICAgICAgIEFkZCB0aGUgLXdlYmtp dC1saW5lLWFsaWduIHByb3BlcnR5IHRvIHN1cHBvcnQgdGhlIGFsaWdubWVudCBvZiBsaW5lcyBp biB0aGUgaW5saW5lIGRpcmVjdGlvbgorICAgICAgICB0byB0aGUgbGluZSBncmlkLgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGZhc3QvbGlu ZS1ncmlkL2xpbmUtYWxpZ24tcGFyc2luZy5odG1sCisKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0 ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uOjpnZXRQcm9wZXJ0eUNTU1ZhbHVlKToK KyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNl cjo6cGFyc2VWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3Mu aDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1 ZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZh bHVlOjpvcGVyYXRvciBMaW5lQWxpZ24pOgorICAgICAgICAqIGNzcy9DU1NQcm9wZXJ0eS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eTo6aXNJbmhlcml0ZWRQcm9wZXJ0eSk6Cisg ICAgICAgICogY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW46CisgICAgICAgICogY3NzL0NTU1N0eWxl QXBwbHlQcm9wZXJ0eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZUFwcGx5UHJvcGVy dHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0 b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0 eSk6CisgICAgICAgICogY3NzL0NTU1ZhbHVlS2V5d29yZHMuaW46CisgICAgICAgICogcmVuZGVy aW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxl OjpkaWZmKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaDoKKyAgICAg ICAgKiByZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaDoKKyAgICAgICAgKiBy ZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpTdHlsZVJhcmVJbmhlcml0ZWREYXRhKToKKyAg ICAgICAgKFdlYkNvcmU6OlN0eWxlUmFyZUluaGVyaXRlZERhdGE6Om9wZXJhdG9yPT0pOgorICAg ICAgICAqIHJlbmRlcmluZy9zdHlsZS9TdHlsZVJhcmVJbmhlcml0ZWREYXRhLmg6CisgICAgICAg IChTdHlsZVJhcmVJbmhlcml0ZWREYXRhKToKKwogMjAxMi0wMi0xNyAgS2FsZXYgTGVtYmVyICA8 a2FsZXZsZW1iZXJAZ21haWwuY29tPgogCiAgICAgICAgIFJlbW92ZSB1bnVzZWQgcGFyYW1ldGVy cyBmcm9tIFdURiB0aHJlYWRpbmcgQVBJCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29t cHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9j c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAkocmV2aXNpb24gMTA3NTk4KQorKysg U291cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIzOSw2ICsyMzksNyBAQCBzdGF0aWMgY29uc3QgaW50IGNvbXB1dGVkUHJv cGVydGllc1tdID0gCiAgICAgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdEJlZm9yZSwK ICAgICBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUxpbWl0TGluZXMsCiAgICAgQ1NTUHJvcGVy dHlXZWJraXRIeXBoZW5zLAorICAgIENTU1Byb3BlcnR5V2Via2l0TGluZUFsaWduLAogICAgIENT U1Byb3BlcnR5V2Via2l0TGluZUJveENvbnRhaW4sCiAgICAgQ1NTUHJvcGVydHlXZWJraXRMaW5l QnJlYWssCiAgICAgQ1NTUHJvcGVydHlXZWJraXRMaW5lQ2xhbXAsCkBAIC0yMjIyLDYgKzIyMjMs OCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NDb21wdXRlZFN0eWxlRGVjCiAgICAgICAgICAg ICByZXR1cm4gY3NzVmFsdWVQb29sLT5jcmVhdGVWYWx1ZShzdHlsZS0+bGluZUdyaWQoKSwgQ1NT UHJpbWl0aXZlVmFsdWU6OkNTU19TVFJJTkcpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0TGluZVNuYXA6CiAgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0 ZShzdHlsZS0+bGluZVNuYXAoKSk7CisgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5l QWxpZ246CisgICAgICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNyZWF0ZShzdHls ZS0+bGluZUFsaWduKCkpOwogICAgICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0V3JpdGluZ01v ZGU6CiAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sLT5jcmVhdGVWYWx1ZShzdHlsZS0+ d3JpdGluZ01vZGUoKSk7CiAgICAgICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0Q29tYmlu ZToKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCShyZXZpc2lvbiAxMDc1OTgpCisrKyBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjA1NSw2 ICsyMDU1LDEwIEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVZhbHVlKGludCBwcm9wSWQsIGIKICAg ICAgICAgaWYgKGlkID09IENTU1ZhbHVlTm9uZSB8fCBpZCA9PSBDU1NWYWx1ZUJhc2VsaW5lIHx8 IGlkID09IENTU1ZhbHVlQ29udGFpbikKICAgICAgICAgICAgIHZhbGlkUHJpbWl0aXZlID0gdHJ1 ZTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVBbGlnbjoK KyAgICAgICAgaWYgKGlkID09IENTU1ZhbHVlTm9uZSB8fCBpZCA9PSBDU1NWYWx1ZUVkZ2VzKQor ICAgICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOworICAgICAgICBicmVhazsKICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0TG9jYWxlOgogICAgICAgICBpZiAoaWQgPT0gQ1NTVmFsdWVB dXRvIHx8IHZhbHVlLT51bml0ID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfU1RSSU5HKQogICAg ICAgICAgICAgdmFsaWRQcmltaXRpdmUgPSB0cnVlOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCShyZXZpc2lvbiAxMDc1OTgpCisrKyBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCSh3b3JraW5nIGNv cHkpCkBAIC0zMTkwLDYgKzMxOTAsMzMgQEAgdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZl VmFsdWU6Om9wZQogICAgIH0KIH0KIAordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU1ByaW1pdGl2ZVZhbHVlKExpbmVBbGlnbiBncmlkQWxpZ24pCisgICAgOiBDU1NWYWx1 ZShQcmltaXRpdmVDbGFzcykKK3sKKyAgICBtX3ByaW1pdGl2ZVVuaXRUeXBlID0gQ1NTX0lERU5U OworICAgIHN3aXRjaCAoZ3JpZEFsaWduKSB7CisgICAgY2FzZSBMaW5lQWxpZ25Ob25lOgorICAg ICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVOb25lOworICAgICAgICBicmVhazsKKyAgICBj YXNlIExpbmVBbGlnbkVkZ2VzOgorICAgICAgICBtX3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVFZGdl czsKKyAgICAgICAgYnJlYWs7CisgICAgfQorfQorCit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmlt aXRpdmVWYWx1ZTo6b3BlcmF0b3IgTGluZUFsaWduKCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKG1f dmFsdWUuaWRlbnQpIHsKKyAgICBjYXNlIENTU1ZhbHVlTm9uZToKKyAgICAgICAgcmV0dXJuIExp bmVBbGlnbk5vbmU7CisgICAgY2FzZSBDU1NWYWx1ZUVkZ2VzOgorICAgICAgICByZXR1cm4gTGlu ZUFsaWduRWRnZXM7CisgICAgZGVmYXVsdDoKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgIHJldHVybiBMaW5lQWxpZ25Ob25lOworICAgIH0KK30KKwogdGVtcGxhdGU8PiBp bmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2ZVZhbHVlKEVTcGVhayBlKQogICAg IDogQ1NTVmFsdWUoUHJpbWl0aXZlQ2xhc3MpCiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUHJvcGVydHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0eS5jcHAJKHJldmlzaW9uIDEwNzU5OCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9w ZXJ0eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyOCw2ICszMjgsNyBAQCBib29sIENTU1Byb3Bl cnR5Ojppc0luaGVyaXRlZFByb3BlcnR5KHVuCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5 cGhlbmF0ZUxpbWl0QmVmb3JlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVM aW1pdExpbmVzOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5zOgorICAgIGNhc2Ug Q1NTUHJvcGVydHlXZWJraXRMaW5lQWxpZ246CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExp bmVCb3hDb250YWluOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lQnJlYWs6CiAgICAg Y2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVHcmlkOgpJbmRleDogU291cmNlL1dlYkNvcmUvY3Nz L0NTU1Byb3BlcnR5TmFtZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NT U1Byb3BlcnR5TmFtZXMuaW4JKHJldmlzaW9uIDEwNzU5OCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcm9wZXJ0eU5hbWVzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0yNzEsNiArMjcxLDcgQEAg ei1pbmRleAogLXdlYmtpdC1oeXBoZW5zCiAtZXB1Yi1oeXBoZW5zID0gLXdlYmtpdC1oeXBoZW5z CiAtd2Via2l0LWxpbmUtYm94LWNvbnRhaW4KKy13ZWJraXQtbGluZS1hbGlnbgogLXdlYmtpdC1s aW5lLWJyZWFrCiAtd2Via2l0LWxpbmUtY2xhbXAKIC13ZWJraXQtbGluZS1ncmlkCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkocmV2aXNpb24g MTA3NTk4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE5MjcsNiArMTkyNyw3IEBAIENTU1N0eWxlQXBwbHlQcm9wZXJ0 eTo6Q1NTU3R5bGVBcHBseVByb3AKIAogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0 eVdlYmtpdExpbmVHcmlkLCBBcHBseVByb3BlcnR5U3RyaW5nPE1hcE5vbmVUb051bGwsICZSZW5k ZXJTdHlsZTo6bGluZUdyaWQsICZSZW5kZXJTdHlsZTo6c2V0TGluZUdyaWQsICZSZW5kZXJTdHls ZTo6aW5pdGlhbExpbmVHcmlkPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRMaW5lU25hcCwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8TGlu ZVNuYXAsICZSZW5kZXJTdHlsZTo6bGluZVNuYXAsIExpbmVTbmFwLCAmUmVuZGVyU3R5bGU6OnNl dExpbmVTbmFwLCBMaW5lU25hcCwgJlJlbmRlclN0eWxlOjppbml0aWFsTGluZVNuYXA+OjpjcmVh dGVIYW5kbGVyKCkpOworICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdExp bmVBbGlnbiwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8TGluZUFsaWduLCAmUmVuZGVyU3R5bGU6Omxp bmVBbGlnbiwgTGluZUFsaWduLCAmUmVuZGVyU3R5bGU6OnNldExpbmVBbGlnbiwgTGluZUFsaWdu LCAmUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lQWxpZ24+OjpjcmVhdGVIYW5kbGVyKCkpOwogCiAg ICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0VGV4dENvbWJpbmUsIEFwcGx5 UHJvcGVydHlEZWZhdWx0PFRleHRDb21iaW5lLCAmUmVuZGVyU3R5bGU6OnRleHRDb21iaW5lLCBU ZXh0Q29tYmluZSwgJlJlbmRlclN0eWxlOjpzZXRUZXh0Q29tYmluZSwgVGV4dENvbWJpbmUsICZS ZW5kZXJTdHlsZTo6aW5pdGlhbFRleHRDb21iaW5lPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBz ZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRUZXh0RW1waGFzaXNQb3NpdGlvbiwg QXBwbHlQcm9wZXJ0eURlZmF1bHQ8VGV4dEVtcGhhc2lzUG9zaXRpb24sICZSZW5kZXJTdHlsZTo6 dGV4dEVtcGhhc2lzUG9zaXRpb24sIFRleHRFbXBoYXNpc1Bvc2l0aW9uLCAmUmVuZGVyU3R5bGU6 OnNldFRleHRFbXBoYXNpc1Bvc2l0aW9uLCBUZXh0RW1waGFzaXNQb3NpdGlvbiwgJlJlbmRlclN0 eWxlOjppbml0aWFsVGV4dEVtcGhhc2lzUG9zaXRpb24+OjpjcmVhdGVIYW5kbGVyKCkpOwpJbmRl eDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkocmV2aXNpb24gMTA3NTk4 KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MDU4LDYgKzQwNTgsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJv cGVydHkoaW50CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUxpbWl0QWZ0ZXI6 CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEh5cGhlbmF0ZUxpbWl0QmVmb3JlOgogICAgIGNh c2UgQ1NTUHJvcGVydHlXZWJraXRIeXBoZW5hdGVMaW1pdExpbmVzOgorICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRMaW5lQWxpZ246CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVHcmlk OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lU25hcDoKICAgICBjYXNlIENTU1Byb3Bl cnR5V2Via2l0VGV4dENvbWJpbmU6CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVmFsdWVL ZXl3b3Jkcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTVmFsdWVLZXl3 b3Jkcy5pbgkocmV2aXNpb24gMTA3NTk4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ZhbHVl S2V5d29yZHMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTg4Miw2ICs4ODIsOSBAQCBtYXhpbXVtCiB3 cmFwCiAvLyBub25lCiAKKy8vIC13ZWJraXQtbGluZS1hbGlnbgorZWRnZXMKKwogI2lmIGRlZmlu ZWQoRU5BQkxFX0NTU19GSUxURVJTKSAmJiBFTkFCTEVfQ1NTX0ZJTFRFUlMKIC8vIC13ZWJraXQt ZmlsdGVyCiAjaWYgZGVmaW5lZChFTkFCTEVfQ1NTX1NIQURFUlMpICYmIEVOQUJMRV9DU1NfU0hB REVSUwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuY3BwCShyZXZpc2lvbiAxMDc1OTgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NjYsNyArNDY2LDggQEAgU3R5 bGVEaWZmZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0IAogICAgICAgICAgICAgfHwgcmFy ZUluaGVyaXRlZERhdGEtPnRleHRFbXBoYXNpc0N1c3RvbU1hcmsgIT0gb3RoZXItPnJhcmVJbmhl cml0ZWREYXRhLT50ZXh0RW1waGFzaXNDdXN0b21NYXJrCiAgICAgICAgICAgICB8fCByYXJlSW5o ZXJpdGVkRGF0YS0+bV9saW5lQm94Q29udGFpbiAhPSBvdGhlci0+cmFyZUluaGVyaXRlZERhdGEt Pm1fbGluZUJveENvbnRhaW4KICAgICAgICAgICAgIHx8IHJhcmVJbmhlcml0ZWREYXRhLT5tX2xp bmVHcmlkICE9IG90aGVyLT5yYXJlSW5oZXJpdGVkRGF0YS0+bV9saW5lR3JpZAotICAgICAgICAg ICAgfHwgcmFyZUluaGVyaXRlZERhdGEtPm1fbGluZVNuYXAgIT0gb3RoZXItPnJhcmVJbmhlcml0 ZWREYXRhLT5tX2xpbmVTbmFwKQorICAgICAgICAgICAgfHwgcmFyZUluaGVyaXRlZERhdGEtPm1f bGluZVNuYXAgIT0gb3RoZXItPnJhcmVJbmhlcml0ZWREYXRhLT5tX2xpbmVTbmFwCisgICAgICAg ICAgICB8fCByYXJlSW5oZXJpdGVkRGF0YS0+bV9saW5lQWxpZ24gIT0gb3RoZXItPnJhcmVJbmhl cml0ZWREYXRhLT5tX2xpbmVBbGlnbikKICAgICAgICAgICAgIHJldHVybiBTdHlsZURpZmZlcmVu Y2VMYXlvdXQ7CiAKICAgICAgICAgaWYgKCFyYXJlSW5oZXJpdGVkRGF0YS0+c2hhZG93RGF0YUVx dWl2YWxlbnQoKm90aGVyLT5yYXJlSW5oZXJpdGVkRGF0YS5nZXQoKSkpCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGUuaAkocmV2aXNpb24gMTA3NTk4 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmgJKHdvcmtp bmcgY29weSkKQEAgLTkwNCw2ICs5MDQsNyBAQCBwdWJsaWM6CiAKICAgICBjb25zdCBBdG9taWNT dHJpbmcmIGxpbmVHcmlkKCkgY29uc3QgeyByZXR1cm4gcmFyZUluaGVyaXRlZERhdGEtPm1fbGlu ZUdyaWQ7IH0KICAgICBMaW5lU25hcCBsaW5lU25hcCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19j YXN0PExpbmVTbmFwPihyYXJlSW5oZXJpdGVkRGF0YS0+bV9saW5lU25hcCk7IH0KKyAgICBMaW5l QWxpZ24gbGluZUFsaWduKCkgY29uc3QgeyByZXR1cm4gc3RhdGljX2Nhc3Q8TGluZUFsaWduPihy YXJlSW5oZXJpdGVkRGF0YS0+bV9saW5lQWxpZ24pOyB9CiAKICAgICBXcmFwRmxvdyB3cmFwRmxv dygpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFdyYXBGbG93PihyYXJlTm9uSW5oZXJpdGVk RGF0YS0+bV93cmFwRmxvdyk7IH0KICAgICBXcmFwVGhyb3VnaCB3cmFwVGhyb3VnaCgpIGNvbnN0 IHsgcmV0dXJuIHN0YXRpY19jYXN0PFdyYXBUaHJvdWdoPihyYXJlTm9uSW5oZXJpdGVkRGF0YS0+ bV93cmFwVGhyb3VnaCk7IH0KQEAgLTEzMDMsNiArMTMwNCw3IEBAIHB1YmxpYzoKIAogICAgIHZv aWQgc2V0TGluZUdyaWQoY29uc3QgQXRvbWljU3RyaW5nJiBsaW5lR3JpZCkgeyBTRVRfVkFSKHJh cmVJbmhlcml0ZWREYXRhLCBtX2xpbmVHcmlkLCBsaW5lR3JpZCk7IH0KICAgICB2b2lkIHNldExp bmVTbmFwKExpbmVTbmFwIGxpbmVTbmFwKSB7IFNFVF9WQVIocmFyZUluaGVyaXRlZERhdGEsIG1f bGluZVNuYXAsIGxpbmVTbmFwKTsgfQorICAgIHZvaWQgc2V0TGluZUFsaWduKExpbmVBbGlnbiBs aW5lQWxpZ24pIHsgU0VUX1ZBUihyYXJlSW5oZXJpdGVkRGF0YSwgbV9saW5lQWxpZ24sIGxpbmVB bGlnbik7IH0KIAogICAgIHZvaWQgc2V0Rmxvd1RocmVhZChjb25zdCBBdG9taWNTdHJpbmcmIGZs b3dUaHJlYWQpIHsgU0VUX1ZBUihyYXJlTm9uSW5oZXJpdGVkRGF0YSwgbV9mbG93VGhyZWFkLCBm bG93VGhyZWFkKTsgfQogICAgIHZvaWQgc2V0UmVnaW9uVGhyZWFkKGNvbnN0IEF0b21pY1N0cmlu ZyYgcmVnaW9uVGhyZWFkKSB7IFNFVF9WQVIocmFyZU5vbkluaGVyaXRlZERhdGEsIG1fcmVnaW9u VGhyZWFkLCByZWdpb25UaHJlYWQpOyB9CkBAIC0xNjMyLDYgKzE2MzQsNyBAQCBwdWJsaWM6CiAK ICAgICBzdGF0aWMgY29uc3QgQXRvbWljU3RyaW5nJiBpbml0aWFsTGluZUdyaWQoKSB7IHJldHVy biBudWxsQXRvbTsgfQogICAgIHN0YXRpYyBMaW5lU25hcCBpbml0aWFsTGluZVNuYXAoKSB7IHJl dHVybiBMaW5lU25hcE5vbmU7IH0KKyAgICBzdGF0aWMgTGluZUFsaWduIGluaXRpYWxMaW5lQWxp Z24oKSB7IHJldHVybiBMaW5lQWxpZ25Ob25lOyB9CiAKICAgICBzdGF0aWMgY29uc3QgQXRvbWlj U3RyaW5nJiBpbml0aWFsRmxvd1RocmVhZCgpIHsgcmV0dXJuIG51bGxBdG9tOyB9CiAgICAgc3Rh dGljIGNvbnN0IEF0b21pY1N0cmluZyYgaW5pdGlhbFJlZ2lvblRocmVhZCgpIHsgcmV0dXJuIG51 bGxBdG9tOyB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGVDb25zdGFudHMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAkocmV2aXNpb24gMTA3NTk4KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ1Niw2ICs0NTYsOCBAQCBlbnVtIENvbHVtbkF4aXMgeyBIb3Jpem9udGFsQ29sdW1u QXhpcywgCiAKIGVudW0gTGluZVNuYXAgeyBMaW5lU25hcE5vbmUsIExpbmVTbmFwQmFzZWxpbmUs IExpbmVTbmFwQ29udGFpbiB9OwogCitlbnVtIExpbmVBbGlnbiB7IExpbmVBbGlnbk5vbmUsIExp bmVBbGlnbkVkZ2VzIH07CisKIGVudW0gV3JhcEZsb3cgeyBXcmFwRmxvd0F1dG8sIFdyYXBGbG93 Qm90aCwgV3JhcEZsb3dMZWZ0LCBXcmFwRmxvd1JpZ2h0LCBXcmFwRmxvd01heGltdW0sIFdyYXBG bG93Q2xlYXIgfTsKIAogZW51bSBXcmFwVGhyb3VnaCB7IFdyYXBUaHJvdWdoV3JhcCwgV3JhcFRo cm91Z2hOb25lIH07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVS YXJlSW5oZXJpdGVkRGF0YS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRlZERhdGEuY3BwCShyZXZpc2lvbiAxMDc1OTgpCisr KyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTU0LDYgKzU0LDcgQEAgU3R5bGVSYXJlSW5oZXJpdGVkRGF0 YTo6U3R5bGVSYXJlSW5oZXJpdAogICAgICwgbV9saW5lQm94Q29udGFpbihSZW5kZXJTdHlsZTo6 aW5pdGlhbExpbmVCb3hDb250YWluKCkpCiAgICAgLCBtX2ltYWdlUmVuZGVyaW5nKFJlbmRlclN0 eWxlOjppbml0aWFsSW1hZ2VSZW5kZXJpbmcoKSkKICAgICAsIG1fbGluZVNuYXAoUmVuZGVyU3R5 bGU6OmluaXRpYWxMaW5lU25hcCgpKQorICAgICwgbV9saW5lQWxpZ24oUmVuZGVyU3R5bGU6Omlu aXRpYWxMaW5lQWxpZ24oKSkKICAgICAsIGh5cGhlbmF0aW9uTGltaXRCZWZvcmUoLTEpCiAgICAg LCBoeXBoZW5hdGlvbkxpbWl0QWZ0ZXIoLTEpCiAgICAgLCBoeXBoZW5hdGlvbkxpbWl0TGluZXMo LTEpCkBAIC05OCw2ICs5OSw3IEBAIFN0eWxlUmFyZUluaGVyaXRlZERhdGE6OlN0eWxlUmFyZUlu aGVyaXQKICAgICAsIG1fbGluZUJveENvbnRhaW4oby5tX2xpbmVCb3hDb250YWluKQogICAgICwg bV9pbWFnZVJlbmRlcmluZyhvLm1faW1hZ2VSZW5kZXJpbmcpCiAgICAgLCBtX2xpbmVTbmFwKG8u bV9saW5lU25hcCkKKyAgICAsIG1fbGluZUFsaWduKG8ubV9saW5lQWxpZ24pCiAgICAgLCBoeXBo ZW5hdGlvblN0cmluZyhvLmh5cGhlbmF0aW9uU3RyaW5nKQogICAgICwgaHlwaGVuYXRpb25MaW1p dEJlZm9yZShvLmh5cGhlbmF0aW9uTGltaXRCZWZvcmUpCiAgICAgLCBoeXBoZW5hdGlvbkxpbWl0 QWZ0ZXIoby5oeXBoZW5hdGlvbkxpbWl0QWZ0ZXIpCkBAIC0xNjgsNyArMTcwLDggQEAgYm9vbCBT dHlsZVJhcmVJbmhlcml0ZWREYXRhOjpvcGVyYXRvcj09KAogICAgICAgICAmJiBRdW90ZXNEYXRh OjplcXVhbChxdW90ZXMuZ2V0KCksIG8ucXVvdGVzLmdldCgpKQogICAgICAgICAmJiBtX2xpbmVH cmlkID09IG8ubV9saW5lR3JpZAogICAgICAgICAmJiBtX2ltYWdlUmVuZGVyaW5nID09IG8ubV9p bWFnZVJlbmRlcmluZwotICAgICAgICAmJiBtX2xpbmVTbmFwID09IG8ubV9saW5lU25hcDsKKyAg ICAgICAgJiYgbV9saW5lU25hcCA9PSBvLm1fbGluZVNuYXAKKyAgICAgICAgJiYgbV9saW5lQWxp Z24gPT0gby5tX2xpbmVBbGlnbjsKIH0KIAogYm9vbCBTdHlsZVJhcmVJbmhlcml0ZWREYXRhOjpz aGFkb3dEYXRhRXF1aXZhbGVudChjb25zdCBTdHlsZVJhcmVJbmhlcml0ZWREYXRhJiBvKSBjb25z dApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1N0eWxlUmFyZUluaGVyaXRl ZERhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvU3R5 bGVSYXJlSW5oZXJpdGVkRGF0YS5oCShyZXZpc2lvbiAxMDc1OTgpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3R5bGUvU3R5bGVSYXJlSW5oZXJpdGVkRGF0YS5oCSh3b3JraW5nIGNvcHkp CkBAIC05Miw2ICs5Miw3IEBAIHB1YmxpYzoKICAgICAvLyBDU1MgSW1hZ2UgVmFsdWVzIExldmVs IDMKICAgICB1bnNpZ25lZCBtX2ltYWdlUmVuZGVyaW5nIDogMjsgLy8gRUltYWdlUmVuZGVyaW5n CiAgICAgdW5zaWduZWQgbV9saW5lU25hcCA6IDI7IC8vIExpbmVTbmFwCisgICAgdW5zaWduZWQg bV9saW5lQWxpZ24gOiAxOyAvLyBMaW5lQWxpZ24KIAogICAgIEF0b21pY1N0cmluZyBoeXBoZW5h dGlvblN0cmluZzsKICAgICBzaG9ydCBoeXBoZW5hdGlvbkxpbWl0QmVmb3JlOwpJbmRleDogTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwko cmV2aXNpb24gMTA4MTE5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDItMTcgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUu Y29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03 ODkzNAorICAgICAgICAKKyAgICAgICAgQWRkIHRoZSAtd2Via2l0LWxpbmUtYWxpZ24gcHJvcGVy dHkgdG8gc3VwcG9ydCB0aGUgYWxpZ25tZW50IG9mIGxpbmVzIGluIHRoZSBpbmxpbmUgZGlyZWN0 aW9uCisgICAgICAgIHRvIHRoZSBsaW5lIGdyaWQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xpbmUtZ3JpZC9saW5lLWFsaWduLXBhcnNp bmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xpbmUtZ3JpZC9saW5lLWFs aWduLXBhcnNpbmcuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9saW5lLWdyaWQvc2NyaXB0 LXRlc3RzL2xpbmUtYWxpZ24tcGFyc2luZy5qczogQWRkZWQuCisKIDIwMTItMDItMTYgIERhbmEg SmFuc2VucyAgPGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZS1l bmFibGUgY29tcG9zaXRpbmcvY3VsbGluZy9zY3JvbGxlZC13aXRoaW4tYm94c2hhZG93Lmh0bWwK SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvbGluZS1ncmlkL2xpbmUtYWxpZ24tcGFyc2luZy1leHBl Y3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9saW5lLWdyaWQvbGluZS1h bGlnbi1wYXJzaW5nLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zh c3QvbGluZS1ncmlkL2xpbmUtYWxpZ24tcGFyc2luZy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsMjEgQEAKK1Rlc3QgcGFyc2luZyBvZiB0aGUgQ1NTIGxpbmUtc25hcCBwcm9w ZXJ0eS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgdGVzdCgiLXdlYmtp dC1saW5lLWFsaWduOiBub25lIikgaXMgIm5vbmUiCitQQVNTIHRlc3QoIi13ZWJraXQtbGluZS1h bGlnbjogZWRnZXMiKSBpcyAiZWRnZXMiCitQQVNTIHRlc3QoIi13ZWJraXQtbGluZS1hbGlnbjog OyIpIGlzICIiCitQQVNTIHRlc3QoIi13ZWJraXQtbGluZS1hbGlnbjogMSIpIGlzICIiCitQQVNT IHRlc3QoIi13ZWJraXQtbGluZS1hbGlnbjogMS4yIikgaXMgIiIKK1BBU1MgdGVzdCgiLXdlYmtp dC1saW5lLWFsaWduOiAtMSIpIGlzICIiCitQQVNTIHRlc3QoIi13ZWJraXQtbGluZS1hbGlnbjog MTJweCIpIGlzICIiCitQQVNTIHRlc3RDb21wdXRlZFN0eWxlKCJub25lIikgaXMgIm5vbmUiCitQ QVNTIHRlc3RDb21wdXRlZFN0eWxlKCIiKSBpcyAibm9uZSIKK1BBU1MgdGVzdENvbXB1dGVkU3R5 bGUoIjEycHgiKSBpcyAibm9uZSIKK1BBU1MgdGVzdEluaGVyaXRlZCgibm9uZSIpIGlzICJub25l IgorUEFTUyB0ZXN0SW5oZXJpdGVkKCJlZGdlcyIpIGlzICJlZGdlcyIKK1BBU1Mgc3VjY2Vzc2Z1 bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9m YXN0L2xpbmUtZ3JpZC9saW5lLWFsaWduLXBhcnNpbmcuaHRtbAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9mYXN0L2xpbmUtZ3JpZC9saW5lLWFsaWduLXBhcnNpbmcuaHRtbAkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2Zhc3QvbGluZS1ncmlkL2xpbmUtYWxpZ24tcGFyc2luZy5odG1s CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEwIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0v L0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uLy4u L2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxi b2R5PgorPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0cy9saW5lLWFsaWduLXBhcnNpbmcuanMiPjwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L2xpbmUtZ3JpZC9zY3JpcHQtdGVzdHMvbGluZS1hbGlnbi1wYXJzaW5nLmpzCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2Zhc3QvbGluZS1ncmlkL3NjcmlwdC10ZXN0cy9saW5lLWFsaWduLXBh cnNpbmcuanMJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2xpbmUtZ3JpZC9zY3Jp cHQtdGVzdHMvbGluZS1hbGlnbi1wYXJzaW5nLmpzCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ4 IEBACitkZXNjcmlwdGlvbignVGVzdCBwYXJzaW5nIG9mIHRoZSBDU1MgbGluZS1zbmFwIHByb3Bl cnR5LicpOworCitmdW5jdGlvbiB0ZXN0KGRlY2xhcmF0aW9uKSB7CisgICAgdmFyIGRpdiA9IGRv Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgIGRpdi5zZXRBdHRyaWJ1dGUoInN0eWxl IiwgZGVjbGFyYXRpb24pOworICAgIHJldHVybiBkaXYuc3R5bGUud2Via2l0TGluZUFsaWduOwor fQorCitmdW5jdGlvbiB0ZXN0Q29tcHV0ZWRTdHlsZSh2YWx1ZSkgeworICAgIHZhciBkaXYgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENo aWxkKGRpdik7CisgICAgZGl2LnN0eWxlLnNldFByb3BlcnR5KCItd2Via2l0LWxpbmUtYWxpZ24i LCB2YWx1ZSk7CisgICAgdmFyIHdlYmtpdEZsb3dDb21wdXRlZFZhbHVlID0gZ2V0Q29tcHV0ZWRT dHlsZShkaXYpLmdldFByb3BlcnR5VmFsdWUoIi13ZWJraXQtbGluZS1hbGlnbiIpOworICAgIGRv Y3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQoZGl2KTsKKyAgICByZXR1cm4gd2Via2l0Rmxvd0NvbXB1 dGVkVmFsdWU7Cit9CisKK2Z1bmN0aW9uIHRlc3RJbmhlcml0ZWQocGFyZW50VmFsdWUpIHsKKyAg ICB2YXIgcGFyZW50RGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgZG9j dW1lbnQuYm9keS5hcHBlbmRDaGlsZChwYXJlbnREaXYpOworICAgIHBhcmVudERpdi5zdHlsZS5z ZXRQcm9wZXJ0eSgiLXdlYmtpdC1saW5lLWFsaWduIiwgcGFyZW50VmFsdWUpOworCisgICAgdmFy IGNoaWxkRGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgcGFyZW50RGl2 LmFwcGVuZENoaWxkKGNoaWxkRGl2KTsKKworICAgIHZhciBjaGlsZFdlYktpdEZsb3dDb21wdXRl ZFZhbHVlID0gZ2V0Q29tcHV0ZWRTdHlsZShjaGlsZERpdikuZ2V0UHJvcGVydHlWYWx1ZSgiLXdl YmtpdC1saW5lLWFsaWduIik7CisKKyAgICBwYXJlbnREaXYucmVtb3ZlQ2hpbGQoY2hpbGREaXYp OworICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQocGFyZW50RGl2KTsKKworICAgIHJldHVy biBjaGlsZFdlYktpdEZsb3dDb21wdXRlZFZhbHVlOworfQorCitzaG91bGRCZUVxdWFsVG9TdHJp bmcoJ3Rlc3QoIi13ZWJraXQtbGluZS1hbGlnbjogbm9uZSIpJywgIm5vbmUiKTsKK3Nob3VsZEJl RXF1YWxUb1N0cmluZygndGVzdCgiLXdlYmtpdC1saW5lLWFsaWduOiBlZGdlcyIpJywgImVkZ2Vz Iik7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ3Rlc3QoIi13ZWJraXQtbGluZS1hbGlnbjogOyIp JywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Via2l0LWxpbmUtYWxpZ246 IDEiKScsICIiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygndGVzdCgiLXdlYmtpdC1saW5lLWFs aWduOiAxLjIiKScsICIiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygndGVzdCgiLXdlYmtpdC1s aW5lLWFsaWduOiAtMSIpJywgIiIpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0ZXN0KCItd2Vi a2l0LWxpbmUtYWxpZ246IDEycHgiKScsICIiKTsKKworc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCd0 ZXN0Q29tcHV0ZWRTdHlsZSgibm9uZSIpJywgIm5vbmUiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmlu ZygndGVzdENvbXB1dGVkU3R5bGUoIiIpJywgIm5vbmUiKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmlu ZygndGVzdENvbXB1dGVkU3R5bGUoIjEycHgiKScsICJub25lIik7CisKK3Nob3VsZEJlRXF1YWxU b1N0cmluZygndGVzdEluaGVyaXRlZCgibm9uZSIpJywgIm5vbmUiKTsKK3Nob3VsZEJlRXF1YWxU b1N0cmluZygndGVzdEluaGVyaXRlZCgiZWRnZXMiKScsICJlZGdlcyIpOworCg==