49075 2010-11-05 10:27:10 -0700 WebKit2 will load two copies of the same plugin, but should not 2011-04-13 15:11:41 -0700 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 58276 1 aroben webkit-unassigned andersca jhoneycutt sfalken oldest_to_newest 305349 0 aroben 2010-11-05 10:27:10 -0700 WebKit2 will load two different versions of the same plugin. For example, if you have both Shockwave Director 10.3 and 11.5 installed, WebKit2 will load them both. But we should only load the newer one. 305350 1 aroben 2010-11-05 10:27:37 -0700 <rdar://problem/8635947> 383942 2 aroben 2011-04-12 05:05:07 -0700 *** Bug 58276 has been marked as a duplicate of this bug. *** 383945 3 aroben 2011-04-12 05:11:23 -0700 *** Bug 58276 has been marked as a duplicate of this bug. *** 385127 4 sfalken 2011-04-13 12:17:02 -0700 Even if the plug-in is the same version, we can end up loading two copies if Windows path redirection comes into play (SysWOW64 vs. System32 for example). 385244 5 89461 sfalken 2011-04-13 14:32:58 -0700 Created attachment 89461 Patch 385253 6 sfalken 2011-04-13 14:38:30 -0700 Committed r83769: <http://trac.webkit.org/changeset/83769> 385258 7 89461 aroben 2011-04-13 14:44:55 -0700 Comment on attachment 89461 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89461&action=review > Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp:396 > + String pluginPath = plugin.path; > + String pluginFileName(::PathFindFileNameW(pluginPath.charactersWithNullTermination())); You can use pathGetFileName from WebCore/FileSystem.h. > Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp:401 > + String loadedPluginFileName(::PathFindFileNameW(loadedPlugin.path.charactersWithNullTermination())); Ditto. 385280 8 89471 sfalken 2011-04-13 15:07:22 -0700 Created attachment 89471 Patch 385285 9 sfalken 2011-04-13 15:11:41 -0700 Committed r83772: <http://trac.webkit.org/changeset/83772> 89461 2011-04-13 14:32:58 -0700 2011-04-13 15:07:19 -0700 Patch bug-49075-20110413143257.patch text/plain 2287 sfalken SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzY2KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMTMgIFN0ZXZlIEZh bGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyIHdpbGwgbG9hZCB0d28gY29waWVzIG9mIHRo ZSBzYW1lIHBsdWdpbiwgYnV0IHNob3VsZCBub3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MDc1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84NjM1 OTQ3PgorCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdp bi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkluZm9TdG9yZTo6c2hvdWxkVXNlUGx1Z2lu KTogRG9uJ3QgdXNlIGEgcGx1Zy1pbiBpZiB3ZSd2ZSBhbHJlYWR5IGFsbG93ZWQgYSBwbHVnLWlu IHdpdGggdGhlIHNhbWUgZmlsZW5hbWUuCisKIDIwMTEtMDQtMTMgIEVucmljYSBDYXN1Y2NpICA8 ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJ bmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9y ZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv d2luL1BsdWdpbkluZm9TdG9yZVdpbi5jcHAJKHJldmlzaW9uIDgzNDUyKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvd2luL1BsdWdpbkluZm9TdG9yZVdpbi5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTMzOSw5ICszMzksNiBAQCBzdGF0aWMgYm9vbCBpc05ld1dpbmRvd3NNZWRp YVBsYXllclBsdWdpCiAKIGJvb2wgUGx1Z2luSW5mb1N0b3JlOjpzaG91bGRVc2VQbHVnaW4oY29u c3QgUGx1Z2luJiBwbHVnaW4pCiB7Ci0gICAgLy8gRklYTUU6IFdlIHNob3VsZCBwcmVmZXIgYSBu ZXdlciB2ZXJzaW9uIG9mIGEgcGx1Z2luIHRvIGFuIG9sZGVyIHZlcnNpb24sIHJhdGhlciB0aGFu IGxvYWRpbmcKLSAgICAvLyBib3RoLiA8aHR0cDovL3dlYmtpdC5vcmcvYi80OTA3NT4KLQogICAg IGlmIChwbHVnaW4uaW5mby5uYW1lID09ICJDaXRyaXggSUNBIENsaWVudCIpIHsKICAgICAgICAg Ly8gVGhlIENpdHJpeCBJQ0EgQ2xpZW50IHBsdWctaW4gcmVxdWlyZXMgYSBNb3ppbGxhLWJhc2Vk IGJyb3dzZXI7IHNlZSA8cmRhcjovLzY0MTg2ODE+LgogICAgICAgICByZXR1cm4gZmFsc2U7CkBA IC0zOTMsNiArMzkwLDE5IEBAIGJvb2wgUGx1Z2luSW5mb1N0b3JlOjpzaG91bGRVc2VQbHVnaW4o Y28KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCisgICAgLy8gRklYTUU6IFdlIHNob3Vs ZCBwcmVmZXIgYSBuZXdlciB2ZXJzaW9uIG9mIGEgcGx1Z2luIHRvIGFuIG9sZGVyIHZlcnNpb24s IHJhdGhlciB0aGFuIGxvYWRpbmcKKyAgICAvLyBvbmx5IHRoZSBmaXJzdC4gPGh0dHA6Ly93ZWJr aXQub3JnL2IvNTg0Njk+CisgICAgU3RyaW5nIHBsdWdpblBhdGggPSBwbHVnaW4ucGF0aDsKKyAg ICBTdHJpbmcgcGx1Z2luRmlsZU5hbWUoOjpQYXRoRmluZEZpbGVOYW1lVyhwbHVnaW5QYXRoLmNo YXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkpKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IG1fcGx1Z2lucy5zaXplKCk7ICsraSkgeworICAgICAgICBQbHVnaW4mIGxvYWRlZFBsdWdp biA9IG1fcGx1Z2luc1tpXTsKKworICAgICAgICAvLyBJZiBhIHBsdWctaW4gd2l0aCB0aGUgc2Ft ZSBmaWxlbmFtZSBhbHJlYWR5IGV4aXN0cywgd2UgZG9uJ3Qgd2FudCB0byBsb2FkIGl0LgorICAg ICAgICBTdHJpbmcgbG9hZGVkUGx1Z2luRmlsZU5hbWUoOjpQYXRoRmluZEZpbGVOYW1lVyhsb2Fk ZWRQbHVnaW4ucGF0aC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpKSk7CisgICAgICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZShwbHVnaW5GaWxlTmFtZSwgbG9hZGVkUGx1Z2luRmlsZU5h bWUpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIHJldHVybiB0cnVl OwogfQogCg== 89471 2011-04-13 15:07:22 -0700 2011-04-13 15:10:56 -0700 Patch bug-49075-20110413150720.patch text/plain 2083 sfalken SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzNzcxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMTMgIFN0ZXZlIEZh bGtlbmJ1cmcgIDxzZmFsa2VuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGb2xsb3ctdXAgdG86IFdlYktpdDIgd2lsbCBsb2FkIHR3 byBjb3BpZXMgb2YgdGhlIHNhbWUgcGx1Z2luLCBidXQgc2hvdWxkIG5vdAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkwNzUKKyAgICAgICAgCisgICAg ICAgIFVzZSBwYXRoR2V0RmlsZU5hbWUgaW5zdGVhZCBvZiBXaW4zMiBQYXRoRmluZEZpbGVOYW1l Vy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4u Y3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OnNob3VsZFVzZVBsdWdpbik6 CisKIDIwMTEtMDQtMTMgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3dpbi9QbHVnaW5JbmZvU3RvcmVXaW4uY3Bw CShyZXZpc2lvbiA4Mzc2OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL3dp bi9QbHVnaW5JbmZvU3RvcmVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw3IEBA CiAjaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCiAKICNpbmNsdWRlICJOZXRzY2FwZVBsdWdp bk1vZHVsZS5oIgorI2luY2x1ZGUgPFdlYkNvcmUvRmlsZVN5c3RlbS5oPgogI2luY2x1ZGUgPFdl YkNvcmUvUGF0aFdhbGtlci5oPgogI2luY2x1ZGUgPHNobHdhcGkuaD4KIApAQCAtMzkyLDE0ICsz OTMsMTIgQEAgYm9vbCBQbHVnaW5JbmZvU3RvcmU6OnNob3VsZFVzZVBsdWdpbihjbwogCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBwcmVmZXIgYSBuZXdlciB2ZXJzaW9uIG9mIGEgcGx1Z2luIHRv IGFuIG9sZGVyIHZlcnNpb24sIHJhdGhlciB0aGFuIGxvYWRpbmcKICAgICAvLyBvbmx5IHRoZSBm aXJzdC4gPGh0dHA6Ly93ZWJraXQub3JnL2IvNTg0Njk+Ci0gICAgU3RyaW5nIHBsdWdpblBhdGgg PSBwbHVnaW4ucGF0aDsKLSAgICBTdHJpbmcgcGx1Z2luRmlsZU5hbWUoOjpQYXRoRmluZEZpbGVO YW1lVyhwbHVnaW5QYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCkpKTsKKyAgICBT dHJpbmcgcGx1Z2luRmlsZU5hbWUgPSBwYXRoR2V0RmlsZU5hbWUocGx1Z2luLnBhdGgpOwogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wbHVnaW5zLnNpemUoKTsgKytpKSB7CiAgICAgICAg IFBsdWdpbiYgbG9hZGVkUGx1Z2luID0gbV9wbHVnaW5zW2ldOwogCiAgICAgICAgIC8vIElmIGEg cGx1Zy1pbiB3aXRoIHRoZSBzYW1lIGZpbGVuYW1lIGFscmVhZHkgZXhpc3RzLCB3ZSBkb24ndCB3 YW50IHRvIGxvYWQgaXQuCi0gICAgICAgIFN0cmluZyBsb2FkZWRQbHVnaW5GaWxlTmFtZSg6OlBh dGhGaW5kRmlsZU5hbWVXKGxvYWRlZFBsdWdpbi5wYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1p bmF0aW9uKCkpKTsKLSAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKHBsdWdpbkZpbGVOYW1l LCBsb2FkZWRQbHVnaW5GaWxlTmFtZSkpCisgICAgICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZShw bHVnaW5GaWxlTmFtZSwgcGF0aEdldEZpbGVOYW1lKGxvYWRlZFBsdWdpbi5wYXRoKSkpCiAgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCg==