Fix scripting during NPP_Destroy. Note that if the plugin is making a call t...

webkit/glue/plugins/test/plugin_test.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/plugins/test/plugin_test.h"
 
 #include "base/string_util.h"
 #include "webkit/glue/plugins/test/npapi_constants.h"
 
 namespace NPAPIClient {
 
 PluginTest::PluginTest(NPP id, NPNetscapeFuncs *host_functions) {
   id_ = id;
   id_->pdata = this;
   host_functions_ = host_functions;
   test_completed_ = false;
 }
 
 NPError PluginTest::New(uint16 mode, int16 argc, const char* argn[],
                         const char* argv[], NPSavedData* saved) {
   test_name_ = this->GetArgValue("name", argc, argn, argv);
   test_id_ = this->GetArgValue("id", argc, argn, argv);
   return NPERR_NO_ERROR;
 }
 
+NPError PluginTest::Destroy() {
+  return NPERR_NO_ERROR;
+}
+
 NPError PluginTest::SetWindow(NPWindow* pNPWindow) {
   return NPERR_NO_ERROR;
 }
 
 // It's a shame I have to implement URLEncode.  But, using webkit's
 // or using chrome's means a ball of string of dlls and dependencies that
 // is very very long.  After spending far too much time on it,
 // I'll just encode it myself.  Too bad Microsoft doesn't implement
 // this in a reusable way either.  Both webkit and chrome will
 // end up using libicu, which is a string of dependencies we don't
@@ skipping 23 matching lines @@
   return sOut;
 }
 
 void PluginTest::SignalTestCompleted() {
   test_completed_ = true;
   // To signal test completion, we expect a couple of
   // javascript functions to be defined in the webpage
   // which hosts this plugin:
   //    onSuccess(test_name, test_id)
   //    onFailure(test_name, test_id, error_message)
-  std::string script_result;
-  std::string script_url;
+  std::string script("javascript:");
   if (Succeeded()) {
-    script_url.append("onSuccess(\"");
-    script_url.append(test_name_);
-    script_url.append("\",\"");
-    script_url.append(test_id_);
-    script_url.append("\");");
+    script.append("onSuccess(\"");
+    script.append(test_name_);
+    script.append("\",\"");
+    script.append(test_id_);
+    script.append("\");");
   } else {
-    script_url.append("onFailure(\"");
-    script_url.append(test_name_);
-    script_url.append("\",\"");
-    script_url.append(test_id_);
-    script_url.append("\",\"");
-    script_url.append(test_status_);
-    script_url.append("\");");
+    script.append("onFailure(\"");
+    script.append(test_name_);
+    script.append("\",\"");
+    script.append(test_id_);
+    script.append("\",\"");
+    script.append(test_status_);
+    script.append("\");");
   }
-  script_url = URLEncode(script_url);
-  script_result.append("javascript:");
-  script_result.append(script_url);
-  host_functions_->geturl(id_, script_result.c_str(), "_self");
+
+  NPObject *window_obj = NULL;
+  host_functions_->getvalue(id_, NPNVWindowNPObject,&window_obj);
+  if (!window_obj)

[ananta, 2009/10/06 18:18:24]

Nit: maybe we should do this at the top of this function to avoid all the
appends?. An unlikely scenario though.

[jam, 2009/10/06 19:12:40]

Done.

+    return;
+
+  NPString script_string;
+  script_string.UTF8Characters = script.c_str();
+  script_string.UTF8Length = static_cast<unsigned int>(script.length());
+
+  NPVariant result_var;
+  host_functions_->evaluate(id_, window_obj, &script_string, &result_var);
 }
 
 const char *PluginTest::GetArgValue(const char *name, const int16 argc,
                                     const char *argn[], const char *argv[]) {
   for (int idx = 0; idx < argc; idx++)
     if (base::strcasecmp(argn[idx], name) == 0)
       return argv[idx];
   return NULL;
 }
 
@@ skipping 30 matching lines @@
 void PluginTest::URLNotify(const char* url, NPReason reason, void* data) {
   // There is no default action
 }
 
 int16 PluginTest::HandleEvent(void* event) {
   // There is no default action
   return 0;
 }
 
 } // namespace NPAPIClient