170633 2017-04-07 18:18:07 -0700 Modernize WebPage.h 2017-04-07 19:26:47 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue joepeck oldest_to_newest 1295602 0 achristensen 2017-04-07 18:18:07 -0700 Modernize WebPage.h 1295603 1 306559 achristensen 2017-04-07 18:18:18 -0700 Created attachment 306559 Patch 1295604 2 306559 joepeck 2017-04-07 18:20:36 -0700 Comment on attachment 306559 Patch r=me 1295618 3 306559 commit-queue 2017-04-07 19:26:46 -0700 Comment on attachment 306559 Patch Clearing flags on attachment: 306559 Committed r215138: <http://trac.webkit.org/changeset/215138> 1295619 4 commit-queue 2017-04-07 19:26:47 -0700 All reviewed patches have been landed. Closing bug. 306559 2017-04-07 18:18:18 -0700 2017-04-07 19:26:46 -0700 Patch bug-170633-20170407181815.patch text/plain 17557 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTEzNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE3LTA0LTA3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW9kZXJuaXpl IFdlYlBhZ2UuaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTcwNjMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50Lmg6CisgICAgICAgIChBUEk6OlVJQ2xpZW50 OjpjcmVhdGVOZXdQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoK KyAgICAgICAgKFdlYktpdDo6UnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsUmVzdWx0TGlzdGVu ZXI6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlJ1bkphdmFTY3JpcHRBbGVydFJlc3VsdExp c3RlbmVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpSdW5KYXZhU2NyaXB0Q29uZmlybVJl c3VsdExpc3RlbmVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpSdW5KYXZhU2NyaXB0Q29u ZmlybVJlc3VsdExpc3RlbmVyOjpSdW5KYXZhU2NyaXB0Q29uZmlybVJlc3VsdExpc3RlbmVyKToK KyAgICAgICAgKFdlYktpdDo6UnVuSmF2YVNjcmlwdFByb21wdFJlc3VsdExpc3RlbmVyOjpjcmVh dGUpOgorICAgICAgICAoV2ViS2l0OjpSdW5KYXZhU2NyaXB0UHJvbXB0UmVzdWx0TGlzdGVuZXI6 OlJ1bkphdmFTY3JpcHRQcm9tcHRSZXN1bHRMaXN0ZW5lcik6CisgICAgICAgIChXS1BhZ2VTZXRQ YWdlVUlDbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW06CisgICAgICAgIChXZWJLaXQ6 OlVJRGVsZWdhdGU6OlVJQ2xpZW50OjpjcmVhdGVOZXdQYWdlKToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRE YXRhSW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRTdHJpbmdJbXBsKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9hZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlOjpzY2FsZWRTbmFwc2hvdFdpdGhPcHRpb25zKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZTo6U2FuZGJveEV4dGVuc2lvblRyYWNrZXI6OndpbGxQZXJmb3JtTG9hZERyYWdEZXN0aW5hdGlv bkFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OlNhbmRib3hFeHRlbnNpb25UcmFj a2VyOjpzZXRQZW5kaW5nUHJvdmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorCiAyMDE3LTA0LTA3ICBBbGV4IENocmlzdGVu c2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNlIGF1ZGl0X3Rva2Vu X3QgaW5zdGVhZCBvZiBwaWRfdCBmb3IgY2hlY2tpbmcgc2FuZGJveCBvZiBvdGhlciBwcm9jZXNz ZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGllbnQuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVJQ2xpZW50LmgJKHJl dmlzaW9uIDIxNDk0NCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVUlDbGll bnQuaAkod29ya2luZyBjb3B5KQpAQCAtMjMsOCArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNpZm5kZWYgQVBJVUlDbGllbnRfaAotI2RlZmluZSBB UElVSUNsaWVudF9oCisjcHJhZ21hIG9uY2UKIAogI2luY2x1ZGUgIldLUGFnZS5oIgogI2luY2x1 ZGUgIldlYkV2ZW50LmgiCkBAIC0zMiw3ICszMSw2IEBACiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5 LmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9GbG9hdFJlY3QuaD4KICNpbmNsdWRlIDxmdW5jdGlvbmFs PgotI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKICNpZiBQTEFURk9STShJT1MpCiBPQkpD X0NMQVNTIE5TQXJyYXk7CkBAIC03NSw3ICs3Myw3IEBAIGNsYXNzIFVJQ2xpZW50IHsKIHB1Ymxp YzoKICAgICB2aXJ0dWFsIH5VSUNsaWVudCgpIHsgfQogCi0gICAgdmlydHVhbCBQYXNzUmVmUHRy PFdlYktpdDo6V2ViUGFnZVByb3h5PiBjcmVhdGVOZXdQYWdlKFdlYktpdDo6V2ViUGFnZVByb3h5 KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5E YXRhJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2lu ZG93RmVhdHVyZXMmLCBjb25zdCBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhJikgeyByZXR1 cm4gbnVsbHB0cjsgfQorICAgIHZpcnR1YWwgUmVmUHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBj cmVhdGVOZXdQYWdlKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5 KiwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMmLCBjb25zdCBXZWJL aXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhJikgeyByZXR1cm4gbnVsbHB0cjsgfQogICAgIHZpcnR1 YWwgdm9pZCBzaG93UGFnZShXZWJLaXQ6OldlYlBhZ2VQcm94eSopIHsgfQogICAgIHZpcnR1YWwg dm9pZCBmdWxsc2NyZWVuTWF5UmV0dXJuVG9JbmxpbmUoV2ViS2l0OjpXZWJQYWdlUHJveHkqKSB7 IH0KICAgICB2aXJ0dWFsIHZvaWQgZGlkRW50ZXJGdWxsc2NyZWVuKFdlYktpdDo6V2ViUGFnZVBy b3h5KikgeyB9CkBAIC0xODAsNSArMTc4LDMgQEAgcHVibGljOgogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgQVBJCi0KLSNlbmRpZiAvLyBBUElVSUNsaWVudF9oCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcAkocmV2aXNpb24gMjE0OTQ0KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1NDYs OSArMTU0Niw5IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBSdW5CZWZvcmVVbmxvYWRD b25maXJtUGFuZWxSZXN1bHRMaXN0ZW5lciA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpP YmplY3Q6OlR5cGU6OlJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbFJlc3VsdExpc3RlbmVyPiB7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8UnVuQmVmb3JlVW5sb2FkQ29uZmlybVBh bmVsUmVzdWx0TGlzdGVuZXI+IGNyZWF0ZShGdW5jdGlvbjx2b2lkIChib29sKT4mJiBjb21wbGV0 aW9uSGFuZGxlcikKKyAgICBzdGF0aWMgUmVmPFJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbFJl c3VsdExpc3RlbmVyPiBjcmVhdGUoRnVuY3Rpb248dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFu ZGxlcikKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUnVuQmVmb3JlVW5sb2Fk Q29uZmlybVBhbmVsUmVzdWx0TGlzdGVuZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpKTsK KyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgUnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs UmVzdWx0TGlzdGVuZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpKTsKICAgICB9CiAKICAg ICB2aXJ0dWFsIH5SdW5CZWZvcmVVbmxvYWRDb25maXJtUGFuZWxSZXN1bHRMaXN0ZW5lcigpCkBA IC0xNTcxLDkgKzE1NzEsOSBAQCBwcml2YXRlOgogCiBjbGFzcyBSdW5KYXZhU2NyaXB0QWxlcnRS ZXN1bHRMaXN0ZW5lciA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6 OlJ1bkphdmFTY3JpcHRBbGVydFJlc3VsdExpc3RlbmVyPiB7CiBwdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NSZWZQdHI8UnVuSmF2YVNjcmlwdEFsZXJ0UmVzdWx0TGlzdGVuZXI+IGNyZWF0ZShGdW5j dGlvbjx2b2lkICgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQorICAgIHN0YXRpYyBSZWY8UnVuSmF2 YVNjcmlwdEFsZXJ0UmVzdWx0TGlzdGVuZXI+IGNyZWF0ZShGdW5jdGlvbjx2b2lkKCk+JiYgY29t cGxldGlvbkhhbmRsZXIpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFJ1bkph dmFTY3JpcHRBbGVydFJlc3VsdExpc3RlbmVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSk7 CisgICAgICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFJ1bkphdmFTY3JpcHRBbGVydFJlc3VsdExp c3RlbmVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSk7CiAgICAgfQogCiAgICAgdmlydHVh bCB+UnVuSmF2YVNjcmlwdEFsZXJ0UmVzdWx0TGlzdGVuZXIoKQpAQCAtMTU5Niw5ICsxNTk2LDkg QEAgcHJpdmF0ZToKIAogY2xhc3MgUnVuSmF2YVNjcmlwdENvbmZpcm1SZXN1bHRMaXN0ZW5lciA6 IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmplY3Q6OlR5cGU6OlJ1bkphdmFTY3JpcHRD b25maXJtUmVzdWx0TGlzdGVuZXI+IHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxS dW5KYXZhU2NyaXB0Q29uZmlybVJlc3VsdExpc3RlbmVyPiBjcmVhdGUoRnVuY3Rpb248dm9pZCAo Ym9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCisgICAgc3RhdGljIFJlZjxSdW5KYXZhU2NyaXB0 Q29uZmlybVJlc3VsdExpc3RlbmVyPiBjcmVhdGUoRnVuY3Rpb248dm9pZChib29sKT4mJiBjb21w bGV0aW9uSGFuZGxlcikKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUnVuSmF2 YVNjcmlwdENvbmZpcm1SZXN1bHRMaXN0ZW5lcihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkp OworICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBSdW5KYXZhU2NyaXB0Q29uZmlybVJlc3Vs dExpc3RlbmVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSk7CiAgICAgfQogCiAgICAgdmly dHVhbCB+UnVuSmF2YVNjcmlwdENvbmZpcm1SZXN1bHRMaXN0ZW5lcigpCkBAIC0xNjExLDcgKzE2 MTEsNyBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFJ1bkphdmFT Y3JpcHRDb25maXJtUmVzdWx0TGlzdGVuZXIoRnVuY3Rpb248dm9pZCAoYm9vbCk+JiYgY29tcGxl dGlvbkhhbmRsZXIpCisgICAgZXhwbGljaXQgUnVuSmF2YVNjcmlwdENvbmZpcm1SZXN1bHRMaXN0 ZW5lcihGdW5jdGlvbjx2b2lkKGJvb2wpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogICAgICAgICA6 IG1fY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpCiAgICAgewog ICAgIH0KQEAgLTE2MjEsOSArMTYyMSw5IEBAIHByaXZhdGU6CiAKIGNsYXNzIFJ1bkphdmFTY3Jp cHRQcm9tcHRSZXN1bHRMaXN0ZW5lciA6IHB1YmxpYyBBUEk6Ok9iamVjdEltcGw8QVBJOjpPYmpl Y3Q6OlR5cGU6OlJ1bkphdmFTY3JpcHRQcm9tcHRSZXN1bHRMaXN0ZW5lcj4gewogcHVibGljOgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPFJ1bkphdmFTY3JpcHRQcm9tcHRSZXN1bHRMaXN0ZW5lcj4g Y3JlYXRlKEZ1bmN0aW9uPHZvaWQgKGNvbnN0IFN0cmluZyYpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQorICAgIHN0YXRpYyBSZWY8UnVuSmF2YVNjcmlwdFByb21wdFJlc3VsdExpc3RlbmVyPiBjcmVh dGUoRnVuY3Rpb248dm9pZChjb25zdCBTdHJpbmcmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKICAg ICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgUnVuSmF2YVNjcmlwdFByb21wdFJlc3Vs dExpc3RlbmVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSk7CisgICAgICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IFJ1bkphdmFTY3JpcHRQcm9tcHRSZXN1bHRMaXN0ZW5lcihXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSkpOwogICAgIH0KIAogICAgIHZpcnR1YWwgflJ1bkphdmFTY3JpcHRQ cm9tcHRSZXN1bHRMaXN0ZW5lcigpCkBAIC0xNjM2LDcgKzE2MzYsNyBAQCBwdWJsaWM6CiAgICAg fQogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IFJ1bkphdmFTY3JpcHRQcm9tcHRSZXN1bHRMaXN0 ZW5lcihGdW5jdGlvbjx2b2lkIChjb25zdCBTdHJpbmcmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikK KyAgICBleHBsaWNpdCBSdW5KYXZhU2NyaXB0UHJvbXB0UmVzdWx0TGlzdGVuZXIoRnVuY3Rpb248 dm9pZChjb25zdCBTdHJpbmcmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKICAgICAgICAgOiBtX2Nv bXBsZXRpb25IYW5kbGVyKFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKQogICAgIHsKICAgICB9 CkBAIC0xNzA4LDcgKzE3MDgsNyBAQCB2b2lkIFdLUGFnZVNldFBhZ2VVSUNsaWVudChXS1BhZ2VS ZWYgcGFnCiAgICAgICAgIH0KIAogICAgIHByaXZhdGU6Ci0gICAgICAgIFBhc3NSZWZQdHI8V2Vi UGFnZVByb3h5PiBjcmVhdGVOZXdQYWdlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94 eSogaW5pdGlhdGluZ0ZyYW1lLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3Jp Z2luRGF0YSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFdp bmRvd0ZlYXR1cmVzJiB3aW5kb3dGZWF0dXJlcywgY29uc3QgTmF2aWdhdGlvbkFjdGlvbkRhdGEm IG5hdmlnYXRpb25BY3Rpb25EYXRhKSBvdmVycmlkZQorICAgICAgICBSZWZQdHI8V2ViUGFnZVBy b3h5PiBjcmVhdGVOZXdQYWdlKFdlYlBhZ2VQcm94eSogcGFnZSwgV2ViRnJhbWVQcm94eSogaW5p dGlhdGluZ0ZyYW1lLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luRGF0 YSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3QsIGNvbnN0IFdpbmRvd0Zl YXR1cmVzJiB3aW5kb3dGZWF0dXJlcywgY29uc3QgTmF2aWdhdGlvbkFjdGlvbkRhdGEmIG5hdmln YXRpb25BY3Rpb25EYXRhKSBvdmVycmlkZQogICAgICAgICB7CiAgICAgICAgICAgICBpZiAobV9j bGllbnQuY3JlYXRlTmV3UGFnZSkgewogICAgICAgICAgICAgICAgIGF1dG8gY29uZmlndXJhdGlv biA9IHBhZ2UtPmNvbmZpZ3VyYXRpb24oKS5jb3B5KCk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvVUlEZWxlZ2F0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgJKHJldmlzaW9uIDIxNDk0NCkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLmgJKHdvcmtpbmcgY29weSkKQEAg LTIzLDggKzIzLDcgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwog Ci0jaWZuZGVmIFVJQ2xpZW50X2gKLSNkZWZpbmUgVUlDbGllbnRfaAorI3ByYWdtYSBvbmNlCiAK ICNpbXBvcnQgIldLRm91bmRhdGlvbi5oIgogCkBAIC03Niw3ICs3NSw3IEBAIHByaXZhdGU6CiAK ICAgICBwcml2YXRlOgogICAgICAgICAvLyBBUEk6OlVJQ2xpZW50Ci0gICAgICAgIFBhc3NSZWZQ dHI8V2ViS2l0OjpXZWJQYWdlUHJveHk+IGNyZWF0ZU5ld1BhZ2UoV2ViS2l0OjpXZWJQYWdlUHJv eHkqLCBXZWJLaXQ6OldlYkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdp bkRhdGEmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBXZWJDb3JlOjpX aW5kb3dGZWF0dXJlcyYsIGNvbnN0IFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbkRhdGEmKSBvdmVy cmlkZTsKKyAgICAgICAgUmVmUHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiBjcmVhdGVOZXdQYWdl KFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgY29uc3QgV2Vi Q29yZTo6U2VjdXJpdHlPcmlnaW5EYXRhJiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 JiwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMmLCBjb25zdCBXZWJLaXQ6Ok5hdmlnYXRp b25BY3Rpb25EYXRhJikgb3ZlcnJpZGU7CiAgICAgICAgIHZvaWQgY2xvc2UoV2ViS2l0OjpXZWJQ YWdlUHJveHkqKSBvdmVycmlkZTsKICAgICAgICAgdm9pZCBmdWxsc2NyZWVuTWF5UmV0dXJuVG9J bmxpbmUoV2ViS2l0OjpXZWJQYWdlUHJveHkqKSBvdmVycmlkZTsKICAgICAgICAgdm9pZCBkaWRF bnRlckZ1bGxzY3JlZW4oV2ViS2l0OjpXZWJQYWdlUHJveHkqKSBvdmVycmlkZTsKQEAgLTE2MCw1 ICsxNTksMyBAQCBwcml2YXRlOgogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBX S19BUElfRU5BQkxFRAotCi0jZW5kaWYgLy8gVUlDbGllbnRfaApJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL1VJRGVsZWdhdGUubW0JKHJldmlzaW9uIDIxNDk0NCkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9VSURlbGVnYXRlLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0xNjksNyArMTY5LDcgQEAgVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6On5VSUNsaWVudCgp CiB7CiB9CiAKLVBhc3NSZWZQdHI8V2ViS2l0OjpXZWJQYWdlUHJveHk+IFVJRGVsZWdhdGU6OlVJ Q2xpZW50OjpjcmVhdGVOZXdQYWdlKFdlYktpdDo6V2ViUGFnZVByb3h5KiBwYWdlLCBXZWJLaXQ6 OldlYkZyYW1lUHJveHkqIGluaXRpYXRpbmdGcmFtZSwgY29uc3QgV2ViQ29yZTo6U2VjdXJpdHlP cmlnaW5EYXRhJiBzZWN1cml0eU9yaWdpbkRhdGEsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMmIHdpbmRvd0ZlYXR1 cmVzLCBjb25zdCBXZWJLaXQ6Ok5hdmlnYXRpb25BY3Rpb25EYXRhJiBuYXZpZ2F0aW9uQWN0aW9u RGF0YSkKK1JlZlB0cjxXZWJLaXQ6OldlYlBhZ2VQcm94eT4gVUlEZWxlZ2F0ZTo6VUlDbGllbnQ6 OmNyZWF0ZU5ld1BhZ2UoV2ViS2l0OjpXZWJQYWdlUHJveHkqIHBhZ2UsIFdlYktpdDo6V2ViRnJh bWVQcm94eSogaW5pdGlhdGluZ0ZyYW1lLCBjb25zdCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRh dGEmIHNlY3VyaXR5T3JpZ2luRGF0YSwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBy ZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpXaW5kb3dGZWF0dXJlcyYgd2luZG93RmVhdHVyZXMsIGNv bnN0IFdlYktpdDo6TmF2aWdhdGlvbkFjdGlvbkRhdGEmIG5hdmlnYXRpb25BY3Rpb25EYXRhKQog ewogICAgIGlmICghbV91aURlbGVnYXRlLm1fZGVsZWdhdGVNZXRob2RzLndlYlZpZXdDcmVhdGVX ZWJWaWV3V2l0aENvbmZpZ3VyYXRpb25Gb3JOYXZpZ2F0aW9uQWN0aW9uV2luZG93RmVhdHVyZXMp CiAgICAgICAgIHJldHVybiBudWxscHRyOwpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMjE0OTQ0KQorKysgU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MjA4LDcgKzEyMDgsNyBAQCB2b2lkIFdlYlBhZ2U6OmxvYWRSZXF1ZXN0KGNvbnN0IExvYWRQYXJh CiAgICAgQVNTRVJUKCFtX3BlbmRpbmdOYXZpZ2F0aW9uSUQpOwogfQogCi12b2lkIFdlYlBhZ2U6 OmxvYWREYXRhSW1wbCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFBhc3NSZWZQdHI8U2hhcmVkQnVm ZmVyPiBzaGFyZWRCdWZmZXIsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYg ZW5jb2RpbmdOYW1lLCBjb25zdCBVUkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgdW5yZWFjaGFibGVV UkwsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKK3ZvaWQgV2ViUGFnZTo6bG9hZERhdGFJbXBs KHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgUmVmPFNoYXJlZEJ1ZmZlcj4mJiBzaGFyZWRCdWZmZXIs IGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBjb25z dCBVUkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRh JiB1c2VyRGF0YSkKIHsKICAgICBTZW5kU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIgc3RvcHBlcih0 aGlzKTsKIApAQCAtMTIxNiw3ICsxMjE2LDcgQEAgdm9pZCBXZWJQYWdlOjpsb2FkRGF0YUltcGwo dWludDY0X3QgbmF2aQogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoYmFzZVVSTCk7CiAg ICAgUmVzb3VyY2VSZXNwb25zZSByZXNwb25zZShVUkwoKSwgTUlNRVR5cGUsIHNoYXJlZEJ1ZmZl ci0+c2l6ZSgpLCBlbmNvZGluZ05hbWUpOwotICAgIFN1YnN0aXR1dGVEYXRhIHN1YnN0aXR1dGVE YXRhKHNoYXJlZEJ1ZmZlciwgdW5yZWFjaGFibGVVUkwsIHJlc3BvbnNlLCBTdWJzdGl0dXRlRGF0 YTo6U2Vzc2lvbkhpc3RvcnlWaXNpYmlsaXR5OjpIaWRkZW4pOworICAgIFN1YnN0aXR1dGVEYXRh IHN1YnN0aXR1dGVEYXRhKFdURk1vdmUoc2hhcmVkQnVmZmVyKSwgdW5yZWFjaGFibGVVUkwsIHJl c3BvbnNlLCBTdWJzdGl0dXRlRGF0YTo6U2Vzc2lvbkhpc3RvcnlWaXNpYmlsaXR5OjpIaWRkZW4p OwogCiAgICAgLy8gTGV0IHRoZSBJbmplY3RlZEJ1bmRsZSBrbm93IHdlIGFyZSBhYm91dCB0byBz dGFydCB0aGUgbG9hZCwgcGFzc2luZyB0aGUgdXNlciBkYXRhIGZyb20gdGhlIFVJUHJvY2Vzcwog ICAgIC8vIHRvIGFsbCB0aGUgY2xpZW50IHRvIHNldCB1cCBhbnkgbmVlZGVkIHN0YXRlLgpAQCAt MTIyOSwxMSArMTIyOSwxMSBAQCB2b2lkIFdlYlBhZ2U6OmxvYWREYXRhSW1wbCh1aW50NjRfdCBu YXZpCiB2b2lkIFdlYlBhZ2U6OmxvYWRTdHJpbmdJbXBsKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg Y29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBV UkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgdW5yZWFjaGFibGVVUkwsIGNvbnN0IFVzZXJEYXRhJiB1 c2VyRGF0YSkKIHsKICAgICBpZiAoIWh0bWxTdHJpbmcuaXNOdWxsKCkgJiYgaHRtbFN0cmluZy5p czhCaXQoKSkgewotICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBT aGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihodG1sU3Ry aW5nLmNoYXJhY3RlcnM4KCkpLCBodG1sU3RyaW5nLmxlbmd0aCgpICogc2l6ZW9mKExDaGFyKSk7 Ci0gICAgICAgIGxvYWREYXRhSW1wbChuYXZpZ2F0aW9uSUQsIHNoYXJlZEJ1ZmZlciwgTUlNRVR5 cGUsIEFTQ0lJTGl0ZXJhbCgibGF0aW4xIiksIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCB1c2Vy RGF0YSk7CisgICAgICAgIGF1dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUo cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oaHRtbFN0cmluZy5jaGFyYWN0ZXJzOCgpKSwg aHRtbFN0cmluZy5sZW5ndGgoKSAqIHNpemVvZihMQ2hhcikpOworICAgICAgICBsb2FkRGF0YUlt cGwobmF2aWdhdGlvbklELCBXVEZNb3ZlKHNoYXJlZEJ1ZmZlciksIE1JTUVUeXBlLCBBU0NJSUxp dGVyYWwoImxhdGluMSIpLCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCwgdXNlckRhdGEpOwogICAg IH0gZWxzZSB7Ci0gICAgICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNo YXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJp bmcuY2hhcmFjdGVyczE2KCkpLCBodG1sU3RyaW5nLmxlbmd0aCgpICogc2l6ZW9mKFVDaGFyKSk7 Ci0gICAgICAgIGxvYWREYXRhSW1wbChuYXZpZ2F0aW9uSUQsIHNoYXJlZEJ1ZmZlciwgTUlNRVR5 cGUsIEFTQ0lJTGl0ZXJhbCgidXRmLTE2IiksIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCB1c2Vy RGF0YSk7CisgICAgICAgIGF1dG8gc2hhcmVkQnVmZmVyID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUo cmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oaHRtbFN0cmluZy5jaGFyYWN0ZXJzMTYoKSks IGh0bWxTdHJpbmcubGVuZ3RoKCkgKiBzaXplb2YoVUNoYXIpKTsKKyAgICAgICAgbG9hZERhdGFJ bXBsKG5hdmlnYXRpb25JRCwgV1RGTW92ZShzaGFyZWRCdWZmZXIpLCBNSU1FVHlwZSwgQVNDSUlM aXRlcmFsKCJ1dGYtMTYiKSwgYmFzZVVSTCwgdW5yZWFjaGFibGVVUkwsIHVzZXJEYXRhKTsKICAg ICB9CiB9CiAKQEAgLTEyNDEsOSArMTI0MSw5IEBAIHZvaWQgV2ViUGFnZTo6bG9hZERhdGEoY29u c3QgTG9hZFBhcmFtZXQKIHsKICAgICBwbGF0Zm9ybURpZFJlY2VpdmVMb2FkUGFyYW1ldGVycyhs b2FkUGFyYW1ldGVycyk7CiAKLSAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIg PSBTaGFyZWRCdWZmZXI6OmNyZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihsb2Fk UGFyYW1ldGVycy5kYXRhLmRhdGEoKSksIGxvYWRQYXJhbWV0ZXJzLmRhdGEuc2l6ZSgpKTsKKyAg ICBhdXRvIHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgY2hhcio+KGxvYWRQYXJhbWV0ZXJzLmRhdGEuZGF0YSgpKSwgbG9hZFBhcmFtZXRl cnMuZGF0YS5zaXplKCkpOwogICAgIFVSTCBiYXNlVVJMID0gbG9hZFBhcmFtZXRlcnMuYmFzZVVS TFN0cmluZy5pc0VtcHR5KCkgPyBibGFua1VSTCgpIDogVVJMKFVSTCgpLCBsb2FkUGFyYW1ldGVy cy5iYXNlVVJMU3RyaW5nKTsKLSAgICBsb2FkRGF0YUltcGwobG9hZFBhcmFtZXRlcnMubmF2aWdh dGlvbklELCBzaGFyZWRCdWZmZXIsIGxvYWRQYXJhbWV0ZXJzLk1JTUVUeXBlLCBsb2FkUGFyYW1l dGVycy5lbmNvZGluZ05hbWUsIGJhc2VVUkwsIFVSTCgpLCBsb2FkUGFyYW1ldGVycy51c2VyRGF0 YSk7CisgICAgbG9hZERhdGFJbXBsKGxvYWRQYXJhbWV0ZXJzLm5hdmlnYXRpb25JRCwgV1RGTW92 ZShzaGFyZWRCdWZmZXIpLCBsb2FkUGFyYW1ldGVycy5NSU1FVHlwZSwgbG9hZFBhcmFtZXRlcnMu ZW5jb2RpbmdOYW1lLCBiYXNlVVJMLCBVUkwoKSwgbG9hZFBhcmFtZXRlcnMudXNlckRhdGEpOwog fQogCiB2b2lkIFdlYlBhZ2U6OmxvYWRTdHJpbmcoY29uc3QgTG9hZFBhcmFtZXRlcnMmIGxvYWRQ YXJhbWV0ZXJzKQpAQCAtMTkxOSw3ICsxOTE5LDcgQEAgdm9pZCBXZWJQYWdlOjp0YWtlU25hcHNo b3QoSW50UmVjdCBzbmFwcwogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6SW1hZ2VD YWxsYmFjayhoYW5kbGUsIGNhbGxiYWNrSUQpKTsKIH0KIAotUGFzc1JlZlB0cjxXZWJJbWFnZT4g V2ViUGFnZTo6c2NhbGVkU25hcHNob3RXaXRoT3B0aW9ucyhjb25zdCBJbnRSZWN0JiByZWN0LCBk b3VibGUgYWRkaXRpb25hbFNjYWxlRmFjdG9yLCBTbmFwc2hvdE9wdGlvbnMgb3B0aW9ucykKK1Jl ZlB0cjxXZWJJbWFnZT4gV2ViUGFnZTo6c2NhbGVkU25hcHNob3RXaXRoT3B0aW9ucyhjb25zdCBJ bnRSZWN0JiByZWN0LCBkb3VibGUgYWRkaXRpb25hbFNjYWxlRmFjdG9yLCBTbmFwc2hvdE9wdGlv bnMgb3B0aW9ucykKIHsKICAgICBJbnRSZWN0IHNuYXBzaG90UmVjdCA9IHJlY3Q7CiAgICAgSW50 U2l6ZSBiaXRtYXBTaXplID0gc25hcHNob3RSZWN0LnNpemUoKTsKQEAgLTQxNDgsOSArNDE0OCw5 IEBAIHZvaWQgV2ViUGFnZTo6U2FuZGJveEV4dGVuc2lvblRyYWNrZXI6OmkKICAgICB9CiB9CiAK LXZvaWQgV2ViUGFnZTo6U2FuZGJveEV4dGVuc2lvblRyYWNrZXI6OndpbGxQZXJmb3JtTG9hZERy YWdEZXN0aW5hdGlvbkFjdGlvbihQYXNzUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+IHBlbmRpbmdE cm9wU2FuZGJveEV4dGVuc2lvbikKK3ZvaWQgV2ViUGFnZTo6U2FuZGJveEV4dGVuc2lvblRyYWNr ZXI6OndpbGxQZXJmb3JtTG9hZERyYWdEZXN0aW5hdGlvbkFjdGlvbihSZWZQdHI8U2FuZGJveEV4 dGVuc2lvbj4mJiBwZW5kaW5nRHJvcFNhbmRib3hFeHRlbnNpb24pCiB7Ci0gICAgc2V0UGVuZGlu Z1Byb3Zpc2lvbmFsU2FuZGJveEV4dGVuc2lvbihwZW5kaW5nRHJvcFNhbmRib3hFeHRlbnNpb24p OworICAgIHNldFBlbmRpbmdQcm92aXNpb25hbFNhbmRib3hFeHRlbnNpb24oV1RGTW92ZShwZW5k aW5nRHJvcFNhbmRib3hFeHRlbnNpb24pKTsKIH0KIAogdm9pZCBXZWJQYWdlOjpTYW5kYm94RXh0 ZW5zaW9uVHJhY2tlcjo6YmVnaW5Mb2FkKFdlYkZyYW1lKiBmcmFtZSwgY29uc3QgU2FuZGJveEV4 dGVuc2lvbjo6SGFuZGxlJiBoYW5kbGUpCkBAIC00MTYwLDkgKzQxNjAsOSBAQCB2b2lkIFdlYlBh Z2U6OlNhbmRib3hFeHRlbnNpb25UcmFja2VyOjpiCiAgICAgc2V0UGVuZGluZ1Byb3Zpc2lvbmFs U2FuZGJveEV4dGVuc2lvbihTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGUoaGFuZGxlKSk7CiB9CiAK LXZvaWQgV2ViUGFnZTo6U2FuZGJveEV4dGVuc2lvblRyYWNrZXI6OnNldFBlbmRpbmdQcm92aXNp b25hbFNhbmRib3hFeHRlbnNpb24oUGFzc1JlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiBwZW5kaW5n UHJvdmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uKQordm9pZCBXZWJQYWdlOjpTYW5kYm94RXh0ZW5z aW9uVHJhY2tlcjo6c2V0UGVuZGluZ1Byb3Zpc2lvbmFsU2FuZGJveEV4dGVuc2lvbihSZWZQdHI8 U2FuZGJveEV4dGVuc2lvbj4mJiBwZW5kaW5nUHJvdmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uKQog ewotICAgIG1fcGVuZGluZ1Byb3Zpc2lvbmFsU2FuZGJveEV4dGVuc2lvbiA9IHBlbmRpbmdQcm92 aXNpb25hbFNhbmRib3hFeHRlbnNpb247ICAgIAorICAgIG1fcGVuZGluZ1Byb3Zpc2lvbmFsU2Fu ZGJveEV4dGVuc2lvbiA9IFdURk1vdmUocGVuZGluZ1Byb3Zpc2lvbmFsU2FuZGJveEV4dGVuc2lv bik7CiB9CiAKIHN0YXRpYyBib29sIHNob3VsZFJldXNlQ29tbWl0dGVkU2FuZGJveEV4dGVuc2lv bihXZWJGcmFtZSogZnJhbWUpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDIxNDk0NCkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ4OSw3ICs0ODksNyBA QCBwdWJsaWM6CiAgICAgV2ViQ29yZTo6SW50UmVjdCByb290Vmlld1RvQWNjZXNzaWJpbGl0eVNj cmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAjZW5kaWYKICAgICAKLSAgICBQYXNzUmVm UHRyPFdlYkltYWdlPiBzY2FsZWRTbmFwc2hvdFdpdGhPcHRpb25zKGNvbnN0IFdlYkNvcmU6Oklu dFJlY3QmLCBkb3VibGUgYWRkaXRpb25hbFNjYWxlRmFjdG9yLCBTbmFwc2hvdE9wdGlvbnMpOwor ICAgIFJlZlB0cjxXZWJJbWFnZT4gc2NhbGVkU25hcHNob3RXaXRoT3B0aW9ucyhjb25zdCBXZWJD b3JlOjpJbnRSZWN0JiwgZG91YmxlIGFkZGl0aW9uYWxTY2FsZUZhY3RvciwgU25hcHNob3RPcHRp b25zKTsKIAogICAgIHN0YXRpYyBjb25zdCBXZWJFdmVudCogY3VycmVudEV2ZW50KCk7CiAKQEAg LTYzMCwxMyArNjMwLDEzIEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBpbnZhbGlkYXRlKCk7CiAK ICAgICAgICAgdm9pZCBiZWdpbkxvYWQoV2ViRnJhbWUqLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGUmIGhhbmRsZSk7Ci0gICAgICAgIHZvaWQgd2lsbFBlcmZvcm1Mb2FkRHJhZ0Rlc3Rp bmF0aW9uQWN0aW9uKFBhc3NSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gcGVuZGluZ0Ryb3BTYW5k Ym94RXh0ZW5zaW9uKTsKKyAgICAgICAgdm9pZCB3aWxsUGVyZm9ybUxvYWREcmFnRGVzdGluYXRp b25BY3Rpb24oUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+JiYgcGVuZGluZ0Ryb3BTYW5kYm94RXh0 ZW5zaW9uKTsKICAgICAgICAgdm9pZCBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZChXZWJGcmFtZSop OwogICAgICAgICB2b2lkIGRpZENvbW1pdFByb3Zpc2lvbmFsTG9hZChXZWJGcmFtZSopOwogICAg ICAgICB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWQoV2ViRnJhbWUqKTsKIAogICAgIHByaXZh dGU6Ci0gICAgICAgIHZvaWQgc2V0UGVuZGluZ1Byb3Zpc2lvbmFsU2FuZGJveEV4dGVuc2lvbihQ YXNzUmVmUHRyPFNhbmRib3hFeHRlbnNpb24+KTsKKyAgICAgICAgdm9pZCBzZXRQZW5kaW5nUHJv dmlzaW9uYWxTYW5kYm94RXh0ZW5zaW9uKFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiYmKTsKIAog ICAgICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gbV9wZW5kaW5nUHJvdmlzaW9uYWxTYW5k Ym94RXh0ZW5zaW9uOwogICAgICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gbV9wcm92aXNp b25hbFNhbmRib3hFeHRlbnNpb247CkBAIC0xMDMyLDcgKzEwMzIsNyBAQCBwcml2YXRlOgogCiAg ICAgU3RyaW5nIHNvdXJjZUZvckZyYW1lKFdlYkZyYW1lKik7CiAKLSAgICB2b2lkIGxvYWREYXRh SW1wbCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFBhc3NSZWZQdHI8V2ViQ29yZTo6U2hhcmVkQnVm ZmVyPiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUs IGNvbnN0IFdlYkNvcmU6OlVSTCYgYmFzZVVSTCwgY29uc3QgV2ViQ29yZTo6VVJMJiBmYWlsaW5n VVJMLCBjb25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgbG9hZERhdGFJbXBsKHVpbnQ2NF90IG5h dmlnYXRpb25JRCwgUmVmPFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4mJiwgY29uc3QgU3RyaW5nJiBN SU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0IFdlYkNvcmU6OlVSTCYg YmFzZVVSTCwgY29uc3QgV2ViQ29yZTo6VVJMJiBmYWlsaW5nVVJMLCBjb25zdCBVc2VyRGF0YSYp OwogICAgIHZvaWQgbG9hZFN0cmluZ0ltcGwodWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBT dHJpbmcmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBXZWJDb3JlOjpVUkwmIGJhc2VV UkwsIGNvbnN0IFdlYkNvcmU6OlVSTCYgZmFpbGluZ1VSTCwgY29uc3QgVXNlckRhdGEmKTsKIAog ICAgIGJvb2wgcGxhdGZvcm1IYXNMb2NhbERhdGFGb3JVUkwoY29uc3QgV2ViQ29yZTo6VVJMJik7 Cg==