11693 2006-11-26 02:03:14 -0800 fix the Qt build 2006-11-26 06:06:38 -0800 1 1 1 Unclassified WebKit Platform 420+ Other Linux RESOLVED FIXED P2 Normal --- 1 hausmann webkit-unassigned oldest_to_newest 44240 0 hausmann 2006-11-26 02:03:14 -0800 This patch fixes the Qt build, adapts it to various renamings of enums, classes and methods. 44241 1 11632 hausmann 2006-11-26 02:04:33 -0800 Created attachment 11632 fix the Qt build 44243 2 11632 aroben 2006-11-26 02:08:16 -0800 Comment on attachment 11632 fix the Qt build r=me 44244 3 11632 mjs 2006-11-26 02:11:35 -0800 Comment on attachment 11632 fix the Qt build r=me 44236 4 mitz 2006-11-26 06:06:38 -0800 Landed by Rob in r17880. 11632 2006-11-26 02:04:33 -0800 2006-11-26 02:08:16 -0800 fix the Qt build patch.txt text/plain 8362 hausmann SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzg3OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDYtMTEtMjYgIFNpbW9uIEhhdXNtYW5uICA8aGF1c21hbm5Aa2Rl Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBo dHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTY5MworICAgICAgICBGaXgg dGhlIFF0IGJ1aWxkLCBhZGFwdCB0byB2YXJpb3VzIGVudW0vY2xhc3MgcmVuYW1pbmdzLgorCisg ICAgICAgICoga2NhbnZhcy9kZXZpY2UvcXQvS1JlbmRlcmluZ0RldmljZVF0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OktSZW5kZXJpbmdEZXZpY2VRdDo6Y3JlYXRlUmVzb3VyY2UpOgorICAgICAg ICAoV2ViQ29yZTo6S1JlbmRlcmluZ0RldmljZVF0OjpjcmVhdGVQYWludFNlcnZlcik6CisgICAg ICAgICoga2NhbnZhcy9kZXZpY2UvcXQvS1JlbmRlcmluZ0RldmljZVF0Lmg6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3Mvc3ZnL3F0L1NWR1BhaW50U2VydmVyTGluZWFyR3JhZGllbnRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdQYWludFNlcnZlckxpbmVhckdyYWRpZW50OjpzZXR1 cCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc3ZnL3F0L1NWR1BhaW50U2VydmVyUXQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHUGFpbnRTZXJ2ZXI6OnJlbmRlclBhdGgpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3N2Zy9xdC9TVkdQYWludFNlcnZlclJhZGlhbEdyYWRp ZW50UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2V0dXApOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3N2Zy9xdC9TVkdQYWludFNlcnZlclNvbGlkUXQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U1ZHUGFpbnRTZXJ2ZXJTb2xpZDo6c2V0dXApOgorCiAyMDA2LTExLTI0ICBSb2IgQnVp cyAgPGJ1aXNAa2RlLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBNaXR6LgpJbmRleDogV2Vi Q29yZS9rY2FudmFzL2RldmljZS9xdC9LUmVuZGVyaW5nRGV2aWNlUXQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUva2NhbnZhcy9kZXZpY2UvcXQvS1JlbmRlcmluZ0RldmljZVF0LmNwcAkocmV2 aXNpb24gMTc4NzkpCisrKyBXZWJDb3JlL2tjYW52YXMvZGV2aWNlL3F0L0tSZW5kZXJpbmdEZXZp Y2VRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDkgKzI5LDEwIEBACiAjaW5jbHVkZSAiU1ZH UmVzb3VyY2VDbGlwcGVyLmgiCiAjaW5jbHVkZSAiU1ZHUmVzb3VyY2VNYXJrZXIuaCIKICNpbmNs dWRlICJLUmVuZGVyaW5nRGV2aWNlUXQuaCIKLSNpbmNsdWRlICJLUmVuZGVyaW5nUGFpbnRTZXJ2 ZXJTb2xpZFF0LmgiCi0jaW5jbHVkZSAiS1JlbmRlcmluZ1BhaW50U2VydmVyR3JhZGllbnRRdC5o IgotI2luY2x1ZGUgIktSZW5kZXJpbmdQYWludFNlcnZlclBhdHRlcm5RdC5oIgorI2luY2x1ZGUg IlNWR1BhaW50U2VydmVyU29saWQuaCIKKyNpbmNsdWRlICJTVkdQYWludFNlcnZlckxpbmVhckdy YWRpZW50LmgiCisjaW5jbHVkZSAiU1ZHUGFpbnRTZXJ2ZXJSYWRpYWxHcmFkaWVudC5oIgorI2lu Y2x1ZGUgIlNWR1BhaW50U2VydmVyUGF0dGVybi5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK QEAgLTE0NiwzMyArMTQ3LDMzIEBAIFBhc3NSZWZQdHI8U1ZHUmVzb3VyY2U+IEtSZW5kZXJpbmdE ZXZpY2UKIHsKICAgICBzd2l0Y2ggKHR5cGUpCiAgICAgewotICAgICAgICBjYXNlIFJTX0NMSVBQ RVI6CisgICAgICAgIGNhc2UgQ2xpcHBlclJlc291cmNlVHlwZToKICAgICAgICAgICAgIHJldHVy biBuZXcgU1ZHUmVzb3VyY2VDbGlwcGVyKCk7Ci0gICAgICAgIGNhc2UgUlNfTUFSS0VSOgorICAg ICAgICBjYXNlIE1hcmtlclJlc291cmNlVHlwZToKICAgICAgICAgICAgIHJldHVybiBuZXcgU1ZH UmVzb3VyY2VNYXJrZXIoKTsgLy8gVXNlIGRlZmF1bHQgaW1wbGVtZW50YXRpb24uLi4KLSAgICAg ICAgY2FzZSBSU19JTUFHRToKKyAgICAgICAgY2FzZSBJbWFnZVJlc291cmNlVHlwZToKICAgICAg ICAgICAgIC8vIHJldHVybiBuZXcgU1ZHUmVzb3VyY2VJbWFnZVF0KCk7Ci0gICAgICAgIGNhc2Ug UlNfRklMVEVSOgorICAgICAgICBjYXNlIEZpbHRlclJlc291cmNlVHlwZToKICAgICAgICAgICAg IC8vIHJldHVybiBuZXcgS0NhbnZhc0ZpbHRlclF0KCk7Ci0gICAgICAgIGNhc2UgUlNfTUFTS0VS OgorICAgICAgICBjYXNlIE1hc2tlclJlc291cmNlVHlwZToKICAgICAgICAgICAgIC8vIHJldHVy biBuZXcgS0NhbnZhc01hc2tlclF0KCk7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBy ZXR1cm4gMDsKICAgICB9CiB9CiAKLVBhc3NSZWZQdHI8S1JlbmRlcmluZ1BhaW50U2VydmVyPiBL UmVuZGVyaW5nRGV2aWNlUXQ6OmNyZWF0ZVBhaW50U2VydmVyKGNvbnN0IEtDUGFpbnRTZXJ2ZXJU eXBlJiB0eXBlKSBjb25zdAorUGFzc1JlZlB0cjxTVkdQYWludFNlcnZlcj4gS1JlbmRlcmluZ0Rl dmljZVF0OjpjcmVhdGVQYWludFNlcnZlcihjb25zdCBTVkdQYWludFNlcnZlclR5cGUmIHR5cGUp IGNvbnN0CiB7CiAgICAgc3dpdGNoICh0eXBlKQogICAgIHsKLSAgICAgICAgY2FzZSBQU19TT0xJ RDoKLSAgICAgICAgICAgIHJldHVybiBuZXcgS1JlbmRlcmluZ1BhaW50U2VydmVyU29saWRRdCgp OwotICAgICAgICBjYXNlIFBTX1BBVFRFUk46Ci0gICAgICAgICAgICByZXR1cm4gbmV3IEtSZW5k ZXJpbmdQYWludFNlcnZlclBhdHRlcm5RdCgpOwotICAgICAgICBjYXNlIFBTX0xJTkVBUl9HUkFE SUVOVDoKLSAgICAgICAgICAgIHJldHVybiBuZXcgS1JlbmRlcmluZ1BhaW50U2VydmVyTGluZWFy R3JhZGllbnRRdCgpOwotICAgICAgICBjYXNlIFBTX1JBRElBTF9HUkFESUVOVDoKLSAgICAgICAg ICAgIHJldHVybiBuZXcgS1JlbmRlcmluZ1BhaW50U2VydmVyUmFkaWFsR3JhZGllbnRRdCgpOwor ICAgICAgICBjYXNlIFNvbGlkUGFpbnRTZXJ2ZXI6CisgICAgICAgICAgICByZXR1cm4gbmV3IFNW R1BhaW50U2VydmVyU29saWQoKTsKKyAgICAgICAgY2FzZSBQYXR0ZXJuUGFpbnRTZXJ2ZXI6Cisg ICAgICAgICAgICByZXR1cm4gbmV3IFNWR1BhaW50U2VydmVyUGF0dGVybigpOworICAgICAgICBj YXNlIExpbmVhckdyYWRpZW50UGFpbnRTZXJ2ZXI6CisgICAgICAgICAgICByZXR1cm4gbmV3IFNW R1BhaW50U2VydmVyTGluZWFyR3JhZGllbnQoKTsKKyAgICAgICAgY2FzZSBSYWRpYWxHcmFkaWVu dFBhaW50U2VydmVyOgorICAgICAgICAgICAgcmV0dXJuIG5ldyBTVkdQYWludFNlcnZlclJhZGlh bEdyYWRpZW50KCk7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gMDsKICAg ICB9CkluZGV4OiBXZWJDb3JlL2tjYW52YXMvZGV2aWNlL3F0L0tSZW5kZXJpbmdEZXZpY2VRdC5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUva2NhbnZhcy9kZXZpY2UvcXQvS1JlbmRlcmluZ0Rldmlj ZVF0LmgJKHJldmlzaW9uIDE3ODc5KQorKysgV2ViQ29yZS9rY2FudmFzL2RldmljZS9xdC9LUmVu ZGVyaW5nRGV2aWNlUXQuaAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogI2luY2x1 ZGUgPFFQYWludGVyPgogI2luY2x1ZGUgPFFQYWludGVyUGF0aD4KIAorI2luY2x1ZGUgIlBhdGgu aCIKICNpbmNsdWRlICJLUmVuZGVyaW5nRGV2aWNlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsK QEAgLTc4LDcgKzc5LDcgQEAgcHVibGljOgogCiAgICAgLy8gUmVzb3VyY2UgY3JlYXRpb24KICAg ICB2aXJ0dWFsIFBhc3NSZWZQdHI8U1ZHUmVzb3VyY2U+IGNyZWF0ZVJlc291cmNlKGNvbnN0IFNW R1Jlc291cmNlVHlwZSYpIGNvbnN0OwotICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxLUmVuZGVyaW5n UGFpbnRTZXJ2ZXI+IGNyZWF0ZVBhaW50U2VydmVyKGNvbnN0IEtDUGFpbnRTZXJ2ZXJUeXBlJikg Y29uc3Q7CisgICAgdmlydHVhbCBQYXNzUmVmUHRyPFNWR1BhaW50U2VydmVyPiBjcmVhdGVQYWlu dFNlcnZlcihjb25zdCBTVkdQYWludFNlcnZlclR5cGUmKSBjb25zdDsKICAgICB2aXJ0dWFsIFNW R0ZpbHRlckVmZmVjdCogY3JlYXRlRmlsdGVyRWZmZWN0KGNvbnN0IFNWR0ZpbHRlckVmZmVjdFR5 cGUmKSBjb25zdDsKIH07CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3ZnL3F0 L1NWR1BhaW50U2VydmVyTGluZWFyR3JhZGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9zdmcvcXQvU1ZHUGFpbnRTZXJ2ZXJMaW5lYXJHcmFkaWVudFF0 LmNwcAkocmV2aXNpb24gMTc4NzkpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N2Zy9x dC9TVkdQYWludFNlcnZlckxpbmVhckdyYWRpZW50UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 MCw3ICs3MCw3IEBAIGJvb2wgU1ZHUGFpbnRTZXJ2ZXJMaW5lYXJHcmFkaWVudDo6c2V0dXAKIAog ICAgIC8vIFRPRE86IEdyYWRpZW50IHRyYW5zZm9ybSArIG9wYWNpdHkgZml4ZXMhCiAKLSAgICBp ZiAoKHR5cGUgJiBBUFBMWV9UT19GSUxMKSAmJiByZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFz RmlsbCgpKSB7CisgICAgaWYgKCh0eXBlICYgQXBwbHlUb0ZpbGxUYXJnZXRUeXBlKSAmJiByZW5k ZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFzRmlsbCgpKSB7CiAgICAgICAgIGZpbGxDb2xvckFycmF5 KGdyYWRpZW50LCBncmFkaWVudFN0b3BzKCksIG9wYWNpdHkpOwogCiAgICAgICAgIFFCcnVzaCBi cnVzaChncmFkaWVudCk7CkBAIC03OSw3ICs3OSw3IEBAIGJvb2wgU1ZHUGFpbnRTZXJ2ZXJMaW5l YXJHcmFkaWVudDo6c2V0dXAKICAgICAgICAgcXRDb250ZXh0LT5zZXRGaWxsUnVsZShyZW5kZXJT dHlsZS0+c3ZnU3R5bGUoKS0+ZmlsbFJ1bGUoKSk7CiAgICAgfQogCi0gICAgaWYgKCh0eXBlICYg QVBQTFlfVE9fU1RST0tFKSAmJiByZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFzU3Ryb2tlKCkp IHsKKyAgICBpZiAoKHR5cGUgJiBBcHBseVRvU3Ryb2tlVGFyZ2V0VHlwZSkgJiYgcmVuZGVyU3R5 bGUtPnN2Z1N0eWxlKCktPmhhc1N0cm9rZSgpKSB7CiAgICAgICAgIGZpbGxDb2xvckFycmF5KGdy YWRpZW50LCBncmFkaWVudFN0b3BzKCksIG9wYWNpdHkpOwogCiAgICAgICAgIFFQZW4gcGVuOwpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdmcvcXQvU1ZHUGFpbnRTZXJ2ZXJRdC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9zdmcvcXQvU1ZHUGFp bnRTZXJ2ZXJRdC5jcHAJKHJldmlzaW9uIDE3ODc5KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9zdmcvcXQvU1ZHUGFpbnRTZXJ2ZXJRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg1LDEw ICs4NSwxMCBAQCB2b2lkIFNWR1BhaW50U2VydmVyOjpyZW5kZXJQYXRoKEtSZW5kZXJpCiAgICAg UmVuZGVyU3R5bGUqIHJlbmRlclN0eWxlID0gcGF0aC0+c3R5bGUoKTsKICAgICBLUmVuZGVyaW5n RGV2aWNlQ29udGV4dFF0KiBxdENvbnRleHQgPSBzdGF0aWNfY2FzdDxLUmVuZGVyaW5nRGV2aWNl Q29udGV4dFF0Kj4oY29udGV4dCk7CiAKLSAgICBpZiAoKHR5cGUgJiBBUFBMWV9UT19GSUxMKSAm JiByZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFzRmlsbCgpKQorICAgIGlmICgodHlwZSAmIEFw cGx5VG9GaWxsVGFyZ2V0VHlwZSkgJiYgcmVuZGVyU3R5bGUtPnN2Z1N0eWxlKCktPmhhc0ZpbGwo KSkKICAgICAgICAgcXRDb250ZXh0LT5maWxsUGF0aCgpOwogCi0gICAgaWYgKCh0eXBlICYgQVBQ TFlfVE9fU1RST0tFKSAmJiByZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFzU3Ryb2tlKCkpCisg ICAgaWYgKCh0eXBlICYgQXBwbHlUb1N0cm9rZVRhcmdldFR5cGUpICYmIHJlbmRlclN0eWxlLT5z dmdTdHlsZSgpLT5oYXNTdHJva2UoKSkKICAgICAgICAgcXRDb250ZXh0LT5zdHJva2VQYXRoKCk7 CiB9CiAKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3ZnL3F0L1NWR1BhaW50U2Vy dmVyUmFkaWFsR3JhZGllbnRRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9zdmcvcXQvU1ZHUGFpbnRTZXJ2ZXJSYWRpYWxHcmFkaWVudFF0LmNwcAkocmV2aXNp b24gMTc4NzkpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N2Zy9xdC9TVkdQYWludFNl cnZlclJhZGlhbEdyYWRpZW50UXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIsNyArMTAyLDcg QEAgYm9vbCBTVkdQYWludFNlcnZlclJhZGlhbEdyYWRpZW50Ojogc2V0dQogICAgIC8vIGdyYWRp ZW50VHJhbnMubWFwKGN4LCBjeSwgJmN4LCAmY3kpOwogICAgIC8vIHF0Q29udGV4dC0+cGFpbnRl cigpLnNldE1hdHJpeChtYXQpOwogCi0gICAgaWYgKCh0eXBlICYgQVBQTFlfVE9fRklMTCkgJiYg cmVuZGVyU3R5bGUtPnN2Z1N0eWxlKCktPmhhc0ZpbGwoKSkgeworICAgIGlmICgodHlwZSAmIEFw cGx5VG9GaWxsVGFyZ2V0VHlwZSkgJiYgcmVuZGVyU3R5bGUtPnN2Z1N0eWxlKCktPmhhc0ZpbGwo KSkgewogICAgICAgICBmaWxsQ29sb3JBcnJheShncmFkaWVudCwgZ3JhZGllbnRTdG9wcygpLCBv cGFjaXR5KTsKIAogICAgICAgICBRQnJ1c2ggYnJ1c2goZ3JhZGllbnQpOwpAQCAtMTExLDcgKzEx MSw3IEBAIGJvb2wgU1ZHUGFpbnRTZXJ2ZXJSYWRpYWxHcmFkaWVudDo6IHNldHUKICAgICAgICAg cXRDb250ZXh0LT5zZXRGaWxsUnVsZShyZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+ZmlsbFJ1bGUo KSk7CiAgICAgfQogCi0gICAgaWYgKCh0eXBlICYgQVBQTFlfVE9fU1RST0tFKSAmJiByZW5kZXJT dHlsZS0+c3ZnU3R5bGUoKS0+aGFzU3Ryb2tlKCkpIHsKKyAgICBpZiAoKHR5cGUgJiBBcHBseVRv U3Ryb2tlVGFyZ2V0VHlwZSkgJiYgcmVuZGVyU3R5bGUtPnN2Z1N0eWxlKCktPmhhc1N0cm9rZSgp KSB7CiAgICAgICAgIGZpbGxDb2xvckFycmF5KGdyYWRpZW50LCBncmFkaWVudFN0b3BzKCksIG9w YWNpdHkpOwogCiAgICAgICAgIFFQZW4gcGVuOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9zdmcvcXQvU1ZHUGFpbnRTZXJ2ZXJTb2xpZFF0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3N2Zy9xdC9TVkdQYWludFNlcnZlclNvbGlkUXQuY3BwCShy ZXZpc2lvbiAxNzg3OSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc3ZnL3F0L1NWR1Bh aW50U2VydmVyU29saWRRdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4LDcgKzM4LDcgQEAgYm9v bCBTVkdQYWludFNlcnZlclNvbGlkOjpzZXR1cChLUmVuZGVyaQogCiAgICAgUUNvbG9yIGMgPSBj b2xvcigpOwogCi0gICAgaWYgKCh0eXBlICYgQVBQTFlfVE9fRklMTCkgJiYgcmVuZGVyU3R5bGUt PnN2Z1N0eWxlKCktPmhhc0ZpbGwoKSkgeworICAgIGlmICgodHlwZSAmIEFwcGx5VG9GaWxsVGFy Z2V0VHlwZSkgJiYgcmVuZGVyU3R5bGUtPnN2Z1N0eWxlKCktPmhhc0ZpbGwoKSkgewogICAgICAg ICBjLnNldEFscGhhRihyZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+ZmlsbE9wYWNpdHkoKSk7CiAK ICAgICAgICAgUUJydXNoIGJydXNoKGMpOwpAQCAtNDgsNyArNDgsNyBAQCBib29sIFNWR1BhaW50 U2VydmVyU29saWQ6OnNldHVwKEtSZW5kZXJpCiAgICAgICAgIC8qIGlmKGlzUGFpbnRpbmdUZXh0 KCkpIC4uLiAqLwogICAgIH0KIAotICAgIGlmKCh0eXBlICYgQVBQTFlfVE9fU1RST0tFKSAmJiBy ZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFzU3Ryb2tlKCkpIHsKKyAgICBpZigodHlwZSAmIEFw cGx5VG9TdHJva2VUYXJnZXRUeXBlKSAmJiByZW5kZXJTdHlsZS0+c3ZnU3R5bGUoKS0+aGFzU3Ry b2tlKCkpIHsKICAgICAgICAgYy5zZXRBbHBoYUYocmVuZGVyU3R5bGUtPnN2Z1N0eWxlKCktPnN0 cm9rZU9wYWNpdHkoKSk7CiAKICAgICAgICAgUVBlbiBwZW4oYyk7Cg==