173350 2017-06-14 00:35:30 -0700 Add API::InjectedBundleClient 2017-06-14 09:21:40 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 173351 1 cgarcia webkit-unassigned achristensen berto buildbot darin gustavo mcatanzaro sam oldest_to_newest 1319031 0 cgarcia 2017-06-14 00:35:30 -0700 It will be used by the GTK+ port instead of the C API. 1319032 1 312866 cgarcia 2017-06-14 00:37:56 -0700 Created attachment 312866 Patch 1319034 2 buildbot 2017-06-14 00:40:33 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1319152 3 cgarcia 2017-06-14 09:21:40 -0700 Committed r218261: <http://trac.webkit.org/changeset/218261> 312866 2017-06-14 00:37:56 -0700 2017-06-14 08:41:56 -0700 Patch wk2-injected-bundle-client-api.dif text/plain 20108 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMGJlNzM1N2Q2OC4uZjBmY2JjNmY4NDggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNSBAQAorMjAxNy0wNi0xNCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CisKKyAgICAgICAgQWRkIEFQSTo6SW5qZWN0ZWRCdW5kbGVDbGllbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzM1MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IHdpbGwgYmUgdXNl ZCBieSB0aGUgR1RLKyBwb3J0IGluc3RlYWQgb2YgdGhlIEMgQVBJLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9BUElJbmplY3RlZEJ1bmRsZUNsaWVudC5oOiBDb3BpZWQgZnJvbSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmguCisgICAg ICAgIChBUEk6OkluamVjdGVkQnVuZGxlQ2xpZW50OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21Jbmpl Y3RlZEJ1bmRsZSk6CisgICAgICAgIChBUEk6OkluamVjdGVkQnVuZGxlQ2xpZW50OjpkaWRSZWNl aXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKToKKyAgICAgICAgKEFQSTo6 SW5qZWN0ZWRCdW5kbGVDbGllbnQ6OmdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2Vy RGF0YSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHA6CisgICAgICAg IChXS0NvbnRleHRTZXRJbmplY3RlZEJ1bmRsZUNsaWVudCk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHA6CisgICAgICAgICh3ZWJraXRXZWJDb250ZXh0 RGlzcG9zZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNs aWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVu dDo6V2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50KToKKyAgICAgICAgKFdlYktpdDo6V2Vi Q29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3Rl ZEJ1bmRsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVu dDo6ZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudDo6Z2V0SW5qZWN0ZWRC dW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29u dGV4dEluamVjdGVkQnVuZGxlQ2xpZW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OldlYlByb2Nlc3NQ b29sKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnNldEluamVjdGVkQnVuZGxl Q2xpZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dlYlBy b2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6aGFuZGxlTWVzc2FnZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpoYW5kbGVTeW5jaHJvbm91c01lc3Nh Z2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICAqIFdl YktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxNy0wNi0xMyAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgRG8gbm90IG1peCBD IGFuZCBDKysgQVBJIGVycm9yIGNvbnN0YW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9BUElJbmplY3RlZEJ1bmRsZUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9BUElJbmplY3RlZEJ1bmRsZUNsaWVudC5oCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwLi4yMzUwYzYxZmUxMwotLS0gL2Rldi9udWxsCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJSW5qZWN0ZWRCdW5kbGVDbGllbnQuaApAQCAt MCwwICsxLDQ2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE3IElnYWxpYSBTLkwuCisgKgor ICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0 aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhh dCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICog ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJ VFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQg V0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElF RCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5E SVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJ QUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G CisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5E IE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RS SUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgor ICovCisKKyNwcmFnbWEgb25jZQorCisjaW5jbHVkZSAiQVBJT2JqZWN0LmgiCisjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KKworbmFtZXNwYWNlIFdlYktpdCB7CitjbGFzcyBXZWJQcm9jZXNzUG9v bDsKK30KKworbmFtZXNwYWNlIEFQSSB7CisKK2NsYXNzIEluamVjdGVkQnVuZGxlQ2xpZW50IHsK K3B1YmxpYzoKKyAgICB2aXJ0dWFsIH5JbmplY3RlZEJ1bmRsZUNsaWVudCgpID0gZGVmYXVsdDsK KworICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShX ZWJLaXQ6OldlYlByb2Nlc3NQb29sJiwgY29uc3QgV1RGOjpTdHJpbmcmLCBBUEk6Ok9iamVjdCop IHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdlRnJvbUlu amVjdGVkQnVuZGxlKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2wmLCBjb25zdCBXVEY6OlN0cmluZyYs IEFQSTo6T2JqZWN0KiwgUmVmUHRyPEFQSTo6T2JqZWN0PiYpIHsgfQorICAgIHZpcnR1YWwgUmVm UHRyPEFQSTo6T2JqZWN0PiBnZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEo V2ViS2l0OjpXZWJQcm9jZXNzUG9vbCYpIHsgcmV0dXJuIG51bGxwdHI7IH0KK307CisKK30gLy8g bmFtZXNwYWNlIEFQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0 LmNwcAppbmRleCAzM2ZiYTM3NzdkOC4uMDY1ZWY4MTJjY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVk ZSAiV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oIgogI2luY2x1ZGUgIldLUmV0YWluUHRyLmgi CiAjaW5jbHVkZSAiV2ViQ2VydGlmaWNhdGVJbmZvLmgiCisjaW5jbHVkZSAiV2ViQ29udGV4dElu amVjdGVkQnVuZGxlQ2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViSWNvbkRhdGFiYXNlLmgiCiAjaW5j bHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CkBAIC05Miw3 ICs5Myw3IEBAIHZvaWQgV0tDb250ZXh0U2V0Q2xpZW50KFdLQ29udGV4dFJlZiBjb250ZXh0UmVm LCBjb25zdCBXS0NvbnRleHRDbGllbnRCYXNlKiB3a0NsCiAKIHZvaWQgV0tDb250ZXh0U2V0SW5q ZWN0ZWRCdW5kbGVDbGllbnQoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIGNvbnN0IFdLQ29udGV4 dEluamVjdGVkQnVuZGxlQ2xpZW50QmFzZSogd2tDbGllbnQpCiB7Ci0gICAgdG9JbXBsKGNvbnRl eHRSZWYpLT5pbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVDbGllbnQod2tDbGllbnQpOworICAgIHRv SW1wbChjb250ZXh0UmVmKS0+c2V0SW5qZWN0ZWRCdW5kbGVDbGllbnQoc3RkOjptYWtlX3VuaXF1 ZTxXZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQ+KHdrQ2xpZW50KSk7CiB9CiAKIHZvaWQg V0tDb250ZXh0U2V0SGlzdG9yeUNsaWVudChXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgY29uc3Qg V0tDb250ZXh0SGlzdG9yeUNsaWVudEJhc2UqIHdrQ2xpZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcAppbmRleCAwOWU4 MjEzNzViOS4uNmU1ZjA0ZjU1MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0yMyw2ICsyMyw3IEBACiAjaW5j bHVkZSAiQVBJQXV0b21hdGlvbkNsaWVudC5oIgogI2luY2x1ZGUgIkFQSUN1c3RvbVByb3RvY29s TWFuYWdlckNsaWVudC5oIgogI2luY2x1ZGUgIkFQSURvd25sb2FkQ2xpZW50LmgiCisjaW5jbHVk ZSAiQVBJSW5qZWN0ZWRCdW5kbGVDbGllbnQuaCIKICNpbmNsdWRlICJBUElQYWdlQ29uZmlndXJh dGlvbi5oIgogI2luY2x1ZGUgIkFQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oIgogI2luY2x1 ZGUgIkFQSVN0cmluZy5oIgpAQCAtMzM1LDcgKzMzNiw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdl YkNvbnRleHREaXNwb3NlKEdPYmplY3QqIG9iamVjdCkKICAgICBXZWJLaXRXZWJDb250ZXh0UHJp dmF0ZSogcHJpdiA9IFdFQktJVF9XRUJfQ09OVEVYVChvYmplY3QpLT5wcml2OwogICAgIGlmICgh cHJpdi0+Y2xpZW50c0RldGFjaGVkKSB7CiAgICAgICAgIHByaXYtPmNsaWVudHNEZXRhY2hlZCA9 IHRydWU7Ci0gICAgICAgIHByaXYtPnByb2Nlc3NQb29sLT5pbml0aWFsaXplSW5qZWN0ZWRCdW5k bGVDbGllbnQobnVsbHB0cik7CisgICAgICAgIHByaXYtPnByb2Nlc3NQb29sLT5zZXRJbmplY3Rl ZEJ1bmRsZUNsaWVudChudWxscHRyKTsKICAgICAgICAgcHJpdi0+cHJvY2Vzc1Bvb2wtPnNldERv d25sb2FkQ2xpZW50KG51bGxwdHIpOwogICAgICAgICBwcml2LT5wcm9jZXNzUG9vbC0+c2V0TGVn YWN5Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyQ2xpZW50KG51bGxwdHIpOwogICAgIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGll bnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRJbmplY3RlZEJ1bmRs ZUNsaWVudC5jcHAKaW5kZXggOTBhYzE5YjgwZDUuLmY0Y2E2MmNjYWI2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVuZGxl Q2xpZW50LmNwcApAQCAtMzAsMzQgKzMwLDM3IEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wu aCIKICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAotdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7Ci0KIG5hbWVzcGFjZSBXZWJLaXQgewogCi12b2lkIFdlYkNvbnRleHRJbmplY3RlZEJ1 bmRsZUNsaWVudDo6ZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV2ViUHJvY2Vz c1Bvb2wqIHByb2Nlc3NQb29sLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBBUEk6Ok9iamVj dCogbWVzc2FnZUJvZHkpCitXZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQ6OldlYkNvbnRl eHRJbmplY3RlZEJ1bmRsZUNsaWVudChjb25zdCBXS0NvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVu dEJhc2UqIGNsaWVudCkKK3sKKyAgICBpbml0aWFsaXplKGNsaWVudCk7Cit9CisKK3ZvaWQgV2Vi Q29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50OjpkaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3Rl ZEJ1bmRsZShXZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wsIGNvbnN0IFN0cmluZyYgbWVzc2Fn ZU5hbWUsIEFQSTo6T2JqZWN0KiBtZXNzYWdlQm9keSkKIHsKICAgICBpZiAoIW1fY2xpZW50LmRp ZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKQogICAgICAgICByZXR1cm47CiAKLSAg ICBtX2NsaWVudC5kaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSh0b0FQSShwcm9j ZXNzUG9vbCksIHRvQVBJKG1lc3NhZ2VOYW1lLmltcGwoKSksIHRvQVBJKG1lc3NhZ2VCb2R5KSwg bV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKKyAgICBtX2NsaWVudC5kaWRSZWNlaXZlTWVzc2Fn ZUZyb21JbmplY3RlZEJ1bmRsZSh0b0FQSSgmcHJvY2Vzc1Bvb2wpLCB0b0FQSShtZXNzYWdlTmFt ZS5pbXBsKCkpLCB0b0FQSShtZXNzYWdlQm9keSksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbyk7 CiB9CiAKLXZvaWQgV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50OjpkaWRSZWNlaXZlU3lu Y2hyb25vdXNNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKFdlYlByb2Nlc3NQb29sKiBwcm9jZXNz UG9vbCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgQVBJOjpPYmplY3QqIG1lc3NhZ2VCb2R5 LCBSZWZQdHI8QVBJOjpPYmplY3Q+JiByZXR1cm5EYXRhKQordm9pZCBXZWJDb250ZXh0SW5qZWN0 ZWRCdW5kbGVDbGllbnQ6OmRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRC dW5kbGUoV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2VO YW1lLCBBUEk6Ok9iamVjdCogbWVzc2FnZUJvZHksIFJlZlB0cjxBUEk6Ok9iamVjdD4mIHJldHVy bkRhdGEpCiB7CiAgICAgaWYgKCFtX2NsaWVudC5kaWRSZWNlaXZlU3luY2hyb25vdXNNZXNzYWdl RnJvbUluamVjdGVkQnVuZGxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBXS1R5cGVSZWYgcmV0 dXJuRGF0YVJlZiA9IDA7Ci0gICAgbV9jbGllbnQuZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2Fn ZUZyb21JbmplY3RlZEJ1bmRsZSh0b0FQSShwcm9jZXNzUG9vbCksIHRvQVBJKG1lc3NhZ2VOYW1l LmltcGwoKSksIHRvQVBJKG1lc3NhZ2VCb2R5KSwgJnJldHVybkRhdGFSZWYsIG1fY2xpZW50LmJh c2UuY2xpZW50SW5mbyk7CisgICAgV0tUeXBlUmVmIHJldHVybkRhdGFSZWYgPSBudWxscHRyOwor ICAgIG1fY2xpZW50LmRpZFJlY2VpdmVTeW5jaHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5k bGUodG9BUEkoJnByb2Nlc3NQb29sKSwgdG9BUEkobWVzc2FnZU5hbWUuaW1wbCgpKSwgdG9BUEko bWVzc2FnZUJvZHkpLCAmcmV0dXJuRGF0YVJlZiwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsK ICAgICByZXR1cm5EYXRhID0gYWRvcHRSZWYodG9JbXBsKHJldHVybkRhdGFSZWYpKTsKIH0KIAot UmVmUHRyPEFQSTo6T2JqZWN0PiBXZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQ6OmdldElu amVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YShXZWJQcm9jZXNzUG9vbCogcHJvY2Vz c1Bvb2wpCitSZWZQdHI8QVBJOjpPYmplY3Q+IFdlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVu dDo6Z2V0SW5qZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhKFdlYlByb2Nlc3NQb29s JiBwcm9jZXNzUG9vbCkKIHsKICAgICBpZiAoIW1fY2xpZW50LmdldEluamVjdGVkQnVuZGxlSW5p dGlhbGl6YXRpb25Vc2VyRGF0YSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICByZXR1 cm4gYWRvcHRSZWYodG9JbXBsKG1fY2xpZW50LmdldEluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRp b25Vc2VyRGF0YSh0b0FQSShwcm9jZXNzUG9vbCksIG1fY2xpZW50LmJhc2UuY2xpZW50SW5mbykp KTsKKyAgICByZXR1cm4gYWRvcHRSZWYodG9JbXBsKG1fY2xpZW50LmdldEluamVjdGVkQnVuZGxl SW5pdGlhbGl6YXRpb25Vc2VyRGF0YSh0b0FQSSgmcHJvY2Vzc1Bvb2wpLCBtX2NsaWVudC5iYXNl LmNsaWVudEluZm8pKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVu dC5oCmluZGV4IDJkZTYzY2UzY2I4Li41MzhlMTk5NmIwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHRJbmplY3RlZEJ1bmRsZUNsaWVudC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQuaApA QCAtMjYsNyArMjYsOCBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlICJBUElDbGllbnQuaCIK LSNpbmNsdWRlICJXS0NvbnRleHQuaCIKKyNpbmNsdWRlICJBUElJbmplY3RlZEJ1bmRsZUNsaWVu dC5oIgorI2luY2x1ZGUgIldLQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50LmgiCiAjaW5jbHVk ZSA8d3RmL0ZvcndhcmQuaD4KIAogbmFtZXNwYWNlIEFQSSB7CkBAIC00MSwxMSArNDIsMTMgQEAg bmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYlByb2Nlc3NQb29sOwogCi1jbGFzcyBXZWJD b250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnQgOiBwdWJsaWMgQVBJOjpDbGllbnQ8V0tDb250ZXh0 SW5qZWN0ZWRCdW5kbGVDbGllbnRCYXNlPiB7CitjbGFzcyBXZWJDb250ZXh0SW5qZWN0ZWRCdW5k bGVDbGllbnQgOiBwdWJsaWMgQVBJOjpJbmplY3RlZEJ1bmRsZUNsaWVudCwgcHVibGljIEFQSTo6 Q2xpZW50PFdLQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50QmFzZT4gewogcHVibGljOgotICAg IHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoV2ViUHJvY2Vzc1Bvb2wq LCBjb25zdCBTdHJpbmcmLCBBUEk6Ok9iamVjdCopOwotICAgIHZvaWQgZGlkUmVjZWl2ZVN5bmNo cm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShXZWJQcm9jZXNzUG9vbCosIGNvbnN0IFN0 cmluZyYsIEFQSTo6T2JqZWN0KiwgUmVmUHRyPEFQSTo6T2JqZWN0PiYgcmV0dXJuRGF0YSk7Ci0g ICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBnZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNl ckRhdGEoV2ViUHJvY2Vzc1Bvb2wqKTsKKyAgICBleHBsaWNpdCBXZWJDb250ZXh0SW5qZWN0ZWRC dW5kbGVDbGllbnQoY29uc3QgV0tDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnRCYXNlKik7CisK KyAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVuZGxlKFdlYlByb2Nlc3NQ b29sJiwgY29uc3QgV1RGOjpTdHJpbmcmLCBBUEk6Ok9iamVjdCopIG92ZXJyaWRlOworICAgIHZv aWQgZGlkUmVjZWl2ZVN5bmNocm9ub3VzTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZShXZWJQcm9j ZXNzUG9vbCYsIGNvbnN0IFdURjo6U3RyaW5nJiwgQVBJOjpPYmplY3QqLCBSZWZQdHI8QVBJOjpP YmplY3Q+Jikgb3ZlcnJpZGU7CisgICAgUmVmUHRyPEFQSTo6T2JqZWN0PiBnZXRJbmplY3RlZEJ1 bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEoV2ViUHJvY2Vzc1Bvb2wmKSBvdmVycmlkZTsKIH07 CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUG9vbC5jcHAKaW5kZXggYWZjNDc2ODMxNTkuLmZlN2Y2ZDEyMTJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTMxLDYgKzMxLDcgQEAK ICNpbmNsdWRlICJBUElDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCIKICNpbmNsdWRlICJB UElEb3dubG9hZENsaWVudC5oIgogI2luY2x1ZGUgIkFQSUhUVFBDb29raWVTdG9yZS5oIgorI2lu Y2x1ZGUgIkFQSUluamVjdGVkQnVuZGxlQ2xpZW50LmgiCiAjaW5jbHVkZSAiQVBJTGVnYWN5Q29u dGV4dEhpc3RvcnlDbGllbnQuaCIKICNpbmNsdWRlICJBUElQYWdlQ29uZmlndXJhdGlvbi5oIgog I2luY2x1ZGUgIkFQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oIgpAQCAtMjE3LDYgKzIxOCw3 IEBAIFdlYlByb2Nlc3NQb29sOjpXZWJQcm9jZXNzUG9vbChBUEk6OlByb2Nlc3NQb29sQ29uZmln dXJhdGlvbiYgY29uZmlndXJhdGlvbikKICAgICAsIG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3Mo ZmFsc2UpCiAgICAgLCBtX3Byb2Nlc3NXaXRoUGFnZUNhY2hlKDApCiAgICAgLCBtX2RlZmF1bHRQ YWdlR3JvdXAoV2ViUGFnZUdyb3VwOjpjcmVhdGVOb25OdWxsKCkpCisgICAgLCBtX2luamVjdGVk QnVuZGxlQ2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8QVBJOjpJbmplY3RlZEJ1bmRsZUNsaWVudD4o KSkKICAgICAsIG1fYXV0b21hdGlvbkNsaWVudChzdGQ6Om1ha2VfdW5pcXVlPEFQSTo6QXV0b21h dGlvbkNsaWVudD4oKSkKICAgICAsIG1fZG93bmxvYWRDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxB UEk6OkRvd25sb2FkQ2xpZW50PigpKQogICAgICwgbV9oaXN0b3J5Q2xpZW50KHN0ZDo6bWFrZV91 bmlxdWU8QVBJOjpMZWdhY3lDb250ZXh0SGlzdG9yeUNsaWVudD4oKSkKQEAgLTMzMCw5ICszMzIs MTIgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6aW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS0NvbnRl eHRDbGllbnRCYXNlKiBjbGllbnQpCiAgICAgbV9jbGllbnQuaW5pdGlhbGl6ZShjbGllbnQpOwog fQogCi12b2lkIFdlYlByb2Nlc3NQb29sOjppbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVDbGllbnQo Y29uc3QgV0tDb250ZXh0SW5qZWN0ZWRCdW5kbGVDbGllbnRCYXNlKiBjbGllbnQpCit2b2lkIFdl YlByb2Nlc3NQb29sOjpzZXRJbmplY3RlZEJ1bmRsZUNsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJ OjpJbmplY3RlZEJ1bmRsZUNsaWVudD4mJiBjbGllbnQpCiB7Ci0gICAgbV9pbmplY3RlZEJ1bmRs ZUNsaWVudC5pbml0aWFsaXplKGNsaWVudCk7CisgICAgaWYgKCFjbGllbnQpCisgICAgICAgIG1f aW5qZWN0ZWRCdW5kbGVDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPEFQSTo6SW5qZWN0ZWRCdW5k bGVDbGllbnQ+KCk7CisgICAgZWxzZQorICAgICAgICBtX2luamVjdGVkQnVuZGxlQ2xpZW50ID0g V1RGTW92ZShjbGllbnQpOwogfQogCiB2b2lkIFdlYlByb2Nlc3NQb29sOjppbml0aWFsaXplQ29u bmVjdGlvbkNsaWVudChjb25zdCBXS0NvbnRleHRDb25uZWN0aW9uQ2xpZW50QmFzZSogY2xpZW50 KQpAQCAtNzU2LDcgKzc2MSw3IEBAIFdlYlByb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmNy ZWF0ZU5ld1dlYlByb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURhCiAgICAgLy8gQWRk IGFueSBwbGF0Zm9ybSBzcGVjaWZpYyBwYXJhbWV0ZXJzCiAgICAgcGxhdGZvcm1Jbml0aWFsaXpl V2ViUHJvY2VzcyhwYXJhbWV0ZXJzKTsKIAotICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gaW5qZWN0 ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhID0gbV9pbmplY3RlZEJ1bmRsZUNsaWVudC5n ZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEodGhpcyk7CisgICAgUmVmUHRy PEFQSTo6T2JqZWN0PiBpbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEgPSBtX2lu amVjdGVkQnVuZGxlQ2xpZW50LT5nZXRJbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRh dGEoKnRoaXMpOwogICAgIGlmICghaW5qZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRh KQogICAgICAgICBpbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGEgPSBtX2luamVj dGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YTsKICAgICBwYXJhbWV0ZXJzLmluaXRpYWxp emF0aW9uVXNlckRhdGEgPSBVc2VyRGF0YShwcm9jZXNzLT50cmFuc2Zvcm1PYmplY3RzVG9IYW5k bGVzKGluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YS5nZXQoKSkpOwpAQCAtMTQy OSw3ICsxNDM0LDcgQEAgdm9pZCBXZWJQcm9jZXNzUG9vbDo6aGFuZGxlTWVzc2FnZShJUEM6OkNv bm5lY3Rpb24mIGNvbm5lY3Rpb24sIGNvbnN0IFN0cmluZyYgbWUKICAgICBhdXRvKiB3ZWJQcm9j ZXNzUHJveHkgPSB3ZWJQcm9jZXNzUHJveHlGcm9tQ29ubmVjdGlvbihjb25uZWN0aW9uLCBtX3By b2Nlc3Nlcyk7CiAgICAgaWYgKCF3ZWJQcm9jZXNzUHJveHkpCiAgICAgICAgIHJldHVybjsKLSAg ICBtX2luamVjdGVkQnVuZGxlQ2xpZW50LmRpZFJlY2VpdmVNZXNzYWdlRnJvbUluamVjdGVkQnVu ZGxlKHRoaXMsIG1lc3NhZ2VOYW1lLCB3ZWJQcm9jZXNzUHJveHktPnRyYW5zZm9ybUhhbmRsZXNU b09iamVjdHMobWVzc2FnZUJvZHkub2JqZWN0KCkpLmdldCgpKTsKKyAgICBtX2luamVjdGVkQnVu ZGxlQ2xpZW50LT5kaWRSZWNlaXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1bmRsZSgqdGhpcywgbWVz c2FnZU5hbWUsIHdlYlByb2Nlc3NQcm94eS0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyhtZXNz YWdlQm9keS5vYmplY3QoKSkuZ2V0KCkpOwogfQogCiB2b2lkIFdlYlByb2Nlc3NQb29sOjpoYW5k bGVTeW5jaHJvbm91c01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiBjb25uZWN0aW9uLCBjb25zdCBT dHJpbmcmIG1lc3NhZ2VOYW1lLCBjb25zdCBVc2VyRGF0YSYgbWVzc2FnZUJvZHksIFVzZXJEYXRh JiByZXR1cm5Vc2VyRGF0YSkKQEAgLTE0MzksNyArMTQ0NCw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Bv b2w6OmhhbmRsZVN5bmNocm9ub3VzTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24s IGNvbnN0CiAgICAgICAgIHJldHVybjsKIAogICAgIFJlZlB0cjxBUEk6Ok9iamVjdD4gcmV0dXJu RGF0YTsKLSAgICBtX2luamVjdGVkQnVuZGxlQ2xpZW50LmRpZFJlY2VpdmVTeW5jaHJvbm91c01l c3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUodGhpcywgbWVzc2FnZU5hbWUsIHdlYlByb2Nlc3NQcm94 eS0+dHJhbnNmb3JtSGFuZGxlc1RvT2JqZWN0cyhtZXNzYWdlQm9keS5vYmplY3QoKSkuZ2V0KCks IHJldHVybkRhdGEpOworICAgIG1faW5qZWN0ZWRCdW5kbGVDbGllbnQtPmRpZFJlY2VpdmVTeW5j aHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUoKnRoaXMsIG1lc3NhZ2VOYW1lLCB3ZWJQ cm9jZXNzUHJveHktPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHMobWVzc2FnZUJvZHkub2JqZWN0 KCkpLmdldCgpLCByZXR1cm5EYXRhKTsKICAgICByZXR1cm5Vc2VyRGF0YSA9IFVzZXJEYXRhKHdl YlByb2Nlc3NQcm94eS0+dHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyhyZXR1cm5EYXRhLmdldCgp KSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXgg NzM5YjM5NzAxNTAuLjBjNzQ1MWFlMWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuaApAQCAtNDIsNyArNDIsNiBAQAogI2luY2x1ZGUgIlZpc2l0ZWRMaW5rU3Rv cmUuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0Q2xpZW50LmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4 dENvbm5lY3Rpb25DbGllbnQuaCIKLSNpbmNsdWRlICJXZWJDb250ZXh0SW5qZWN0ZWRCdW5kbGVD bGllbnQuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3Jl L0xpbmtIYXNoLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TZXNzaW9uSUQuaD4KQEAgLTc3LDYgKzc2 LDcgQEAgY2xhc3MgQXV0b21hdGlvbkNsaWVudDsKIGNsYXNzIEN1c3RvbVByb3RvY29sTWFuYWdl ckNsaWVudDsKIGNsYXNzIERvd25sb2FkQ2xpZW50OwogY2xhc3MgSFRUUENvb2tpZVN0b3JlOwor Y2xhc3MgSW5qZWN0ZWRCdW5kbGVDbGllbnQ7CiBjbGFzcyBMZWdhY3lDb250ZXh0SGlzdG9yeUNs aWVudDsKIGNsYXNzIFBhZ2VDb25maWd1cmF0aW9uOwogfQpAQCAtMTQwLDcgKzE0MCw3IEBAIHB1 YmxpYzoKICAgICBib29sIGRpc3BhdGNoU3luY01lc3NhZ2UoSVBDOjpDb25uZWN0aW9uJiwgSVBD OjpEZWNvZGVyJiwgc3RkOjp1bmlxdWVfcHRyPElQQzo6RW5jb2Rlcj4mKTsKIAogICAgIHZvaWQg aW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS0NvbnRleHRDbGllbnRCYXNlKik7Ci0gICAgdm9pZCBp bml0aWFsaXplSW5qZWN0ZWRCdW5kbGVDbGllbnQoY29uc3QgV0tDb250ZXh0SW5qZWN0ZWRCdW5k bGVDbGllbnRCYXNlKik7CisgICAgdm9pZCBzZXRJbmplY3RlZEJ1bmRsZUNsaWVudChzdGQ6OnVu aXF1ZV9wdHI8QVBJOjpJbmplY3RlZEJ1bmRsZUNsaWVudD4mJik7CiAgICAgdm9pZCBpbml0aWFs aXplQ29ubmVjdGlvbkNsaWVudChjb25zdCBXS0NvbnRleHRDb25uZWN0aW9uQ2xpZW50QmFzZSop OwogICAgIHZvaWQgc2V0SGlzdG9yeUNsaWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpMZWdhY3lD b250ZXh0SGlzdG9yeUNsaWVudD4pOwogICAgIHZvaWQgc2V0RG93bmxvYWRDbGllbnQoc3RkOjp1 bmlxdWVfcHRyPEFQSTo6RG93bmxvYWRDbGllbnQ+KTsKQEAgLTQ4NSw3ICs0ODUsNyBAQCBwcml2 YXRlOgogICAgIFJlZjxXZWJQYWdlR3JvdXA+IG1fZGVmYXVsdFBhZ2VHcm91cDsKIAogICAgIFJl ZlB0cjxBUEk6Ok9iamVjdD4gbV9pbmplY3RlZEJ1bmRsZUluaXRpYWxpemF0aW9uVXNlckRhdGE7 Ci0gICAgV2ViQ29udGV4dEluamVjdGVkQnVuZGxlQ2xpZW50IG1faW5qZWN0ZWRCdW5kbGVDbGll bnQ7CisgICAgc3RkOjp1bmlxdWVfcHRyPEFQSTo6SW5qZWN0ZWRCdW5kbGVDbGllbnQ+IG1faW5q ZWN0ZWRCdW5kbGVDbGllbnQ7CiAKICAgICBXZWJDb250ZXh0Q2xpZW50IG1fY2xpZW50OwogICAg IFdlYkNvbnRleHRDb25uZWN0aW9uQ2xpZW50IG1fY29ubmVjdGlvbkNsaWVudDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1Nv dXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBkZjgz YWI2NjhjOS4uNzdjOGRiNTg2YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTEyMTYsNiArMTIxNiw3IEBACiAJCTdBODIxRjRD MUUyRjY3MzkwMDYwNDU3NyAvKiBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdBODIxRjRCMUUy RjY2NDgwMDYwNDU3NyAvKiBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCAqLzsg fTsKIAkJN0E4MjFGNEUxRTJGNjdBODAwNjA0NTc3IC8qIExlZ2FjeUN1c3RvbVByb3RvY29sTWFu YWdlckNsaWVudC5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDdBODIxRjREMUUyRjY3OUUwMDYwNDU3NyAvKiBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFn ZXJDbGllbnQubW0gKi87IH07CiAJCTdBODIxRjUwMUUyRjdBNzUwMDYwNDU3NyAvKiBBUElDdXN0 b21Qcm90b2NvbE1hbmFnZXJDbGllbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDdBODIxRjRGMUUyRjdBNUMwMDYwNDU3NyAvKiBBUElDdXN0b21Qcm90 b2NvbE1hbmFnZXJDbGllbnQuaCAqLzsgfTsKKwkJN0E4QTlENTgxRUYxMTlCMDAwOTgwMUFFIC8q IEFQSUluamVjdGVkQnVuZGxlQ2xpZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSA3QThBOUQ1NzFFRjExOUFBMDA5ODAxQUUgLyogQVBJSW5qZWN0ZWRC dW5kbGVDbGllbnQuaCAqLzsgfTsKIAkJN0FBRDE3NUYxRUE2QUY5OTAwM0IwODk0IC8qIFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZUNvY29hLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0FBRDE3NUUxRUE2QUYzNzAwM0IwODk0IC8qIFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZUNvY29hLm1tICovOyB9OwogCQk3QUI2RUE0NTFFRUFB RTM4MDAwMzdCMkIgLyogQVBJSWNvbkRhdGFiYXNlQ2xpZW50LmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3QUI2RUE0NDFFRUFBRTIzMDAwMzdCMkIgLyog QVBJSWNvbkRhdGFiYXNlQ2xpZW50LmggKi87IH07CiAJCTdBQjZFQTQ3MUVFQUI2QjgwMDAzN0Iy QiAvKiBBUElHZW9sb2NhdGlvblByb3ZpZGVyLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA3QUI2RUE0NjFFRUFCNkIwMDAwMzdCMkIgLyogQVBJR2VvbG9j YXRpb25Qcm92aWRlci5oICovOyB9OwpAQCAtMzUwMiw2ICszNTAzLDcgQEAKIAkJN0E4MjFGNEIx RTJGNjY0ODAwNjA0NTc3IC8qIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudC5oICov ID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZp bGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBMZWdhY3lDdXN0b21Qcm90b2NvbE1hbmFn ZXJDbGllbnQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0E4MjFGNEQxRTJGNjc5 RTAwNjA0NTc3IC8qIExlZ2FjeUN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudC5tbSAqLyA9IHtp c2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlw ZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IExlZ2FjeUN1c3RvbVByb3RvY29sTWFu YWdlckNsaWVudC5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0E4MjFGNEYxRTJG N0E1QzAwNjA0NTc3IC8qIEFQSUN1c3RvbVByb3RvY29sTWFuYWdlckNsaWVudC5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBBUElDdXN0b21Qcm90b2NvbE1hbmFnZXJDbGllbnQu aDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJN0E4QTlENTcxRUYxMTlBQTAwOTgwMUFF IC8qIEFQSUluamVjdGVkQnVuZGxlQ2xpZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsg cGF0aCA9IEFQSUluamVjdGVkQnVuZGxlQ2xpZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTdBOUNEOEMwMUM3Nzk4NDkwMEQ5RjZDNyAvKiBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK IAkJN0E5Q0Q4QzExQzc3OTg0OTAwRDlGNkM3IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0E5Q0Q4QzIx Qzc3OUFENjAwRDlGNkM3IC8qIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5tZXNzYWdl cy5pbiAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHRleHQ7IHBhdGggPSBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUubWVzc2FnZXMuaW47IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC02ODkyLDYgKzY4 OTQsNyBAQAogCQkJCTUxRDEyNDgyMUU3MzRBQzgwMDJCMjgyMCAvKiBBUElIVFRQQ29va2llU3Rv cmUuY3BwICovLAogCQkJCTUxRDEyNDgzMUU3MzRBQzgwMDJCMjgyMCAvKiBBUElIVFRQQ29va2ll U3RvcmUuaCAqLywKIAkJCQk1MTQzQjI2MTFEREQwREEwMDAxNEZBQzYgLyogQVBJSWNvbkxvYWRp bmdDbGllbnQuaCAqLywKKwkJCQk3QThBOUQ1NzFFRjExOUFBMDA5ODAxQUUgLyogQVBJSW5qZWN0 ZWRCdW5kbGVDbGllbnQuaCAqLywKIAkJCQk3Q0U0RDIwNjFBNDY3NzU3MDBDN0YxNTIgLyogQVBJ TGVnYWN5Q29udGV4dEhpc3RvcnlDbGllbnQuaCAqLywKIAkJCQkxQTI0NjRGMjE4OTFFNDUxMDAy MzRDNUIgLyogQVBJTG9hZGVyQ2xpZW50LmggKi8sCiAJCQkJN0NEM0E0ODAxQTVEMDJGQTAwOTYy M0I4IC8qIEFQSU5hdmlnYXRpb24uY3BwICovLApAQCAtODg2MCw2ICs4ODYzLDcgQEAKIAkJCQlC QzIwNTI4MTExQzk0Mjg0MDA4RjMzNzUgLyogV0tCdW5kbGVQYWdlLmggaW4gSGVhZGVycyAqLywK IAkJCQk3Q0Y0N0ZGNzE3Mjc1QjcxMDA4QUNCOTEgLyogV0tCdW5kbGVQYWdlQmFubmVyLmggaW4g SGVhZGVycyAqLywKIAkJCQk3Q0Y0N0ZGRjE3Mjc2QUUzMDA4QUNCOTEgLyogV0tCdW5kbGVQYWdl QmFubmVyTWFjLmggaW4gSGVhZGVycyAqLywKKwkJCQk3QThBOUQ1ODFFRjExOUIwMDA5ODAxQUUg LyogQVBJSW5qZWN0ZWRCdW5kbGVDbGllbnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTFBQjQ3NEU0 MTg0RDQ0OTgwMDUxQjYyMiAvKiBXS0J1bmRsZVBhZ2VDb250ZXh0TWVudUNsaWVudC5oIGluIEhl YWRlcnMgKi8sCiAJCQkJMUFCNDc0RTAxODRENDQ2QTAwNTFCNjIyIC8qIFdLQnVuZGxlUGFnZUVk aXRvckNsaWVudC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUFCNDc0RTIxODRENDQ4MDAwNTFCNjIy IC8qIFdLQnVuZGxlUGFnZUZvcm1DbGllbnQuaCBpbiBIZWFkZXJzICovLAo=