40866 2010-06-18 16:08:19 -0700 Clean up WebPluginDatabase.mm 2010-06-18 16:43:34 -0700 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 240201 0 andersca 2010-06-18 16:08:19 -0700 Clean up WebPluginDatabase.mm 240205 1 59167 andersca 2010-06-18 16:10:27 -0700 Created attachment 59167 Patch 240210 2 andersca 2010-06-18 16:17:19 -0700 Committed r61452: <http://trac.webkit.org/changeset/61452> 240216 3 webkit.review.bot 2010-06-18 16:43:34 -0700 http://trac.webkit.org/changeset/61452 might have broken Chromium Mac Release The following changes are on the blame list: http://trac.webkit.org/changeset/61452 http://trac.webkit.org/changeset/61453 59167 2010-06-18 16:10:27 -0700 2010-06-18 16:12:32 -0700 Patch bug-40866-20100618161026.patch text/plain 7420 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTQ0OSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTAtMDYtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBDbGVhbiB1cCBXZWJQbHVnaW5EYXRhYmFzZS5tbQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4NjYKKworICAgICAgICAqIFBsdWdp bnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaDoKKyAgICAgICAgKiBQbHVnaW5zL1dlYkJhc2VQbHVn aW5QYWNrYWdlLm1tOgorICAgICAgICAocGF0aEJ5UmVzb2x2aW5nU3ltbGlua3NBbmRBbGlhc2Vz KToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgaW5pdFdpdGhQYXRoOl0pOgorICAg ICAgICBDaGFuZ2UgYW4gaW5zdGFuY2UgbWV0aG9kIGludG8gYSBzdGF0aWMgZnVuY3Rpb24uCisg ICAgICAgIAorICAgICAgICAqIFBsdWdpbnMvV2ViUGx1Z2luRGF0YWJhc2UubW06CisgICAgICAg IChQbHVnaW5QYWNrYWdlQ2FuZGlkYXRlczo6UGx1Z2luUGFja2FnZUNhbmRpZGF0ZXMpOgorICAg ICAgICAoUGx1Z2luUGFja2FnZUNhbmRpZGF0ZXM6OnVwZGF0ZSk6CisgICAgICAgIChQbHVnaW5Q YWNrYWdlQ2FuZGlkYXRlczo6YmVzdENhbmRpZGF0ZSk6CisgICAgICAgIEFkZCBhIG5ldyBQbHVn aW5QYWNrYWdlQ2FuZGlkYXRlcyBjbGFzcy4KKyAgICAgICAgCisgICAgICAgICgtW1dlYlBsdWdp bkRhdGFiYXNlIHBsdWdpbkZvcktleTp3aXRoRW51bWVyYXRvclNlbGVjdG9yOl0pOgorICAgICAg ICBVc2UgUGx1Z2luUGFja2FnZUNhbmRpZGF0ZXMgaGVyZS4KKwogMjAxMC0wNi0xOCAgQW5kZXJz IENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBUaWdlciBidWls ZC4KSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5oCShyZXZp c2lvbiA2MTQ0NCkKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw4ICsyNiw2IEBACiAgKiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLSNp bXBvcnQgPFdlYkNvcmUvV2ViQ29yZVZpZXdGYWN0b3J5Lmg+Ci0KICNpZiBFTkFCTEUoTkVUU0NB UEVfUExVR0lOX0FQSSkKICNpbXBvcnQgPFdlYktpdC9ucGZ1bmN0aW9ucy5oPgogI2Vsc2UKSW5k ZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0JKHJldmlzaW9u IDYxNDQzKQorKysgV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw3IEBAICsgKE5TU3RyaW5nICopcHJlZmVycmVkTG9j YWxpemF0aW9uTmFtZQogICAgIHJldHVybiBXZWJDRkF1dG9yZWxlYXNlKFdLQ29weUNGTG9jYWxp emF0aW9uUHJlZmVycmVkTmFtZShOVUxMKSk7CiB9CiAKLS0gKE5TU3RyaW5nICopcGF0aEJ5UmVz b2x2aW5nU3ltbGlua3NBbmRBbGlhc2VzSW5QYXRoOihOU1N0cmluZyAqKXRoZVBhdGgKK3N0YXRp YyBOU1N0cmluZyAqcGF0aEJ5UmVzb2x2aW5nU3ltbGlua3NBbmRBbGlhc2VzKE5TU3RyaW5nICp0 aGVQYXRoKQogewogICAgIE5TU3RyaW5nICpuZXdQYXRoID0gW3RoZVBhdGggc3RyaW5nQnlSZXNv bHZpbmdTeW1saW5rc0luUGF0aF07CiAKQEAgLTEyMiw3ICsxMjIsNyBAQCAtIChpZClpbml0V2l0 aFBhdGg6KE5TU3RyaW5nICopcGx1Z2luUGF0CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0 XSkpCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgICAgIAotICAgIHBhdGggPSBbW3NlbGYgcGF0 aEJ5UmVzb2x2aW5nU3ltbGlua3NBbmRBbGlhc2VzSW5QYXRoOnBsdWdpblBhdGhdIHJldGFpbl07 CisgICAgcGF0aCA9IFtwYXRoQnlSZXNvbHZpbmdTeW1saW5rc0FuZEFsaWFzZXMocGx1Z2luUGF0 aCkgY29weV07CiAgICAgYnVuZGxlID0gW1tOU0J1bmRsZSBhbGxvY10gaW5pdFdpdGhQYXRoOnBh dGhdOwogI2lmbmRlZiBfX3BwY19fCiAgICAgLy8gMzItYml0IFBvd2VyUEMgaXMgdGhlIG9ubHkg cGxhdGZvcm0gd2hlcmUgbm9uLWJ1bmRsZWQgQ0ZNIHBsdWdpbnMgYXJlIHN1cHBvcnRlZApJbmRl eDogV2ViS2l0L21hYy9QbHVnaW5zL1dlYlBsdWdpbkRhdGFiYXNlLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVnaW5EYXRhYmFzZS5tbQkocmV2aXNpb24gNjE0NDMp CisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luRGF0YWJhc2UubW0JKHdvcmtpbmcgY29w eSkKQEAgLTg2LDYyICs4Niw4OCBAQCBzdGF0aWMgdm9pZCBjaGVja0NhbmRpZGF0ZShXZWJCYXNl UGx1Z2luCiAgICAgICAgICpjdXJyZW50UGx1Z2luID0gKmNhbmRpZGF0ZVBsdWdpbjsKIH0KIAot LSAoV2ViQmFzZVBsdWdpblBhY2thZ2UgKilwbHVnaW5Gb3JLZXk6KE5TU3RyaW5nICopa2V5IHdp dGhFbnVtZXJhdG9yU2VsZWN0b3I6KFNFTCllbnVtZXJhdG9yU2VsZWN0b3IKLXsKLSAgICBXZWJC YXNlUGx1Z2luUGFja2FnZSAqcGx1Z2luID0gbmlsOwotICAgIFdlYkJhc2VQbHVnaW5QYWNrYWdl ICp3ZWJQbHVnaW4gPSBuaWw7CitzdHJ1Y3QgUGx1Z2luUGFja2FnZUNhbmRpZGF0ZXMgeworICAg IFBsdWdpblBhY2thZ2VDYW5kaWRhdGVzKCkKKyAgICAgICAgOiB3ZWJQbHVnaW4obmlsKQorICAg ICAgICAsIG1hY2hvUGx1Z2luKG5pbCkKICNpZmRlZiBTVVBQT1JUX0NGTQotICAgIFdlYkJhc2VQ bHVnaW5QYWNrYWdlICpDRk1QbHVnaW4gPSBuaWw7CisgICAgICAgICwgQ0ZNUGx1Z2luKG5pbCkK ICNlbmRpZgotICAgIFdlYkJhc2VQbHVnaW5QYWNrYWdlICptYWNob1BsdWdpbiA9IG5pbDsgICAg Ci0KLSAgICBOU0VudW1lcmF0b3IgKnBsdWdpbkVudW1lcmF0b3IgPSBbcGx1Z2lucyBvYmplY3RF bnVtZXJhdG9yXTsKLSAgICBrZXkgPSBba2V5IGxvd2VyY2FzZVN0cmluZ107Ci0KLSAgICB3aGls ZSAoKHBsdWdpbiA9IFtwbHVnaW5FbnVtZXJhdG9yIG5leHRPYmplY3RdKSAhPSBuaWwpIHsKLSAg ICAgICAgaWYgKFtbW3BsdWdpbiBwZXJmb3JtU2VsZWN0b3I6ZW51bWVyYXRvclNlbGVjdG9yXSBh bGxPYmplY3RzXSBjb250YWluc09iamVjdDprZXldKSB7Ci0gICAgICAgICAgICBpZiAoW3BsdWdp biBpc0tpbmRPZkNsYXNzOltXZWJQbHVnaW5QYWNrYWdlIGNsYXNzXV0pIAotICAgICAgICAgICAg ICAgIGNoZWNrQ2FuZGlkYXRlKCZ3ZWJQbHVnaW4sICZwbHVnaW4pOworICAgIHsKKyAgICB9Cisg ICAgCisgICAgdm9pZCB1cGRhdGUoV2ViQmFzZVBsdWdpblBhY2thZ2UgKnBsdWdpbikKKyAgICB7 CisgICAgICAgIGlmIChbcGx1Z2luIGlzS2luZE9mQ2xhc3M6W1dlYlBsdWdpblBhY2thZ2UgY2xh c3NdXSkgeworICAgICAgICAgICAgY2hlY2tDYW5kaWRhdGUoJndlYlBsdWdpbiwgJnBsdWdpbik7 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgICAgIAogI2lmIEVOQUJM RShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgICAgICAgICAgZWxzZSBpZihbcGx1Z2luIGlzS2lu ZE9mQ2xhc3M6W1dlYk5ldHNjYXBlUGx1Z2luUGFja2FnZSBjbGFzc11dKSB7Ci0gICAgICAgICAg ICAgICAgV2ViRXhlY3V0YWJsZVR5cGUgZXhlY3V0YWJsZVR5cGUgPSBbKFdlYk5ldHNjYXBlUGx1 Z2luUGFja2FnZSAqKXBsdWdpbiBleGVjdXRhYmxlVHlwZV07CisgICAgICAgIGlmKFtwbHVnaW4g aXNLaW5kT2ZDbGFzczpbV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlIGNsYXNzXV0pIHsKKyAgICAg ICAgICAgIFdlYkV4ZWN1dGFibGVUeXBlIGV4ZWN1dGFibGVUeXBlID0gWyhXZWJOZXRzY2FwZVBs dWdpblBhY2thZ2UgKilwbHVnaW4gZXhlY3V0YWJsZVR5cGVdOwogI2lmZGVmIFNVUFBPUlRfQ0ZN Ci0gICAgICAgICAgICAgICAgaWYgKGV4ZWN1dGFibGVUeXBlID09IFdlYkNGTUV4ZWN1dGFibGVU eXBlKSB7Ci0gICAgICAgICAgICAgICAgICAgIGNoZWNrQ2FuZGlkYXRlKCZDRk1QbHVnaW4sICZw bHVnaW4pOwotICAgICAgICAgICAgICAgIH0gZWxzZSAKKyAgICAgICAgICAgIGlmIChleGVjdXRh YmxlVHlwZSA9PSBXZWJDRk1FeGVjdXRhYmxlVHlwZSkgeworICAgICAgICAgICAgICAgIGNoZWNr Q2FuZGlkYXRlKCZDRk1QbHVnaW4sICZwbHVnaW4pOworICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgIH0KICNlbmRpZiAvLyBTVVBQT1JUX0NGTQotICAgICAgICAgICAgICAgIGlm IChleGVjdXRhYmxlVHlwZSA9PSBXZWJNYWNoT0V4ZWN1dGFibGVUeXBlKSB7Ci0gICAgICAgICAg ICAgICAgICAgIGNoZWNrQ2FuZGlkYXRlKCZtYWNob1BsdWdpbiwgJnBsdWdpbik7Ci0gICAgICAg ICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAg ICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgICAgIGlmIChleGVjdXRhYmxlVHlw ZSA9PSBXZWJNYWNoT0V4ZWN1dGFibGVUeXBlKSB7CisgICAgICAgICAgICAgICAgY2hlY2tDYW5k aWRhdGUoJm1hY2hvUGx1Z2luLCAmcGx1Z2luKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CiAg ICAgICAgICAgICB9Ci0jZW5kaWYKICAgICAgICAgfQorI2VuZGlmCisgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgIH0KLQotICAgIC8vIEFsbG93IG90aGVyIHBsdWctaW5zIHRvIHdp biBvdmVyIFFUIGJlY2F1c2UgaWYgdGhlIHVzZXIgaGFzIGluc3RhbGxlZCBhIHBsdWctaW4gdGhh dCBjYW4gaGFuZGxlIGEgdHlwZQotICAgIC8vIHRoYXQgdGhlIFFUIHBsdWctaW4gY2FuIGhhbmRs ZSwgdGhleSBwcm9iYWJseSBpbnRlbmRlZCB0byBvdmVycmlkZSBRVC4KLSAgICBpZiAod2ViUGx1 Z2luICYmICFbd2ViUGx1Z2luIGlzUXVpY2tUaW1lUGx1Z0luXSkKLSAgICAgICAgcmV0dXJuIHdl YlBsdWdpbjsKICAgICAKLSAgICBlbHNlIGlmIChtYWNob1BsdWdpbiAmJiAhW21hY2hvUGx1Z2lu IGlzUXVpY2tUaW1lUGx1Z0luXSkKLSAgICAgICAgcmV0dXJuIG1hY2hvUGx1Z2luOworICAgIFdl YkJhc2VQbHVnaW5QYWNrYWdlICpiZXN0Q2FuZGlkYXRlKCkKKyAgICB7CisgICAgICAgIC8vIEFs bG93IG90aGVyIHBsdWctaW5zIHRvIHdpbiBvdmVyIFFUIGJlY2F1c2UgaWYgdGhlIHVzZXIgaGFz IGluc3RhbGxlZCBhIHBsdWctaW4gdGhhdCBjYW4gaGFuZGxlIGEgdHlwZQorICAgICAgICAvLyB0 aGF0IHRoZSBRVCBwbHVnLWluIGNhbiBoYW5kbGUsIHRoZXkgcHJvYmFibHkgaW50ZW5kZWQgdG8g b3ZlcnJpZGUgUVQuCisgICAgICAgIGlmICh3ZWJQbHVnaW4gJiYgIVt3ZWJQbHVnaW4gaXNRdWlj a1RpbWVQbHVnSW5dKQorICAgICAgICAgICAgcmV0dXJuIHdlYlBsdWdpbjsKKyAgICAKKyAgICAg ICAgaWYgKG1hY2hvUGx1Z2luICYmICFbbWFjaG9QbHVnaW4gaXNRdWlja1RpbWVQbHVnSW5dKQor ICAgICAgICAgICAgcmV0dXJuIG1hY2hvUGx1Z2luOworICAgICAgICAKICNpZmRlZiBTVVBQT1JU X0NGTQotICAgIGVsc2UgaWYgKENGTVBsdWdpbiAmJiAhW0NGTVBsdWdpbiBpc1F1aWNrVGltZVBs dWdJbl0pCi0gICAgICAgIHJldHVybiBDRk1QbHVnaW47CisgICAgICAgIGlmIChDRk1QbHVnaW4g JiYgIVtDRk1QbHVnaW4gaXNRdWlja1RpbWVQbHVnSW5dKQorICAgICAgICAgICAgcmV0dXJuIENG TVBsdWdpbjsKICNlbmRpZiAvLyBTVVBQT1JUX0NGTQotICAgIGVsc2UgaWYgKHdlYlBsdWdpbikK LSAgICAgICAgcmV0dXJuIHdlYlBsdWdpbjsKLSAgICBlbHNlIGlmIChtYWNob1BsdWdpbikKLSAg ICAgICAgcmV0dXJuIG1hY2hvUGx1Z2luOworICAgICAgICAKKyAgICAgICAgaWYgKHdlYlBsdWdp bikKKyAgICAgICAgICAgIHJldHVybiB3ZWJQbHVnaW47CisgICAgICAgIGlmIChtYWNob1BsdWdp bikKKyAgICAgICAgICAgIHJldHVybiBtYWNob1BsdWdpbjsKICNpZmRlZiBTVVBQT1JUX0NGTQot ICAgIGVsc2UgaWYgKENGTVBsdWdpbikKLSAgICAgICAgcmV0dXJuIENGTVBsdWdpbjsKKyAgICAg ICAgaWYgKENGTVBsdWdpbikKKyAgICAgICAgICAgIHJldHVybiBDRk1QbHVnaW47CiAjZW5kaWYK LSAgICByZXR1cm4gbmlsOworICAgICAgICByZXR1cm4gbmlsOworICAgIH0KKyAgICAKKyAgICBX ZWJCYXNlUGx1Z2luUGFja2FnZSAqd2ViUGx1Z2luOworICAgIFdlYkJhc2VQbHVnaW5QYWNrYWdl ICptYWNob1BsdWdpbjsKKyNpZmRlZiBTVVBQT1JUX0NGTQorICAgIFdlYkJhc2VQbHVnaW5QYWNr YWdlICpDRk1QbHVnaW47CisjZW5kaWYKK307CisKKy0gKFdlYkJhc2VQbHVnaW5QYWNrYWdlICop cGx1Z2luRm9yS2V5OihOU1N0cmluZyAqKWtleSB3aXRoRW51bWVyYXRvclNlbGVjdG9yOihTRUwp ZW51bWVyYXRvclNlbGVjdG9yCit7CisgICAgUGx1Z2luUGFja2FnZUNhbmRpZGF0ZXMgY2FuZGlk YXRlczsKKyAgICBXZWJCYXNlUGx1Z2luUGFja2FnZSAqcGx1Z2luID0gbmlsOworCisgICAga2V5 ID0gW2tleSBsb3dlcmNhc2VTdHJpbmddOworICAgIE5TRW51bWVyYXRvciAqcGx1Z2luRW51bWVy YXRvciA9IFtwbHVnaW5zIG9iamVjdEVudW1lcmF0b3JdOworCisgICAgd2hpbGUgKChwbHVnaW4g PSBbcGx1Z2luRW51bWVyYXRvciBuZXh0T2JqZWN0XSkgIT0gbmlsKSB7CisgICAgICAgIGlmIChb W1twbHVnaW4gcGVyZm9ybVNlbGVjdG9yOmVudW1lcmF0b3JTZWxlY3Rvcl0gYWxsT2JqZWN0c10g Y29udGFpbnNPYmplY3Q6a2V5XSkKKyAgICAgICAgICAgIGNhbmRpZGF0ZXMudXBkYXRlKHBsdWdp bik7CisgICAgfQorCisgICAgcmV0dXJuIGNhbmRpZGF0ZXMuYmVzdENhbmRpZGF0ZSgpOwogfQog CiAtIChXZWJCYXNlUGx1Z2luUGFja2FnZSAqKXBsdWdpbkZvck1JTUVUeXBlOihOU1N0cmluZyAq KU1JTUVUeXBlCg==