Add webkit to the repository.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 1639 insertions, 0 deletions

diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
new file mode 100644
index 0000000..b012f58
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.cpp
@@ -0,0 +1,622 @@
+/*
+ IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
+ consideration of your agreement to the following terms, and your use, installation, 
+ modification or redistribution of this Apple software constitutes acceptance of these 
+ terms.  If you do not agree with these terms, please do not use, install, modify or 
+ redistribute this Apple software.
+ 
+ In consideration of your agreement to abide by the following terms, and subject to these 
+ terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in 
+ this original Apple software (the "Apple Software"), to use, reproduce, modify and 
+ redistribute the Apple Software, with or without modifications, in source and/or binary 
+ forms; provided that if you redistribute the Apple Software in its entirety and without 
+ modifications, you must retain this notice and the following text and disclaimers in all 
+ such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
+ or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
+ the Apple Software without specific prior written permission from Apple. Except as expressly
+ stated in this notice, no other rights or licenses, express or implied, are granted by Apple
+ herein, including but not limited to any patent rights that may be infringed by your 
+ derivative works or by other works in which the Apple Software may be incorporated.
+ 
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
+ EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
+ USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ 
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
+ REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
+ WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
+ OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "PluginObject.h"
+
+#include "TestObject.h"
+#include <assert.h>
+#include <stdio.h>
+#ifdef WIN32
+#include <stdlib.h>
+#define snprintf sprintf_s
+#endif
+
+static void pluginInvalidate(NPObject *obj);
+static bool pluginHasProperty(NPObject *obj, NPIdentifier name);
+static bool pluginHasMethod(NPObject *obj, NPIdentifier name);
+static bool pluginGetProperty(NPObject *obj, NPIdentifier name, NPVariant *variant);
+static bool pluginSetProperty(NPObject *obj, NPIdentifier name, const NPVariant *variant);
+static bool pluginInvoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
+static bool pluginInvokeDefault(NPObject *obj, const NPVariant *args, uint32_t argCount, NPVariant *result);
+static NPObject *pluginAllocate(NPP npp, NPClass *theClass);
+static void pluginDeallocate(NPObject *obj);
+
+NPNetscapeFuncs *browser;
+
+static NPClass pluginClass = { 
+    NP_CLASS_STRUCT_VERSION,
+    pluginAllocate, 
+    pluginDeallocate, 
+    pluginInvalidate,
+    pluginHasMethod,
+    pluginInvoke,
+    pluginInvokeDefault,
+    pluginHasProperty,
+    pluginGetProperty,
+    pluginSetProperty,
+};
+ 
+NPClass *getPluginClass(void)
+{
+    return &pluginClass;
+}
+
+static bool identifiersInitialized = false;
+
+#define ID_PROPERTY_PROPERTY        0
+#define ID_PROPERTY_EVENT_LOGGING   1
+#define ID_PROPERTY_HAS_STREAM      2
+#define ID_PROPERTY_TEST_OBJECT     3
+#define ID_PROPERTY_LOG_DESTROY     4
+#define ID_PROPERTY_TEST_OBJECT_COUNT 5
+#define NUM_PROPERTY_IDENTIFIERS    6
+
+static NPIdentifier pluginPropertyIdentifiers[NUM_PROPERTY_IDENTIFIERS];
+static const NPUTF8 *pluginPropertyIdentifierNames[NUM_PROPERTY_IDENTIFIERS] = {
+    "property",
+    "eventLoggingEnabled",
+    "hasStream",
+    "testObject",
+    "logDestroy",
+    "testObjectCount",
+};
+
+#define ID_TEST_CALLBACK_METHOD     0
+#define ID_TEST_GETURL              1
+#define ID_REMOVE_DEFAULT_METHOD    2
+#define ID_TEST_DOM_ACCESS          3
+#define ID_TEST_GET_URL_NOTIFY      4
+#define ID_TEST_INVOKE_DEFAULT      5
+#define ID_DESTROY_STREAM           6
+#define ID_TEST_ENUMERATE           7
+#define ID_TEST_GETINTIDENTIFIER    8
+#define ID_TEST_GET_PROPERTY        9
+#define ID_TEST_EVALUATE            10
+#define ID_TEST_GET_PROPERTY_RETURN_VALUE 11
+#define ID_TEST_CALLBACK_METHOD_RET 12
+#define ID_TEST_CREATE_TEST_OBJECT  13
+#define ID_TEST_PASS_TEST_OBJECT    14
+#define ID_TEST_CLONE_OBJECT        15
+#define ID_TEST_SCRIPT_OBJECT_INVOKE 16
+#define NUM_METHOD_IDENTIFIERS      17
+
+static NPIdentifier pluginMethodIdentifiers[NUM_METHOD_IDENTIFIERS];
+static const NPUTF8 *pluginMethodIdentifierNames[NUM_METHOD_IDENTIFIERS] = {
+    "testCallback",
+    "getURL",
+    "removeDefaultMethod",
+    "testDOMAccess",
+    "getURLNotify",
+    "testInvokeDefault",
+    "destroyStream",
+    "testEnumerate",
+    "testGetIntIdentifier",
+    "testGetProperty",
+    "testEvaluate",
+    "testGetPropertyReturnValue",
+    "testCallbackRet",       // Chrome bug 897451
+    "testCreateTestObject",  // Chrome bug 1093606
+    "testPassTestObject",    // Chrome bug 1093606
+    "testCloneObject",
+    "testScriptObjectInvoke", // Chrome bug 1175346
+};
+
+static NPUTF8* createCStringFromNPVariant(const NPVariant *variant)
+{
+    size_t length = NPVARIANT_TO_STRING(*variant).UTF8Length;
+    NPUTF8* result = (NPUTF8*)malloc(length + 1);
+    memcpy(result, NPVARIANT_TO_STRING(*variant).UTF8Characters, length);
+    result[length] = '\0';
+    return result;
+}
+
+static void initializeIdentifiers(void)
+{
+    browser->getstringidentifiers(pluginPropertyIdentifierNames, NUM_PROPERTY_IDENTIFIERS, pluginPropertyIdentifiers);
+    browser->getstringidentifiers(pluginMethodIdentifierNames, NUM_METHOD_IDENTIFIERS, pluginMethodIdentifiers);
+}
+
+static bool pluginHasProperty(NPObject *obj, NPIdentifier name)
+{
+    for (int i = 0; i < NUM_PROPERTY_IDENTIFIERS; i++)
+        if (name == pluginPropertyIdentifiers[i])
+            return true;
+    return false;
+}
+
+static bool pluginHasMethod(NPObject *obj, NPIdentifier name)
+{
+    for (int i = 0; i < NUM_METHOD_IDENTIFIERS; i++)
+        if (name == pluginMethodIdentifiers[i])
+            return true;
+    return false;
+}
+
+static bool pluginGetProperty(NPObject *obj, NPIdentifier name, NPVariant *variant)
+{
+    if (name == pluginPropertyIdentifiers[ID_PROPERTY_PROPERTY]) {
+        char* mem = static_cast<char*>(browser->memalloc(9));
+        strcpy(mem, "property");
+        STRINGZ_TO_NPVARIANT(mem, *variant);
+        return true;
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_EVENT_LOGGING]) {
+        BOOLEAN_TO_NPVARIANT(((PluginObject *)obj)->eventLogging, *variant);
+        return true;
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_LOG_DESTROY]) {
+        BOOLEAN_TO_NPVARIANT(((PluginObject *)obj)->logDestroy, *variant);
+        return true;            
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_HAS_STREAM]) {
+        BOOLEAN_TO_NPVARIANT(((PluginObject *)obj)->stream != 0, *variant);
+        return true;
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_TEST_OBJECT]) {
+        NPObject *testObject = ((PluginObject *)obj)->testObject;
+        browser->retainobject(testObject);
+        OBJECT_TO_NPVARIANT(testObject, *variant);
+        return true;
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_TEST_OBJECT_COUNT]) {
+        INT32_TO_NPVARIANT(getTestObjectCount(), *variant);
+        return true;
+    }
+    return false;
+}
+
+static bool pluginSetProperty(NPObject *obj, NPIdentifier name, const NPVariant *variant)
+{
+    if (name == pluginPropertyIdentifiers[ID_PROPERTY_EVENT_LOGGING]) {
+        ((PluginObject *)obj)->eventLogging = NPVARIANT_TO_BOOLEAN(*variant);
+        return true;
+    } else if (name == pluginPropertyIdentifiers[ID_PROPERTY_LOG_DESTROY]) {
+        ((PluginObject *)obj)->logDestroy = NPVARIANT_TO_BOOLEAN(*variant);
+        return true;
+    }
+    
+    return false;
+}
+
+static void testDOMAccess(PluginObject *obj)
+{
+    // Get plug-in's DOM element
+    NPObject *elementObject;
+    if (browser->getvalue(obj->npp, NPNVPluginElementNPObject, &elementObject) == NPERR_NO_ERROR) {
+        // Get style
+        NPVariant styleVariant;
+        NPIdentifier styleIdentifier = browser->getstringidentifier("style");
+        if (browser->getproperty(obj->npp, elementObject, styleIdentifier, &styleVariant) && NPVARIANT_IS_OBJECT(styleVariant)) {
+            // Set style.border
+            NPIdentifier borderIdentifier = browser->getstringidentifier("border");
+            NPVariant borderVariant;
+            STRINGZ_TO_NPVARIANT("3px solid red", borderVariant);
+            browser->setproperty(obj->npp, NPVARIANT_TO_OBJECT(styleVariant), borderIdentifier, &borderVariant);
+            browser->releasevariantvalue(&styleVariant);
+        }
+        
+        browser->releaseobject(elementObject);
+    }
+}
+
+static bool pluginInvoke(NPObject *header, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result)
+{
+    PluginObject *obj = (PluginObject *)header;
+    if (name == pluginMethodIdentifiers[ID_TEST_CALLBACK_METHOD]) {
+        // call whatever method name we're given
+        if (argCount > 0 && NPVARIANT_IS_STRING(args[0])) {
+            NPObject *windowScriptObject;
+            browser->getvalue(obj->npp, NPNVWindowNPObject, &windowScriptObject);
+
+            NPUTF8* callbackString = createCStringFromNPVariant(&args[0]);
+            NPIdentifier callbackIdentifier = browser->getstringidentifier(callbackString);
+            free(callbackString);
+
+            NPVariant browserResult;
+            browser->invoke(obj->npp, windowScriptObject, callbackIdentifier, 0, 0, &browserResult);
+            browser->releasevariantvalue(&browserResult);
+
+            VOID_TO_NPVARIANT(*result);
+            return true;
+        }
+    } else if (name == pluginMethodIdentifiers[ID_TEST_GETURL]) {
+        if (argCount == 2 && NPVARIANT_IS_STRING(args[0]) && NPVARIANT_IS_STRING(args[1])) {
+            NPUTF8* urlString = createCStringFromNPVariant(&args[0]);
+            NPUTF8* targetString = createCStringFromNPVariant(&args[1]);
+            browser->geturl(obj->npp, urlString, targetString);
+            free(urlString);
+            free(targetString);
+
+            VOID_TO_NPVARIANT(*result);
+            return true;
+        } else if (argCount == 1 && NPVARIANT_IS_STRING(args[0])) {
+            NPUTF8* urlString = createCStringFromNPVariant(&args[0]);
+            browser->geturl(obj->npp, urlString, 0);
+            free(urlString);
+
+            VOID_TO_NPVARIANT(*result);
+            return true;
+        }
+    } else if (name == pluginMethodIdentifiers[ID_REMOVE_DEFAULT_METHOD]) {
+        pluginClass.invokeDefault = 0;
+        VOID_TO_NPVARIANT(*result);
+        return true;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_DOM_ACCESS]) {
+        testDOMAccess(obj);
+        VOID_TO_NPVARIANT(*result);
+        return true;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_GET_URL_NOTIFY]) {
+        if (argCount == 3
+          && NPVARIANT_IS_STRING(args[0])
+          && (NPVARIANT_IS_STRING(args[1]) || NPVARIANT_IS_NULL(args[1]))
+          && NPVARIANT_IS_STRING(args[2])) {
+            NPUTF8* urlString = createCStringFromNPVariant(&args[0]);
+            NPUTF8* targetString = (NPVARIANT_IS_STRING(args[1]) ? createCStringFromNPVariant(&args[1]) : NULL);
+            NPUTF8* callbackString = createCStringFromNPVariant(&args[2]);
+            
+            NPIdentifier callbackIdentifier = browser->getstringidentifier(callbackString);
+            browser->geturlnotify(obj->npp, urlString, targetString, callbackIdentifier);
+
+            free(urlString);
+            free(targetString);
+            free(callbackString);
+            
+            VOID_TO_NPVARIANT(*result);
+            return true;
+        }
+    } else if (name == pluginMethodIdentifiers[ID_TEST_INVOKE_DEFAULT] && NPVARIANT_IS_OBJECT(args[0])) {
+        NPObject *callback = NPVARIANT_TO_OBJECT(args[0]);
+        
+        NPVariant args[1];
+        NPVariant browserResult;
+        
+        STRINGZ_TO_NPVARIANT("test", args[0]);
+        bool retval = browser->invokeDefault(obj->npp, callback, args, 1, &browserResult);
+        
+        if (retval)
+            browser->releasevariantvalue(&browserResult);
+        
+        BOOLEAN_TO_NPVARIANT(retval, *result);
+        return true;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_ENUMERATE]) {
+        if (argCount == 2 && NPVARIANT_IS_OBJECT(args[0]) && NPVARIANT_IS_OBJECT(args[1])) {
+            uint32_t count;            
+            NPIdentifier* identifiers;
+
+            if (browser->enumerate(obj->npp, NPVARIANT_TO_OBJECT(args[0]), &identifiers, &count)) {
+                NPObject* outArray = NPVARIANT_TO_OBJECT(args[1]);
+                NPIdentifier pushIdentifier = browser->getstringidentifier("push");
+                
+                for (uint32_t i = 0; i < count; i++) {
+                    NPUTF8* string = browser->utf8fromidentifier(identifiers[i]);
+                    
+                    if (!string)
+                        continue;
+                                        
+                    NPVariant args[1];
+                    STRINGZ_TO_NPVARIANT(string, args[0]);
+                    NPVariant browserResult;
+                    browser->invoke(obj->npp, outArray, pushIdentifier, args, 1, &browserResult);
+                    browser->releasevariantvalue(&browserResult);
+                    browser->memfree(string);
+                }
+                
+                browser->memfree(identifiers);
+            }
+            
+            VOID_TO_NPVARIANT(*result);
+            return true;            
+        }
+        return false;
+    } else if (name == pluginMethodIdentifiers[ID_DESTROY_STREAM]) {
+        NPError npError = browser->destroystream(obj->npp, obj->stream, NPRES_USER_BREAK);
+        INT32_TO_NPVARIANT(npError, *result);
+        return true;        
+    } else if (name == pluginMethodIdentifiers[ID_TEST_GETINTIDENTIFIER]) {
+        if (argCount == 1 && NPVARIANT_IS_DOUBLE(args[0])) {
+            NPIdentifier identifier = browser->getintidentifier((int)NPVARIANT_TO_DOUBLE(args[0]));
+            INT32_TO_NPVARIANT((int32)identifier, *result);
+            return true;
+        }
+    } else if (name == pluginMethodIdentifiers[ID_TEST_EVALUATE] && 
+               argCount == 1 && NPVARIANT_IS_STRING(args[0])) {
+        NPObject *windowScriptObject;
+        browser->getvalue(obj->npp, NPNVWindowNPObject, &windowScriptObject);
+
+        NPString s = NPVARIANT_TO_STRING(args[0]);
+        
+        bool retval = browser->evaluate(obj->npp, windowScriptObject, &s, result);
+        browser->releaseobject(windowScriptObject);
+        return retval;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_GET_PROPERTY] &&
+               argCount > 0) {
+        NPObject *object;
+        browser->getvalue(obj->npp, NPNVWindowNPObject, &object);
+
+        for (uint32_t i = 0; i < argCount; i++) {
+            assert(NPVARIANT_IS_STRING(args[i]));
+            NPUTF8* propertyString = createCStringFromNPVariant(&args[i]);
+            NPIdentifier propertyIdentifier = browser->getstringidentifier(propertyString);
+            free(propertyString);
+            
+            NPVariant variant;
+            bool retval = browser->getproperty(obj->npp, object, propertyIdentifier, &variant);
+            browser->releaseobject(object);
+            
+            if (!retval)
+                break;
+            
+            if (i + 1 < argCount) {
+                assert(NPVARIANT_IS_OBJECT(variant));
+                object = NPVARIANT_TO_OBJECT(variant);
+            } else {                
+                *result = variant;
+                return true;
+            }
+        }
+        
+        VOID_TO_NPVARIANT(*result);
+        return false;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_GET_PROPERTY_RETURN_VALUE] &&
+        argCount == 2 && NPVARIANT_IS_OBJECT(args[0]) && NPVARIANT_IS_STRING(args[1])) {
+        NPUTF8* propertyString = createCStringFromNPVariant(&args[1]);
+        NPIdentifier propertyIdentifier = browser->getstringidentifier(propertyString);
+        free(propertyString);
+
+        NPVariant variant;
+        bool retval = browser->getproperty(obj->npp, NPVARIANT_TO_OBJECT(args[0]), propertyIdentifier, &variant);
+        if (retval)
+            browser->releasevariantvalue(&variant);
+
+        BOOLEAN_TO_NPVARIANT(retval, *result);
+        return true;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_CALLBACK_METHOD_RET]) {
+        // call whatever method name we're given, and pass it the 'window' obj.
+        // we expect the function to return its argument.
+        if (argCount > 0 && NPVARIANT_IS_STRING(args[0])) {
+            NPObject *windowScriptObject;
+            browser->getvalue(obj->npp, NPNVWindowNPObject, &windowScriptObject);
+
+            NPUTF8* callbackString = createCStringFromNPVariant(&args[0]);
+            NPIdentifier callbackIdentifier = browser->getstringidentifier(callbackString);
+            free(callbackString);
+
+            NPVariant callbackArgs[1];
+            OBJECT_TO_NPVARIANT(windowScriptObject, callbackArgs[0]);
+
+            NPVariant browserResult;
+            browser->invoke(obj->npp, windowScriptObject, callbackIdentifier,
+                            callbackArgs, 1, &browserResult);
+
+            if (NPVARIANT_IS_OBJECT(browserResult)) {
+                // Now return the callbacks return value back to our caller.
+                // BUG 897451: This should be the same as the
+                // windowScriptObject, but its not (in Chrome) - or at least, it
+                // has a different refcount. This means Chrome will delete the
+                // object before returning it and the calling JS gets a garbage
+                // value.  Firefox handles it fine.
+                OBJECT_TO_NPVARIANT(NPVARIANT_TO_OBJECT(browserResult), *result);
+            } else {                
+                browser->releasevariantvalue(&browserResult);
+                VOID_TO_NPVARIANT(*result);
+            }
+
+            return true;
+        }
+    } else if (name == pluginMethodIdentifiers[ID_TEST_CREATE_TEST_OBJECT]) {
+        NPObject *testObject = browser->createobject(obj->npp, getTestClass());
+        assert(testObject->referenceCount == 1);
+        OBJECT_TO_NPVARIANT(testObject, *result);
+        return true;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_PASS_TEST_OBJECT]) {
+        // call whatever method name we're given, and pass it our second
+        // argument.
+        if (argCount > 1 && NPVARIANT_IS_STRING(args[0])) {
+            NPObject *windowScriptObject;
+            browser->getvalue(obj->npp, NPNVWindowNPObject, &windowScriptObject);
+
+            NPUTF8* callbackString = createCStringFromNPVariant(&args[0]);
+            NPIdentifier callbackIdentifier = browser->getstringidentifier(callbackString);
+            free(callbackString);
+
+            NPVariant browserResult;
+            browser->invoke(obj->npp, windowScriptObject, callbackIdentifier, &args[1], 1, &browserResult);
+            browser->releasevariantvalue(&browserResult);
+
+            VOID_TO_NPVARIANT(*result);
+            return true;
+        }
+    } else if (name == pluginMethodIdentifiers[ID_TEST_CLONE_OBJECT]) {
+        // Create another instance of the same class
+        NPObject *new_object = browser->createobject(obj->npp, &pluginClass);
+        assert(new_object->referenceCount == 1);
+        OBJECT_TO_NPVARIANT(new_object, *result);
+        return true;
+    } else if (name == pluginMethodIdentifiers[ID_TEST_SCRIPT_OBJECT_INVOKE]) {
+        if (argCount > 1 && NPVARIANT_IS_STRING(args[0])) {
+            // Invoke a script callback to get a script NPObject. Then call
+            // a method on the script NPObject passing it a freshly created
+            // NPObject.
+            // Arguments:
+            // arg1:  Callback that returns a script object.
+            // arg2:  Name of the method to call on the script object returned 
+            //        from the callback
+            NPObject *windowScriptObject;
+            browser->getvalue(obj->npp, NPNVWindowNPObject, 
+                              &windowScriptObject);
+
+            // Arg1 is the name of the callback
+            NPUTF8* callbackString = createCStringFromNPVariant(&args[0]);
+            NPIdentifier callbackIdentifier = 
+                  browser->getstringidentifier(callbackString);
+            free(callbackString);
+
+            // Invoke a callback that returns a script object
+            NPVariant object_result;
+            browser->invoke(obj->npp, windowScriptObject, callbackIdentifier, 
+                            &args[1], 1, &object_result);
+
+            // Script object returned
+            NPObject *script_object = object_result.value.objectValue;
+
+            // Arg2 is the name of the method to be called on the script object
+            NPUTF8* object_mehod_string = createCStringFromNPVariant(&args[1]);
+            NPIdentifier object_method = 
+                browser->getstringidentifier(object_mehod_string);
+            free(object_mehod_string);
+
+            // Create a fresh NPObject to be passed as an argument
+            NPObject *object_arg = browser->createobject(obj->npp, &pluginClass);
+            NPVariant invoke_args[1];
+            OBJECT_TO_NPVARIANT(object_arg, invoke_args[0]);
+
+            // Invoke the script method
+            NPVariant object_method_result;
+            browser->invoke(obj->npp, script_object, object_method,
+                            invoke_args, 1, &object_method_result);
+
+            browser->releasevariantvalue(&object_result);
+            VOID_TO_NPVARIANT(*result);
+            if (NPVARIANT_IS_OBJECT(object_method_result)) {
+                // Now return the callbacks return value back to our caller.
+                // BUG 897451: This should be the same as the
+                // windowScriptObject, but its not (in Chrome) - or at least, it
+                // has a different refcount. This means Chrome will delete the
+                // object before returning it and the calling JS gets a garbage
+                // value.  Firefox handles it fine.
+                OBJECT_TO_NPVARIANT(NPVARIANT_TO_OBJECT(object_method_result),
+                                    *result);
+            } else {                
+                browser->releasevariantvalue(&object_method_result);
+                VOID_TO_NPVARIANT(*result);
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
+static bool pluginInvokeDefault(NPObject *obj, const NPVariant *args, uint32_t argCount, NPVariant *result)
+{
+    INT32_TO_NPVARIANT(1, *result);
+    return true;
+}
+
+static void pluginInvalidate(NPObject *obj)
+{
+}
+
+static NPObject *pluginAllocate(NPP npp, NPClass *theClass)
+{
+    PluginObject *newInstance = (PluginObject*)malloc(sizeof(PluginObject));
+    
+    if (!identifiersInitialized) {
+        identifiersInitialized = true;
+        initializeIdentifiers();
+    }
+
+    newInstance->npp = npp;
+    newInstance->testObject = browser->createobject(npp, getTestClass());
+    newInstance->eventLogging = FALSE;
+    newInstance->logDestroy = FALSE;
+    newInstance->logSetWindow = FALSE;
+    newInstance->returnErrorFromNewStream = FALSE;
+    newInstance->stream = 0;
+    
+    newInstance->firstUrl = NULL;
+    newInstance->firstHeaders = NULL;
+    newInstance->lastUrl = NULL;
+    newInstance->lastHeaders = NULL;
+    
+    return (NPObject *)newInstance;
+}
+
+static void pluginDeallocate(NPObject *header) 
+{
+    PluginObject* obj = (PluginObject*)header;
+    
+    browser->releaseobject(obj->testObject);
+
+    free(obj->firstUrl);
+    free(obj->firstHeaders);
+    free(obj->lastUrl);
+    free(obj->lastHeaders);
+
+    free(obj);
+}
+
+void handleCallback(PluginObject* object, const char *url, NPReason reason, void *notifyData)
+{
+    assert(object);
+    
+    NPVariant args[2];
+    
+    NPObject *windowScriptObject;
+    browser->getvalue(object->npp, NPNVWindowNPObject, &windowScriptObject);
+    
+    NPIdentifier callbackIdentifier = notifyData;
+
+    INT32_TO_NPVARIANT(reason, args[0]);
+
+    char *strHdr = NULL;
+    if (object->firstUrl && object->firstHeaders && object->lastUrl && object->lastHeaders) {
+        // Format expected by JavaScript validator: four fields separated by \n\n:
+        // First URL; first header block; last URL; last header block.
+        // Note that header blocks already end with \n due to how NPStream::headers works.
+        int len = strlen(object->firstUrl) + 2
+            + strlen(object->firstHeaders) + 1
+            + strlen(object->lastUrl) + 2
+            + strlen(object->lastHeaders) + 1;
+        strHdr = (char*)malloc(len + 1);
+        snprintf(strHdr, len + 1, "%s\n\n%s\n%s\n\n%s\n",
+                 object->firstUrl, object->firstHeaders, object->lastUrl, object->lastHeaders);
+        STRINGN_TO_NPVARIANT(strHdr, len, args[1]);
+    } else
+        NULL_TO_NPVARIANT(args[1]);
+
+    NPVariant browserResult;
+    browser->invoke(object->npp, windowScriptObject, callbackIdentifier, args, 2, &browserResult);
+    browser->releasevariantvalue(&browserResult);
+
+    free(strHdr);
+}
+
+void notifyStream(PluginObject* object, const char *url, const char *headers)
+{
+    if (object->firstUrl == NULL) {
+        if (url)
+            object->firstUrl = strdup(url);
+        if (headers)
+            object->firstHeaders = strdup(headers);
+    } else {
+        free(object->lastUrl);
+        free(object->lastHeaders);
+        object->lastUrl = (url ? strdup(url) : NULL);
+        object->lastHeaders = (headers ? strdup(headers) : NULL);
+    }
+}
diff --git a/webkit/tools/npapi_layout_test_plugin/PluginObject.h b/webkit/tools/npapi_layout_test_plugin/PluginObject.h
new file mode 100644
index 0000000..cacfe41
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/PluginObject.h
@@ -0,0 +1,56 @@
+/*
+ IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
+ consideration of your agreement to the following terms, and your use, installation, 
+ modification or redistribution of this Apple software constitutes acceptance of these 
+ terms.  If you do not agree with these terms, please do not use, install, modify or 
+ redistribute this Apple software.
+ 
+ In consideration of your agreement to abide by the following terms, and subject to these 
+ terms, Apple grants you a personal, non-exclusive license, under AppleŐs copyrights in 
+ this original Apple software (the "Apple Software"), to use, reproduce, modify and 
+ redistribute the Apple Software, with or without modifications, in source and/or binary 
+ forms; provided that if you redistribute the Apple Software in its entirety and without 
+ modifications, you must retain this notice and the following text and disclaimers in all 
+ such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
+ or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
+ the Apple Software without specific prior written permission from Apple. Except as expressly
+ stated in this notice, no other rights or licenses, express or implied, are granted by Apple
+ herein, including but not limited to any patent rights that may be infringed by your 
+ derivative works or by other works in which the Apple Software may be incorporated.
+ 
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
+ EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
+ USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ 
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
+ REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
+ WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
+ OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "webkit/glue/plugins/nphostapi.h"
+
+extern NPNetscapeFuncs *browser;
+
+typedef struct {
+    NPObject header;
+    NPP npp;
+    NPBool eventLogging;
+    NPBool logSetWindow;
+    NPBool logDestroy;
+    NPBool returnErrorFromNewStream;
+    NPObject* testObject;
+    NPStream* stream;
+    char* onStreamLoad;
+    char* firstUrl;
+    char* firstHeaders;
+    char* lastUrl;
+    char* lastHeaders;
+} PluginObject;
+
+extern NPClass *getPluginClass(void);
+extern void handleCallback(PluginObject* object, const char *url, NPReason reason, void *notifyData);
+extern void notifyStream(PluginObject* object, const char *url, const char *headers);
diff --git a/webkit/tools/npapi_layout_test_plugin/SConscript b/webkit/tools/npapi_layout_test_plugin/SConscript
new file mode 100644
index 0000000..3536bd3
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/SConscript
@@ -0,0 +1,100 @@
+# Copyright 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
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#    * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Import('env', 'env_res')
+
+env = env.Clone()
+env_res = env_res.Clone()
+
+input_files = [
+    'main.cpp',
+    env_res.RES('npapi_layout_test_plugin.rc'),
+    'PluginObject.cpp',
+    'TestObject.cpp',
+    'npapi_layout_test_plugin.def',
+]
+
+env.Append(
+    CCFLAGS = [
+        '/TP',
+        '/WX',
+        '/wd4503',
+        '/wd4819',
+    ],
+
+    LIBS = [
+        'advapi32.lib',
+        'comctl32.lib',
+        'comdlg32.lib',
+        'delayimp.lib',
+        'gdi32.lib',
+        'kernel32.lib',
+        'msimg32.lib',
+        'odbc32.lib',
+        'odbccp32.lib',
+        'ole32.lib',
+        'oleaut32.lib',
+        'psapi.lib',
+        'rpcrt4.lib',
+        'shell32.lib',
+        'shlwapi.lib',
+        'user32.lib',
+        'usp10.lib',
+        'uuid.lib',
+        'version.lib',
+        'wininet.lib',
+        'winmm.lib',
+        'winspool.lib',
+        'ws2_32.lib',
+    ],
+
+    LINKFLAGS = [
+        '/DELAYLOAD:"dwmapi.dll"',
+        '/DELAYLOAD:"uxtheme.dll"',
+        '/FIXED:No',
+        '/SUBSYSTEM:CONSOLE',
+        '/MACHINE:X86',
+        '/safeseh',
+        '/dynamicbase',
+        '/ignore:4199',
+        '/nxcompat',
+    ],
+)
+
+dll = env.SharedLibrary(['npapi_layout_test_plugin',
+                         'npapi_layout_test_plugin.lib',
+                         'npapi_layout_test_plugin.ilk',
+                         'npapi_layout_test_plugin.pdb'],
+                        input_files)
+
+i = env.Install('$TARGET_ROOT/plugins', dll)
+env.Alias('webkit', i)
+
+i = env.Install('$TARGET_ROOT', dll)
+env.Alias('webkit', i)
diff --git a/webkit/tools/npapi_layout_test_plugin/TestObject.cpp b/webkit/tools/npapi_layout_test_plugin/TestObject.cpp
new file mode 100644
index 0000000..141061d2
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/TestObject.cpp
@@ -0,0 +1,169 @@
+/*
+ IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
+ consideration of your agreement to the following terms, and your use, installation, 
+ modification or redistribution of this Apple software constitutes acceptance of these 
+ terms.  If you do not agree with these terms, please do not use, install, modify or 
+ redistribute this Apple software.
+ 
+ In consideration of your agreement to abide by the following terms, and subject to these 
+ terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in 
+ this original Apple software (the "Apple Software"), to use, reproduce, modify and 
+ redistribute the Apple Software, with or without modifications, in source and/or binary 
+ forms; provided that if you redistribute the Apple Software in its entirety and without 
+ modifications, you must retain this notice and the following text and disclaimers in all 
+ such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
+ or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
+ the Apple Software without specific prior written permission from Apple. Except as expressly
+ stated in this notice, no other rights or licenses, express or implied, are granted by Apple
+ herein, including but not limited to any patent rights that may be infringed by your 
+ derivative works or by other works in which the Apple Software may be incorporated.
+ 
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
+ EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
+ USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ 
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
+ REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
+ WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
+ OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "TestObject.h"
+#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 NPClass testClass = { 
+    NP_CLASS_STRUCT_VERSION,
+    testAllocate, 
+    testDeallocate, 
+    0,
+    0,
+    0,
+    testInvokeDefault,
+    testHasProperty,
+    testGetProperty,
+    0,
+    0,
+    testEnumerate
+};
+
+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
+
+static NPIdentifier testIdentifiers[NUM_TEST_IDENTIFIERS];
+static const NPUTF8 *testIdentifierNames[NUM_TEST_IDENTIFIERS] = {
+    "foo",
+    "bar",
+    "testObject",
+    "refCount",
+};
+
+static void initializeIdentifiers(void)
+{
+    browser->getstringidentifiers(testIdentifierNames, NUM_TEST_IDENTIFIERS, testIdentifiers);
+}
+
+static NPObject *testAllocate(NPP npp, NPClass *theClass)
+{
+    TestObject *newInstance =
+        static_cast<TestObject*>(malloc(sizeof(TestObject)));
+    newInstance->testObject = NULL;
+    ++testObjectCount;
+    
+    if (!identifiersInitialized) {
+        identifiersInitialized = true;
+        initializeIdentifiers();
+    }
+    
+    return reinterpret_cast<NPObject*>(newInstance);
+}
+
+static void testDeallocate(NPObject *obj) 
+{
+    TestObject *testObject = reinterpret_cast<TestObject*>(obj);
+    if (testObject->testObject)
+      browser->releaseobject(testObject->testObject);
+    --testObjectCount;
+    free(obj);
+}
+
+static bool testInvokeDefault(NPObject *obj, const NPVariant *args,
+                              uint32_t argCount, NPVariant *result)
+{
+    INT32_TO_NPVARIANT(2, *result);
+    return true;
+}
+
+static bool testHasProperty(NPObject *obj, NPIdentifier name)
+{
+    for (unsigned i = 0; i < NUM_TEST_IDENTIFIERS; i++) {
+        if (testIdentifiers[i] == name)
+            return true;
+    }
+    
+    return false;
+}
+
+static bool testGetProperty(NPObject *obj, NPIdentifier name, 
+                            NPVariant *variant)
+{
+    if (name == testIdentifiers[ID_PROPERTY_FOO]) {
+        char* mem = static_cast<char*>(browser->memalloc(4));
+        strcpy(mem, "foo");
+        STRINGZ_TO_NPVARIANT(mem, *variant);
+        return true;
+    } else if (name == testIdentifiers[ID_PROPERTY_BAR]) {
+        BOOLEAN_TO_NPVARIANT(true, *variant);
+        return true;
+    } 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;
+    }
+    return false;
+}
+
+static bool testEnumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
+{
+    *count = NUM_TEST_IDENTIFIERS;
+    
+    *value = (NPIdentifier*)browser->memalloc(NUM_TEST_IDENTIFIERS * sizeof(NPIdentifier));
+    memcpy(*value, testIdentifiers, sizeof(NPIdentifier) * NUM_TEST_IDENTIFIERS);
+    
+    return true;
+}
+
+
diff --git a/webkit/tools/npapi_layout_test_plugin/TestObject.h b/webkit/tools/npapi_layout_test_plugin/TestObject.h
new file mode 100644
index 0000000..fe9839f
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/TestObject.h
@@ -0,0 +1,44 @@
+/*
+ IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
+ consideration of your agreement to the following terms, and your use, installation, 
+ modification or redistribution of this Apple software constitutes acceptance of these 
+ terms.  If you do not agree with these terms, please do not use, install, modify or 
+ redistribute this Apple software.
+ 
+ In consideration of your agreement to abide by the following terms, and subject to these 
+ terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in 
+ this original Apple software (the "Apple Software"), to use, reproduce, modify and 
+ redistribute the Apple Software, with or without modifications, in source and/or binary 
+ forms; provided that if you redistribute the Apple Software in its entirety and without 
+ modifications, you must retain this notice and the following text and disclaimers in all 
+ such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
+ or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
+ the Apple Software without specific prior written permission from Apple. Except as expressly
+ stated in this notice, no other rights or licenses, express or implied, are granted by Apple
+ herein, including but not limited to any patent rights that may be infringed by your 
+ derivative works or by other works in which the Apple Software may be incorporated.
+ 
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
+ EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
+ USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ 
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
+ REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
+ WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
+ OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "bindings/npapi.h"
+#include "bindings/npruntime.h"
+
+
+typedef struct {
+    NPObject header;
+    NPObject* testObject;
+} TestObject;
+
+NPClass *getTestClass(void);
+int getTestObjectCount(void);
\ No newline at end of file
diff --git a/webkit/tools/npapi_layout_test_plugin/main.cpp b/webkit/tools/npapi_layout_test_plugin/main.cpp
new file mode 100644
index 0000000..0ad2d6b
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/main.cpp
@@ -0,0 +1,346 @@
+/*
+ IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
+ consideration of your agreement to the following terms, and your use, installation, 
+ modification or redistribution of this Apple software constitutes acceptance of these 
+ terms.  If you do not agree with these terms, please do not use, install, modify or 
+ redistribute this Apple software.
+ 
+ In consideration of your agreement to abide by the following terms, and subject to these 
+ terms, Apple grants you a personal, non-exclusive license, under Apple’s copyrights in 
+ this original Apple software (the "Apple Software"), to use, reproduce, modify and 
+ redistribute the Apple Software, with or without modifications, in source and/or binary 
+ forms; provided that if you redistribute the Apple Software in its entirety and without 
+ modifications, you must retain this notice and the following text and disclaimers in all 
+ such redistributions of the Apple Software.  Neither the name, trademarks, service marks 
+ or logos of Apple Computer, Inc. may be used to endorse or promote products derived from 
+ the Apple Software without specific prior written permission from Apple. Except as expressly
+ stated in this notice, no other rights or licenses, express or implied, are granted by Apple
+ herein, including but not limited to any patent rights that may be infringed by your 
+ derivative works or by other works in which the Apple Software may be incorporated.
+ 
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, 
+ EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, 
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS 
+ USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+ 
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
+          OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, 
+ REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND 
+ WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR 
+ OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "PluginObject.h"
+
+#ifdef WIN32
+#include <stdio.h>
+#include <stdlib.h>
+#define strcasecmp _stricmp
+#define NPAPI WINAPI
+#else
+#define NPAPI
+#endif
+
+// Mach-o entry points
+extern "C" {
+    NPError NPAPI NP_Initialize(NPNetscapeFuncs *browserFuncs);
+    NPError NPAPI NP_GetEntryPoints(NPPluginFuncs *pluginFuncs);
+    void NPAPI NP_Shutdown(void);
+}
+
+// Mach-o entry points
+NPError NPAPI NP_Initialize(NPNetscapeFuncs *browserFuncs)
+{
+    browser = browserFuncs;
+    return NPERR_NO_ERROR;
+}
+
+NPError NPAPI NP_GetEntryPoints(NPPluginFuncs *pluginFuncs)
+{
+    pluginFuncs->version = 11;
+    pluginFuncs->size = sizeof(pluginFuncs);
+    pluginFuncs->newp = NPP_New;
+    pluginFuncs->destroy = NPP_Destroy;
+    pluginFuncs->setwindow = NPP_SetWindow;
+    pluginFuncs->newstream = NPP_NewStream;
+    pluginFuncs->destroystream = NPP_DestroyStream;
+    pluginFuncs->asfile = NPP_StreamAsFile;
+    pluginFuncs->writeready = NPP_WriteReady;
+    pluginFuncs->write = (NPP_WriteProcPtr)NPP_Write;
+    pluginFuncs->print = NPP_Print;
+    pluginFuncs->event = NPP_HandleEvent;
+    pluginFuncs->urlnotify = NPP_URLNotify;
+    pluginFuncs->getvalue = NPP_GetValue;
+    pluginFuncs->setvalue = NPP_SetValue;
+    
+    return NPERR_NO_ERROR;
+}
+
+void NPAPI NP_Shutdown(void)
+{
+}
+
+NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char *argn[], char *argv[], NPSavedData *saved)
+{
+    if (browser->version >= 14) {
+        PluginObject* obj = (PluginObject*)browser->createobject(instance, getPluginClass());
+    
+        obj->onStreamLoad = NULL;
+        
+        for (int i = 0; i < argc; i++) {
+            if (strcasecmp(argn[i], "onstreamload") == 0 && !obj->onStreamLoad)
+                obj->onStreamLoad = strdup(argv[i]);
+            else if (strcasecmp(argn[i], "src") == 0 &&
+                     strcasecmp(argv[i], "data:application/x-webkit-test-netscape,returnerrorfromnewstream") == 0)
+                obj->returnErrorFromNewStream = TRUE;
+            else if (strcasecmp(argn[i], "logfirstsetwindow") == 0)
+                obj->logSetWindow = TRUE;
+        }
+        
+        instance->pdata = obj;
+    }
+    
+    // On Windows and Unix, plugins only get events if they are windowless.
+    return browser->setvalue(instance, NPPVpluginWindowBool, NULL);
+}
+
+NPError NPP_Destroy(NPP instance, NPSavedData **save)
+{
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+    if (obj) {
+        if (obj->onStreamLoad)
+            free(obj->onStreamLoad);
+        
+        if (obj->logDestroy)
+            printf("PLUGIN: NPP_Destroy\n");
+
+        browser->releaseobject(&obj->header);
+    }
+
+    fflush(stdout);
+
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_SetWindow(NPP instance, NPWindow *window)
+{
+    if (window->window == NULL) {
+        return NPERR_NO_ERROR;
+    }
+   
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+
+    if (obj) {
+        if (obj->logSetWindow) {
+            printf("PLUGIN: NPP_SetWindow: %d %d\n", (int)window->width, (int)window->height);
+            obj->logSetWindow = false;
+        }
+    }
+    
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream *stream, NPBool seekable, uint16 *stype)
+{
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+    obj->stream = stream;
+    *stype = NP_ASFILEONLY;
+
+    if (obj->returnErrorFromNewStream)
+        return NPERR_GENERIC_ERROR;
+    
+    if (browser->version >= NPVERS_HAS_RESPONSE_HEADERS)
+        notifyStream(obj, stream->url, stream->headers);
+
+    if (obj->onStreamLoad) {
+        NPObject *windowScriptObject;
+        browser->getvalue(obj->npp, NPNVWindowNPObject, &windowScriptObject);
+                
+        NPString script;
+        script.UTF8Characters = obj->onStreamLoad;
+        script.UTF8Length = strlen(obj->onStreamLoad);
+        
+        NPVariant browserResult;
+        browser->evaluate(obj->npp, windowScriptObject, &script, &browserResult);
+        browser->releasevariantvalue(&browserResult);
+    }
+    
+    return NPERR_NO_ERROR;
+}
+
+NPError NPP_DestroyStream(NPP instance, NPStream *stream, NPReason reason)
+{
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+    obj->stream = 0;
+
+    return NPERR_NO_ERROR;
+}
+
+int32 NPP_WriteReady(NPP instance, NPStream *stream)
+{
+    return 0;
+}
+
+int32 NPP_Write(NPP instance, NPStream *stream, int32 offset, int32 len, void *buffer)
+{
+    return 0;
+}
+
+void NPP_StreamAsFile(NPP instance, NPStream *stream, const char *fname)
+{
+}
+
+void NPP_Print(NPP instance, NPPrint *platformPrint)
+{
+}
+
+int16 NPP_HandleEvent(NPP instance, void *event)
+{
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+    if (!obj->eventLogging)
+        return 0;
+    
+#ifdef WIN32
+    // Below is the event handling code.  Per the NPAPI spec, the events don't
+    // map directly between operating systems:
+    // http://devedge-temp.mozilla.org/library/manuals/2002/plugin/1.0/structures5.html#1000000
+    NPEvent* evt = static_cast<NPEvent*>(event);
+    short x = static_cast<short>(evt->lParam & 0xffff);
+    short y = static_cast<short>(evt->lParam >> 16);
+    switch (evt->event) {
+        case WM_PAINT:
+            printf("PLUGIN: updateEvt\n");
+            break;
+        case WM_LBUTTONDOWN:
+        case WM_MBUTTONDOWN:
+        case WM_RBUTTONDOWN:
+            printf("PLUGIN: mouseDown at (%d, %d)\n", x, y);
+            break;
+        case WM_LBUTTONUP:
+        case WM_MBUTTONUP:
+        case WM_RBUTTONUP:
+            printf("PLUGIN: mouseUp at (%d, %d)\n", x, y);
+            break;
+        case WM_LBUTTONDBLCLK:
+        case WM_MBUTTONDBLCLK:
+        case WM_RBUTTONDBLCLK:
+            break;
+        case WM_MOUSEMOVE:
+            printf("PLUGIN: adjustCursorEvent\n");
+            break;
+        case WM_KEYUP:
+            // TODO(tc): We need to convert evt->wParam from virtual-key code
+            // to key code.
+            printf("NOTIMPLEMENTED PLUGIN: keyUp '%c'\n", ' ');
+            break;
+        case WM_KEYDOWN:
+            // TODO(tc): We need to convert evt->wParam from virtual-key code
+            // to key code.
+            printf("NOTIMPLEMENTED PLUGIN: keyDown '%c'\n", ' ');
+            break;
+        case WM_SETCURSOR:
+            break;
+        case WM_SETFOCUS:
+            printf("PLUGIN: getFocusEvent\n");
+            break;
+        case WM_KILLFOCUS:
+            printf("PLUGIN: loseFocusEvent\n");
+            break;
+        default:
+            printf("PLUGIN: event %d\n", evt->event);        
+    }
+
+    fflush(stdout);
+
+#else
+    EventRecord* evt = static_cast<EventRecord*>(event);
+    Point pt = { evt->where.v, evt->where.h };
+    switch (evt->what) {
+        case nullEvent:
+            // these are delivered non-deterministically, don't log.
+            break;
+        case mouseDown:
+            GlobalToLocal(&pt);
+            printf("PLUGIN: mouseDown at (%d, %d)\n", pt.h, pt.v);
+            break;
+        case mouseUp:
+            GlobalToLocal(&pt);
+            printf("PLUGIN: mouseUp at (%d, %d)\n", pt.h, pt.v);
+            break;
+        case keyDown:
+            printf("PLUGIN: keyDown '%c'\n", (char)(evt->message & 0xFF));
+            break;
+        case keyUp:
+            printf("PLUGIN: keyUp '%c'\n", (char)(evt->message & 0xFF));
+            break;
+        case autoKey:
+            printf("PLUGIN: autoKey '%c'\n", (char)(evt->message & 0xFF));
+            break;
+        case updateEvt:
+            printf("PLUGIN: updateEvt\n");
+            break;
+        case diskEvt:
+            printf("PLUGIN: diskEvt\n");
+            break;
+        case activateEvt:
+            printf("PLUGIN: activateEvt\n");
+            break;
+        case osEvt:
+            printf("PLUGIN: osEvt - ");
+            switch ((evt->message & 0xFF000000) >> 24) {
+                case suspendResumeMessage:
+                    printf("%s\n", (evt->message & 0x1) ? "resume" : "suspend");
+                    break;
+                case mouseMovedMessage:
+                    printf("mouseMoved\n");
+                    break;
+                default:
+                    printf("%08lX\n", evt->message);
+            }
+            break;
+        case kHighLevelEvent:
+            printf("PLUGIN: kHighLevelEvent\n");
+            break;
+        // NPAPI events
+        case getFocusEvent:
+            printf("PLUGIN: getFocusEvent\n");
+            break;
+        case loseFocusEvent:
+            printf("PLUGIN: loseFocusEvent\n");
+            break;
+        case adjustCursorEvent:
+            printf("PLUGIN: adjustCursorEvent\n");
+            break;
+        default:
+            printf("PLUGIN: event %d\n", evt->what);
+    }
+#endif
+    
+    return 0;
+}
+
+void NPP_URLNotify(NPP instance, const char *url, NPReason reason, void *notifyData)
+{
+    PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+        
+    handleCallback(obj, url, reason, notifyData);
+}
+
+NPError NPP_GetValue(NPP instance, NPPVariable variable, void *value)
+{
+    if (variable == NPPVpluginScriptableNPObject) {
+        void **v = (void **)value;
+        PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
+        // Return value is expected to be retained
+        browser->retainobject((NPObject *)obj);
+        *v = obj;
+        return NPERR_NO_ERROR;
+    }
+    return NPERR_GENERIC_ERROR;
+}
+
+NPError NPP_SetValue(NPP instance, NPNVariable variable, void *value)
+{
+    return NPERR_GENERIC_ERROR;
+}
diff --git a/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.def b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.def
new file mode 100644
index 0000000..dff1e6a
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.def
@@ -0,0 +1,6 @@
+LIBRARY   npapi_layout_test_plugin
+
+EXPORTS
+  NP_GetEntryPoints   @1
+  NP_Initialize       @2
+  NP_Shutdown         @3
diff --git a/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.rc b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.rc
new file mode 100644
index 0000000..080b7a8
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.rc
@@ -0,0 +1,104 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "FileDescription", "Simple Netscape plug-in that handles test content for WebKit"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "npapi_te"
+            VALUE "LegalCopyright", "Copyright (C) 2007"
+            VALUE "MIMEType", "application/x-webkit-test-netscape"
+            VALUE "FileExtents", "testnetscape"
+            VALUE "FileOpenName", "test netscape content"
+            VALUE "OriginalFilename", "npapi_te.dll"
+            VALUE "ProductName", "WebKit Test PlugIn"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj
new file mode 100644
index 0000000..ffcd474
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/npapi_layout_test_plugin.vcproj
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="npapi_layout_test_plugin"
+	ProjectGUID="{BE6D5659-A8D5-4890-A42C-090DD10EF62C}"
+	RootNamespace="npapi_layout_test_plugin"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\build\webkit_common.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				ModuleDefinitionFile="npapi_layout_test_plugin.def"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy.exe /Y /F $(TargetPath) $(TargetDir)\plugins\"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\build\webkit_common.vsprops"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="winmm.lib"
+				ModuleDefinitionFile="npapi_layout_test_plugin.def"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine="xcopy.exe /Y /F $(TargetPath) $(TargetDir)\plugins\"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath=".\main.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\npapi_layout_test_plugin.rc"
+			>
+		</File>
+		<File
+			RelativePath=".\PluginObject.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\PluginObject.h"
+			>
+		</File>
+		<File
+			RelativePath=".\resource.h"
+			>
+		</File>
+		<File
+			RelativePath=".\TestObject.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\TestObject.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/webkit/tools/npapi_layout_test_plugin/resource.h b/webkit/tools/npapi_layout_test_plugin/resource.h
new file mode 100644
index 0000000..c2bcf92
--- /dev/null
+++ b/webkit/tools/npapi_layout_test_plugin/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by npapi_layout_test_plugin.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif