164131 2016-10-28 08:59:17 -0700 [CSS Parser] Miscellaneous bug fixes 2016-10-28 09:26:29 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt commit-queue oldest_to_newest 1245612 0 hyatt 2016-10-28 08:59:17 -0700 Miscellaneous bug fixes 1245616 1 293164 hyatt 2016-10-28 09:03:14 -0700 Created attachment 293164 Patch 1245618 2 commit-queue 2016-10-28 09:04:38 -0700 Attachment 293164 did not pass style-queue: ERROR: Source/WebCore/css/StyleBuilderConverter.h:344: A case label should not be indented, but line up with its switch statement. [whitespace/indent] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1245625 3 hyatt 2016-10-28 09:26:29 -0700 Landed in r208051 with an ASSERT_UNUSED to fix the release build. 293164 2016-10-28 09:03:14 -0700 2016-10-28 09:06:05 -0700 Patch patch.txt text/plain 14146 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODA0OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ3IEBACisyMDE2LTEwLTI4ICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBNaXNjZWxsYW5l b3VzIGJ1ZyBmaXhlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTY0MTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUpOgorICAgICAgICAq IGNzcy9DU1NQcm9wZXJ0eU5hbWVzLmluOgorICAgICAgICBUaGUgcHJlZml4IHdhcyBpbmNvcnJl Y3RseSBkcm9wcGVkIGZyb20gLXdlYmtpdC1jb2x1bW4tcHJvZ3Jlc3Npb24uCisgICAgICAgIFB1 dCBpdCBiYWNrLgorCisgICAgICAgICogY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0UG9zaXRpb25Db21w b25lbnQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0 T2JqZWN0UG9zaXRpb24pOgorICAgICAgICBGaXggb2JqZWN0LXBvc2l0aW9uIHBhcnNpbmcgc28g dGhhdCB0aGUgcG9zaXRpb24gY29tcG9uZW50cyBjYW4KKyAgICAgICAgYmUgaWRzLgorCisgICAg ICAgICogY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVC dWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQ29udGVudCk6CisgICAgICAgIFRoZSBuZXcgcGFyc2Vy IGRvZXNuJ3QgbWFrZSBhIGxpc3QgZm9yIGNvbnRlbnQ6bm9uZSwgc2luY2Ugbm9uZSBjYW4ndCBi ZQorICAgICAgICBhIGNvbXBvbmVudCBvZiBhIGxpc3QgYW55d2F5LiBBZGQgY29kZSB0byBoYW5k bGUgdGhpcyBjYXNlIGluIHRoZQorICAgICAgICBhcHBseSBmdW5jdGlvbi4KKworICAgICAgICAq IGNzcy9wYXJzZXIvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzVmFsaWRLZXl3 b3JkUHJvcGVydHlBbmRWYWx1ZSk6CisgICAgICAgIFB1dCB0aGUgcHJlZml4IGJhY2sgb24gLXdl YmtpdC1jb2x1bW4tcHJvZ3Jlc3Npb24uCisKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1BhcnNl ckZhc3RQYXRocy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXJGYXN0UGF0aHM6Omlz VmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJz ZXJGYXN0UGF0aHM6OmlzS2V5d29yZFByb3BlcnR5SUQpOgorICAgICAgICBTYW1lLgorCisgICAg ICAgICogY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNT U1BhcnNlckltcGw6OnBhcnNlUGFnZVNlbGVjdG9yKToKKyAgICAgICAgTWFrZSBzdXJlIG1hdGNo IHR5cGUgaXMgY2hlY2tlZCwgc2luY2Ugb3VyIGNvZGUgYXNzZXJ0cyBpZiBpdCBpc24ndC4KKwor ICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6dmFsaWRXaWR0aE9ySGVpZ2h0S2V5d29yZCk6CisgICAgICAgIChXZWJDb3JlOjpjb25z dW1lTGluZUdyaWQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXI6OnBhcnNl U2luZ2xlVmFsdWUpOgorICAgICAgICBBZGQgc3VwcG9ydCBmb3IgdGhlIGxpbmUtZ3JpZCBwcm9w ZXJ0aWVzIGFuZCBmb3IgLXdlYmtpdC1uYnNwLW1vZGUuCisKIDIwMTYtMTAtMjggIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIEFsd2F5cyB1c2UgaU9TIHByZWxv YWQgYmVoYXZpb3IKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVj bGFyYXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRl ZFN0eWxlRGVjbGFyYXRpb24uY3BwCShyZXZpc2lvbiAyMDgwMzApCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAt Mjg5LDcgKzI4OSw3IEBAIHN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGNvbXB1dGVkUHJvcGUK ICAgICBDU1NQcm9wZXJ0eUNvbHVtbkNvdW50LAogICAgIENTU1Byb3BlcnR5Q29sdW1uRmlsbCwK ICAgICBDU1NQcm9wZXJ0eUNvbHVtbkdhcCwKLSAgICBDU1NQcm9wZXJ0eUNvbHVtblByb2dyZXNz aW9uLAorICAgIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUHJvZ3Jlc3Npb24sCiAgICAgQ1NTUHJv cGVydHlDb2x1bW5SdWxlQ29sb3IsCiAgICAgQ1NTUHJvcGVydHlDb2x1bW5SdWxlU3R5bGUsCiAg ICAgQ1NTUHJvcGVydHlDb2x1bW5SdWxlV2lkdGgsCkBAIC0yODAwLDcgKzI4MDAsNyBAQCBSZWZQ dHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6CiAgICAgICAgICAgICBpZiAoc3R5 bGUtPmhhc05vcm1hbENvbHVtbkdhcCgpKQogICAgICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1 ZVBvb2wuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9ybWFsKTsKICAgICAgICAgICAg IHJldHVybiB6b29tQWRqdXN0ZWRQaXhlbFZhbHVlKHN0eWxlLT5jb2x1bW5HYXAoKSwgKnN0eWxl KTsKLSAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUNvbHVtblByb2dyZXNzaW9uOgorICAgICAgICBj YXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUHJvZ3Jlc3Npb246CiAgICAgICAgICAgICByZXR1 cm4gY3NzVmFsdWVQb29sLmNyZWF0ZVZhbHVlKHN0eWxlLT5jb2x1bW5Qcm9ncmVzc2lvbigpKTsK ICAgICAgICAgY2FzZSBDU1NQcm9wZXJ0eUNvbHVtblJ1bGVDb2xvcjoKICAgICAgICAgICAgIHJl dHVybiBtX2FsbG93VmlzaXRlZFN0eWxlID8gY3NzVmFsdWVQb29sLmNyZWF0ZUNvbG9yVmFsdWUo c3R5bGUtPnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eU91dGxpbmVDb2xvcikucmdi KCkpIDogY3VycmVudENvbG9yT3JWYWxpZENvbG9yKHN0eWxlLCBzdHlsZS0+Y29sdW1uUnVsZUNv bG9yKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4JKHJldmlz aW9uIDIwODAzMCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCSh3 b3JraW5nIGNvcHkpCkBAIC00NDMsOCArNDQzLDcgQEAgY29sdW1uLWZpbGwKIC13ZWJraXQtY29s dW1uLWZpbGwgPSBjb2x1bW4tZmlsbAogY29sdW1uLWdhcCBbQ3VzdG9tPUFsbF0KIC13ZWJraXQt Y29sdW1uLWdhcCA9IGNvbHVtbi1nYXAKLWNvbHVtbi1wcm9ncmVzc2lvbgotLXdlYmtpdC1jb2x1 bW4tcHJvZ3Jlc3Npb24gPSBjb2x1bW4tcHJvZ3Jlc3Npb24KKy13ZWJraXQtY29sdW1uLXByb2dy ZXNzaW9uCiBjb2x1bW4tcnVsZSBbTG9uZ2hhbmRzPWNvbHVtbi1ydWxlLXdpZHRofGNvbHVtbi1y dWxlLXN0eWxlfGNvbHVtbi1ydWxlLWNvbG9yXQogLXdlYmtpdC1jb2x1bW4tcnVsZSA9IGNvbHVt bi1ydWxlCiBjb2x1bW4tcnVsZS1jb2xvciBbVmlzaXRlZExpbmtDb2xvclN1cHBvcnQsIEluaXRp YWw9aW52YWxpZENvbG9yXQpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNv bnZlcnRlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJD b252ZXJ0ZXIuaAkocmV2aXNpb24gMjA4MDMxKQorKysgU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl QnVpbGRlckNvbnZlcnRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTgsNyArMTU4LDcgQEAgcHJp dmF0ZToKICNlbmRpZgogCiAgICAgc3RhdGljIExlbmd0aCBjb252ZXJ0VG8xMDBQZXJjZW50TWlu dXNMZW5ndGgoY29uc3QgTGVuZ3RoJik7Ci0gICAgc3RhdGljIExlbmd0aCBjb252ZXJ0UG9zaXRp b25Db21wb25lbnQoU3R5bGVSZXNvbHZlciYsIGNvbnN0IENTU1ByaW1pdGl2ZVZhbHVlJik7Cisg ICAgdGVtcGxhdGU8Q1NTVmFsdWVJRCwgQ1NTVmFsdWVJRD4gc3RhdGljIExlbmd0aCBjb252ZXJ0 UG9zaXRpb25Db21wb25lbnQoU3R5bGVSZXNvbHZlciYsIGNvbnN0IENTU1ByaW1pdGl2ZVZhbHVl Jik7CiAKICNpZiBFTkFCTEUoQ1NTX0dSSURfTEFZT1VUKQogICAgIHN0YXRpYyBHcmlkTGVuZ3Ro IGNyZWF0ZUdyaWRUcmFja0JyZWFkdGgoY29uc3QgQ1NTUHJpbWl0aXZlVmFsdWUmLCBTdHlsZVJl c29sdmVyJik7CkBAIC0zMjMsNiArMzIzLDcgQEAgaW5saW5lIExlbmd0aCBTdHlsZUJ1aWxkZXJD b252ZXJ0ZXI6OmNvbgogICAgIHJldHVybiBMZW5ndGgoQ2FsY3VsYXRpb25WYWx1ZTo6Y3JlYXRl KFdURk1vdmUob3ApLCBWYWx1ZVJhbmdlQWxsKSk7CiB9CiAKK3RlbXBsYXRlIDxDU1NWYWx1ZUlE IGNzc1ZhbHVlRm9yMCwgQ1NTVmFsdWVJRCBjc3NWYWx1ZUZvcjEwMD4KIGlubGluZSBMZW5ndGgg U3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0UG9zaXRpb25Db21wb25lbnQoU3R5bGVSZXNv bHZlciYgc3R5bGVSZXNvbHZlciwgY29uc3QgQ1NTUHJpbWl0aXZlVmFsdWUmIHZhbHVlKQogewog ICAgIExlbmd0aCBsZW5ndGg7CkBAIC0zMzcsNyArMzM4LDIwIEBAIGlubGluZSBMZW5ndGggU3R5 bGVCdWlsZGVyQ29udmVydGVyOjpjb24KIAogICAgICAgICBsZW5ndGhWYWx1ZSA9IHZhbHVlLnBh aXJWYWx1ZSgpLT5zZWNvbmQoKTsKICAgICB9Ci0KKyAgICAKKyAgICBpZiAodmFsdWUuaXNWYWx1 ZUlEKCkpIHsKKyAgICAgICAgc3dpdGNoICh2YWx1ZS52YWx1ZUlEKCkpIHsKKyAgICAgICAgICAg IGNhc2UgY3NzVmFsdWVGb3IwOgorICAgICAgICAgICAgICAgIHJldHVybiBMZW5ndGgoMCwgUGVy Y2VudCk7CisgICAgICAgICAgICBjYXNlIGNzc1ZhbHVlRm9yMTAwOgorICAgICAgICAgICAgICAg IHJldHVybiBMZW5ndGgoMTAwLCBQZXJjZW50KTsKKyAgICAgICAgICAgIGNhc2UgQ1NTVmFsdWVD ZW50ZXI6CisgICAgICAgICAgICAgICAgcmV0dXJuIExlbmd0aCg1MCwgUGVyY2VudCk7CisgICAg ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor ICAgICAgICB9CisgICAgfQorICAgICAgICAKICAgICBsZW5ndGggPSBjb252ZXJ0TGVuZ3RoKHN0 eWxlUmVzb2x2ZXIsICpsZW5ndGhWYWx1ZSk7CiAKICAgICBpZiAocmVsYXRpdmVUb1RyYWlsaW5n RWRnZSkKQEAgLTM1Myw4ICszNjcsOCBAQCBpbmxpbmUgTGVuZ3RoUG9pbnQgU3R5bGVCdWlsZGVy Q29udmVydGVyCiAgICAgaWYgKCFwYWlyIHx8ICFwYWlyLT5maXJzdCgpIHx8ICFwYWlyLT5zZWNv bmQoKSkKICAgICAgICAgcmV0dXJuIFJlbmRlclN0eWxlOjppbml0aWFsT2JqZWN0UG9zaXRpb24o KTsKIAotICAgIExlbmd0aCBsZW5ndGhYID0gY29udmVydFBvc2l0aW9uQ29tcG9uZW50KHN0eWxl UmVzb2x2ZXIsICpwYWlyLT5maXJzdCgpKTsKLSAgICBMZW5ndGggbGVuZ3RoWSA9IGNvbnZlcnRQ b3NpdGlvbkNvbXBvbmVudChzdHlsZVJlc29sdmVyLCAqcGFpci0+c2Vjb25kKCkpOworICAgIExl bmd0aCBsZW5ndGhYID0gY29udmVydFBvc2l0aW9uQ29tcG9uZW50PENTU1ZhbHVlTGVmdCwgQ1NT VmFsdWVSaWdodD4oc3R5bGVSZXNvbHZlciwgKnBhaXItPmZpcnN0KCkpOworICAgIExlbmd0aCBs ZW5ndGhZID0gY29udmVydFBvc2l0aW9uQ29tcG9uZW50PENTU1ZhbHVlVG9wLCBDU1NWYWx1ZUJv dHRvbT4oc3R5bGVSZXNvbHZlciwgKnBhaXItPnNlY29uZCgpKTsKIAogICAgIHJldHVybiBMZW5n dGhQb2ludChsZW5ndGhYLCBsZW5ndGhZKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZUJ1aWxkZXJDdXN0b20uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVCdWlsZGVyQ3VzdG9tLmgJKHJldmlzaW9uIDIwODAzMCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaAkod29ya2luZyBjb3B5KQpAQCAtMTM3OCw2ICsxMzc4LDEz IEBAIGlubGluZSB2b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmgKIAogaW5saW5lIHZv aWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlQ29udGVudChTdHlsZVJlc29sdmVyJiBz dHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiB7CisgICAgaWYgKGlzPENTU1ByaW1pdGl2 ZVZhbHVlPih2YWx1ZSkpIHsKKyAgICAgICAgY29uc3QgYXV0byYgcHJpbWl0aXZlVmFsdWUgPSBk b3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4odmFsdWUpOworICAgICAgICBBU1NFUlQocHJpbWl0 aXZlVmFsdWUudmFsdWVJRCgpID09IENTU1ZhbHVlTm9ybWFsIHx8IHByaW1pdGl2ZVZhbHVlLnZh bHVlSUQoKSA9PSBDU1NWYWx1ZU5vbmUpOworICAgICAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCkt PmNsZWFyQ29udGVudCgpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAogICAgIGJvb2wg ZGlkU2V0ID0gZmFsc2U7CiAgICAgZm9yIChhdXRvJiBpdGVtIDogZG93bmNhc3Q8Q1NTVmFsdWVM aXN0Pih2YWx1ZSkpIHsKICAgICAgICAgaWYgKGlzPENTU0ltYWdlR2VuZXJhdG9yVmFsdWU+KGl0 ZW0uZ2V0KCkpKSB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXIuY3Bw CShyZXZpc2lvbiAyMDgwMzApCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgzOCw3ICs4MzgsNyBAQCBzdGF0aWMgaW5saW5lIGJv b2wgaXNWYWxpZEtleXdvcmRQcm9wZXJ0CiAgICAgICAgIGlmICh2YWx1ZUlEID09IENTU1ZhbHVl QXV0byB8fCB2YWx1ZUlEID09IENTU1ZhbHVlQmFsYW5jZSkKICAgICAgICAgICAgIHJldHVybiB0 cnVlOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIENTU1Byb3BlcnR5Q29sdW1uUHJvZ3Jlc3Np b246CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtblByb2dyZXNzaW9uOgogICAgICAg ICBpZiAodmFsdWVJRCA9PSBDU1NWYWx1ZU5vcm1hbCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlUmV2 ZXJzZSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBicmVhazsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5jcHAJKHJl dmlzaW9uIDIwODAzMCkKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyRmFz dFBhdGhzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjYwLDggKzY2MCw3IEBAIGJvb2wgQ1NTUGFy c2VyRmFzdFBhdGhzOjppc1ZhbGlkS2V5d29yZFAKICAgICBjYXNlIENTU1Byb3BlcnR5VW5pY29k ZUJpZGk6CiAgICAgICAgIHJldHVybiB2YWx1ZUlEID09IENTU1ZhbHVlTm9ybWFsIHx8IHZhbHVl SUQgPT0gQ1NTVmFsdWVFbWJlZAogICAgICAgICAgICAgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUJp ZGlPdmVycmlkZSB8fCB2YWx1ZUlEID09IENTU1ZhbHVlV2Via2l0SXNvbGF0ZQotICAgICAgICAg ICAgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVdlYmtpdElzb2xhdGVPdmVycmlkZSB8fCB2YWx1ZUlE ID09IENTU1ZhbHVlV2Via2l0UGxhaW50ZXh0Ci0gICAgICAgICAgICB8fCB2YWx1ZUlEID09IENT U1ZhbHVlSXNvbGF0ZSB8fCB2YWx1ZUlEID09IENTU1ZhbHVlV2Via2l0SXNvbGF0ZU92ZXJyaWRl IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVXZWJraXRQbGFpbnRleHQ7CisgICAgICAgICAgICB8fCB2 YWx1ZUlEID09IENTU1ZhbHVlV2Via2l0SXNvbGF0ZU92ZXJyaWRlIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVXZWJraXRQbGFpbnRleHQ7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVZlY3RvckVmZmVjdDoK ICAgICAgICAgcmV0dXJuIHZhbHVlSUQgPT0gQ1NTVmFsdWVOb25lIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVOb25TY2FsaW5nU3Ryb2tlOwogICAgIGNhc2UgQ1NTUHJvcGVydHlWaXNpYmlsaXR5OiAv LyB2aXNpYmxlIHwgaGlkZGVuIHwgY29sbGFwc2UKQEAgLTY5MSw2ICs2OTAsMTAgQEAgYm9vbCBD U1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUAogICAgICAgICByZXR1cm4gdmFsdWVJ RCA9PSBDU1NWYWx1ZVN0YXJ0IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVFbmQgfHwgdmFsdWVJRCA9 PSBDU1NWYWx1ZUNlbnRlciB8fCB2YWx1ZUlEID09IENTU1ZhbHVlSnVzdGlmeTsKICAgICBjYXNl IENTU1Byb3BlcnR5Q29sdW1uRmlsbDoKICAgICAgICAgcmV0dXJuIHZhbHVlSUQgPT0gQ1NTVmFs dWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVCYWxhbmNlOworICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRDb2x1bW5BeGlzOgorICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZUhv cml6b250YWwgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVZlcnRpY2FsIHx8IHZhbHVlSUQgPT0gQ1NT VmFsdWVBdXRvOworICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1bW5Qcm9ncmVzc2lvbjoK KyAgICAgICAgcmV0dXJuIHZhbHVlSUQgPT0gQ1NTVmFsdWVOb3JtYWwgfHwgdmFsdWVJRCA9PSBD U1NWYWx1ZVJldmVyc2U7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUFsaWduQ29udGVudDoKICAgICAg ICAgLy8gRklYTUU6IFBlciBDU1MgYWxpZ25tZW50LCB0aGlzIHByb3BlcnR5IHNob3VsZCBhY2Nl cHQgYW4gb3B0aW9uYWwgPG92ZXJmbG93LXBvc2l0aW9uPi4gV2Ugc2hvdWxkIHNoYXJlIHRoaXMg cGFyc2luZyBjb2RlIHdpdGggJ2p1c3RpZnktc2VsZicuCiAgICAgICAgIHJldHVybiB2YWx1ZUlE ID09IENTU1ZhbHVlRmxleFN0YXJ0IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVGbGV4RW5kIHx8IHZh bHVlSUQgPT0gQ1NTVmFsdWVDZW50ZXIgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVNwYWNlQmV0d2Vl biB8fCB2YWx1ZUlEID09IENTU1ZhbHVlU3BhY2VBcm91bmQgfHwgdmFsdWVJRCA9PSBDU1NWYWx1 ZVN0cmV0Y2g7CkBAIC03MTUsNiArNzE4LDggQEAgYm9vbCBDU1NQYXJzZXJGYXN0UGF0aHM6Omlz VmFsaWRLZXl3b3JkUAogICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZUF1dG8gfHwg dmFsdWVJRCA9PSBDU1NWYWx1ZU5vbmUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUFudGlhbGlhc2Vk IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVTdWJwaXhlbEFudGlhbGlhc2VkOwogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRMaW5lQnJlYWs6IC8vIGF1dG8gfCBsb29zZSB8IG5vcm1hbCB8IHN0cmlj dCB8IGFmdGVyLXdoaXRlLXNwYWNlCiAgICAgICAgIHJldHVybiB2YWx1ZUlEID09IENTU1ZhbHVl QXV0byB8fCB2YWx1ZUlEID09IENTU1ZhbHVlTG9vc2UgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZU5v cm1hbCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlU3RyaWN0IHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVB ZnRlcldoaXRlU3BhY2U7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExpbmVTbmFwOgorICAg ICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZU5vbmUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1 ZUJhc2VsaW5lIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVDb250YWluOwogICAgIGNhc2UgQ1NTUHJv cGVydHlXZWJraXRNYXJnaW5BZnRlckNvbGxhcHNlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRNYXJnaW5CZWZvcmVDb2xsYXBzZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TWFyZ2lu Qm90dG9tQ29sbGFwc2U6CkBAIC03NzUsNiArNzgwLDE2IEBAIGJvb2wgQ1NTUGFyc2VyRmFzdFBh dGhzOjppc1ZhbGlkS2V5d29yZFAKICAgICBjYXNlIENTU1Byb3BlcnR5QXBwbGVQYXlCdXR0b25U eXBlOiAvLyBwbGFpbiB8IGJ1eSB8IHNldC11cAogICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBD U1NWYWx1ZVBsYWluIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVCdXkgfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZVNldFVwOwogI2VuZGlmCisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE5ic3BNb2RlOiAv LyBub3JtYWwgfCBzcGFjZQorICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZU5vcm1h bCB8fCB2YWx1ZUlEID09IENTU1ZhbHVlU3BhY2U7CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtp dFRleHRab29tOgorICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZU5vcm1hbCB8fCB2 YWx1ZUlEID09IENTU1ZhbHVlUmVzZXQ7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIC8vIEFwcGxl IHNwZWNpZmljIHByb3BlcnR5LiBUaGVzZSB3aWxsIG5ldmVyIGJlIHN0YW5kYXJkaXplZCBhbmQg aXMgcHVyZWx5IHRvCisgICAgLy8gc3VwcG9ydCBjdXN0b20gV2ViS2l0LWJhc2VkIEFwcGxlIGFw cGxpY2F0aW9ucy4KKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VG91Y2hDYWxsb3V0OgorICAg ICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZURlZmF1bHQgfHwgdmFsdWVJRCA9PSBDU1NW YWx1ZU5vbmU7CisjZW5kaWYKICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNzk2LDcgKzgxMSw3IEBAIGJvb2wgQ1NT UGFyc2VyRmFzdFBhdGhzOjppc0tleXdvcmRQcm9wZXIKICAgICBjYXNlIENTU1Byb3BlcnR5Q2Fw dGlvblNpZGU6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUNsZWFyOgogICAgIGNhc2UgQ1NTUHJvcGVy dHlDb2x1bW5GaWxsOgotICAgIGNhc2UgQ1NTUHJvcGVydHlDb2x1bW5Qcm9ncmVzc2lvbjoKKyAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Q29sdW1uUHJvZ3Jlc3Npb246CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eUNvbHVtblJ1bGVTdHlsZToKICAgICBjYXNlIENTU1Byb3BlcnR5RGlyZWN0aW9uOgog ICAgIGNhc2UgQ1NTUHJvcGVydHlEaXNwbGF5OgpJbmRleDogU291cmNlL1dlYkNvcmUvY3NzL3Bh cnNlci9DU1NQYXJzZXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3Mv cGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCShyZXZpc2lvbiAyMDgwMzApCisrKyBTb3VyY2UvV2Vi Q29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTcs NyArMjE3LDcgQEAgQ1NTU2VsZWN0b3JMaXN0IENTU1BhcnNlckltcGw6OnBhcnNlUGFnZQogICAg ICAgICBzZWxlY3RvciA9IHN0ZDo6dW5pcXVlX3B0cjxDU1NQYXJzZXJTZWxlY3Rvcj4obmV3IENT U1BhcnNlclNlbGVjdG9yKTsKICAgICAgICAgaWYgKCFwc2V1ZG8uaXNOdWxsKCkpIHsKICAgICAg ICAgICAgIHNlbGVjdG9yID0gc3RkOjp1bmlxdWVfcHRyPENTU1BhcnNlclNlbGVjdG9yPihDU1NQ YXJzZXJTZWxlY3Rvcjo6cGFyc2VQYWdlUHNldWRvU2VsZWN0b3IocHNldWRvKSk7Ci0gICAgICAg ICAgICBpZiAoIXNlbGVjdG9yIHx8IHNlbGVjdG9yLT5wc2V1ZG9FbGVtZW50VHlwZSgpID09IENT U1NlbGVjdG9yOjpQc2V1ZG9FbGVtZW50VW5rbm93bikKKyAgICAgICAgICAgIGlmICghc2VsZWN0 b3IgfHwgc2VsZWN0b3ItPm1hdGNoKCkgIT0gQ1NTU2VsZWN0b3I6OlBzZXVkb0VsZW1lbnQgfHwg c2VsZWN0b3ItPnBzZXVkb0VsZW1lbnRUeXBlKCkgPT0gQ1NTU2VsZWN0b3I6OlBzZXVkb0VsZW1l bnRVbmtub3duKQogICAgICAgICAgICAgICAgIHJldHVybiBDU1NTZWxlY3Rvckxpc3QoKTsKICAg ICAgICAgfQogICAgICAgICBpZiAoIXR5cGVTZWxlY3Rvci5pc051bGwoKSkKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuY3BwCShyZXZpc2lv biAyMDgwMzApCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2Vy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTE3LDggKzkxNyw3IEBAIHN0YXRpYyBSZWZQdHI8Q1NT VmFsdWU+IGNvbnN1bWVUZXh0SW5kZW4KIC8vIEZJWE1FLU5FV1BBUlNFUjogRHJvcCB0aGUgcHJl Zml4IG9uIG1pbi1jb250ZW50LCBtYXgtY29udGVudCBhbmQgZml0LWNvbnRlbnQuCiBzdGF0aWMg Ym9vbCB2YWxpZFdpZHRoT3JIZWlnaHRLZXl3b3JkKENTU1ZhbHVlSUQgaWQsIGNvbnN0IENTU1Bh cnNlckNvbnRleHQmIC8qY29udGV4dCovKQogewotICAgIGlmIChpZCA9PSBDU1NWYWx1ZVdlYmtp dE1pbkNvbnRlbnQgfHwgaWQgPT0gQ1NTVmFsdWVXZWJraXRNYXhDb250ZW50IHx8IGlkID09IENT U1ZhbHVlV2Via2l0RmlsbEF2YWlsYWJsZSB8fCBpZCA9PSBDU1NWYWx1ZVdlYmtpdEZpdENvbnRl bnQKLSAgICAgICAgfHwgaWQgPT0gQ1NTVmFsdWVXZWJraXRNaW5Db250ZW50IHx8IGlkID09IENT U1ZhbHVlV2Via2l0TWF4Q29udGVudCB8fCBpZCA9PSBDU1NWYWx1ZVdlYmtpdEZpdENvbnRlbnQp IHsKKyAgICBpZiAoaWQgPT0gQ1NTVmFsdWVJbnRyaW5zaWMgfHwgaWQgPT0gQ1NTVmFsdWVNaW5J bnRyaW5zaWMgfHwgaWQgPT0gQ1NTVmFsdWVXZWJraXRNaW5Db250ZW50IHx8IGlkID09IENTU1Zh bHVlV2Via2l0TWF4Q29udGVudCB8fCBpZCA9PSBDU1NWYWx1ZVdlYmtpdEZpbGxBdmFpbGFibGUg fHwgaWQgPT0gQ1NTVmFsdWVXZWJraXRGaXRDb250ZW50KSB7CiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIH0KICAgICByZXR1cm4gZmFsc2U7CkBAIC0zMTE5LDYgKzMxMTgsMTMgQEAgc3RhdGlj IFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUxpbmVCb3hDbwogICAgIHJldHVybiBDU1NMaW5lQm94 Q29udGFpblZhbHVlOjpjcmVhdGUobGluZUJveENvbnRhaW4pOwogfQogCitzdGF0aWMgUmVmUHRy PENTU1ZhbHVlPiBjb25zdW1lTGluZUdyaWQoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UpCit7 CisgICAgaWYgKHJhbmdlLnBlZWsoKS5pZCgpID09IENTU1ZhbHVlTm9uZSkKKyAgICAgICAgcmV0 dXJuIGNvbnN1bWVJZGVudChyYW5nZSk7CisgICAgcmV0dXJuIGNvbnN1bWVDdXN0b21JZGVudChy YW5nZSk7Cit9CisKIFJlZlB0cjxDU1NWYWx1ZT4gQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlU2lu Z2xlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSwgQ1NTUHJvcGVydHlJRCBjdXJyZW50U2hv cnRoYW5kKQogewogICAgIGlmIChDU1NQYXJzZXJGYXN0UGF0aHM6OmlzS2V5d29yZFByb3BlcnR5 SUQocHJvcGVydHkpKSB7CkBAIC0zNDg3LDYgKzM0OTMsOCBAQCBSZWZQdHI8Q1NTVmFsdWU+IENT U1Byb3BlcnR5UGFyc2VyOjpwYXJzCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZsb3dGcm9t OgogICAgICAgICByZXR1cm4gY29uc3VtZUZsb3dQcm9wZXJ0eShtX3JhbmdlKTsKICNlbmRpZgor ICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRMaW5lR3JpZDoKKyAgICAgICAgcmV0dXJuIGNvbnN1 bWVMaW5lR3JpZChtX3JhbmdlKTsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICB9Cg==