Added support for constructor calls in the NPAPI

webkit/port/bindings/v8/V8NPObject.cpp

 // Copyright (c) 2008, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 #include "V8DOMMap.h"
 #include "HTMLPlugInElement.h"
 #include "V8HTMLAppletElement.h"
 #include "V8HTMLEmbedElement.h"
 #include "V8HTMLObjectElement.h"
 
 using namespace WebCore;
 
 enum InvokeFunctionType {
     INVOKE_METHOD = 1,
-    INVOKE_DEFAULT = 2
+    INVOKE_CONSTRUCT = 2,
+    INVOKE_DEFAULT = 3
 };
 
 // TODO(mbelshe): need comments.
 // Params: holder could be HTMLEmbedElement or NPObject
 static v8::Handle<v8::Value> NPObjectInvokeImpl(const v8::Arguments& args, InvokeFunctionType funcId)
 {
     NPObject* npobject;
 
     // These three types are subtypes of HTMLPlugInElement.
     if (V8HTMLAppletElement::HasInstance(args.Holder()) ||
@@ skipping 34 matching lines @@
     VOID_TO_NPVARIANT(result);
 
     switch (funcId) {
     case INVOKE_METHOD:
         if (npobject->_class->invoke) {
             v8::Handle<v8::String> function_name(v8::String::Cast(*args.Data()));
             NPIdentifier ident = getStringIdentifier(function_name);
             npobject->_class->invoke(npobject, ident, npArgs, argc, &result);
         }
         break;
+    case INVOKE_CONSTRUCT:
+        if (npobject->_class->construct)
+            npobject->_class->construct(npobject, npArgs, argc, &result);
+        break;
     case INVOKE_DEFAULT:
         if (npobject->_class->invokeDefault)
             npobject->_class->invokeDefault(npobject, npArgs, argc, &result);
-        // The call might be a construct call on an NPObject.
-        // See http://code.google.com/p/chromium/issues/detail?id=3285
-        //
-        // TODO: when V8 passes in the correct flag args.is_construct_call_,
-        // make a separate NPN_Construct case.
-        else if (npobject->_class->construct)
-            npobject->_class->construct(npobject, npArgs, argc, &result);
         break;
     default:
         break;
     }
 
     for (int i=0; i < argc; i++)
         NPN_ReleaseVariantValue(&npArgs[i]);
     delete[] npArgs;
 
     // unwrap return values
     v8::Handle<v8::Value> rv = convertNPVariantToV8Object(&result, npobject);
     NPN_ReleaseVariantValue(&result);
 
     return rv;
 }
 
 
 v8::Handle<v8::Value> NPObjectMethodHandler(const v8::Arguments& args)
 {
     return NPObjectInvokeImpl(args, INVOKE_METHOD);
 }
 
 
 v8::Handle<v8::Value> NPObjectInvokeDefaultHandler(const v8::Arguments& args)
 {
-    return NPObjectInvokeImpl(args, INVOKE_DEFAULT);
+    if (args.IsConstructCall())
+        return NPObjectInvokeImpl(args, INVOKE_CONSTRUCT);
+    else
+        return NPObjectInvokeImpl(args, INVOKE_DEFAULT);
 }
 
 
 static void WeakTemplateCallback(v8::Persistent<v8::Value> obj, void* param);
 
 // NPIdentifier is PrivateIdentifier*.
 static WeakReferenceMap<PrivateIdentifier, v8::FunctionTemplate> \
     static_template_map(&WeakTemplateCallback);
 
 static void WeakTemplateCallback(v8::Persistent<v8::Value> obj, void* param)
@@ skipping 221 matching lines @@
 void ForgetV8ObjectForNPObject(NPObject* object)
 {
     if (staticNpobjectMap.contains(object)) {
         v8::HandleScope scope;
         v8::Persistent<v8::Object> handle(staticNpobjectMap.get(object));
         WebCore::V8Proxy::SetDOMWrapper(handle, WebCore::V8ClassIndex::NPOBJECT, NULL);
         staticNpobjectMap.forget(object);
         NPN_ReleaseObject(object);
     }
 }