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

Unified Diff: webkit/glue/plugins/test/plugin_client.cc

Issue 258026: Fix scripting during NPP_Destroy. Note that if the plugin is making a call t... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: webkit/glue/plugins/test/plugin_client.cc
===================================================================
--- webkit/glue/plugins/test/plugin_client.cc (revision 28004)
+++ webkit/glue/plugins/test/plugin_client.cc (working copy)
@@ -160,7 +160,8 @@
// TODO(port): plugin_windowed_test.*.
} else if (test_name == "hidden_plugin" ||
test_name == "create_instance_in_paint" ||
- test_name == "alert_in_window_message") {
+ test_name == "alert_in_window_message" ||
+ test_name == "ensure_scripting_works_in_destroy") {
new_test = new NPAPIClient::WindowedPluginTest(instance,
NPAPIClient::PluginClient::HostFunctions());
#endif
@@ -191,10 +192,10 @@
NPAPIClient::PluginTest *plugin =
(NPAPIClient::PluginTest*)instance->pdata;
+
+ NPError rv = plugin->Destroy();
delete plugin;
-
- // XXXMB - do work here.
- return NPERR_GENERIC_ERROR;
+ return rv;
}
NPError NPP_SetWindow(NPP instance, NPWindow* pNPWindow) {

Powered by Google App Engine
This is Rietveld 408576698