Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1134)

Side by Side Diff: webkit/glue/plugins/test/plugin_client.cc

Issue 119052: Fix browser hang due to plugin deadlock... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/string_util.h" 5 #include "base/string_util.h"
6 #include "webkit/glue/plugins/test/plugin_client.h" 6 #include "webkit/glue/plugins/test/plugin_client.h"
7 #include "webkit/glue/plugins/test/plugin_arguments_test.h" 7 #include "webkit/glue/plugins/test/plugin_arguments_test.h"
8 #include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h" 8 #include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h"
9 #include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h" 9 #include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h"
10 #include "webkit/glue/plugins/test/plugin_geturl_test.h" 10 #include "webkit/glue/plugins/test/plugin_geturl_test.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 } else if (test_name == "geturl") { 102 } else if (test_name == "geturl") {
103 new_test = new NPAPIClient::PluginGetURLTest(instance, 103 new_test = new NPAPIClient::PluginGetURLTest(instance,
104 NPAPIClient::PluginClient::HostFunctions()); 104 NPAPIClient::PluginClient::HostFunctions());
105 } else if (test_name == "npobject_proxy") { 105 } else if (test_name == "npobject_proxy") {
106 new_test = new NPAPIClient::NPObjectProxyTest(instance, 106 new_test = new NPAPIClient::NPObjectProxyTest(instance,
107 NPAPIClient::PluginClient::HostFunctions()); 107 NPAPIClient::PluginClient::HostFunctions());
108 #if defined(OS_WIN) 108 #if defined(OS_WIN)
109 // TODO(port): plugin_windowless_test.*. 109 // TODO(port): plugin_windowless_test.*.
110 } else if (test_name == "execute_script_delete_in_paint" || 110 } else if (test_name == "execute_script_delete_in_paint" ||
111 test_name == "execute_script_delete_in_mouse_move" || 111 test_name == "execute_script_delete_in_mouse_move" ||
112 test_name == "delete_frame_test") { 112 test_name == "delete_frame_test" ||
113 test_name == "multiple_instances_sync_calls") {
113 new_test = new NPAPIClient::WindowlessPluginTest(instance, 114 new_test = new NPAPIClient::WindowlessPluginTest(instance,
114 NPAPIClient::PluginClient::HostFunctions(), test_name); 115 NPAPIClient::PluginClient::HostFunctions(), test_name);
115 windowless_plugin = true; 116 windowless_plugin = true;
116 #endif 117 #endif
117 } else if (test_name == "getjavascripturl") { 118 } else if (test_name == "getjavascripturl") {
118 new_test = new NPAPIClient::ExecuteGetJavascriptUrlTest(instance, 119 new_test = new NPAPIClient::ExecuteGetJavascriptUrlTest(instance,
119 NPAPIClient::PluginClient::HostFunctions()); 120 NPAPIClient::PluginClient::HostFunctions());
120 #if defined(OS_WIN) 121 #if defined(OS_WIN)
121 // TODO(port): plugin_window_size_test.*. 122 // TODO(port): plugin_window_size_test.*.
122 } else if (test_name == "checkwindowrect") { 123 } else if (test_name == "checkwindowrect") {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 (NPAPIClient::PluginTest*)instance->pdata; 300 (NPAPIClient::PluginTest*)instance->pdata;
300 301
301 return plugin->HandleEvent(event); 302 return plugin->HandleEvent(event);
302 } 303 }
303 304
304 void* NPP_GetJavaClass(void) { 305 void* NPP_GetJavaClass(void) {
305 // XXXMB - do work here. 306 // XXXMB - do work here.
306 return NULL; 307 return NULL;
307 } 308 }
308 } // extern "C" 309 } // extern "C"
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698