139051 2014-11-25 11:13:16 -0800 Remove user content handling from PageGroup 2014-11-25 11:50:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1051023 0 andersca 2014-11-25 11:13:16 -0800 Remove user content handling from PageGroup 1051024 1 242204 andersca 2014-11-25 11:25:36 -0800 Created attachment 242204 Patch 1051027 2 andersca 2014-11-25 11:50:31 -0800 Committed r176544: <http://trac.webkit.org/changeset/176544> 242204 2014-11-25 11:25:36 -0800 2014-11-25 11:42:33 -0800 Patch bug-139051-20141125112557.patch text/plain 23322 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmJhYzBmOTY2YWFkN2Uy NzQ5MzdkY2Y1YWI3YTZhNDQ1ZWZkZDRhZS4uMmU2Mjg0OThlMzdlYWVkZmJhOTMzNmNmOWZiZTUz NDQ4YTM3OWNmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTExLTI1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHVzZXIg Y29udGVudCBoYW5kbGluZyBmcm9tIFBhZ2VHcm91cAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5MDUxCisKKyAgICAgICAgUmVtb3ZlIG1fdXNlckNv bnRlbnRDb250cm9sbGVyIGZyb20gUGFnZUdyb3VwIGFuZCB0aGUgcmVsYXRlZCBmdW5jdGlvbnMg YW5kIHN5bWJvbCBleHBvcnRzLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisgICAgICAg ICogcGFnZS9QYWdlR3JvdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjpQYWdl R3JvdXApOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjp+UGFnZUdyb3VwKToKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6YWRkUGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpQYWdl R3JvdXA6OnJlbW92ZVBhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UGFnZUdyb3VwOjphZGRVc2Vy U2NyaXB0VG9Xb3JsZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OmFk ZFVzZXJTdHlsZVNoZWV0VG9Xb3JsZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpQYWdl R3JvdXA6OnJlbW92ZVVzZXJTY3JpcHRGcm9tV29ybGQpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6UGFnZUdyb3VwOjpyZW1vdmVVc2VyU3R5bGVTaGVldEZyb21Xb3JsZCk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbVdvcmxk KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6cmVtb3ZlVXNlclN0eWxl U2hlZXRzRnJvbVdvcmxkKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlBhZ2VHcm91cDo6 cmVtb3ZlQWxsVXNlckNvbnRlbnQpOiBEZWxldGVkLgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3Vw Lmg6CisKKzIwMTQtMTEtMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBBZGQgYSB1c2VyIGNvbnRlbnQgY29udHJvbGxlciB0byBXZWJWaWV3R3JvdXAg YW5kIHVzZSBpdCBmb3IgdXNlciBjb250ZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkwNDMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDMxNTJlYTdm YTY3ZTQ3ODQxOWEyMzM1ZDkzMmJiNTU4OTc5MTliNzcuLmZjMzMxZmYxNDE4ZTlkN2YzZDFjYmFk YmY1N2MxMTUzZGUyYTkzZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAx NC0xMS0yNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAg IFJlbW92ZSB1c2VyIGNvbnRlbnQgaGFuZGxpbmcgZnJvbSBQYWdlR3JvdXAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTA1MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgdXNlciBjb250ZW50 IGNvbnRyb2xsZXIgaW4gdGhlIHdlYiB2aWV3IGdyb3VwLgorCisgICAgICAgICogV2ViVmlldy9X ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9pbmplY3RPdXRsb29rUXVpcmtzU2NyaXB0 XSk6CisKKzIwMTQtMTEtMjUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4K KwogICAgICAgICBBZGQgYSB1c2VyIGNvbnRlbnQgY29udHJvbGxlciB0byBXZWJWaWV3R3JvdXAg YW5kIHVzZSBpdCBmb3IgdXNlciBjb250ZW50CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzkwNDMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGJlOGQyYjJhM2I5NjAw NGFlNWM0YjBhNGZkM2I4YTVkZGNjZGQ3OWMuLmMwZTc1NDM4YzdkYjFmNjEyMjZkMTA3MDQ0NDFi MTIyNmMwMTU2YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxNC0xMS0yNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB1c2Vy IGNvbnRlbnQgaGFuZGxpbmcgZnJvbSBQYWdlR3JvdXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTA1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9Jbmpl Y3RlZEJ1bmRsZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjphZGRVc2Vy U2NyaXB0KToKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OmFkZFVzZXJTdHlsZVNo ZWV0KToKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OnJlbW92ZVVzZXJTY3JpcHQp OgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6cmVtb3ZlVXNlclN0eWxlU2hlZXQp OgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6cmVtb3ZlVXNlclNjcmlwdHMpOgor ICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6cmVtb3ZlVXNlclN0eWxlU2hlZXRzKToK KyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OnJlbW92ZUFsbFVzZXJDb250ZW50KToK KyAgICAgICAgVGFsayB0byB0aGUgdXNlciBjb250ZW50IGNvbnRyb2xsZXIgZnJvbSB0aGUgcGFz c2VkIGluIFdlYlBhZ2VHcm91cFByb3h5LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAg ICAgQ3JlYXRlIHRoZSBXZWJQYWdlR3JvdXBQcm94eSBiZWZvcmUgY3JlYXRpbmcgdGhlIHBhZ2Ug c28gd2UgY2FuIGdldCBpdHMgdXNlciBjb250ZW50IGNvbnRyb2xsZXIgYW5kCisgICAgICAgIHBh c3MgaXQgdG8gdGhlIHBhZ2UgY29uZmlndXJhdGlvbiBpZiBuZWNlc3NhcnkuCisgICAgICAgIAor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3JvdXBQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cFByb3h5Ojp1c2VyQ29udGVudENvbnRyb2xsZXIpOgor ICAgICAgICBOZXcgZnVuY3Rpb24gdGhhdCBsYXppbHkgY3JlYXRlcyBhIHVzZXIgY29udGVudCBj b250cm9sbGVyLiBXZSBkb24ndCB3YW50IHRvIGNyZWF0ZSB0aGlzIGVhZ2VybHkgc2luY2UKKyAg ICAgICAgaXQncyBub3QgdXNlZCB3aXRoIHRoZSBtb2Rlcm4gQVBJLgorCisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VHcm91cFByb3h5OjphZGRVc2VyU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VHcm91cFByb3h5OjphZGRVc2VyU2NyaXB0KToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZUdyb3VwUHJveHk6OnJlbW92ZUFsbFVzZXJTdHlsZVNoZWV0cyk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VHcm91cFByb3h5OjpyZW1vdmVBbGxVc2VyU2NyaXB0cyk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VHcm91cFByb3h5OjpyZW1vdmVBbGxVc2VyQ29udGVudCk6CisgICAg ICAgIENhbGwgdGhyb3VnaCB0byB0aGUgdXNlciBjb250ZW50IGNvbnRyb2xsZXIuCisKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZUdyb3VwUHJveHkuaDoKKyAgICAgICAgQWRk IGFuIG1fdXNlckNvbnRlbnRDb250cm9sbGVyIG1lbWJlci4KKwogMjAxNC0xMS0yNSAgVGluZy1X ZWkgTGFuICA8bGFudHc0NEBnbWFpbC5jb20+CiAKICAgICAgICAgW0dUS10gVXNlIExEX0xJQlJB UllfUEFUSCB0byBtYWtlIGctaXItc2Nhbm5lciB1c2UgdGhlIG5ld2x5LWJ1aWx0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUuZXhwLmluCmluZGV4IDI2N2NmYjhiMDRkYThkOGJmYTY1YzlhMWE2NDA1ZDYyMThiNTZhNzgu LjExYjcxZGJiMDdkN2Y5NTM5MmI0NjJhNWYwYzQ4MjhhZTQxZjEzOGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu ZXhwLmluCkBAIC0xNTU0LDE2ICsxNTU0LDkgQEAgX19aTjdXZWJDb3JlOVBhZ2VHcm91cDE0YWRk VmlzaXRlZExpbmtFUEt0bQogX19aTjdXZWJDb3JlOVBhZ2VHcm91cDE2c3luY0xvY2FsU3RvcmFn ZUV2CiBfX1pON1dlYkNvcmU5UGFnZUdyb3VwMTdjbG9zZUxvY2FsU3RvcmFnZUV2CiBfX1pON1dl YkNvcmU5UGFnZUdyb3VwMThhZGRWaXNpdGVkTGlua0hhc2hFeQotX19aTjdXZWJDb3JlOVBhZ2VH cm91cDIwYWRkVXNlclNjcmlwdFRvV29ybGRFUk5TXzE1RE9NV3JhcHBlcldvcmxkRVJLTjNXVEY2 U3RyaW5nRVJLTlNfM1VSTEVSS05TM182VmVjdG9ySVM0X0xqMEVOUzNfMTVDcmFzaE9uT3ZlcmZs b3dFRUVTRV9OU18yM1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lRU5TXzI1VXNlckNvbnRlbnRJbmpl Y3RlZEZyYW1lc0UKLV9fWk43V2ViQ29yZTlQYWdlR3JvdXAyMHJlbW92ZUFsbFVzZXJDb250ZW50 RXYKIF9fWk43V2ViQ29yZTlQYWdlR3JvdXAyMXJlbW92ZUFsbFZpc2l0ZWRMaW5rc0V2Ci1fX1pO N1dlYkNvcmU5UGFnZUdyb3VwMjRhZGRVc2VyU3R5bGVTaGVldFRvV29ybGRFUk5TXzE1RE9NV3Jh cHBlcldvcmxkRVJLTjNXVEY2U3RyaW5nRVJLTlNfM1VSTEVSS05TM182VmVjdG9ySVM0X0xqMEVO UzNfMTVDcmFzaE9uT3ZlcmZsb3dFRUVTRV9OU18yNVVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXNF TlNfMTRVc2VyU3R5bGVMZXZlbEVOU18yMlVzZXJTdHlsZUluamVjdGlvblRpbWVFCi1fX1pON1dl YkNvcmU5UGFnZUdyb3VwMjVyZW1vdmVVc2VyU2NyaXB0RnJvbVdvcmxkRVJOU18xNURPTVdyYXBw ZXJXb3JsZEVSS05TXzNVUkxFCi1fX1pON1dlYkNvcmU5UGFnZUdyb3VwMjZyZW1vdmVVc2VyU2Ny aXB0c0Zyb21Xb3JsZEVSTlNfMTVET01XcmFwcGVyV29ybGRFCiBfX1pON1dlYkNvcmU5UGFnZUdy b3VwMjZzZXRTaG91bGRUcmFja1Zpc2l0ZWRMaW5rc0ViCi1fX1pON1dlYkNvcmU5UGFnZUdyb3Vw MjlyZW1vdmVVc2VyU3R5bGVTaGVldEZyb21Xb3JsZEVSTlNfMTVET01XcmFwcGVyV29ybGRFUktO U18zVVJMRQogX19aTjdXZWJDb3JlOVBhZ2VHcm91cDMwY2xvc2VJZGxlTG9jYWxTdG9yYWdlRGF0 YWJhc2VzRXYKLV9fWk43V2ViQ29yZTlQYWdlR3JvdXAzMHJlbW92ZVVzZXJTdHlsZVNoZWV0c0Zy b21Xb3JsZEVSTlNfMTVET01XcmFwcGVyV29ybGRFCiBfX1pON1dlYkNvcmU5UGFnZUdyb3VwOXBh Z2VHcm91cEVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTlTY3JvbGxiYXIxMW1vdXNlRXhp dGVkRXYKIF9fWk43V2ViQ29yZTlTY3JvbGxiYXIxMm1vdXNlRW50ZXJlZEV2CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1BhZ2VHcm91cC5jcHAKaW5kZXggMGU3MWUyYTQxNWRiYWE5YzI1ODUzOTNiODE4ZGFjMzM3YWYw NGFhYi4uYzVlOWJhNGQyYzM3NmU2MDIxOWFkMTk5Yjk5OWRlN2NkOWNlYzkwMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvUGFnZUdyb3VwLmNwcApAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgIlNlY3VyaXR5 T3JpZ2luLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJTdG9yYWdlTmFtZXNw YWNlLmgiCi0jaW5jbHVkZSAiVXNlckNvbnRlbnRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiVmlz aXRlZExpbmtTdG9yZS5oIgogI2luY2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KIApAQCAtNjcs NyArNjYsNiBAQCBQYWdlR3JvdXA6OlBhZ2VHcm91cChjb25zdCBTdHJpbmcmIG5hbWUpCiAgICAg OiBtX25hbWUobmFtZSkKICAgICAsIG1fdmlzaXRlZExpbmtzUG9wdWxhdGVkKGZhbHNlKQogICAg ICwgbV9pZGVudGlmaWVyKGdldFVuaXF1ZUlkZW50aWZpZXIoKSkKLSAgICAsIG1fdXNlckNvbnRl bnRDb250cm9sbGVyKFVzZXJDb250ZW50Q29udHJvbGxlcjo6Y3JlYXRlKCkpCiAgICAgLCBtX2dy b3VwU2V0dGluZ3Moc3RkOjptYWtlX3VuaXF1ZTxHcm91cFNldHRpbmdzPigpKQogewogfQpAQCAt NzUsNyArNzMsNiBAQCBQYWdlR3JvdXA6OlBhZ2VHcm91cChjb25zdCBTdHJpbmcmIG5hbWUpCiBQ YWdlR3JvdXA6OlBhZ2VHcm91cChQYWdlJiBwYWdlKQogICAgIDogbV92aXNpdGVkTGlua3NQb3B1 bGF0ZWQoZmFsc2UpCiAgICAgLCBtX2lkZW50aWZpZXIoZ2V0VW5pcXVlSWRlbnRpZmllcigpKQot ICAgICwgbV91c2VyQ29udGVudENvbnRyb2xsZXIoVXNlckNvbnRlbnRDb250cm9sbGVyOjpjcmVh dGUoKSkKICAgICAsIG1fZ3JvdXBTZXR0aW5ncyhzdGQ6Om1ha2VfdW5pcXVlPEdyb3VwU2V0dGlu Z3M+KCkpCiB7CiAgICAgYWRkUGFnZShwYWdlKTsKQEAgLTgzLDcgKzgwLDYgQEAgUGFnZUdyb3Vw OjpQYWdlR3JvdXAoUGFnZSYgcGFnZSkKIAogUGFnZUdyb3VwOjp+UGFnZUdyb3VwKCkKIHsKLSAg ICByZW1vdmVBbGxVc2VyQ29udGVudCgpOwogfQogCiB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBQ YWdlR3JvdXAqPiBQYWdlR3JvdXBNYXA7CkBAIC0xNjYsMTggKzE2MiwxMiBAQCB2b2lkIFBhZ2VH cm91cDo6YWRkUGFnZShQYWdlJiBwYWdlKQogewogICAgIEFTU0VSVCghbV9wYWdlcy5jb250YWlu cygmcGFnZSkpOwogICAgIG1fcGFnZXMuYWRkKCZwYWdlKTsKLQotICAgIGlmICghcGFnZS51c2Vy Q29udGVudENvbnRyb2xsZXIoKSkKLSAgICAgICAgcGFnZS5zZXRVc2VyQ29udGVudENvbnRyb2xs ZXIobV91c2VyQ29udGVudENvbnRyb2xsZXIuZ2V0KCkpOwogfQogCiB2b2lkIFBhZ2VHcm91cDo6 cmVtb3ZlUGFnZShQYWdlJiBwYWdlKQogewogICAgIEFTU0VSVChtX3BhZ2VzLmNvbnRhaW5zKCZw YWdlKSk7CiAgICAgbV9wYWdlcy5yZW1vdmUoJnBhZ2UpOwotCi0gICAgaWYgKHBhZ2UudXNlckNv bnRlbnRDb250cm9sbGVyKCkgPT0gbV91c2VyQ29udGVudENvbnRyb2xsZXIpCi0gICAgICAgIHBh Z2Uuc2V0VXNlckNvbnRlbnRDb250cm9sbGVyKG51bGxwdHIpOwogfQogCiBWaXNpdGVkTGlua1N0 b3JlJiBQYWdlR3JvdXA6OnZpc2l0ZWRMaW5rU3RvcmUoKQpAQCAtMjg2LDQ0ICsyNzYsNiBAQCBT dG9yYWdlTmFtZXNwYWNlKiBQYWdlR3JvdXA6OnRyYW5zaWVudExvY2FsU3RvcmFnZShTZWN1cml0 eU9yaWdpbiogdG9wT3JpZ2luKQogICAgIHJldHVybiByZXN1bHQuaXRlcmF0b3ItPnZhbHVlLmdl dCgpOwogfQogCi12b2lkIFBhZ2VHcm91cDo6YWRkVXNlclNjcmlwdFRvV29ybGQoRE9NV3JhcHBl cldvcmxkJiB3b3JsZCwgY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IFVSTCYgdXJsLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgd2hpdGVsaXN0LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxhY2ts aXN0LCBVc2VyU2NyaXB0SW5qZWN0aW9uVGltZSBpbmplY3Rpb25UaW1lLCBVc2VyQ29udGVudElu amVjdGVkRnJhbWVzIGluamVjdGVkRnJhbWVzKQotewotICAgIGF1dG8gdXNlclNjcmlwdCA9IHN0 ZDo6bWFrZV91bmlxdWU8VXNlclNjcmlwdD4oc291cmNlLCB1cmwsIHdoaXRlbGlzdCwgYmxhY2ts aXN0LCBpbmplY3Rpb25UaW1lLCBpbmplY3RlZEZyYW1lcyk7Ci0gICAgbV91c2VyQ29udGVudENv bnRyb2xsZXItPmFkZFVzZXJTY3JpcHQod29ybGQsIFdURjo6bW92ZSh1c2VyU2NyaXB0KSk7Ci19 Ci0KLXZvaWQgUGFnZUdyb3VwOjphZGRVc2VyU3R5bGVTaGVldFRvV29ybGQoRE9NV3JhcHBlcldv cmxkJiB3b3JsZCwgY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IFVSTCYgdXJsLCBjb25zdCBW ZWN0b3I8U3RyaW5nPiYgd2hpdGVsaXN0LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgYmxhY2tsaXN0 LCBVc2VyQ29udGVudEluamVjdGVkRnJhbWVzIGluamVjdGVkRnJhbWVzLCBVc2VyU3R5bGVMZXZl bCBsZXZlbCwgVXNlclN0eWxlSW5qZWN0aW9uVGltZSBpbmplY3Rpb25UaW1lKQotewotICAgIGF1 dG8gdXNlclN0eWxlU2hlZXQgPSBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTdHlsZVNoZWV0Pihzb3Vy Y2UsIHVybCwgd2hpdGVsaXN0LCBibGFja2xpc3QsIGluamVjdGVkRnJhbWVzLCBsZXZlbCk7Ci0g ICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFVzZXJTdHlsZVNoZWV0KHdvcmxkLCBXVEY6 Om1vdmUodXNlclN0eWxlU2hlZXQpLCBpbmplY3Rpb25UaW1lKTsKLQotfQotCi12b2lkIFBhZ2VH cm91cDo6cmVtb3ZlVXNlclNjcmlwdEZyb21Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkLCBj b25zdCBVUkwmIHVybCkKLXsKLSAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+cmVtb3ZlVXNl clNjcmlwdCh3b3JsZCwgdXJsKTsKLX0KLQotdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTdHls ZVNoZWV0RnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVSTCYgdXJsKQot ewotICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5yZW1vdmVVc2VyU3R5bGVTaGVldCh3b3Js ZCwgdXJsKTsKLX0KLQotdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVzZXJTY3JpcHRzRnJvbVdvcmxk KERPTVdyYXBwZXJXb3JsZCYgd29ybGQpCi17Ci0gICAgbV91c2VyQ29udGVudENvbnRyb2xsZXIt PnJlbW92ZVVzZXJTY3JpcHRzKHdvcmxkKTsKLX0KLQotdm9pZCBQYWdlR3JvdXA6OnJlbW92ZVVz ZXJTdHlsZVNoZWV0c0Zyb21Xb3JsZChET01XcmFwcGVyV29ybGQmIHdvcmxkKQotewotICAgIG1f dXNlckNvbnRlbnRDb250cm9sbGVyLT5yZW1vdmVVc2VyU3R5bGVTaGVldHMod29ybGQpOwotfQot Ci12b2lkIFBhZ2VHcm91cDo6cmVtb3ZlQWxsVXNlckNvbnRlbnQoKQotewotICAgIG1fdXNlckNv bnRlbnRDb250cm9sbGVyLT5yZW1vdmVBbGxVc2VyQ29udGVudCgpOwotfQotCiAjaWYgRU5BQkxF KFZJREVPX1RSQUNLKQogdm9pZCBQYWdlR3JvdXA6OmNhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWQo KQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKaW5kZXggNmY4MzlmZDdkZDIxNjVmZWMyZGQ5NTc1 NDc0ZTk1ZDA3ZmU0MWI2NS4uYmM1ZjQ0Yzg1YzhkMTNkYjdmZDJjZjYwMDMxYWRjMGQzZDY3ZjZh ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5oCkBAIC00Myw3ICs0Myw2IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICBjbGFzcyBTZWN1cml0eU9yaWdpbjsKICAgICBjbGFzcyBTdG9yYWdlTmFt ZXNwYWNlOwogICAgIGNsYXNzIFZpc2l0ZWRMaW5rU3RvcmU7Ci0gICAgY2xhc3MgVXNlckNvbnRl bnRDb250cm9sbGVyOwogCiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIGNsYXNzIENhcHRp b25QcmVmZXJlbmNlc0NoYW5nZWRMaXN0ZW5lcjsKQEAgLTkzLDE0ICs5Miw2IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogICAgICAgICBTdG9yYWdlTmFtZXNwYWNlKiB0cmFuc2llbnRMb2NhbFN0 b3JhZ2UoU2VjdXJpdHlPcmlnaW4qIHRvcE9yaWdpbik7CiAKLSAgICAgICAgV0VCQ09SRV9FWFBP UlQgdm9pZCBhZGRVc2VyU2NyaXB0VG9Xb3JsZChET01XcmFwcGVyV29ybGQmLCBjb25zdCBTdHJp bmcmIHNvdXJjZSwgY29uc3QgVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHdoaXRlbGlzdCwg Y29uc3QgVmVjdG9yPFN0cmluZz4mIGJsYWNrbGlzdCwgVXNlclNjcmlwdEluamVjdGlvblRpbWUs IFVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMpOwotICAgICAgICBXRUJDT1JFX0VYUE9SVCB2b2lk IGFkZFVzZXJTdHlsZVNoZWV0VG9Xb3JsZChET01XcmFwcGVyV29ybGQmLCBjb25zdCBTdHJpbmcm IHNvdXJjZSwgY29uc3QgVVJMJiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIHdoaXRlbGlzdCwgY29u c3QgVmVjdG9yPFN0cmluZz4mIGJsYWNrbGlzdCwgVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcywg VXNlclN0eWxlTGV2ZWwgPSBVc2VyU3R5bGVVc2VyTGV2ZWwsIFVzZXJTdHlsZUluamVjdGlvblRp bWUgPSBJbmplY3RJbkV4aXN0aW5nRG9jdW1lbnRzKTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQg dm9pZCByZW1vdmVVc2VyU3R5bGVTaGVldEZyb21Xb3JsZChET01XcmFwcGVyV29ybGQmLCBjb25z dCBVUkwmKTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZW1vdmVVc2VyU2NyaXB0RnJv bVdvcmxkKERPTVdyYXBwZXJXb3JsZCYsIGNvbnN0IFVSTCYpOwotICAgICAgICBXRUJDT1JFX0VY UE9SVCB2b2lkIHJlbW92ZVVzZXJTY3JpcHRzRnJvbVdvcmxkKERPTVdyYXBwZXJXb3JsZCYpOwot ICAgICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlbW92ZVVzZXJTdHlsZVNoZWV0c0Zyb21Xb3Js ZChET01XcmFwcGVyV29ybGQmKTsKLSAgICAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCByZW1vdmVB bGxVc2VyQ29udGVudCgpOwotCiAgICAgICAgIEdyb3VwU2V0dGluZ3MmIGdyb3VwU2V0dGluZ3Mo KSBjb25zdCB7IHJldHVybiAqbV9ncm91cFNldHRpbmdzOyB9CiAKICNpZiBFTkFCTEUoVklERU9f VFJBQ0spCkBAIC0xMjMsOCArMTE0LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBS ZWZQdHI8U3RvcmFnZU5hbWVzcGFjZT4gbV9sb2NhbFN0b3JhZ2U7CiAgICAgICAgIEhhc2hNYXA8 UmVmUHRyPFNlY3VyaXR5T3JpZ2luPiwgUmVmUHRyPFN0b3JhZ2VOYW1lc3BhY2U+PiBtX3RyYW5z aWVudExvY2FsU3RvcmFnZU1hcDsKIAotICAgICAgICBSZWZQdHI8VXNlckNvbnRlbnRDb250cm9s bGVyPiBtX3VzZXJDb250ZW50Q29udHJvbGxlcjsKLQogICAgICAgICBjb25zdCBzdGQ6OnVuaXF1 ZV9wdHI8R3JvdXBTZXR0aW5ncz4gbV9ncm91cFNldHRpbmdzOwogCiAjaWYgRU5BQkxFKFZJREVP X1RSQUNLKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1t IGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCmluZGV4IDU0ZTAyNWMzYjNm NDZkZjg3OTFiZTM3MTc2ZDU3ODhmMDlmOTU5OWYuLmZiMTM0YTg0ODEyYzM2OGQ1NzNiZWJjZjMw NzY3OTc1MTM4ZDVhMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KQEAgLTc4 MCw4ICs3ODAsOCBAQCBzdGF0aWMgTlNTdHJpbmcgKmxlYWtPdXRsb29rUXVpcmtzVXNlclNjcmlw dENvbnRlbnRzKCkKIC0odm9pZClfaW5qZWN0T3V0bG9va1F1aXJrc1NjcmlwdAogewogICAgIHN0 YXRpYyBOU1N0cmluZyAqb3V0bG9va1F1aXJrc1NjcmlwdENvbnRlbnRzID0gbGVha091dGxvb2tR dWlya3NVc2VyU2NyaXB0Q29udGVudHMoKTsKLSAgICBjb3JlKHNlbGYpLT5ncm91cCgpLmFkZFVz ZXJTY3JpcHRUb1dvcmxkKCpjb3JlKFtXZWJTY3JpcHRXb3JsZCB3b3JsZF0pLAotICAgICAgICBv dXRsb29rUXVpcmtzU2NyaXB0Q29udGVudHMsIFVSTCgpLCBWZWN0b3I8U3RyaW5nPigpLCBWZWN0 b3I8U3RyaW5nPigpLCBJbmplY3RBdERvY3VtZW50RW5kLCBJbmplY3RJbkFsbEZyYW1lcyk7Cisg ICAgX3ByaXZhdGUtPmdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS5hZGRVc2VyU2NyaXB0 KCpjb3JlKFtXZWJTY3JpcHRXb3JsZCB3b3JsZF0pLCBzdGQ6Om1ha2VfdW5pcXVlPFVzZXJTY3Jp cHQ+KG91dGxvb2tRdWlya3NTY3JpcHRDb250ZW50cywgVVJMKCksIFZlY3RvcjxTdHJpbmc+KCks IFZlY3RvcjxTdHJpbmc+KCksIEluamVjdEF0RG9jdW1lbnRFbmQsIEluamVjdEluQWxsRnJhbWVz KSk7CisKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCmluZGV4IDVlYjk1YzBlZDUy MGY5OWJiYjJjZWQyM2UxNzk4YTNjM2Q4NWNiNzIuLmM1M2Y2NmE4NDNlZTdhMzdlY2Y3MjE5OTg4 ODg5MGE1ZmQxMzE3YWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwCkBAIC03MCw2ICs3MCw3IEBA CiAjaW5jbHVkZSA8V2ViQ29yZS9TZWN1cml0eVBvbGljeS5oPgogI2luY2x1ZGUgPFdlYkNvcmUv U2Vzc2lvbklELmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZXR0aW5ncy5oPgorI2luY2x1ZGUgPFdl YkNvcmUvVXNlckNvbnRlbnRDb250cm9sbGVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyR2Vz dHVyZUluZGljYXRvci5oPgogCiAjaWYgRU5BQkxFKENTU19SRUdJT05TKSB8fCBFTkFCTEUoQ1NT X0NPTVBPU0lUSU5HKQpAQCAtNDc1LDQwICs0NzYsNDQgQEAgYm9vbCBJbmplY3RlZEJ1bmRsZTo6 aXNQcm9jZXNzaW5nVXNlckdlc3R1cmUoKQogdm9pZCBJbmplY3RlZEJ1bmRsZTo6YWRkVXNlclNj cmlwdChXZWJQYWdlR3JvdXBQcm94eSogcGFnZUdyb3VwLCBJbmplY3RlZEJ1bmRsZVNjcmlwdFdv cmxkKiBzY3JpcHRXb3JsZCwgY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IFN0cmluZyYgdXJs LCBBUEk6OkFycmF5KiB3aGl0ZWxpc3QsIEFQSTo6QXJyYXkqIGJsYWNrbGlzdCwgV2ViQ29yZTo6 VXNlclNjcmlwdEluamVjdGlvblRpbWUgaW5qZWN0aW9uVGltZSwgV2ViQ29yZTo6VXNlckNvbnRl bnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcykKIHsKICAgICAvLyB1cmwgaXMgbm90IGZy b20gVVJMOjpzdHJpbmcoKSwgaS5lLiBpdCBoYXMgbm90IGFscmVhZHkgYmVlbiBwYXJzZWQgYnkg VVJMLCBzbyB3ZSBoYXZlIHRvIHVzZSB0aGUgcmVsYXRpdmUgVVJMIGNvbnN0cnVjdG9yIGZvciBV UkwgaW5zdGVhZCBvZiB0aGUgUGFyc2VkVVJMU3RyaW5nVGFnIHZlcnNpb24uCi0gICAgUGFnZUdy b3VwOjpwYWdlR3JvdXAocGFnZUdyb3VwLT5pZGVudGlmaWVyKCkpLT5hZGRVc2VyU2NyaXB0VG9X b3JsZChzY3JpcHRXb3JsZC0+Y29yZVdvcmxkKCksIHNvdXJjZSwgVVJMKFVSTCgpLCB1cmwpLCB3 aGl0ZWxpc3QgPyB3aGl0ZWxpc3QtPnRvU3RyaW5nVmVjdG9yKCkgOiBWZWN0b3I8U3RyaW5nPigp LCBibGFja2xpc3QgPyBibGFja2xpc3QtPnRvU3RyaW5nVmVjdG9yKCkgOiBWZWN0b3I8U3RyaW5n PigpLCBpbmplY3Rpb25UaW1lLCBpbmplY3RlZEZyYW1lcyk7CisgICAgYXV0byB1c2VyU2NyaXB0 ID0gc3RkOjptYWtlX3VuaXF1ZTxVc2VyU2NyaXB0Pihzb3VyY2UsIFVSTChVUkwoKSwgdXJsKSwg d2hpdGVsaXN0ID8gd2hpdGVsaXN0LT50b1N0cmluZ1ZlY3RvcigpIDogVmVjdG9yPFN0cmluZz4o KSwgYmxhY2tsaXN0ID8gYmxhY2tsaXN0LT50b1N0cmluZ1ZlY3RvcigpIDogVmVjdG9yPFN0cmlu Zz4oKSwgaW5qZWN0aW9uVGltZSwgaW5qZWN0ZWRGcmFtZXMpOworCisgICAgcGFnZUdyb3VwLT51 c2VyQ29udGVudENvbnRyb2xsZXIoKS5hZGRVc2VyU2NyaXB0KHNjcmlwdFdvcmxkLT5jb3JlV29y bGQoKSwgV1RGOjptb3ZlKHVzZXJTY3JpcHQpKTsKIH0KIAogdm9pZCBJbmplY3RlZEJ1bmRsZTo6 YWRkVXNlclN0eWxlU2hlZXQoV2ViUGFnZUdyb3VwUHJveHkqIHBhZ2VHcm91cCwgSW5qZWN0ZWRC dW5kbGVTY3JpcHRXb3JsZCogc2NyaXB0V29ybGQsIGNvbnN0IFN0cmluZyYgc291cmNlLCBjb25z dCBTdHJpbmcmIHVybCwgQVBJOjpBcnJheSogd2hpdGVsaXN0LCBBUEk6OkFycmF5KiBibGFja2xp c3QsIFdlYkNvcmU6OlVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMgaW5qZWN0ZWRGcmFtZXMpCiB7 CiAgICAgLy8gdXJsIGlzIG5vdCBmcm9tIFVSTDo6c3RyaW5nKCksIGkuZS4gaXQgaGFzIG5vdCBh bHJlYWR5IGJlZW4gcGFyc2VkIGJ5IFVSTCwgc28gd2UgaGF2ZSB0byB1c2UgdGhlIHJlbGF0aXZl IFVSTCBjb25zdHJ1Y3RvciBmb3IgVVJMIGluc3RlYWQgb2YgdGhlIFBhcnNlZFVSTFN0cmluZ1Rh ZyB2ZXJzaW9uLgotICAgIFBhZ2VHcm91cDo6cGFnZUdyb3VwKHBhZ2VHcm91cC0+aWRlbnRpZmll cigpKS0+YWRkVXNlclN0eWxlU2hlZXRUb1dvcmxkKHNjcmlwdFdvcmxkLT5jb3JlV29ybGQoKSwg c291cmNlLCBVUkwoVVJMKCksIHVybCksIHdoaXRlbGlzdCA/IHdoaXRlbGlzdC0+dG9TdHJpbmdW ZWN0b3IoKSA6IFZlY3RvcjxTdHJpbmc+KCksIGJsYWNrbGlzdCA/IGJsYWNrbGlzdC0+dG9TdHJp bmdWZWN0b3IoKSA6IFZlY3RvcjxTdHJpbmc+KCksIGluamVjdGVkRnJhbWVzKTsKKyAgICBhdXRv IHVzZXJTdHlsZVNoZWV0ID0gc3RkOjptYWtlX3VuaXF1ZTxVc2VyU3R5bGVTaGVldD4oc291cmNl LCBVUkwoVVJMKCksIHVybCksIHdoaXRlbGlzdCA/IHdoaXRlbGlzdC0+dG9TdHJpbmdWZWN0b3Io KSA6IFZlY3RvcjxTdHJpbmc+KCksIGJsYWNrbGlzdCA/IGJsYWNrbGlzdC0+dG9TdHJpbmdWZWN0 b3IoKSA6IFZlY3RvcjxTdHJpbmc+KCksIGluamVjdGVkRnJhbWVzLCBVc2VyU3R5bGVVc2VyTGV2 ZWwpOworCisgICAgcGFnZUdyb3VwLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS5hZGRVc2VyU3R5 bGVTaGVldChzY3JpcHRXb3JsZC0+Y29yZVdvcmxkKCksIFdURjo6bW92ZSh1c2VyU3R5bGVTaGVl dCksIEluamVjdEluRXhpc3RpbmdEb2N1bWVudHMpOwogfQogCiB2b2lkIEluamVjdGVkQnVuZGxl OjpyZW1vdmVVc2VyU2NyaXB0KFdlYlBhZ2VHcm91cFByb3h5KiBwYWdlR3JvdXAsIEluamVjdGVk QnVuZGxlU2NyaXB0V29ybGQqIHNjcmlwdFdvcmxkLCBjb25zdCBTdHJpbmcmIHVybCkKIHsKICAg ICAvLyB1cmwgaXMgbm90IGZyb20gVVJMOjpzdHJpbmcoKSwgaS5lLiBpdCBoYXMgbm90IGFscmVh ZHkgYmVlbiBwYXJzZWQgYnkgVVJMLCBzbyB3ZSBoYXZlIHRvIHVzZSB0aGUgcmVsYXRpdmUgVVJM IGNvbnN0cnVjdG9yIGZvciBVUkwgaW5zdGVhZCBvZiB0aGUgUGFyc2VkVVJMU3RyaW5nVGFnIHZl cnNpb24uCi0gICAgUGFnZUdyb3VwOjpwYWdlR3JvdXAocGFnZUdyb3VwLT5pZGVudGlmaWVyKCkp LT5yZW1vdmVVc2VyU2NyaXB0RnJvbVdvcmxkKHNjcmlwdFdvcmxkLT5jb3JlV29ybGQoKSwgVVJM KFVSTCgpLCB1cmwpKTsKKyAgICBwYWdlR3JvdXAtPnVzZXJDb250ZW50Q29udHJvbGxlcigpLnJl bW92ZVVzZXJTY3JpcHQoc2NyaXB0V29ybGQtPmNvcmVXb3JsZCgpLCBVUkwoVVJMKCksIHVybCkp OwogfQogCiB2b2lkIEluamVjdGVkQnVuZGxlOjpyZW1vdmVVc2VyU3R5bGVTaGVldChXZWJQYWdl R3JvdXBQcm94eSogcGFnZUdyb3VwLCBJbmplY3RlZEJ1bmRsZVNjcmlwdFdvcmxkKiBzY3JpcHRX b3JsZCwgY29uc3QgU3RyaW5nJiB1cmwpCiB7CiAgICAgLy8gdXJsIGlzIG5vdCBmcm9tIFVSTDo6 c3RyaW5nKCksIGkuZS4gaXQgaGFzIG5vdCBhbHJlYWR5IGJlZW4gcGFyc2VkIGJ5IFVSTCwgc28g d2UgaGF2ZSB0byB1c2UgdGhlIHJlbGF0aXZlIFVSTCBjb25zdHJ1Y3RvciBmb3IgVVJMIGluc3Rl YWQgb2YgdGhlIFBhcnNlZFVSTFN0cmluZ1RhZyB2ZXJzaW9uLgotICAgIFBhZ2VHcm91cDo6cGFn ZUdyb3VwKHBhZ2VHcm91cC0+aWRlbnRpZmllcigpKS0+cmVtb3ZlVXNlclN0eWxlU2hlZXRGcm9t V29ybGQoc2NyaXB0V29ybGQtPmNvcmVXb3JsZCgpLCBVUkwoVVJMKCksIHVybCkpOworICAgIHBh Z2VHcm91cC0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkucmVtb3ZlVXNlclN0eWxlU2hlZXQoc2Ny aXB0V29ybGQtPmNvcmVXb3JsZCgpLCBVUkwoVVJMKCksIHVybCkpOwogfQogCiB2b2lkIEluamVj dGVkQnVuZGxlOjpyZW1vdmVVc2VyU2NyaXB0cyhXZWJQYWdlR3JvdXBQcm94eSogcGFnZUdyb3Vw LCBJbmplY3RlZEJ1bmRsZVNjcmlwdFdvcmxkKiBzY3JpcHRXb3JsZCkKIHsKLSAgICBQYWdlR3Jv dXA6OnBhZ2VHcm91cChwYWdlR3JvdXAtPmlkZW50aWZpZXIoKSktPnJlbW92ZVVzZXJTY3JpcHRz RnJvbVdvcmxkKHNjcmlwdFdvcmxkLT5jb3JlV29ybGQoKSk7CisgICAgcGFnZUdyb3VwLT51c2Vy Q29udGVudENvbnRyb2xsZXIoKS5yZW1vdmVVc2VyU2NyaXB0cyhzY3JpcHRXb3JsZC0+Y29yZVdv cmxkKCkpOwogfQogCiB2b2lkIEluamVjdGVkQnVuZGxlOjpyZW1vdmVVc2VyU3R5bGVTaGVldHMo V2ViUGFnZUdyb3VwUHJveHkqIHBhZ2VHcm91cCwgSW5qZWN0ZWRCdW5kbGVTY3JpcHRXb3JsZCog c2NyaXB0V29ybGQpCiB7Ci0gICAgUGFnZUdyb3VwOjpwYWdlR3JvdXAocGFnZUdyb3VwLT5pZGVu dGlmaWVyKCkpLT5yZW1vdmVVc2VyU3R5bGVTaGVldHNGcm9tV29ybGQoc2NyaXB0V29ybGQtPmNv cmVXb3JsZCgpKTsKKyAgICBwYWdlR3JvdXAtPnVzZXJDb250ZW50Q29udHJvbGxlcigpLnJlbW92 ZVVzZXJTdHlsZVNoZWV0cyhzY3JpcHRXb3JsZC0+Y29yZVdvcmxkKCkpOwogfQogCiB2b2lkIElu amVjdGVkQnVuZGxlOjpyZW1vdmVBbGxVc2VyQ29udGVudChXZWJQYWdlR3JvdXBQcm94eSogcGFn ZUdyb3VwKQogewotICAgIFBhZ2VHcm91cDo6cGFnZUdyb3VwKHBhZ2VHcm91cC0+aWRlbnRpZmll cigpKS0+cmVtb3ZlQWxsVXNlckNvbnRlbnQoKTsKKyAgICBwYWdlR3JvdXAtPnVzZXJDb250ZW50 Q29udHJvbGxlcigpLnJlbW92ZUFsbFVzZXJDb250ZW50KCk7CiB9CiAKIHZvaWQgSW5qZWN0ZWRC dW5kbGU6OmdhcmJhZ2VDb2xsZWN0SmF2YVNjcmlwdE9iamVjdHMoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGUzM2ZlYzk3NzI4NTFiMmRl MmI0MzJlNTMxZjA1MTMxNzlmMmE4ODYuLjk3ZDc1OTNlOTE1MDMyMzY4ZGMwMDRkNmM5MTQyZjIz ZTU5NGI4ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKQEAgLTMzNyw2ICszMzcsOCBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBhZ2VJ RCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICAgICAvLyA0 bXMgc2hvdWxkIGJlIGFkb3B0ZWQgcHJvamVjdC13aWRlIG5vdywgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMjE0CiAgICAgU2V0dGluZ3M6OnNldERlZmF1bHRNaW5E T01UaW1lckludGVydmFsKDAuMDA0KTsKIAorICAgIG1fcGFnZUdyb3VwID0gV2ViUHJvY2Vzczo6 c2hhcmVkKCkud2ViUGFnZUdyb3VwKHBhcmFtZXRlcnMucGFnZUdyb3VwRGF0YSk7CisKICNpZiBQ TEFURk9STShJT1MpCiAgICAgU2V0dGluZ3M6OnNldFNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNh dGVnb3J5KHRydWUpOwogI2VuZGlmCkBAIC0zNjMsNyArMzY1LDcgQEAgV2ViUGFnZTo6V2ViUGFn ZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFt ZXRlcnMpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ucHJvZ3Jlc3NUcmFja2VyQ2xpZW50ID0gbmV3 IFdlYlByb2dyZXNzVHJhY2tlckNsaWVudCgqdGhpcyk7CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24u ZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQgPSBuZXcgV2ViRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQo KnRoaXMpOwogCi0gICAgcGFnZUNvbmZpZ3VyYXRpb24udXNlckNvbnRlbnRDb250cm9sbGVyID0g bV91c2VyQ29udGVudENvbnRyb2xsZXIgPyAmbV91c2VyQ29udGVudENvbnRyb2xsZXItPnVzZXJD b250ZW50Q29udHJvbGxlcigpIDogbnVsbHB0cjsKKyAgICBwYWdlQ29uZmlndXJhdGlvbi51c2Vy Q29udGVudENvbnRyb2xsZXIgPSBtX3VzZXJDb250ZW50Q29udHJvbGxlciA/ICZtX3VzZXJDb250 ZW50Q29udHJvbGxlci0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkgOiAmbV9wYWdlR3JvdXAtPnVz ZXJDb250ZW50Q29udHJvbGxlcigpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnZpc2l0ZWRMaW5r U3RvcmUgPSBWaXNpdGVkTGlua1RhYmxlQ29udHJvbGxlcjo6Z2V0T3JDcmVhdGUocGFyYW1ldGVy cy52aXNpdGVkTGlua1RhYmxlSUQpOwogCiAgICAgbV9wYWdlID0gc3RkOjptYWtlX3VuaXF1ZTxQ YWdlPihwYWdlQ29uZmlndXJhdGlvbik7CkBAIC00MDYsNyArNDA4LDYgQEAgV2ViUGFnZTo6V2Vi UGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmIHBh cmFtZXRlcnMpCiAgICAgbV9wYWdlLT5zZXRDYW5TdGFydE1lZGlhKGZhbHNlKTsKICAgICBtX21h eVN0YXJ0TWVkaWFXaGVuSW5XaW5kb3cgPSBwYXJhbWV0ZXJzLm1heVN0YXJ0TWVkaWFXaGVuSW5X aW5kb3c7CiAKLSAgICBtX3BhZ2VHcm91cCA9IFdlYlByb2Nlc3M6OnNoYXJlZCgpLndlYlBhZ2VH cm91cChwYXJhbWV0ZXJzLnBhZ2VHcm91cERhdGEpOwogICAgIG1fcGFnZS0+c2V0R3JvdXBOYW1l KG1fcGFnZUdyb3VwLT5pZGVudGlmaWVyKCkpOwogICAgIG1fcGFnZS0+c2V0RGV2aWNlU2NhbGVG YWN0b3IocGFyYW1ldGVycy5kZXZpY2VTY2FsZUZhY3Rvcik7CiAjaWYgUExBVEZPUk0oSU9TKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2VHcm91 cFByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3Jv dXBQcm94eS5jcHAKaW5kZXggOTE2NGY0ODBlZjczZTg3Mjg0NDVjZWQ3MmQxOTkxYzM2MDAzMDQz NC4uNzI5ZTY5MjU1YTA2ZDdjOWE3Y2ExODI2ODZjM2VlZDMzNzg5ODRlYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2VHcm91cFByb3h5LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZUdyb3VwUHJveHku Y3BwCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiSW5qZWN0ZWRCdW5kbGUuaCIKICNpbmNs dWRlIDxXZWJDb3JlL0RPTVdyYXBwZXJXb3JsZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZUdy b3VwLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaD4KIAogbmFt ZXNwYWNlIFdlYktpdCB7CiAKQEAgLTQzLDEwICs0NCw2IEBAIFBhc3NSZWZQdHI8V2ViUGFnZUdy b3VwUHJveHk+IFdlYlBhZ2VHcm91cFByb3h5OjpjcmVhdGUoY29uc3QgV2ViUGFnZUdyb3VwRGF0 YSYKICAgICByZXR1cm4gcGFnZUdyb3VwLnJlbGVhc2UoKTsKIH0KIAotV2ViUGFnZUdyb3VwUHJv eHk6On5XZWJQYWdlR3JvdXBQcm94eSgpCi17Ci19Ci0KIFdlYlBhZ2VHcm91cFByb3h5OjpXZWJQ YWdlR3JvdXBQcm94eShjb25zdCBXZWJQYWdlR3JvdXBEYXRhJiBkYXRhKQogICAgIDogbV9kYXRh KGRhdGEpCiAgICAgLCBtX3BhZ2VHcm91cChXZWJDb3JlOjpQYWdlR3JvdXA6OnBhZ2VHcm91cCht X2RhdGEuaWRlbnRpZmVyKSkKQEAgLTU3LDI5ICs1NCw0MSBAQCBXZWJQYWdlR3JvdXBQcm94eTo6 V2ViUGFnZUdyb3VwUHJveHkoY29uc3QgV2ViUGFnZUdyb3VwRGF0YSYgZGF0YSkKICAgICAgICAg YWRkVXNlclNjcmlwdChkYXRhLnVzZXJTY3JpcHRzW2ldKTsKIH0KIAorV2ViUGFnZUdyb3VwUHJv eHk6On5XZWJQYWdlR3JvdXBQcm94eSgpCit7Cit9CisKK1dlYkNvcmU6OlVzZXJDb250ZW50Q29u dHJvbGxlciYgV2ViUGFnZUdyb3VwUHJveHk6OnVzZXJDb250ZW50Q29udHJvbGxlcigpCit7Cisg ICAgaWYgKCFtX3VzZXJDb250ZW50Q29udHJvbGxlcikKKyAgICAgICAgbV91c2VyQ29udGVudENv bnRyb2xsZXIgPSBXZWJDb3JlOjpVc2VyQ29udGVudENvbnRyb2xsZXI6OmNyZWF0ZSgpOworCisg ICAgcmV0dXJuICptX3VzZXJDb250ZW50Q29udHJvbGxlcjsKK30KKwogdm9pZCBXZWJQYWdlR3Jv dXBQcm94eTo6YWRkVXNlclN0eWxlU2hlZXQoY29uc3QgV2ViQ29yZTo6VXNlclN0eWxlU2hlZXQm IHVzZXJTdHlsZVNoZWV0KQogewotICAgIG1fcGFnZUdyb3VwLT5hZGRVc2VyU3R5bGVTaGVldFRv V29ybGQoV2ViQ29yZTo6bWFpblRocmVhZE5vcm1hbFdvcmxkKCksIHVzZXJTdHlsZVNoZWV0LnNv dXJjZSgpLCB1c2VyU3R5bGVTaGVldC51cmwoKSwgdXNlclN0eWxlU2hlZXQud2hpdGVsaXN0KCks IHVzZXJTdHlsZVNoZWV0LmJsYWNrbGlzdCgpLCB1c2VyU3R5bGVTaGVldC5pbmplY3RlZEZyYW1l cygpLCB1c2VyU3R5bGVTaGVldC5sZXZlbCgpKTsKKyAgICB1c2VyQ29udGVudENvbnRyb2xsZXIo KS5hZGRVc2VyU3R5bGVTaGVldChXZWJDb3JlOjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSwgc3Rk OjptYWtlX3VuaXF1ZTxXZWJDb3JlOjpVc2VyU3R5bGVTaGVldD4odXNlclN0eWxlU2hlZXQpLCBX ZWJDb3JlOjpJbmplY3RJbkV4aXN0aW5nRG9jdW1lbnRzKTsKIH0KIAogdm9pZCBXZWJQYWdlR3Jv dXBQcm94eTo6YWRkVXNlclNjcmlwdChjb25zdCBXZWJDb3JlOjpVc2VyU2NyaXB0JiB1c2VyU2Ny aXB0KQogewotICAgIG1fcGFnZUdyb3VwLT5hZGRVc2VyU2NyaXB0VG9Xb3JsZChXZWJDb3JlOjpt YWluVGhyZWFkTm9ybWFsV29ybGQoKSwgdXNlclNjcmlwdC5zb3VyY2UoKSwgdXNlclNjcmlwdC51 cmwoKSwgdXNlclNjcmlwdC53aGl0ZWxpc3QoKSwgdXNlclNjcmlwdC5ibGFja2xpc3QoKSwgdXNl clNjcmlwdC5pbmplY3Rpb25UaW1lKCksIHVzZXJTY3JpcHQuaW5qZWN0ZWRGcmFtZXMoKSk7Cisg ICAgdXNlckNvbnRlbnRDb250cm9sbGVyKCkuYWRkVXNlclNjcmlwdChXZWJDb3JlOjptYWluVGhy ZWFkTm9ybWFsV29ybGQoKSwgc3RkOjptYWtlX3VuaXF1ZTxXZWJDb3JlOjpVc2VyU2NyaXB0Pih1 c2VyU2NyaXB0KSk7CiB9CiAKIHZvaWQgV2ViUGFnZUdyb3VwUHJveHk6OnJlbW92ZUFsbFVzZXJT dHlsZVNoZWV0cygpCiB7Ci0gICAgbV9wYWdlR3JvdXAtPnJlbW92ZVVzZXJTdHlsZVNoZWV0c0Zy b21Xb3JsZChXZWJDb3JlOjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSk7CisgICAgdXNlckNvbnRl bnRDb250cm9sbGVyKCkucmVtb3ZlVXNlclN0eWxlU2hlZXRzKFdlYkNvcmU6Om1haW5UaHJlYWRO b3JtYWxXb3JsZCgpKTsKIH0KIAogdm9pZCBXZWJQYWdlR3JvdXBQcm94eTo6cmVtb3ZlQWxsVXNl clNjcmlwdHMoKQogewotICAgIG1fcGFnZUdyb3VwLT5yZW1vdmVVc2VyU2NyaXB0c0Zyb21Xb3Js ZChXZWJDb3JlOjptYWluVGhyZWFkTm9ybWFsV29ybGQoKSk7CisgICAgdXNlckNvbnRlbnRDb250 cm9sbGVyKCkucmVtb3ZlVXNlclNjcmlwdHMoV2ViQ29yZTo6bWFpblRocmVhZE5vcm1hbFdvcmxk KCkpOwogfQogCiB2b2lkIFdlYlBhZ2VHcm91cFByb3h5OjpyZW1vdmVBbGxVc2VyQ29udGVudCgp CiB7Ci0gICAgbV9wYWdlR3JvdXAtPnJlbW92ZUFsbFVzZXJDb250ZW50KCk7CisgICAgdXNlckNv bnRlbnRDb250cm9sbGVyKCkucmVtb3ZlQWxsVXNlckNvbnRlbnQoKTsKIH0KIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZUdyb3VwUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlR3JvdXBQcm94eS5oCmluZGV4IDVlN2Q1MGI4NWM1Mzc5MjE5MWY5MDRiZmE2YWVm ZmEwMjg0MGJmODkuLjZmMzlmNDI0M2VjZTEwMzA1YzE4MTM2OGQ3OGJmYjc2OWViZTYzM2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3JvdXBQ cm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlR3Jv dXBQcm94eS5oCkBAIC0zNyw2ICszNyw3IEBAIGNsYXNzIE1lc3NhZ2VEZWNvZGVyOwogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CiBjbGFzcyBQYWdlR3JvdXA7CitjbGFzcyBVc2VyQ29udGVudENvbnRy b2xsZXI7CiB9CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNTIsMTAgKzUzLDkgQEAgcHVibGlj OgogICAgIGJvb2wgaXNWaXNpYmxlVG9IaXN0b3J5Q2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9k YXRhLnZpc2libGVUb0hpc3RvcnlDbGllbnQ7IH0KICAgICBXZWJDb3JlOjpQYWdlR3JvdXAqIGNv cmVQYWdlR3JvdXAoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VHcm91cDsgfQogCi0gICAgdm9pZCBk aWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7 CisgICAgV2ViQ29yZTo6VXNlckNvbnRlbnRDb250cm9sbGVyJiB1c2VyQ29udGVudENvbnRyb2xs ZXIoKTsKIAotcHJpdmF0ZToKLSAgICBXZWJQYWdlR3JvdXBQcm94eShjb25zdCBXZWJQYWdlR3Jv dXBEYXRhJik7CisgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24qLCBJ UEM6Ok1lc3NhZ2VEZWNvZGVyJik7CiAKICAgICB2b2lkIGFkZFVzZXJTdHlsZVNoZWV0KGNvbnN0 IFdlYkNvcmU6OlVzZXJTdHlsZVNoZWV0Jik7CiAgICAgdm9pZCBhZGRVc2VyU2NyaXB0KGNvbnN0 IFdlYkNvcmU6OlVzZXJTY3JpcHQmKTsKQEAgLTYzLDggKzYzLDEzIEBAIHByaXZhdGU6CiAgICAg dm9pZCByZW1vdmVBbGxVc2VyU2NyaXB0cygpOwogICAgIHZvaWQgcmVtb3ZlQWxsVXNlckNvbnRl bnQoKTsKIAorcHJpdmF0ZToKKyAgICBXZWJQYWdlR3JvdXBQcm94eShjb25zdCBXZWJQYWdlR3Jv dXBEYXRhJik7CisKICAgICBXZWJQYWdlR3JvdXBEYXRhIG1fZGF0YTsKICAgICBXZWJDb3JlOjpQ YWdlR3JvdXAqIG1fcGFnZUdyb3VwOworCisgICAgUmVmUHRyPFdlYkNvcmU6OlVzZXJDb250ZW50 Q29udHJvbGxlcj4gbV91c2VyQ29udGVudENvbnRyb2xsZXI7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQK