51073 2010-12-14 16:27:22 -0800 Move Windows version of getPluginInfo to NetscapePluginModule 2010-12-14 17:19:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 322336 0 andersca 2010-12-14 16:27:22 -0800 Move Windows version of getPluginInfo to NetscapePluginModule 322340 1 76591 andersca 2010-12-14 16:30:05 -0800 Created attachment 76591 Patch 322344 2 andersca 2010-12-14 16:34:17 -0800 Committed r74073: <http://trac.webkit.org/changeset/74073> 322376 3 webkit.review.bot 2010-12-14 17:19:01 -0800 http://trac.webkit.org/changeset/74073 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: fast/css/focus-ring-detached.html fast/css/focus-ring-multiline.html 76591 2010-12-14 16:30:05 -0800 2010-12-14 16:31:20 -0800 Patch bug-51073-20101214163003.patch text/plain 12968 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ODRkYjYwYTIzMWU3M2YwOTQ2MzRjOTZlYmJjYzYwZjNhMGRlNTRiMC4uYzQwYWRhZjdlMGYxNzYw MmZjNjFiMDA4NmJmZGE0ZjM2NWJjNDgwNiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMCBAQAogMjAxMC0xMi0xNCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgV2luZG93cyB2ZXJzaW9uIG9mIGdldFBs dWdpbkluZm8gdG8gTmV0c2NhcGVQbHVnaW5Nb2R1bGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMDczCisKKyAgICAgICAgKiBTaGFyZWQvUGx1Z2lu cy9OZXRzY2FwZS93aW4vTmV0c2NhcGVQbHVnaW5Nb2R1bGVXaW4uY3BwOiBBZGRlZC4KKyAgICAg ICAgKFdlYktpdDo6Z2V0VmVyc2lvbkluZm8pOgorICAgICAgICAoV2ViS2l0OjpmaWxlVmVyc2lv bik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRQbHVnaW5JbmZv KToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy93aW4vUGx1Z2luSW5mb1N0b3JlV2luLmNw cDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpnZXRQbHVnaW5JbmZvKToKKyAg ICAgICAgKiB3aW4vV2ViS2l0Mi52Y3Byb2o6CisKKzIwMTAtMTItMTQgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIFJvYmVu LgogCiAgICAgICAgIE1vdmUgUGx1Z2luSW5mb1N0b3JlOjpnZXRQbHVnaW5JbmZvIHRvIE5ldHNj YXBlUGx1Z2luTW9kdWxlCmRpZmYgLS1naXQgYS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNj YXBlL3dpbi9OZXRzY2FwZVBsdWdpbk1vZHVsZVdpbi5jcHAgYi9XZWJLaXQyL1NoYXJlZC9QbHVn aW5zL05ldHNjYXBlL3dpbi9OZXRzY2FwZVBsdWdpbk1vZHVsZVdpbi5jcHAKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NjY4NGVjZmUyZmQyYTFiOWU5NDQ2NzQ1ZTIyYjE1NGU3ZDc5ODUzYgotLS0gL2Rldi9udWxsCisr KyBiL1dlYktpdDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvd2luL05ldHNjYXBlUGx1Z2luTW9k dWxlV2luLmNwcApAQCAtMCwwICsxLDExNyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMCBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUg bXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMg SVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRP UlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MK KyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgor ICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJOZXRz Y2FwZVBsdWdpbk1vZHVsZS5oIgorCisjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+Cisj aW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CisKK3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwor CituYW1lc3BhY2UgV2ViS2l0IHsKKworc3RhdGljIFN0cmluZyBnZXRWZXJzaW9uSW5mbyhjb25z dCBMUFZPSUQgdmVyc2lvbkluZm9EYXRhLCBjb25zdCBTdHJpbmcmIGluZm8pCit7CisgICAgTFBW T0lEIGJ1ZmZlcjsKKyAgICBVSU5UIGJ1ZmZlckxlbmd0aDsKKyAgICBTdHJpbmcgc3ViSW5mbyA9 ICJcXFN0cmluZ2ZpbGVJbmZvXFwwNDA5MDRFNFxcIiArIGluZm87CisgICAgaWYgKCE6OlZlclF1 ZXJ5VmFsdWVXKHZlcnNpb25JbmZvRGF0YSwgY29uc3RfY2FzdDxVQ2hhcio+KHN1YkluZm8uY2hh cmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSksICZidWZmZXIsICZidWZmZXJMZW5ndGgpIHx8 ICFidWZmZXJMZW5ndGgpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIC8vIFN1YnRy YWN0IDEgZnJvbSB0aGUgbGVuZ3RoOyB3ZSBkb24ndCB3YW50IHRoZSB0cmFpbGluZyBudWxsIGNo YXJhY3Rlci4KKyAgICByZXR1cm4gU3RyaW5nKHJlaW50ZXJwcmV0X2Nhc3Q8VUNoYXIqPihidWZm ZXIpLCBidWZmZXJMZW5ndGggLSAxKTsKK30KKworc3RhdGljIHVpbnQ2NF90IGZpbGVWZXJzaW9u KERXT1JEIGxlYXN0U2lnbmlmaWNhbnQsIERXT1JEIG1vc3RTaWduaWZpY2FudCkKK3sKKyAgICBV TEFSR0VfSU5URUdFUiB2ZXJzaW9uOworICAgIHZlcnNpb24uTG93UGFydCA9IGxlYXN0U2lnbmlm aWNhbnQ7CisgICAgdmVyc2lvbi5IaWdoUGFydCA9IG1vc3RTaWduaWZpY2FudDsKKyAgICByZXR1 cm4gdmVyc2lvbi5RdWFkUGFydDsKK30KKworYm9vbCBOZXRzY2FwZVBsdWdpbk1vZHVsZTo6Z2V0 UGx1Z2luSW5mbyhjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFBsdWdpbkluZm9TdG9yZTo6UGx1 Z2luJiBwbHVnaW4pCit7CisgICAgICAgIFN0cmluZyBwYXRoQ29weSA9IHBsdWdpblBhdGg7Cisg ICAgRFdPUkQgdmVyc2lvbkluZm9TaXplID0gOjpHZXRGaWxlVmVyc2lvbkluZm9TaXplVyhwYXRo Q29weS5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCAwKTsKKyAgICBpZiAoIXZlcnNp b25JbmZvU2l6ZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgT3duQXJyYXlQdHI8Y2hh cj4gdmVyc2lvbkluZm9EYXRhKG5ldyBjaGFyW3ZlcnNpb25JbmZvU2l6ZV0pOworICAgIGlmICgh OjpHZXRGaWxlVmVyc2lvbkluZm9XKHBhdGhDb3B5LmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0 aW9uKCksIDAsIHZlcnNpb25JbmZvU2l6ZSwgdmVyc2lvbkluZm9EYXRhLmdldCgpKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgU3RyaW5nIG5hbWUgPSBnZXRWZXJzaW9uSW5mbyh2ZXJz aW9uSW5mb0RhdGEuZ2V0KCksICJQcm9kdWN0TmFtZSIpOworICAgIFN0cmluZyBkZXNjcmlwdGlv biA9IGdldFZlcnNpb25JbmZvKHZlcnNpb25JbmZvRGF0YS5nZXQoKSwgIkZpbGVEZXNjcmlwdGlv biIpOworICAgIGlmIChuYW1lLmlzTnVsbCgpIHx8IGRlc2NyaXB0aW9uLmlzTnVsbCgpKQorICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBWU19GSVhFREZJTEVJTkZPKiBpbmZvOworICAgIFVJ TlQgaW5mb1NpemU7CisgICAgaWYgKCE6OlZlclF1ZXJ5VmFsdWVXKHZlcnNpb25JbmZvRGF0YS5n ZXQoKSwgTCJcXCIsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmaW5mbyksICZpbmZvU2l6ZSkg fHwgaW5mb1NpemUgPCBzaXplb2YoVlNfRklYRURGSUxFSU5GTykpCisgICAgICAgIHJldHVybiBm YWxzZTsKKworICAgIFZlY3RvcjxTdHJpbmc+IHR5cGVzOworICAgIGdldFZlcnNpb25JbmZvKHZl cnNpb25JbmZvRGF0YS5nZXQoKSwgIk1JTUVUeXBlIikuc3BsaXQoJ3wnLCB0eXBlcyk7CisgICAg VmVjdG9yPFN0cmluZz4gZXh0ZW5zaW9uTGlzdHM7CisgICAgZ2V0VmVyc2lvbkluZm8odmVyc2lv bkluZm9EYXRhLmdldCgpLCAiRmlsZUV4dGVudHMiKS5zcGxpdCgnfCcsIGV4dGVuc2lvbkxpc3Rz KTsKKyAgICBWZWN0b3I8U3RyaW5nPiBkZXNjcmlwdGlvbnM7CisgICAgZ2V0VmVyc2lvbkluZm8o dmVyc2lvbkluZm9EYXRhLmdldCgpLCAiRmlsZU9wZW5OYW1lIikuc3BsaXQoJ3wnLCBkZXNjcmlw dGlvbnMpOworCisgICAgVmVjdG9yPE1pbWVDbGFzc0luZm8+IG1pbWVzKHR5cGVzLnNpemUoKSk7 CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0eXBlcy5zaXplKCk7IGkrKykgeworICAgICAg ICBTdHJpbmcgdHlwZSA9IHR5cGVzW2ldLmxvd2VyKCk7CisgICAgICAgIFN0cmluZyBkZXNjcmlw dGlvbiA9IGkgPCBkZXNjcmlwdGlvbnMuc2l6ZSgpID8gZGVzY3JpcHRpb25zW2ldIDogIiI7Cisg ICAgICAgIFN0cmluZyBleHRlbnNpb25MaXN0ID0gaSA8IGV4dGVuc2lvbkxpc3RzLnNpemUoKSA/ IGV4dGVuc2lvbkxpc3RzW2ldIDogIiI7CisKKyAgICAgICAgVmVjdG9yPFN0cmluZz4gZXh0ZW5z aW9uc1ZlY3RvcjsKKyAgICAgICAgZXh0ZW5zaW9uTGlzdC5zcGxpdCgnLCcsIGV4dGVuc2lvbnNW ZWN0b3IpOworCisgICAgICAgIC8vIEdldCByaWQgb2YgdGhlIGV4dGVuc2lvbiBsaXN0IHRoYXQg bWF5IGJlIGF0IHRoZSBlbmQgb2YgdGhlIGRlc2NyaXB0aW9uIHN0cmluZy4KKyAgICAgICAgaW50 IHBvcyA9IGRlc2NyaXB0aW9uLmZpbmQoIigqIik7CisgICAgICAgIGlmIChwb3MgIT0gLTEpIHsK KyAgICAgICAgICAgIC8vIFRoZXJlIG1pZ2h0IGJlIGEgc3BhY2UgdGhhdCB3ZSBuZWVkIHRvIGdl dCByaWQgb2YuCisgICAgICAgICAgICBpZiAocG9zID4gMSAmJiBkZXNjcmlwdGlvbltwb3MgLSAx XSA9PSAnICcpCisgICAgICAgICAgICAgICAgcG9zLS07CisgICAgICAgICAgICBkZXNjcmlwdGlv biA9IGRlc2NyaXB0aW9uLmxlZnQocG9zKTsKKyAgICAgICAgfQorCisgICAgICAgIG1pbWVzW2ld LnR5cGUgPSB0eXBlOworICAgICAgICBtaW1lc1tpXS5kZXNjID0gZGVzY3JpcHRpb247CisgICAg ICAgIG1pbWVzW2ldLmV4dGVuc2lvbnMuc3dhcChleHRlbnNpb25zVmVjdG9yKTsKKyAgICB9CisK KyAgICBwbHVnaW4ucGF0aCA9IHBsdWdpblBhdGg7CisgICAgcGx1Z2luLmluZm8uZGVzYyA9IGRl c2NyaXB0aW9uOworICAgIHBsdWdpbi5pbmZvLm5hbWUgPSBuYW1lOworICAgIHBsdWdpbi5pbmZv LmZpbGUgPSBwYXRoR2V0RmlsZU5hbWUocGx1Z2luUGF0aCk7CisgICAgcGx1Z2luLmluZm8ubWlt ZXMuc3dhcChtaW1lcyk7CisgICAgcGx1Z2luLmZpbGVWZXJzaW9uID0gZmlsZVZlcnNpb24oaW5m by0+ZHdGaWxlVmVyc2lvbkxTLCBpbmZvLT5kd0ZpbGVWZXJzaW9uTVMpOworCisgICAgcmV0dXJu IHRydWU7Cit9CisKK30gLy8gbmFtZXNwYWNlIFdlYktpdAorCmRpZmYgLS1naXQgYS9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3BwIGIvV2ViS2l0Mi9V SVByb2Nlc3MvUGx1Z2lucy93aW4vUGx1Z2luSW5mb1N0b3JlV2luLmNwcAppbmRleCBmZTdkODk2 NjhiMjEzM2M1ZTBhZmUyNzFlMTIyZTA3MDFkMzQ1MjI1Li40ODVmODkyZTJiZWVkMjViNDlmNDVk NTQ5MTc2ZDgyNGM5NTNiNmI5IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdp bnMvd2luL1BsdWdpbkluZm9TdG9yZVdpbi5jcHAKQEAgLTI1LDExICsyNSw4IEBACiAKICNpbmNs dWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKIAotI2RlZmluZSBESVNBQkxFX05PVF9JTVBMRU1FTlRF RF9XQVJOSU5HUyAxCi0jaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKLSNpbmNsdWRlIDxXZWJD b3JlL0ZpbGVTeXN0ZW0uaD4KKyNpbmNsdWRlICJOZXRzY2FwZVBsdWdpbk1vZHVsZS5oIgogI2lu Y2x1ZGUgPHNobHdhcGkuaD4KLSNpbmNsdWRlIDx3dGYvT3duQXJyYXlQdHIuaD4KIAogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTM0MCwxOCArMzM3LDYgQEAgVmVjdG9yPFN0cmluZz4g UGx1Z2luSW5mb1N0b3JlOjppbmRpdmlkdWFsUGx1Z2luUGF0aHMoKQogICAgIHJldHVybiBwYXRo czsKIH0KIAotc3RhdGljIFN0cmluZyBnZXRWZXJzaW9uSW5mbyhjb25zdCBMUFZPSUQgdmVyc2lv bkluZm9EYXRhLCBjb25zdCBTdHJpbmcmIGluZm8pCi17Ci0gICAgTFBWT0lEIGJ1ZmZlcjsKLSAg ICBVSU5UIGJ1ZmZlckxlbmd0aDsKLSAgICBTdHJpbmcgc3ViSW5mbyA9ICJcXFN0cmluZ2ZpbGVJ bmZvXFwwNDA5MDRFNFxcIiArIGluZm87Ci0gICAgaWYgKCE6OlZlclF1ZXJ5VmFsdWVXKHZlcnNp b25JbmZvRGF0YSwgY29uc3RfY2FzdDxVQ2hhcio+KHN1YkluZm8uY2hhcmFjdGVyc1dpdGhOdWxs VGVybWluYXRpb24oKSksICZidWZmZXIsICZidWZmZXJMZW5ndGgpIHx8ICFidWZmZXJMZW5ndGgp Ci0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKLQotICAgIC8vIFN1YnRyYWN0IDEgZnJvbSB0aGUg bGVuZ3RoOyB3ZSBkb24ndCB3YW50IHRoZSB0cmFpbGluZyBudWxsIGNoYXJhY3Rlci4KLSAgICBy ZXR1cm4gU3RyaW5nKHJlaW50ZXJwcmV0X2Nhc3Q8VUNoYXIqPihidWZmZXIpLCBidWZmZXJMZW5n dGggLSAxKTsKLX0KLQogc3RhdGljIHVpbnQ2NF90IGZpbGVWZXJzaW9uKERXT1JEIGxlYXN0U2ln bmlmaWNhbnQsIERXT1JEIG1vc3RTaWduaWZpY2FudCkKIHsKICAgICBVTEFSR0VfSU5URUdFUiB2 ZXJzaW9uOwpAQCAtMzYyLDYzICszNDcsNyBAQCBzdGF0aWMgdWludDY0X3QgZmlsZVZlcnNpb24o RFdPUkQgbGVhc3RTaWduaWZpY2FudCwgRFdPUkQgbW9zdFNpZ25pZmljYW50KQogCiBib29sIFBs dWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2luSW5mbyhjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFBs dWdpbiYgcGx1Z2luKQogewotICAgIFN0cmluZyBwYXRoQ29weSA9IHBsdWdpblBhdGg7Ci0gICAg RFdPUkQgdmVyc2lvbkluZm9TaXplID0gOjpHZXRGaWxlVmVyc2lvbkluZm9TaXplVyhwYXRoQ29w eS5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCAwKTsKLSAgICBpZiAoIXZlcnNpb25J bmZvU2l6ZSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgT3duQXJyYXlQdHI8Y2hhcj4g dmVyc2lvbkluZm9EYXRhKG5ldyBjaGFyW3ZlcnNpb25JbmZvU2l6ZV0pOwotICAgIGlmICghOjpH ZXRGaWxlVmVyc2lvbkluZm9XKHBhdGhDb3B5LmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9u KCksIDAsIHZlcnNpb25JbmZvU2l6ZSwgdmVyc2lvbkluZm9EYXRhLmdldCgpKSkKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotCi0gICAgU3RyaW5nIG5hbWUgPSBnZXRWZXJzaW9uSW5mbyh2ZXJzaW9u SW5mb0RhdGEuZ2V0KCksICJQcm9kdWN0TmFtZSIpOwotICAgIFN0cmluZyBkZXNjcmlwdGlvbiA9 IGdldFZlcnNpb25JbmZvKHZlcnNpb25JbmZvRGF0YS5nZXQoKSwgIkZpbGVEZXNjcmlwdGlvbiIp OwotICAgIGlmIChuYW1lLmlzTnVsbCgpIHx8IGRlc2NyaXB0aW9uLmlzTnVsbCgpKQotICAgICAg ICByZXR1cm4gZmFsc2U7Ci0KLSAgICBWU19GSVhFREZJTEVJTkZPKiBpbmZvOwotICAgIFVJTlQg aW5mb1NpemU7Ci0gICAgaWYgKCE6OlZlclF1ZXJ5VmFsdWVXKHZlcnNpb25JbmZvRGF0YS5nZXQo KSwgTCJcXCIsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCoqPigmaW5mbyksICZpbmZvU2l6ZSkgfHwg aW5mb1NpemUgPCBzaXplb2YoVlNfRklYRURGSUxFSU5GTykpCi0gICAgICAgIHJldHVybiBmYWxz ZTsKLQotICAgIFZlY3RvcjxTdHJpbmc+IHR5cGVzOwotICAgIGdldFZlcnNpb25JbmZvKHZlcnNp b25JbmZvRGF0YS5nZXQoKSwgIk1JTUVUeXBlIikuc3BsaXQoJ3wnLCB0eXBlcyk7Ci0gICAgVmVj dG9yPFN0cmluZz4gZXh0ZW5zaW9uTGlzdHM7Ci0gICAgZ2V0VmVyc2lvbkluZm8odmVyc2lvbklu Zm9EYXRhLmdldCgpLCAiRmlsZUV4dGVudHMiKS5zcGxpdCgnfCcsIGV4dGVuc2lvbkxpc3RzKTsK LSAgICBWZWN0b3I8U3RyaW5nPiBkZXNjcmlwdGlvbnM7Ci0gICAgZ2V0VmVyc2lvbkluZm8odmVy c2lvbkluZm9EYXRhLmdldCgpLCAiRmlsZU9wZW5OYW1lIikuc3BsaXQoJ3wnLCBkZXNjcmlwdGlv bnMpOwotCi0gICAgVmVjdG9yPE1pbWVDbGFzc0luZm8+IG1pbWVzKHR5cGVzLnNpemUoKSk7Ci0g ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0eXBlcy5zaXplKCk7IGkrKykgewotICAgICAgICBT dHJpbmcgdHlwZSA9IHR5cGVzW2ldLmxvd2VyKCk7Ci0gICAgICAgIFN0cmluZyBkZXNjcmlwdGlv biA9IGkgPCBkZXNjcmlwdGlvbnMuc2l6ZSgpID8gZGVzY3JpcHRpb25zW2ldIDogIiI7Ci0gICAg ICAgIFN0cmluZyBleHRlbnNpb25MaXN0ID0gaSA8IGV4dGVuc2lvbkxpc3RzLnNpemUoKSA/IGV4 dGVuc2lvbkxpc3RzW2ldIDogIiI7Ci0KLSAgICAgICAgVmVjdG9yPFN0cmluZz4gZXh0ZW5zaW9u c1ZlY3RvcjsKLSAgICAgICAgZXh0ZW5zaW9uTGlzdC5zcGxpdCgnLCcsIGV4dGVuc2lvbnNWZWN0 b3IpOwotCi0gICAgICAgIC8vIEdldCByaWQgb2YgdGhlIGV4dGVuc2lvbiBsaXN0IHRoYXQgbWF5 IGJlIGF0IHRoZSBlbmQgb2YgdGhlIGRlc2NyaXB0aW9uIHN0cmluZy4KLSAgICAgICAgaW50IHBv cyA9IGRlc2NyaXB0aW9uLmZpbmQoIigqIik7Ci0gICAgICAgIGlmIChwb3MgIT0gLTEpIHsKLSAg ICAgICAgICAgIC8vIFRoZXJlIG1pZ2h0IGJlIGEgc3BhY2UgdGhhdCB3ZSBuZWVkIHRvIGdldCBy aWQgb2YuCi0gICAgICAgICAgICBpZiAocG9zID4gMSAmJiBkZXNjcmlwdGlvbltwb3MgLSAxXSA9 PSAnICcpCi0gICAgICAgICAgICAgICAgcG9zLS07Ci0gICAgICAgICAgICBkZXNjcmlwdGlvbiA9 IGRlc2NyaXB0aW9uLmxlZnQocG9zKTsKLSAgICAgICAgfQotCi0gICAgICAgIG1pbWVzW2ldLnR5 cGUgPSB0eXBlOwotICAgICAgICBtaW1lc1tpXS5kZXNjID0gZGVzY3JpcHRpb247Ci0gICAgICAg IG1pbWVzW2ldLmV4dGVuc2lvbnMuc3dhcChleHRlbnNpb25zVmVjdG9yKTsKLSAgICB9Ci0KLSAg ICBwbHVnaW4ucGF0aCA9IHBsdWdpblBhdGg7Ci0gICAgcGx1Z2luLmluZm8uZGVzYyA9IGRlc2Ny aXB0aW9uOwotICAgIHBsdWdpbi5pbmZvLm5hbWUgPSBuYW1lOwotICAgIHBsdWdpbi5pbmZvLmZp bGUgPSBwYXRoR2V0RmlsZU5hbWUocGx1Z2luUGF0aCk7Ci0gICAgcGx1Z2luLmluZm8ubWltZXMu c3dhcChtaW1lcyk7Ci0gICAgcGx1Z2luLmZpbGVWZXJzaW9uID0gZmlsZVZlcnNpb24oaW5mby0+ ZHdGaWxlVmVyc2lvbkxTLCBpbmZvLT5kd0ZpbGVWZXJzaW9uTVMpOwotCi0gICAgcmV0dXJuIHRy dWU7CisgICAgcmV0dXJuIE5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRQbHVnaW5JbmZvKHBsdWdp blBhdGgsIHBsdWdpbik7CiB9CiAKIHN0YXRpYyBib29sIGlzT2xkV2luZG93c01lZGlhUGxheWVy UGx1Z2luKGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJiBwbHVnaW4pCmRpZmYgLS1naXQg YS9XZWJLaXQyL3dpbi9XZWJLaXQyLnZjcHJvaiBiL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9q CmluZGV4IGEwMDdhYzFlMDc5YjM3MDU2NGI1MDZjZWQzOWJkYzQ0OGQxYTAxNGIuLjE0ZGIzMzg3 MTA0MmM0MDE5NTk0Nzk1OTIxZTA0MTk0NjhmMzIwZmUgMTAwNzU1Ci0tLSBhL1dlYktpdDIvd2lu L1dlYktpdDIudmNwcm9qCisrKyBiL1dlYktpdDIvd2luL1dlYktpdDIudmNwcm9qCkBAIC04NDIs MjIgKzg0Miw2IEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJCQkJPEZpbHRlcgotCQkJCSAgICBO YW1lPSJQbHVnaW5zIgotCQkJCSAgICA+Ci0JCQkJICAgIDxGaWx0ZXIKLQkJCQkgICAgICAgIE5h bWU9Ik5ldHNjYXBlIgotCQkJCSAgICAgICAgPgotCQkJCSAgICAgICAgPEZpbGUKLQkJCQkJCSAg ICBSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxQbHVnaW5zXE5ldHNjYXBlXE5ldHNjYXBlUGx1Z2lu TW9kdWxlLmNwcCIKLQkJCQkJCSAgICA+Ci0JCQkJCSAgICA8L0ZpbGU+Ci0JCQkJCSAgICA8Rmls ZQotCQkJCQkJICAgIFJlbGF0aXZlUGF0aD0iLi5cU2hhcmVkXFBsdWdpbnNcTmV0c2NhcGVcTmV0 c2NhcGVQbHVnaW5Nb2R1bGUuaCIKLQkJCQkJCSAgICA+Ci0JCQkJCSAgICA8L0ZpbGU+Ci0JCQkJ CTwvRmlsdGVyPgotCQkJCTwvRmlsdGVyPgotCQkJCTxGaWx0ZXIKIAkJCQkJTmFtZT0iY2YiCiAJ CQkJCT4KIAkJCQkJPEZpbGUKQEAgLTEwOTgsNiArMTA4MiwzMCBAQAogCQkJCQk8L0ZpbGVDb25m aWd1cmF0aW9uPgogCQkJCTwvRmlsZT4KIAkJCTwvRmlsdGVyPgorCQkJPEZpbHRlcgorCQkJCU5h bWU9IlBsdWdpbnMiCisJCQkJPgorCQkJCTxGaWx0ZXIKKwkJCQkJTmFtZT0iTmV0c2NhcGUiCisJ CQkJCT4KKwkJCQkJPEZpbGUKKwkJCQkJCVJlbGF0aXZlUGF0aD0iLi5cU2hhcmVkXFBsdWdpbnNc TmV0c2NhcGVcTmV0c2NhcGVQbHVnaW5Nb2R1bGUuY3BwIgorCQkJCQkJPgorCQkJCQk8L0ZpbGU+ CisJCQkJCTxGaWxlCisJCQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxQbHVnaW5zXE5ldHNj YXBlXE5ldHNjYXBlUGx1Z2luTW9kdWxlLmgiCisJCQkJCQk+CisJCQkJCTwvRmlsZT4KKwkJCQkJ PEZpbHRlcgorCQkJCQkJTmFtZT0id2luIgorCQkJCQkJPgorCQkJCQkJPEZpbGUKKwkJCQkJCQlS ZWxhdGl2ZVBhdGg9Ii4uXFNoYXJlZFxQbHVnaW5zXE5ldHNjYXBlXHdpblxOZXRzY2FwZVBsdWdp bk1vZHVsZVdpbi5jcHAiCisJCQkJCQkJPgorCQkJCQkJPC9GaWxlPgorCQkJCQk8L0ZpbHRlcj4K KwkJCQk8L0ZpbHRlcj4KKwkJCTwvRmlsdGVyPgogCQk8L0ZpbHRlcj4KIAkJPEZpbHRlcgogCQkJ TmFtZT0iV2ViUHJvY2VzcyIKQEAgLTI4MDMsMjcgKzI4MTEsMjcgQEAKIAkJCQk+CiAJCQk8L0Zp bGU+CiAJCQk8RmlsZQotCQkJCVJlbGF0aXZlUGF0aD0iJChXZWJLaXRPdXRwdXREaXIpXG9ialwk KFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xXZWJEYXRhYmFzZU1hbmFnZXJNZXNzYWdlUmVj ZWl2ZXIuY3BwIgorCQkJCVJlbGF0aXZlUGF0aD0iJChXZWJLaXRPdXRwdXREaXIpXG9ialwkKFBy b2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xXZWJDb250ZXh0TWVzc2FnZVJlY2VpdmVyLmNwcCIK IAkJCQk+CiAJCQk8L0ZpbGU+CiAJCQk8RmlsZQotCQkJCVJlbGF0aXZlUGF0aD0iJChXZWJLaXRP dXRwdXREaXIpXG9ialwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xXZWJEYXRhYmFzZU1h bmFnZXJNZXNzYWdlcy5oIgorCQkJCVJlbGF0aXZlUGF0aD0iJChXZWJLaXRPdXRwdXREaXIpXG9i alwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xXZWJDb250ZXh0TWVzc2FnZXMuaCIKIAkJ CQk+CiAJCQk8L0ZpbGU+CiAJCQk8RmlsZQotCQkJCVJlbGF0aXZlUGF0aD0iJChXZWJLaXRPdXRw dXREaXIpXG9ialwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291cmNlc1xXZWJEYXRhYmFzZU1hbmFn ZXJQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAiCisJCQkJUmVsYXRpdmVQYXRoPSIkKFdlYktpdE91 dHB1dERpcilcb2JqXCQoUHJvamVjdE5hbWUpXERlcml2ZWRTb3VyY2VzXFdlYkRhdGFiYXNlTWFu YWdlck1lc3NhZ2VSZWNlaXZlci5jcHAiCiAJCQkJPgogCQkJPC9GaWxlPgogCQkJPEZpbGUKLQkJ CQlSZWxhdGl2ZVBhdGg9IiQoV2ViS2l0T3V0cHV0RGlyKVxvYmpcJChQcm9qZWN0TmFtZSlcRGVy aXZlZFNvdXJjZXNcV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHlNZXNzYWdlcy5oIgorCQkJCVJlbGF0 aXZlUGF0aD0iJChXZWJLaXRPdXRwdXREaXIpXG9ialwkKFByb2plY3ROYW1lKVxEZXJpdmVkU291 cmNlc1xXZWJEYXRhYmFzZU1hbmFnZXJNZXNzYWdlcy5oIgogCQkJCT4KIAkJCTwvRmlsZT4KIAkJ CTxGaWxlCi0JCQkJUmVsYXRpdmVQYXRoPSIkKFdlYktpdE91dHB1dERpcilcb2JqXCQoUHJvamVj dE5hbWUpXERlcml2ZWRTb3VyY2VzXFdlYkNvbnRleHRNZXNzYWdlUmVjZWl2ZXIuY3BwIgorCQkJ CVJlbGF0aXZlUGF0aD0iJChXZWJLaXRPdXRwdXREaXIpXG9ialwkKFByb2plY3ROYW1lKVxEZXJp dmVkU291cmNlc1xXZWJEYXRhYmFzZU1hbmFnZXJQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAiCiAJ CQkJPgogCQkJPC9GaWxlPgogCQkJPEZpbGUKLQkJCQlSZWxhdGl2ZVBhdGg9IiQoV2ViS2l0T3V0 cHV0RGlyKVxvYmpcJChQcm9qZWN0TmFtZSlcRGVyaXZlZFNvdXJjZXNcV2ViQ29udGV4dE1lc3Nh Z2VzLmgiCisJCQkJUmVsYXRpdmVQYXRoPSIkKFdlYktpdE91dHB1dERpcilcb2JqXCQoUHJvamVj dE5hbWUpXERlcml2ZWRTb3VyY2VzXFdlYkRhdGFiYXNlTWFuYWdlclByb3h5TWVzc2FnZXMuaCIK IAkJCQk+CiAJCQk8L0ZpbGU+CiAJCQk8RmlsZQo=