diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 17:33:29 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-03 17:33:29 +0000 |
| commit | 2c41ad7b7986fdec304ffa3d42ab4bc162bb89e0 (patch) | |
| tree | ff3b26607ba232878732ac1e597b254cad7ccefb /webkit/glue/plugins/test/plugin_client.cc | |
| parent | 71a329c66080f1c095afc642eef5fe10160dc125 (diff) | |
| download | chromium_src-2c41ad7b7986fdec304ffa3d42ab4bc162bb89e0.zip chromium_src-2c41ad7b7986fdec304ffa3d42ab4bc162bb89e0.tar.gz chromium_src-2c41ad7b7986fdec304ffa3d42ab4bc162bb89e0.tar.bz2 | |
Fix browser hang due to plugin deadlock
This involves two plugin instances with second instance making
sync calls to the renderer while the first one is still servicing
an incoming sync request.
Our logic to unblock the renderer during the sync call fails
since the 'in_dispatch_' counter is maintained per plugin channel
(each plugin instance uses its own separate channel). Making
'in_dispatch_' counter static member of PluginChannelBase fixes this
deadlock.
Added a new NPAPI UI test for this scenario.
BUG=12624
TEST=MultipleInstancesSyncCalls
Review URL: http://codereview.chromium.org/119052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/test/plugin_client.cc')
| -rw-r--r-- | webkit/glue/plugins/test/plugin_client.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc index fe0a4c6..bcad2a8 100644 --- a/webkit/glue/plugins/test/plugin_client.cc +++ b/webkit/glue/plugins/test/plugin_client.cc @@ -109,7 +109,8 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, // TODO(port): plugin_windowless_test.*. } else if (test_name == "execute_script_delete_in_paint" || test_name == "execute_script_delete_in_mouse_move" || - test_name == "delete_frame_test") { + test_name == "delete_frame_test" || + test_name == "multiple_instances_sync_calls") { new_test = new NPAPIClient::WindowlessPluginTest(instance, NPAPIClient::PluginClient::HostFunctions(), test_name); windowless_plugin = true; |