Added support for constructor calls in the NPAPI

chrome/plugin/npobject_proxy.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 "chrome/plugin/npobject_proxy.h"
 
 #include "base/waitable_event.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/plugin/plugin_channel_base.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 
 
 struct NPObjectWrapper {
     NPObject object;
     NPObjectProxy* proxy;
 };
 
 NPClass NPObjectProxy::npclass_proxy_ = {
-  2,
+  NP_CLASS_STRUCT_VERSION,
   NPObjectProxy::NPAllocate,
   NPObjectProxy::NPDeallocate,
   NPObjectProxy::NPPInvalidate,
   NPObjectProxy::NPHasMethod,
   NPObjectProxy::NPInvoke,
   NPObjectProxy::NPInvokeDefault,
   NPObjectProxy::NPHasProperty,
   NPObjectProxy::NPGetProperty,
   NPObjectProxy::NPSetProperty,
   NPObjectProxy::NPRemoveProperty,
-  NPObjectProxy::NPNEnumerate
+  NPObjectProxy::NPNEnumerate,
+  NPObjectProxy::NPNConstruct
 };
 
 NPObjectProxy* NPObjectProxy::GetProxy(NPObject* object) {
   NPObjectProxy* proxy = NULL;
 
   // Wrapper exists only for NPObjects that we had created.
   if (&npclass_proxy_ == object->_class) {
     NPObjectWrapper* wrapper = reinterpret_cast<NPObjectWrapper*>(object);
     proxy = wrapper->proxy;
   }
@@ skipping 289 matching lines @@
 
   *count = static_cast<unsigned int>(value_param.size());
   *value = static_cast<NPIdentifier *>(
       NPN_MemAlloc(sizeof(NPIdentifier) * *count));
   for (unsigned int i = 0; i < *count; ++i)
     (*value)[i] = CreateNPIdentifier(value_param[i]);
 
   return true;
 }
 
+bool NPObjectProxy::NPNConstruct(NPObject *obj,
+                                 const NPVariant *args,
+                                 uint32_t arg_count,
+                                 NPVariant *np_result) {
+  NPObjectProxy* proxy = GetProxy(obj);
+  if (!proxy) {
+    return obj->_class->construct(obj, args, arg_count, np_result);
+  }
+
+  bool result = false;
+
+  // Note: This instance can get destroyed in the context of
+  // Send so addref the channel in this scope.
+  scoped_refptr<PluginChannelBase> channel_copy = proxy->channel_;
+  std::vector<NPVariant_Param> args_param;
+  for (unsigned int i = 0; i < arg_count; ++i) {
+    NPVariant_Param param;
+    CreateNPVariantParam(
+        args[i], channel_copy, &param, false, proxy->modal_dialog_event_);
+    args_param.push_back(param);
+  }
+
+  NPVariant_Param param_result;
+  NPObjectMsg_Construct* msg = new NPObjectMsg_Construct(
+      proxy->route_id_, args_param, &param_result, &result);
+
+  // See comment in NPObjectProxy::NPInvokePrivate.
+  msg->set_pump_messages_event(proxy->modal_dialog_event_);
+
+  base::WaitableEvent* modal_dialog_event_handle = proxy->modal_dialog_event_;
+
+  proxy->Send(msg);
+
+  // Send may delete proxy.
+  proxy = NULL;
+
+  if (!result)
+    return false;
+
+  CreateNPVariant(
+      param_result, channel_copy, np_result, modal_dialog_event_handle);
+  return true;
+}
+
 bool NPObjectProxy::NPNEvaluate(NPP npp,
                                 NPObject *obj,
                                 NPString *script,
                                 NPVariant *result_var) {
   bool result = false;
   NPObjectProxy* proxy = GetProxy(obj);
   if (!proxy) {
     return false;
   }
 
@@ skipping 39 matching lines @@
     return;
   }
 
   NPVariant_Param result_param;
   std::string message_str(message);
 
   proxy->Send(new NPObjectMsg_SetException(proxy->route_id(), message_str));
   // Send may delete proxy.
   proxy = NULL;
 }