40959 2010-06-21 17:06:40 -0700 Support reading plug-in info from Carbon resources 2010-06-21 17:33:48 -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 240988 0 andersca 2010-06-21 17:06:40 -0700 Support reading plug-in info from Carbon resources 240990 1 59316 andersca 2010-06-21 17:09:26 -0700 Created attachment 59316 Patch 241009 2 59316 sam 2010-06-21 17:30:09 -0700 Comment on attachment 59316 Patch > +static bool getStringListResource(ResID resourceID, Vector<String>& stringList) { The { should be on the next line. Otherwise, r=me. 241018 3 andersca 2010-06-21 17:33:48 -0700 Committed r61594: <http://trac.webkit.org/changeset/61594> 59316 2010-06-21 17:09:26 -0700 2010-06-21 17:30:09 -0700 Patch bug-40959-20100621170925.patch text/plain 6268 andersca SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MTU5MSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDYtMjEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBTdXBwb3J0IHJlYWRpbmcgcGx1Zy1pbiBpbmZvIGZyb20gQ2FyYm9uIHJlc291cmNlcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA5NTkKKworICAg ICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OlJlc291cmNlTWFwOjpSZXNvdXJjZU1hcCk6CisgICAgICAgIChXZWJLaXQ6 OlJlc291cmNlTWFwOjp+UmVzb3VyY2VNYXApOgorICAgICAgICAoV2ViS2l0OjpSZXNvdXJjZU1h cDo6aXNWYWxpZCk6CisgICAgICAgIChXZWJLaXQ6OmdldFN0cmluZ0xpc3RSZXNvdXJjZSk6Cisg ICAgICAgIChXZWJLaXQ6OmdldFBsdWdpbkluZm9Gcm9tQ2FyYm9uUmVzb3VyY2VzKToKKyAgICAg ICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpnZXRQbHVnaW5JbmZvKToKKwogMjAxMC0wNi0y MSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9Q bHVnaW5JbmZvU3RvcmVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9VSVByb2Nlc3MvUGx1 Z2lucy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tCShyZXZpc2lvbiA2MTU5MSkKKysrIFdlYktp dDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtMjUsNiArMjUsNyBAQAogCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAK KyNpbmNsdWRlIDxXZWJDb3JlL1dlYkNvcmVOU1N0cmluZ0V4dHJhcy5oPgogI2luY2x1ZGUgPHd0 Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgogCkBAIC0xNzQsNiArMTc1 LDEzNSBAQCBzdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvRnJvbVByb3BlcnR5TGlzCiAgICAgcmV0 dXJuIHRydWU7ICAgIAogfQogCitjbGFzcyBSZXNvdXJjZU1hcCB7CitwdWJsaWM6CisgICAgZXhw bGljaXQgUmVzb3VyY2VNYXAoQ0ZCdW5kbGVSZWYgYnVuZGxlKQorICAgICAgICA6IG1fYnVuZGxl KGJ1bmRsZSkKKyAgICAgICAgLCBtX2N1cnJlbnRSZXNvdXJjZUZpbGUoQ3VyUmVzRmlsZSgpKQor ICAgICAgICAsIG1fYnVuZGxlUmVzb3VyY2VNYXAoQ0ZCdW5kbGVPcGVuQnVuZGxlUmVzb3VyY2VN YXAobV9idW5kbGUpKQorICAgIHsKKyAgICAgICAgVXNlUmVzRmlsZShtX2J1bmRsZVJlc291cmNl TWFwKTsKKyAgICB9CisKKyAgICB+UmVzb3VyY2VNYXAoKQorICAgIHsKKyAgICAgICAgLy8gQ2xv c2UgdGhlIHJlc291cmNlIG1hcC4KKyAgICAgICAgQ0ZCdW5kbGVDbG9zZUJ1bmRsZVJlc291cmNl TWFwKG1fYnVuZGxlLCBtX2J1bmRsZVJlc291cmNlTWFwKTsKKyAgICAgICAgCisgICAgICAgIC8v IEFuZCByZXN0b3JlIHRoZSBvbGQgcmVzb3VyY2UuCisgICAgICAgIFVzZVJlc0ZpbGUobV9jdXJy ZW50UmVzb3VyY2VGaWxlKTsKKyAgICB9CisKKyAgICBib29sIGlzVmFsaWQoKSBjb25zdCB7IHJl dHVybiBtX2J1bmRsZVJlc291cmNlTWFwICE9IC0xOyB9CisKK3ByaXZhdGU6CisgICAgQ0ZCdW5k bGVSZWYgbV9idW5kbGU7CisgICAgUmVzRmlsZVJlZk51bSBtX2N1cnJlbnRSZXNvdXJjZUZpbGU7 CisgICAgUmVzRmlsZVJlZk51bSBtX2J1bmRsZVJlc291cmNlTWFwOworfTsKKworc3RhdGljIGJv b2wgZ2V0U3RyaW5nTGlzdFJlc291cmNlKFJlc0lEIHJlc291cmNlSUQsIFZlY3RvcjxTdHJpbmc+ JiBzdHJpbmdMaXN0KSB7CisgICAgSGFuZGxlIHN0cmluZ0xpc3RIYW5kbGUgPSBHZXQxUmVzb3Vy Y2UoJ1NUUiMnLCByZXNvdXJjZUlEKTsKKyAgICBpZiAoIXN0cmluZ0xpc3RIYW5kbGUgfHwgISpz dHJpbmdMaXN0SGFuZGxlKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBHZXQgdGhl IHN0cmluZyBsaXN0IHNpemUuCisgICAgU2l6ZSBzdHJpbmdMaXN0U2l6ZSA9IEdldEhhbmRsZVNp emUoc3RyaW5nTGlzdEhhbmRsZSk7CisgICAgaWYgKHN0cmluZ0xpc3RTaXplIDwgc3RhdGljX2Nh c3Q8U2l6ZT4oc2l6ZW9mKFVJbnQxNikpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgIAorICAg IENGU3RyaW5nRW5jb2Rpbmcgc3RyaW5nRW5jb2RpbmcgPSBzdHJpbmdFbmNvZGluZ0ZvclJlc291 cmNlKHN0cmluZ0xpc3RIYW5kbGUpOworCisgICAgdW5zaWduZWQgY2hhciogcHRyID0gcmVpbnRl cnByZXRfY2FzdDx1bnNpZ25lZCBjaGFyKj4oKnN0cmluZ0xpc3RIYW5kbGUpOworICAgIHVuc2ln bmVkIGNoYXIqIGVuZCA9IHB0ciArIHN0cmluZ0xpc3RTaXplOworICAgIAorICAgIC8vIEdldCB0 aGUgbnVtYmVyIG9mIHN0cmluZ3MgaW4gdGhlIHN0cmluZyBsaXN0LgorICAgIFVJbnQxNiBudW1T dHJpbmdzID0gKnJlaW50ZXJwcmV0X2Nhc3Q8VUludDE2Kj4ocHRyKTsKKyAgICBwdHIgKz0gc2l6 ZW9mKFVJbnQxNik7CisgICAgICAgICAgICAgICAgICAKKyAgICBmb3IgKFVJbnQxNiBpID0gMDsg aSA8IG51bVN0cmluZ3M7ICsraSkgeworICAgICAgICAvLyBXZSdyZSBwYXN0IHRoZSBlbmQgb2Yg dGhlIHN0cmluZywgYmFpbC4KKyAgICAgICAgaWYgKHB0ciA+PSBlbmQpCisgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICAgICAgLy8gR2V0IHRoZSBzdHJpbmcgbGVuZ3RoLgorICAgICAg ICB1bnNpZ25lZCBjaGFyIHN0cmluZ0xlbmd0aCA9ICpwdHIrKzsKKworICAgICAgICBSZXRhaW5Q dHI8Q0ZTdHJpbmdSZWY+IGNmU3RyaW5nKEFkb3B0Q0YsIENGU3RyaW5nQ3JlYXRlV2l0aEJ5dGVz Tm9Db3B5KGtDRkFsbG9jYXRvckRlZmF1bHQsIHB0ciwgc3RyaW5nTGVuZ3RoLCBzdHJpbmdFbmNv ZGluZywgZmFsc2UsIGtDRkFsbG9jYXRvck51bGwpKTsKKyAgICAgICAgaWYgKCFjZlN0cmluZy5n ZXQoKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBzdHJpbmdMaXN0LmFw cGVuZChjZlN0cmluZy5nZXQoKSk7CisgICAgICAgIHB0ciArPSBzdHJpbmdMZW5ndGg7CisgICAg fQorCisgICAgaWYgKHB0ciAhPSBlbmQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJl dHVybiB0cnVlOworfQorCitzdGF0aWMgY29uc3QgUmVzSUQgUGx1Z2luTmFtZU9yRGVzY3JpcHRp b25TdHJpbmdOdW1iZXIgPSAxMjY7CitzdGF0aWMgY29uc3QgUmVzSUQgTUlNRURlc2NyaXB0aW9u U3RyaW5nTnVtYmVyID0gMTI3Oworc3RhdGljIGNvbnN0IFJlc0lEIE1JTUVMaXN0U3RyaW5nU3Ry aW5nTnVtYmVyID0gMTI4OworCitzdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvRnJvbUNhcmJvblJl c291cmNlcyhDRkJ1bmRsZVJlZiBidW5kbGUsIFBsdWdpbkluZm8mIHBsdWdpbkluZm8pCit7Cisg ICAgUmVzb3VyY2VNYXAgcmVzb3VyY2VNYXAoYnVuZGxlKTsKKyAgICBpZiAoIXJlc291cmNlTWFw LmlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgLy8gR2V0IHRoZSBuYW1l IGFuZCBkZXNjcmlwdGlvbiBzdHJpbmcgbGlzdC4KKyAgICBWZWN0b3I8U3RyaW5nPiBuYW1lQW5k RGVzY3JpcHRpb247CisgICAgaWYgKCFnZXRTdHJpbmdMaXN0UmVzb3VyY2UoUGx1Z2luTmFtZU9y RGVzY3JpcHRpb25TdHJpbmdOdW1iZXIsIG5hbWVBbmREZXNjcmlwdGlvbikpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIC8vIEdldCB0aGUgTUlNRSB0eXBlcyBhbmQgZXh0ZW5zaW9ucyBz dHJpbmcgbGlzdC4gVGhpcyBsaXN0IG5lZWRzIHRvIGJlIGEgbXVsdGlwbGUgb2YgdHdvLgorICAg IFZlY3RvcjxTdHJpbmc+IG1pbWVUeXBlc0FuZEV4dGVuc2lvbnM7CisgICAgaWYgKCFnZXRTdHJp bmdMaXN0UmVzb3VyY2UoTUlNRUxpc3RTdHJpbmdTdHJpbmdOdW1iZXIsIG1pbWVUeXBlc0FuZEV4 dGVuc2lvbnMpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAobWltZVR5cGVzQW5k RXh0ZW5zaW9ucy5zaXplKCkgJSAyKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBzaXpl X3QgbnVtTWltZVR5cGVzID0gbWltZVR5cGVzQW5kRXh0ZW5zaW9ucy5zaXplKCkgLyAyOworICAg IAorICAgIC8vIE5vdyBnZXQgdGhlIE1JTUUgdHlwZSBkZXNjcmlwdGlvbnMgc3RyaW5nIGxpc3Qu IFRoaXMgc3RyaW5nIGxpc3QgbmVlZHMgdG8gYmUgdGhlIHNhbWUgbGVuZ3RoIGFzIHRoZSBudW1i ZXIgb2YgTUlNRSB0eXBlcy4KKyAgICBWZWN0b3I8U3RyaW5nPiBtaW1lVHlwZURlc2NyaXB0aW9u czsKKyAgICBpZiAoIWdldFN0cmluZ0xpc3RSZXNvdXJjZShNSU1FRGVzY3JpcHRpb25TdHJpbmdO dW1iZXIsIG1pbWVUeXBlRGVzY3JpcHRpb25zKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisg ICAgaWYgKG1pbWVUeXBlRGVzY3JpcHRpb25zLnNpemUoKSAhPSBudW1NaW1lVHlwZXMpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIEFkZCBhbGwgTUlNRSB0eXBlcy4KKyAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IG1pbWVUeXBlc0FuZEV4dGVuc2lvbnMuc2l6ZSgpIC8gMjsgKytp KSB7CisgICAgICAgIE1pbWVDbGFzc0luZm8gbWltZUNsYXNzSW5mbzsKKyAgICAgICAgCisgICAg ICAgIGNvbnN0IFN0cmluZyYgbWltZVR5cGUgPSBtaW1lVHlwZXNBbmRFeHRlbnNpb25zW2kgKiAy XTsKKyAgICAgICAgY29uc3QgU3RyaW5nJiBkZXNjcmlwdGlvbiA9IG1pbWVUeXBlRGVzY3JpcHRp b25zW2ldOworICAgICAgICAKKyAgICAgICAgbWltZUNsYXNzSW5mby50eXBlID0gbWltZVR5cGUu bG93ZXIoKTsKKyAgICAgICAgbWltZUNsYXNzSW5mby5kZXNjID0gZGVzY3JpcHRpb247CisgICAg ICAgIAorICAgICAgICBWZWN0b3I8U3RyaW5nPiBleHRlbnNpb25zOworICAgICAgICBtaW1lVHlw ZXNBbmRFeHRlbnNpb25zW2kgKiAyICsgMV0uc3BsaXQoJywnLCBleHRlbnNpb25zKTsKKyAgICAg ICAgCisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgZXh0ZW5zaW9ucy5zaXplKCk7ICsr aSkKKyAgICAgICAgICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5hcHBlbmQoZXh0ZW5zaW9u c1tpXS5sb3dlcigpKTsKKworICAgICAgICBwbHVnaW5JbmZvLm1pbWVzLmFwcGVuZChtaW1lQ2xh c3NJbmZvKTsKKyAgICB9CisKKyAgICAvLyBTZXQgdGhlIG5hbWUgYW5kIGRlc2NyaXB0aW9uIGlm IHRoZXkgZXhpc3QuCisgICAgaWYgKG5hbWVBbmREZXNjcmlwdGlvbi5zaXplKCkgPiAwKQorICAg ICAgICBwbHVnaW5JbmZvLm5hbWUgPSBuYW1lQW5kRGVzY3JpcHRpb25bMF07CisgICAgaWYgKG5h bWVBbmREZXNjcmlwdGlvbi5zaXplKCkgPiAxKQorICAgICAgICBwbHVnaW5JbmZvLmRlc2MgPSBu YW1lQW5kRGVzY3JpcHRpb25bMV07CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogYm9vbCBQbHVn aW5JbmZvU3RvcmU6OmdldFBsdWdpbkluZm8oY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBwbHVnaW5Q YXRoLCBQbHVnaW4mIHBsdWdpbikKIHsKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGJ1bmRs ZVBhdGgoQWRvcHRDRiwgcGx1Z2luUGF0aC5jcmVhdGVDRlN0cmluZygpKTsKQEAgLTE5Niw3ICsz MjYsOCBAQCBib29sIFBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2luSW5mbyhjb25zCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAogICAgIC8vIENoZWNrIHRoYXQgdGhlcmUncyB2YWxpZCBpbmZvIGZv ciB0aGlzIHBsdWctaW4uCi0gICAgaWYgKCFnZXRQbHVnaW5JbmZvRnJvbVByb3BlcnR5TGlzdHMo YnVuZGxlLmdldCgpLCBwbHVnaW4uaW5mbykpCisgICAgaWYgKCFnZXRQbHVnaW5JbmZvRnJvbVBy b3BlcnR5TGlzdHMoYnVuZGxlLmdldCgpLCBwbHVnaW4uaW5mbykgJiYKKyAgICAgICAgIWdldFBs dWdpbkluZm9Gcm9tQ2FyYm9uUmVzb3VyY2VzKGJ1bmRsZS5nZXQoKSwgcGx1Z2luLmluZm8pKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBwbHVnaW4ucGF0aCA9IHBsdWdpblBhdGg7Cg==