40868 2010-06-18 16:46:14 -0700 Get rid of the NSEnumerators from WebBasePluginPackage 2010-06-18 16:51:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 240218 0 andersca 2010-06-18 16:46:14 -0700 Get rid of the NSEnumerators from WebBasePluginPackage 240219 1 59170 andersca 2010-06-18 16:46:58 -0700 Created attachment 59170 Patch 240221 2 59170 sam 2010-06-18 16:48:56 -0700 Comment on attachment 59170 Patch Please note the reason (c++ification) in the changelorg. r=me 240222 3 andersca 2010-06-18 16:51:43 -0700 Committed r61454: <http://trac.webkit.org/changeset/61454> 59170 2010-06-18 16:46:58 -0700 2010-06-18 16:48:56 -0700 Patch bug-40868-20100618164656.patch text/plain 7802 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTQ1MykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDYtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBHZXQgcmlkIG9mIHRoZSBOU0VudW1lcmF0b3JzIGZyb20gV2ViQmFzZVBsdWdp blBhY2thZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTQwODY4CisKKyAgICAgICAgKiBQbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLmg6CisgICAg ICAgICogUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbToKKyAgICAgICAgKC1bV2ViQmFz ZVBsdWdpblBhY2thZ2UgTUlNRVR5cGVzXSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNr YWdlIHN1cHBvcnRzRXh0ZW5zaW9uOl0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFja2Fn ZSBzdXBwb3J0c01JTUVUeXBlOl0pOgorICAgICAgICAqIFBsdWdpbnMvV2ViUGx1Z2luRGF0YWJh c2UubW06CisgICAgICAgICgtW1dlYlBsdWdpbkRhdGFiYXNlIHBsdWdpbkZvck1JTUVUeXBlOl0p OgorICAgICAgICAoLVtXZWJQbHVnaW5EYXRhYmFzZSBwbHVnaW5Gb3JFeHRlbnNpb246XSk6Cisg ICAgICAgICgtW1dlYlBsdWdpbkRhdGFiYXNlIHJlZnJlc2hdKToKKyAgICAgICAgKC1bV2ViUGx1 Z2luRGF0YWJhc2UgX3JlbW92ZVBsdWdpbjpdKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJQbGF0Zm9ybVN0cmF0ZWdpZXMubW06CisgICAgICAgIChXZWJQbGF0Zm9ybVN0cmF0ZWdpZXM6 OmdldFBsdWdpbkluZm8pOgorCiAyMDEwLTA2LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNj YUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFdl YktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5oCShyZXZpc2lvbiA2MTQ1MikK KysrIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5oCSh3b3JraW5nIGNv cHkpCkBAIC04Miw4ICs4MiwxMSBAQCBAaW50ZXJmYWNlIFdlYkJhc2VQbHVnaW5QYWNrYWdlIDog TlNPYmplCiAtIChOU1N0cmluZyAqKXBsdWdpbkRlc2NyaXB0aW9uOwogLSAoTlNCdW5kbGUgKili dW5kbGU7CiAKLS0gKE5TRW51bWVyYXRvciAqKWV4dGVuc2lvbkVudW1lcmF0b3I7Ci0tIChOU0Vu dW1lcmF0b3IgKilNSU1FVHlwZUVudW1lcmF0b3I7CistIChCT09MKXN1cHBvcnRzRXh0ZW5zaW9u OihOU1N0cmluZyAqKWV4dGVuc2lvbjsKKy0gKEJPT0wpc3VwcG9ydHNNSU1FVHlwZTooTlNTdHJp bmcgKilNSU1FVHlwZTsKKworLSAoTlNBcnJheSAqKU1JTUVUeXBlczsKKwogLSAoTlNTdHJpbmcg KilkZXNjcmlwdGlvbkZvck1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlOwogLSAoTlNTdHJp bmcgKilNSU1FVHlwZUZvckV4dGVuc2lvbjooTlNTdHJpbmcgKilleHRlbnNpb247CiAtIChOU0Fy cmF5ICopZXh0ZW5zaW9uc0Zvck1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlOwpJbmRleDog V2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQkocmV2aXNpb24gNjE0 NTIpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0JKHdvcmtp bmcgY29weSkKQEAgLTMwMywxNCArMzAzLDE5IEBAIC0gKE5TU3RyaW5nICopcGx1Z2luRGVzY3Jp cHRpb24KICAgICByZXR1cm4gcGx1Z2luRGVzY3JpcHRpb247CiB9CiAKLS0gKE5TRW51bWVyYXRv ciAqKWV4dGVuc2lvbkVudW1lcmF0b3IKKy0gKE5TQXJyYXkgKilNSU1FVHlwZXMKIHsKLSAgICBy ZXR1cm4gW2V4dGVuc2lvblRvTUlNRSBrZXlFbnVtZXJhdG9yXTsKKyAgICByZXR1cm4gW01JTUVU b0V4dGVuc2lvbnMgYWxsS2V5c107CiB9CiAKLS0gKE5TRW51bWVyYXRvciAqKU1JTUVUeXBlRW51 bWVyYXRvcgorLSAoQk9PTClzdXBwb3J0c0V4dGVuc2lvbjooTlNTdHJpbmcgKilleHRlbnNpb24K IHsKLSAgICByZXR1cm4gW01JTUVUb0V4dGVuc2lvbnMga2V5RW51bWVyYXRvcl07CisgICAgcmV0 dXJuIFtleHRlbnNpb25Ub01JTUUgb2JqZWN0Rm9yS2V5OmV4dGVuc2lvbl0gIT0gMDsKK30KKwor LSAoQk9PTClzdXBwb3J0c01JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlCit7CisgICAgcmV0 dXJuIFtNSU1FVG9FeHRlbnNpb25zIG9iamVjdEZvcktleTpNSU1FVHlwZV0gIT0gMDsKIH0KIAog LSAoTlNTdHJpbmcgKilkZXNjcmlwdGlvbkZvck1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBl CkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luRGF0YWJhc2UubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L21hYy9QbHVnaW5zL1dlYlBsdWdpbkRhdGFiYXNlLm1tCShyZXZpc2lvbiA2 MTQ1MikKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVnaW5EYXRhYmFzZS5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMTU0LDMyICsxNTQsMzUgQEAgc3RydWN0IFBsdWdpblBhY2thZ2VDYW5kaWRh dGVzIHsKICNlbmRpZgogfTsKIAotLSAoV2ViQmFzZVBsdWdpblBhY2thZ2UgKilwbHVnaW5Gb3JL ZXk6KE5TU3RyaW5nICopa2V5IHdpdGhFbnVtZXJhdG9yU2VsZWN0b3I6KFNFTCllbnVtZXJhdG9y U2VsZWN0b3IKKy0gKFdlYkJhc2VQbHVnaW5QYWNrYWdlICopcGx1Z2luRm9yTUlNRVR5cGU6KE5T U3RyaW5nICopTUlNRVR5cGUKIHsKICAgICBQbHVnaW5QYWNrYWdlQ2FuZGlkYXRlcyBjYW5kaWRh dGVzOwotICAgIFdlYkJhc2VQbHVnaW5QYWNrYWdlICpwbHVnaW4gPSBuaWw7Ci0KLSAgICBrZXkg PSBba2V5IGxvd2VyY2FzZVN0cmluZ107CisgICAgCisgICAgTUlNRVR5cGUgPSBbTUlNRVR5cGUg bG93ZXJjYXNlU3RyaW5nXTsKICAgICBOU0VudW1lcmF0b3IgKnBsdWdpbkVudW1lcmF0b3IgPSBb cGx1Z2lucyBvYmplY3RFbnVtZXJhdG9yXTsKLQotICAgIHdoaWxlICgocGx1Z2luID0gW3BsdWdp bkVudW1lcmF0b3IgbmV4dE9iamVjdF0pICE9IG5pbCkgewotICAgICAgICBpZiAoW1tbcGx1Z2lu IHBlcmZvcm1TZWxlY3RvcjplbnVtZXJhdG9yU2VsZWN0b3JdIGFsbE9iamVjdHNdIGNvbnRhaW5z T2JqZWN0OmtleV0pCisgICAgCisgICAgd2hpbGUgKFdlYkJhc2VQbHVnaW5QYWNrYWdlICpwbHVn aW4gPSBbcGx1Z2luRW51bWVyYXRvciBuZXh0T2JqZWN0XSkgeworICAgICAgICBpZiAoW3BsdWdp biBzdXBwb3J0c01JTUVUeXBlOk1JTUVUeXBlXSkKICAgICAgICAgICAgIGNhbmRpZGF0ZXMudXBk YXRlKHBsdWdpbik7CiAgICAgfQotCisgICAgCiAgICAgcmV0dXJuIGNhbmRpZGF0ZXMuYmVzdENh bmRpZGF0ZSgpOwogfQogCi0tIChXZWJCYXNlUGx1Z2luUGFja2FnZSAqKXBsdWdpbkZvck1JTUVU eXBlOihOU1N0cmluZyAqKU1JTUVUeXBlCi17Ci0gICAgcmV0dXJuIFtzZWxmIHBsdWdpbkZvcktl eTpbTUlNRVR5cGUgbG93ZXJjYXNlU3RyaW5nXQotICAgICAgIHdpdGhFbnVtZXJhdG9yU2VsZWN0 b3I6QHNlbGVjdG9yKE1JTUVUeXBlRW51bWVyYXRvcildOwotfQotCiAtIChXZWJCYXNlUGx1Z2lu UGFja2FnZSAqKXBsdWdpbkZvckV4dGVuc2lvbjooTlNTdHJpbmcgKilleHRlbnNpb24KIHsKLSAg ICBXZWJCYXNlUGx1Z2luUGFja2FnZSAqcGx1Z2luID0gW3NlbGYgcGx1Z2luRm9yS2V5OltleHRl bnNpb24gbG93ZXJjYXNlU3RyaW5nXQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdp dGhFbnVtZXJhdG9yU2VsZWN0b3I6QHNlbGVjdG9yKGV4dGVuc2lvbkVudW1lcmF0b3IpXTsKKyAg ICBQbHVnaW5QYWNrYWdlQ2FuZGlkYXRlcyBjYW5kaWRhdGVzOworICAgIAorICAgIGV4dGVuc2lv biA9IFtleHRlbnNpb24gbG93ZXJjYXNlU3RyaW5nXTsKKyAgICBOU0VudW1lcmF0b3IgKnBsdWdp bkVudW1lcmF0b3IgPSBbcGx1Z2lucyBvYmplY3RFbnVtZXJhdG9yXTsKKyAgICAKKyAgICB3aGls ZSAoV2ViQmFzZVBsdWdpblBhY2thZ2UgKnBsdWdpbiA9IFtwbHVnaW5FbnVtZXJhdG9yIG5leHRP YmplY3RdKSB7CisgICAgICAgIGlmIChbcGx1Z2luIHN1cHBvcnRzRXh0ZW5zaW9uOmV4dGVuc2lv bl0pCisgICAgICAgICAgICBjYW5kaWRhdGVzLnVwZGF0ZShwbHVnaW4pOworICAgIH0KKyAgICAK KyAgICBXZWJCYXNlUGx1Z2luUGFja2FnZSAqcGx1Z2luID0gY2FuZGlkYXRlcy5iZXN0Q2FuZGlk YXRlKCk7CisgICAgCiAgICAgaWYgKCFwbHVnaW4pIHsKICAgICAgICAgLy8gSWYgbm8gcGx1Zy1p biB3YXMgZm91bmQgZnJvbSB0aGUgZXh0ZW5zaW9uLCBhdHRlbXB0IHRvIG1hcCBmcm9tIHRoZSBl eHRlbnNpb24gdG8gYSBNSU1FIHR5cGUKICAgICAgICAgLy8gYW5kIGZpbmQgdGhlIGEgcGx1Zy1p biBmcm9tIHRoZSBNSU1FIHR5cGUuIFRoaXMgaXMgZG9uZSBpbiBjYXNlIHRoZSBwbHVnLWluIGhh cyBub3QgZnVsbHkgc3BlY2lmaWVkCkBAIC0zMDIsNyArMzA1LDcgQEAgLSAodm9pZClyZWZyZXNo CiAgICAgTlNNdXRhYmxlU2V0ICpNSU1FVHlwZXMgPSBbW05TTXV0YWJsZVNldCBhbGxvY10gaW5p dF07CiAgICAgcGx1Z2luRW51bWVyYXRvciA9IFtwbHVnaW5zIG9iamVjdEVudW1lcmF0b3JdOwog ICAgIHdoaWxlICgocGx1Z2luID0gW3BsdWdpbkVudW1lcmF0b3IgbmV4dE9iamVjdF0pICE9IG5p bCkKLSAgICAgICAgW01JTUVUeXBlcyBhZGRPYmplY3RzRnJvbUFycmF5OltbcGx1Z2luIE1JTUVU eXBlRW51bWVyYXRvcl0gYWxsT2JqZWN0c11dOworICAgICAgICBbTUlNRVR5cGVzIGFkZE9iamVj dHNGcm9tQXJyYXk6W3BsdWdpbiBNSU1FVHlwZXNdXTsKICAgICAKICAgICAvLyBSZWdpc3RlciBw bHVnLWluIHZpZXdzIGFuZCByZXByZXNlbnRhdGlvbnMuCiAgICAgTlNFbnVtZXJhdG9yICpNSU1F RW51bWVyYXRvciA9IFtNSU1FVHlwZXMgb2JqZWN0RW51bWVyYXRvcl07CkBAIC00MzYsOSArNDM5 LDEwIEBAIC0gKHZvaWQpX3JlbW92ZVBsdWdpbjooV2ViQmFzZVBsdWdpblBhY2sKICAgICBBU1NF UlQocGx1Z2luKTsKIAogICAgIC8vIFVucmVnaXN0ZXIgcGx1Zy1pbidzIE1JTUUgdHlwZSByZWdp c3RyYXRpb25zCi0gICAgTlNFbnVtZXJhdG9yICpNSU1FVHlwZUVudW1lcmF0b3IgPSBbcGx1Z2lu IE1JTUVUeXBlRW51bWVyYXRvcl07Ci0gICAgTlNTdHJpbmcgKk1JTUVUeXBlOwotICAgIHdoaWxl ICgoTUlNRVR5cGUgPSBbTUlNRVR5cGVFbnVtZXJhdG9yIG5leHRPYmplY3RdKSkgeworICAgIE5T QXJyYXkgKk1JTUVUeXBlcyA9IFtwbHVnaW4gTUlNRVR5cGVzXTsKKyAgICBmb3IgKE5TVUludGVn ZXIgaSA9IDA7IGkgPCBbTUlNRVR5cGVzIGNvdW50XTsgKytpKSB7CisgICAgICAgIE5TU3RyaW5n ICpNSU1FVHlwZSA9IFtNSU1FVHlwZXMgb2JqZWN0QXRJbmRleDppXTsKKwogICAgICAgICBpZiAo W3JlZ2lzdGVyZWRNSU1FVHlwZXMgY29udGFpbnNPYmplY3Q6TUlNRVR5cGVdKSB7CiAgICAgICAg ICAgICBpZiAoc2VsZiA9PSBzaGFyZWREYXRhYmFzZSkKICAgICAgICAgICAgICAgICBbV2ViVmll dyBfdW5yZWdpc3RlclBsdWdpbk1JTUVUeXBlOk1JTUVUeXBlXTsKSW5kZXg6IFdlYktpdC9tYWMv V2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLm1tCShyZXZpc2lv biA2MTQ0OSkKKysrIFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVn aWVzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw3ICszMSw3IEBACiAjaW1wb3J0IDx3dGYvU3Rk TGliRXh0cmFzLmg+CiAKICNpZmRlZiBCVUlMRElOR19PTl9USUdFUgotLXR5cGVkZWYgdW5zaWdu ZWQgTlNVSW50ZWdlcjsKK3R5cGVkZWYgdW5zaWduZWQgTlNVSW50ZWdlcjsKICNlbmRpZgogCiB1 c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKQEAgLTcyLDIxICs3MiwyMyBAQCB2b2lkIFdlYlBsYXRm b3JtU3RyYXRlZ2llczo6Z2V0UGx1Z2luSW5mCiAgICAgICAgIHBsdWdpbkluZm8uZmlsZSA9IFtw bHVnaW4gZmlsZW5hbWVdOwogICAgICAgICBwbHVnaW5JbmZvLmRlc2MgPSBbcGx1Z2luIHBsdWdp bkRlc2NyaXB0aW9uXTsKIAotICAgICAgICBOU0VudW1lcmF0b3IqIE1JTUVUeXBlRW51bWVyYXRv ciA9IFtwbHVnaW4gTUlNRVR5cGVFbnVtZXJhdG9yXTsKLSAgICAgICAgd2hpbGUgKE5TU3RyaW5n KiBNSU1FID0gW01JTUVUeXBlRW51bWVyYXRvciBuZXh0T2JqZWN0XSkgewotICAgICAgICAgICAg TWltZUNsYXNzSW5mbyBtaW1lOworICAgICAgICBOU0FycmF5ICpNSU1FVHlwZXMgPSBbcGx1Z2lu IE1JTUVUeXBlc107CisgICAgICAgIGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IFtNSU1FVHlw ZXMgY291bnRdOyArK2kpIHsKKyAgICAgICAgICAgIE5TU3RyaW5nICpNSU1FVHlwZSA9IFtNSU1F VHlwZXMgb2JqZWN0QXRJbmRleDppXTsKIAotICAgICAgICAgICAgbWltZS50eXBlID0gU3RyaW5n KE1JTUUpLmxvd2VyKCk7CisgICAgICAgICAgICBNaW1lQ2xhc3NJbmZvIG1pbWVDbGFzc0luZm87 CisKKyAgICAgICAgICAgIG1pbWVDbGFzc0luZm8udHlwZSA9IFN0cmluZyhNSU1FVHlwZSkubG93 ZXIoKTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgTlNBcnJheSAqZXh0ZW5zaW9ucyA9IFtw bHVnaW4gZXh0ZW5zaW9uc0Zvck1JTUVUeXBlOk1JTUVdOworICAgICAgICAgICAgTlNBcnJheSAq ZXh0ZW5zaW9ucyA9IFtwbHVnaW4gZXh0ZW5zaW9uc0Zvck1JTUVUeXBlOk1JTUVUeXBlXTsKICAg ICAgICAgICAgIGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IFtleHRlbnNpb25zIGNvdW50XTsg KytpKSB7CiAgICAgICAgICAgICAgICAgTlNTdHJpbmcgKmV4dGVuc2lvbiA9IFtleHRlbnNpb25z IG9iamVjdEF0SW5kZXg6aV07Ci0gICAgICAgICAgICAgICAgbWltZS5leHRlbnNpb25zLmFwcGVu ZChleHRlbnNpb24pOworICAgICAgICAgICAgICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5h cHBlbmQoZXh0ZW5zaW9uKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgbWltZS5kZXNj ID0gW3BsdWdpbiBkZXNjcmlwdGlvbkZvck1JTUVUeXBlOk1JTUVdOworICAgICAgICAgICAgbWlt ZUNsYXNzSW5mby5kZXNjID0gW3BsdWdpbiBkZXNjcmlwdGlvbkZvck1JTUVUeXBlOk1JTUVUeXBl XTsKICAgICAgICAgICAgIAotICAgICAgICAgICAgcGx1Z2luSW5mby5taW1lcy5hcHBlbmQobWlt ZSk7CisgICAgICAgICAgICBwbHVnaW5JbmZvLm1pbWVzLmFwcGVuZChtaW1lQ2xhc3NJbmZvKTsK ICAgICAgICAgfQogCiAgICAgICAgIHBsdWdpbnMuYXBwZW5kKHBsdWdpbkluZm8pOwo=