Added support for constructor calls in the NPAPI

webkit/tools/npapi_layout_test_plugin/TestObject.cpp

 /*
  * Copyright (C) 2007 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 #include "PluginObject.h"
 
 #include <stdlib.h>
 
 static bool testEnumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
 static bool testInvokeDefault(NPObject *obj, const NPVariant *args, uint32_t argCount, NPVariant *result);
 static bool testHasProperty(NPObject *obj, NPIdentifier name);
 static bool testGetProperty(NPObject *obj, NPIdentifier name, NPVariant *variant);
 static NPObject *testAllocate(NPP npp, NPClass *theClass);
 static void testDeallocate(NPObject *obj);
+static bool testConstruct(NPObject* obj, const NPVariant* args, uint32_t argCount, NPVariant* result);
+
 
 static NPClass testClass = {
     NP_CLASS_STRUCT_VERSION,
     testAllocate,
     testDeallocate,
     0,
     0,
     0,
     testInvokeDefault,
     testHasProperty,
     testGetProperty,
     0,
     0,
-    testEnumerate
+    testEnumerate,
+    testConstruct
 };
 
 NPClass *getTestClass(void)
 {
     return &testClass;
 }
 
 int testObjectCount = 0;
 
 int getTestObjectCount(void) {
   return testObjectCount;
 }
 
 static bool identifiersInitialized = false;
 
-#define NUM_TEST_IDENTIFIERS      4
-#define ID_PROPERTY_FOO           0
-#define ID_PROPERTY_BAR           1
-#define ID_PROPERTY_TEST_OBJECT   2
-#define ID_PROPERTY_REF_COUNT     3
+#define NUM_ENUMERABLE_TEST_IDENTIFIERS 4
+#define NUM_TEST_IDENTIFIERS            5
+
+#define ID_PROPERTY_FOO            0
+#define ID_PROPERTY_BAR            1
+#define ID_PROPERTY_TEST_OBJECT    2
+#define ID_PROPERTY_REF_COUNT      3
+#define ID_PROPERTY_OBJECT_POINTER 4
 
 static NPIdentifier testIdentifiers[NUM_TEST_IDENTIFIERS];
 static const NPUTF8 *testIdentifierNames[NUM_TEST_IDENTIFIERS] = {
     "foo",
     "bar",
     "testObject",
     "refCount",
+    "objectPointer",
 };
 
 static void initializeIdentifiers(void)
 {
     browser->getstringidentifiers(testIdentifierNames, NUM_TEST_IDENTIFIERS, testIdentifiers);
 }
 
 static NPObject *testAllocate(NPP npp, NPClass *theClass)
 {
     TestObject *newInstance =
@@ skipping 49 matching lines @@
     } else if (name == testIdentifiers[ID_PROPERTY_TEST_OBJECT]) {
         TestObject* testObject = reinterpret_cast<TestObject*>(obj);
         if (testObject->testObject == NULL)
           testObject->testObject = browser->createobject(NULL, &testClass);
         browser->retainobject(testObject->testObject);
         OBJECT_TO_NPVARIANT(testObject->testObject, *variant);
         return true;
     } else if (name == testIdentifiers[ID_PROPERTY_REF_COUNT]) {
         INT32_TO_NPVARIANT(obj->referenceCount, *variant);
         return true;
+    } else if (name == testIdentifiers[ID_PROPERTY_OBJECT_POINTER]) {
+        int32_t objectPointer = static_cast<int32_t>(reinterpret_cast<long long>(obj));
+        INT32_TO_NPVARIANT(objectPointer, *variant);
+        return true;
     }
     return false;
 }
 
 static bool testEnumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
 {
-    *count = NUM_TEST_IDENTIFIERS;
+    *count = NUM_ENUMERABLE_TEST_IDENTIFIERS;
 
-    *value = (NPIdentifier*)browser->memalloc(NUM_TEST_IDENTIFIERS * sizeof(NPIdentifier));
-    memcpy(*value, testIdentifiers, sizeof(NPIdentifier) * NUM_TEST_IDENTIFIERS);
+    *value = (NPIdentifier*)browser->memalloc(NUM_ENUMERABLE_TEST_IDENTIFIERS * sizeof(NPIdentifier));
+    memcpy(*value, testIdentifiers, sizeof(NPIdentifier) * NUM_ENUMERABLE_TEST_IDENTIFIERS);
 
     return true;
 }
 
+static bool testConstruct(NPObject* npobj, const NPVariant* args, uint32_t argCount, NPVariant* result)
+{
+    browser->retainobject(npobj);
 
+    // Just return the same object.
+    OBJECT_TO_NPVARIANT(npobj, *result);
+    return true;
+}
+
+