41719 2010-07-06 15:38:02 -0700 Add PluginInfoStore::findPlugin 2010-07-07 10:04:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 247221 0 andersca 2010-07-06 15:38:02 -0700 Add PluginInfoStore::findPlugin 247222 1 60657 andersca 2010-07-06 15:39:41 -0700 Created attachment 60657 Patch 247225 2 webkit.review.bot 2010-07-06 15:42:14 -0700 Attachment 60657 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/UIProcess/Plugins/PluginInfoStore.cpp:29: Alphabetical sorting problem. [build/include_order] [4] WebKit2/UIProcess/Plugins/PluginInfoStore.h:32: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 2 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 247369 3 mrowe 2010-07-07 00:49:40 -0700 Did this get landed or am I imagining things? 247615 4 andersca 2010-07-07 10:04:20 -0700 Yup, fixed in http://trac.webkit.org/projects/webkit/changeset/62600. 60657 2010-07-06 15:39:41 -0700 2010-07-06 15:51:44 -0700 Patch bug-41719-20100706153939.patch text/plain 7526 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg YzQ2YWQxYzM4NWYzMTFmMTU5MGY3NzE0NWY3MTFmMjY2NDcwNDIzMS4uZmExYWY3NDUxYWI2MmYx NmE1YTFjY2U0Mjg1Y2RjOTExZGE4M2YyNSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wNy0wNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBQbHVnaW5JbmZvU3RvcmU6OmZpbmRQbHVn aW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxNzE5 CisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OmdldFBsdWdpbnMpOgorICAgICAgICAoV2Vi S2l0OjpQbHVnaW5JbmZvU3RvcmU6OmZpbmRQbHVnaW5Gb3JNSU1FVHlwZSk6CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6ZmluZFBsdWdpbkZvckV4dGVuc2lvbik6CisgICAgICAg IChXZWJLaXQ6OnBhdGhFeHRlbnNpb24pOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3Rv cmU6OmZpbmRQbHVnaW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9T dG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZvU3RvcmVN YWMubW06CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6bWltZVR5cGVGcm9tRXh0 ZW5zaW9uKToKKwogMjAxMC0wNy0wNiAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFuZGVycyBDYXJsc3Nvbi4KZGlmZiAtLWdpdCBhL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcCBiL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcAppbmRleCBkMTExYzM1NmFjMjhhYTRkZTM2MTRj ODYxNjcwMWI2ZGI2ZTczMGE0Li5iM2FkMTVkNjRiZmJiNzQ2YjNlNDVlNjBhNjFkZWQyMzZmMTAx YjMzIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9y ZS5jcHAKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3Bw CkBAIC0yNSw4ICsyNSwxMSBAQAogCiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAKKyNp bmNsdWRlIDxhbGdvcml0aG0+CisjaW5jbHVkZSA8V2ViQ29yZS9LVVJMLmg+CiAjaW5jbHVkZSA8 d3RmL1N0ZExpYkV4dHJhcy5oPgogCit1c2luZyBuYW1lc3BhY2Ugc3RkOwogdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtODIsNyArODUsNyBAQCB2b2lk IFBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbihjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgpCiAg ICAgbV9wbHVnaW5zLmFwcGVuZChwbHVnaW4pOwogfQogCi12b2lkIFBsdWdpbkluZm9TdG9yZTo6 Z2V0UGx1Z2lucyhWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mIHBsdWdpbnMpCit2b2lkIFBs dWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2lucyhWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbnMpCiB7 CiAgICAgbG9hZFBsdWdpbnNJZk5lY2Vzc2FyeSgpOwogCkBAIC05MCw0ICs5Myw4OSBAQCB2b2lk IFBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2lucyhWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4m IHBsdWdpbnMpCiAgICAgICAgIHBsdWdpbnMuYXBwZW5kKG1fcGx1Z2luc1tpXS5pbmZvKTsKIH0K IAorUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4gUGx1Z2luSW5mb1N0b3JlOjpmaW5kUGx1Z2luRm9y TUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICBBU1NFUlQoIW1pbWVUeXBl LmlzTnVsbCgpKTsKKyAgICAKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGx1Z2lucy5z aXplKCk7ICsraSkgeworICAgICAgICBjb25zdCBQbHVnaW4mIHBsdWdpbiA9IG1fcGx1Z2luc1tp XTsKKyAgICAgICAgCisgICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgcGx1Z2luLmluZm8u bWltZXMuc2l6ZSgpOyArK2opIHsKKyAgICAgICAgICAgIGNvbnN0IE1pbWVDbGFzc0luZm8mIG1p bWVDbGFzc0luZm8gPSBwbHVnaW4uaW5mby5taW1lc1tqXTsKKyAgICAgICAgICAgIGlmIChtaW1l Q2xhc3NJbmZvLnR5cGUgPT0gbWltZVR5cGUpCisgICAgICAgICAgICAgICAgcmV0dXJuIHBsdWdp bjsKKyAgICAgICAgfQorICAgIH0KKyAgICAKKyAgICByZXR1cm4gUGx1Z2luKCk7Cit9CisKK1Bs dWdpbkluZm9TdG9yZTo6UGx1Z2luIFBsdWdpbkluZm9TdG9yZTo6ZmluZFBsdWdpbkZvckV4dGVu c2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lvbiwgU3RyaW5nJiBtaW1lVHlwZSkKK3sKKyAgICBB U1NFUlQoIWV4dGVuc2lvbi5pc051bGwoKSk7CisgICAgCisgICAgZm9yIChzaXplX3QgaSA9IDA7 IGkgPCBtX3BsdWdpbnMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgY29uc3QgUGx1Z2luJiBwbHVn aW4gPSBtX3BsdWdpbnNbaV07CisgICAgICAgIAorICAgICAgICBmb3IgKHNpemVfdCBqID0gMDsg aiA8IHBsdWdpbi5pbmZvLm1pbWVzLnNpemUoKTsgKytqKSB7CisgICAgICAgICAgICBjb25zdCBN aW1lQ2xhc3NJbmZvJiBtaW1lQ2xhc3NJbmZvID0gcGx1Z2luLmluZm8ubWltZXNbal07CisgICAg ICAgICAgICAKKyAgICAgICAgICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBleHRlbnNpb25zID0g bWltZUNsYXNzSW5mby5leHRlbnNpb25zOworICAgICAgICAgICAgCisgICAgICAgICAgICBpZiAo ZmluZChleHRlbnNpb25zLmJlZ2luKCksIGV4dGVuc2lvbnMuZW5kKCksIGV4dGVuc2lvbikgIT0g ZXh0ZW5zaW9ucy5lbmQoKSkgeworICAgICAgICAgICAgICAgIC8vIFdlIGZvdW5kIGEgc3VwcG9y dGVkIGV4dGVuc2lvbiwgc2V0IHRoZSBjb3JyZWN0IE1JTUUgdHlwZS4KKyAgICAgICAgICAgICAg ICBtaW1lVHlwZSA9IG1pbWVDbGFzc0luZm8udHlwZTsKKyAgICAgICAgICAgICAgICByZXR1cm4g cGx1Z2luOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQorICAgIAorICAgIHJldHVy biBQbHVnaW4oKTsKK30KKworc3RhdGljIGlubGluZSBTdHJpbmcgcGF0aEV4dGVuc2lvbihjb25z dCBLVVJMJiB1cmwpCit7CisgICAgU3RyaW5nIGV4dGVuc2lvbjsKKyAgICBTdHJpbmcgZmlsZW5h bWUgPSB1cmwubGFzdFBhdGhDb21wb25lbnQoKTsKKyAgICBpZiAoIWZpbGVuYW1lLmVuZHNXaXRo KCIvIikpIHsKKyAgICAgICAgaW50IGV4dGVuc2lvblBvcyA9IGZpbGVuYW1lLnJldmVyc2VGaW5k KCcuJyk7CisgICAgICAgIGlmIChleHRlbnNpb25Qb3MgIT0gLTEpCisgICAgICAgICAgICBleHRl bnNpb24gPSBmaWxlbmFtZS5zdWJzdHJpbmcoZXh0ZW5zaW9uUG9zICsgMSk7CisgICAgfQorICAg IAorICAgIHJldHVybiBleHRlbnNpb247Cit9CisKK1BsdWdpbkluZm9TdG9yZTo6UGx1Z2luIFBs dWdpbkluZm9TdG9yZTo6ZmluZFBsdWdpbihTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBLVVJMJiB1 cmwpCit7CisgICAgbG9hZFBsdWdpbnNJZk5lY2Vzc2FyeSgpOworICAgIAorICAgIC8vIEZpcnN0 LCBjaGVjayBpZiB3ZSBjYW4gZ2V0IHRoZSBwbHVnLWluIGJhc2VkIG9uIGl0cyBNSU1FIHR5cGUu CisgICAgaWYgKCFtaW1lVHlwZS5pc051bGwoKSkgeworICAgICAgICBQbHVnaW4gcGx1Z2luID0g ZmluZFBsdWdpbkZvck1JTUVUeXBlKG1pbWVUeXBlKTsKKyAgICAgICAgaWYgKCFwbHVnaW4ucGF0 aC5pc051bGwoKSkKKyAgICAgICAgICAgIHJldHVybiBwbHVnaW47CisgICAgfQorCisgICAgLy8g TmV4dCwgY2hlY2sgaWYgYW55IHBsdWctaW5zIGNsYWltIHRvIHN1cHBvcnQgdGhlIFVSTCBleHRl bnNpb24uCisgICAgU3RyaW5nIGV4dGVuc2lvbiA9IHBhdGhFeHRlbnNpb24odXJsKS5sb3dlcigp OworICAgIGlmICghZXh0ZW5zaW9uLmlzTnVsbCgpKSB7CisgICAgICAgIFBsdWdpbiBwbHVnaW4g PSBmaW5kUGx1Z2luRm9yRXh0ZW5zaW9uKGV4dGVuc2lvbiwgbWltZVR5cGUpOworICAgICAgICBp ZiAoIXBsdWdpbi5wYXRoLmlzTnVsbCgpKQorICAgICAgICAgICAgcmV0dXJuIHBsdWdpbjsKKyAg ICAgICAgCisgICAgICAgIC8vIEZpbmFsbHksIHRyeSB0byBnZXQgdGhlIE1JTUUgdHlwZSBmcm9t IHRoZSBleHRlbnNpb24gaW4gYSBwbGF0Zm9ybSBzcGVjaWZpYyBtYW5uZXIgYW5kIHVzZSB0aGF0 LgorICAgICAgICBTdHJpbmcgZXh0ZW5zaW9uTWltZVR5cGUgPSBtaW1lVHlwZUZyb21FeHRlbnNp b24oZXh0ZW5zaW9uKTsKKyAgICAgICAgaWYgKCFleHRlbnNpb25NaW1lVHlwZS5pc051bGwoKSkg eworICAgICAgICAgICAgUGx1Z2luIHBsdWdpbiA9IGZpbmRQbHVnaW5Gb3JNSU1FVHlwZShleHRl bnNpb25NaW1lVHlwZSk7CisgICAgICAgICAgICBpZiAoIXBsdWdpbi5wYXRoLmlzTnVsbCgpKSB7 CisgICAgICAgICAgICAgICAgbWltZVR5cGUgPSBleHRlbnNpb25NaW1lVHlwZTsKKyAgICAgICAg ICAgICAgICByZXR1cm4gcGx1Z2luOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgfQor ICAgIAorICAgIHJldHVybiBQbHVnaW4oKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRp ZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oIGIv V2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuaAppbmRleCAyZjdmNjY4 MzA5N2IxYmQyM2EyYWU0OTAwZTdlMjQwMTM5NDRhMWQyLi5kMWUyZmM3NTI4MTUxZmE2ZDE0NDcx ZjI1ZmE0YjA0ZDQ4M2Y3OTkzIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L1BsdWdpbkluZm9TdG9yZS5oCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu SW5mb1N0b3JlLmgKQEAgLTI4LDYgKzI4LDEwIEBACiAKICNpbmNsdWRlIDxXZWJDb3JlL1BsdWdp bkRhdGEuaD4KIAorbmFtZXNwYWNlIFdlYkNvcmUgeworICAgIGNsYXNzIEtVUkw7Cit9CisKIG5h bWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBQbHVnaW5JbmZvU3RvcmUgewpAQCAtMzcsOSArNDEs NiBAQCBwdWJsaWM6CiAgICAgdm9pZCByZWZyZXNoKCk7CiAgICAgdm9pZCBnZXRQbHVnaW5zKFZl Y3RvcjxXZWJDb3JlOjpQbHVnaW5JbmZvPiYgcGx1Z2lucyk7CiAgICAgCi1wcml2YXRlOgotICAg IFBsdWdpbkluZm9TdG9yZSgpOwotCiAgICAgLy8gUmVwcmVzZW50cyBhIHNpbmdsZSBwbHVnLWlu LgogICAgIHN0cnVjdCBQbHVnaW4gewogICAgICAgICBXZWJDb3JlOjpTdHJpbmcgcGF0aDsKQEAg LTUxLDYgKzUyLDE3IEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICB9OwogCisgICAgLy8gUmV0dXJu cyB0aGUgaW5mbyBmb3IgYSBwbHVnLWluIHRoYXQgY2FuIGhhbmRsZSB0aGUgZ2l2ZW4gTUlNRSB0 eXBlLgorICAgIC8vIElmIHRoZSBNSU1FIHR5cGUgaXMgbnVsbCwgdGhlIGZpbGUgZXh0ZW5zaW9u IG9mIHRoZSBnaXZlbiB1cmwgd2lsbCBiZSB1c2VkIHRvIGluZmVyIHRoZQorICAgIC8vIHBsdWct aW4gdHlwZS4gSW4gdGhhdCBjYXNlLCBtaW1lVHlwZSB3aWxsIGJlIGZpbGxlZCBpbiB3aXRoIHRo ZSByaWdodCBNSU1FIHR5cGUuCisgICAgUGx1Z2luIGZpbmRQbHVnaW4oV2ViQ29yZTo6U3RyaW5n JiBtaW1lVHlwZSwgY29uc3QgV2ViQ29yZTo6S1VSTCYgdXJsKTsKKyAgICAKK3ByaXZhdGU6Cisg ICAgUGx1Z2luSW5mb1N0b3JlKCk7CisKKyAgICBQbHVnaW4gZmluZFBsdWdpbkZvck1JTUVUeXBl KGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgbWltZVR5cGUpOworICAgIFBsdWdpbiBmaW5kUGx1Z2lu Rm9yRXh0ZW5zaW9uKGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgZXh0ZW5zaW9uLCBXZWJDb3JlOjpT dHJpbmcmIG1pbWVUeXBlKTsKKwogICAgIHZvaWQgbG9hZFBsdWdpbnNJZk5lY2Vzc2FyeSgpOwog ICAgIHZvaWQgbG9hZFBsdWdpbnNJbkRpcmVjdG9yeShjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGRp cmVjdG9yeSk7CiAgICAgdm9pZCBsb2FkUGx1Z2luKGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcGx1 Z2luUGF0aCk7CkBAIC02MCw2ICs3Miw3IEBAIHByaXZhdGU6CiAgICAgc3RhdGljIFZlY3RvcjxX ZWJDb3JlOjpTdHJpbmc+IHBsdWdpblBhdGhzSW5EaXJlY3RvcnkoY29uc3QgV2ViQ29yZTo6U3Ry aW5nJiBkaXJlY3RvcnkpOwogICAgIHN0YXRpYyBib29sIGdldFBsdWdpbkluZm8oY29uc3QgV2Vi Q29yZTo6U3RyaW5nJiBwbHVnaW5QYXRoLCBQbHVnaW4mIHBsdWdpbik7CiAgICAgc3RhdGljIGJv b2wgc2hvdWxkVXNlUGx1Z2luKGNvbnN0IFBsdWdpbiYgcGx1Z2luLCBjb25zdCBWZWN0b3I8UGx1 Z2luPiYgbG9hZGVkUGx1Z2lucyk7CisgICAgc3RhdGljIFdlYkNvcmU6OlN0cmluZyBtaW1lVHlw ZUZyb21FeHRlbnNpb24oY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBleHRlbnNpb24pOwogICAgIAog ICAgIFZlY3RvcjxQbHVnaW4+IG1fcGx1Z2luczsKICAgICBib29sIG1fcGx1Z2luTGlzdElzVXBU b0RhdGU7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5J bmZvU3RvcmVNYWMubW0gYi9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5JbmZv U3RvcmVNYWMubW0KaW5kZXggODgzYzUyNGE5ZjFlOTYzOGNiYzgwMDY4ZTdiZDdmOTQ2YmYzZjNj NC4uZGRhOTA0YzBmYzQxOTNhNTQzMGU2YWFiYjYwZDU1N2U2OGU4OTJlOCAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luSW5mb1N0b3JlTWFjLm1tCisrKyBi L1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpbkluZm9TdG9yZU1hYy5tbQpAQCAt MjgsNiArMjgsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvV2ViQ29yZU5TU3RyaW5nRXh0cmFzLmg+ CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+Cisj aW5jbHVkZSAiV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOwogCkBAIC0zNjcsNCArMzY4LDExIEBAIGJvb2wgUGx1Z2luSW5mb1N0b3JlOjpzaG91bGRV c2VQbHVnaW4oY29uc3QgUGx1Z2luJiBwbHVnaW4sIGNvbnN0IFZlY3RvcjxQbHVnaW4+CiAgICAg cmV0dXJuIHRydWU7CiB9CiAKK1N0cmluZyBQbHVnaW5JbmZvU3RvcmU6Om1pbWVUeXBlRnJvbUV4 dGVuc2lvbihjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGV4dGVuc2lvbikKK3sKKyAgICBSZXRhaW5Q dHI8Q0ZTdHJpbmdSZWY+IGV4dGVuc2lvbkNGKEFkb3B0Q0YsIHNhZmVDcmVhdGVDRlN0cmluZyhl eHRlbnNpb24pKTsKKyAgICAKKyAgICByZXR1cm4gV0tHZXRNSU1FVHlwZUZvckV4dGVuc2lvbigo TlNTdHJpbmcgKilleHRlbnNpb25DRi5nZXQoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dAo=