This CL fixes the document-open.html and window-open.html plugin layout tests...

webkit/tools/npapi_layout_test_plugin/main.cpp

 /*
  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
@@ skipping 35 matching lines @@
 #if defined(__GNUC__) && __GNUC__ >= 4
 #define EXPORT __attribute__((visibility ("default")))
 #else
 #define EXPORT
 #endif
 
 #if defined(OS_LINUX)
 #include <X11/Xlib.h>
 #endif
 
-static void log(NPP instance, const char* format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    char message[2048] = "PLUGIN: ";
-    vsprintf(message + strlen(message), format, args);
-    va_end(args);
-
-    NPObject* windowObject = 0;
-    NPError error = browser->getvalue(instance, NPNVWindowNPObject, &windowObject);
-    if (error != NPERR_NO_ERROR) {
-        fprintf(stderr, "Failed to retrieve window object while logging: %s\n", message);
-        return;
-    }
-
-    NPVariant consoleVariant;
-    if (!browser->getproperty(instance, windowObject, browser->getstringidentifier("console"), &consoleVariant)) {
-        fprintf(stderr, "Failed to retrieve console object while logging: %s\n", message);
-        browser->releaseobject(windowObject);
-        return;
-    }
-
-    NPObject* consoleObject = NPVARIANT_TO_OBJECT(consoleVariant);
-
-    NPVariant messageVariant;
-    STRINGZ_TO_NPVARIANT(message, messageVariant);
-
-    NPVariant result;
-    if (!browser->invoke(instance, consoleObject, browser->getstringidentifier("log"), &messageVariant, 1, &result)) {
-        fprintf(stderr, "Failed to invoke console.log while logging: %s\n", message);
-        browser->releaseobject(consoleObject);
-        browser->releaseobject(windowObject);
-        return;
-    }
-
-    browser->releasevariantvalue(&result);
-    browser->releaseobject(consoleObject);
-    browser->releaseobject(windowObject);
-}
-
 // Plugin entry points
 extern "C" {
     EXPORT NPError NPAPI NP_Initialize(NPNetscapeFuncs *browserFuncs
 #if defined(OS_LINUX)
                                 , NPPluginFuncs *pluginFuncs
 #endif
                                 );
     EXPORT NPError NPAPI NP_GetEntryPoints(NPPluginFuncs *pluginFuncs);
     EXPORT void NPAPI NP_Shutdown(void);
 
@@ skipping 61 matching lines @@
                 obj->logSetWindow = TRUE;
             else if (strcasecmp(argn[i], "testnpruntime") == 0)
                 testNPRuntime(instance);
             else if (strcasecmp(argn[i], "logSrc") == 0) {
                 for (int i = 0; i < argc; i++) {
                     if (strcasecmp(argn[i], "src") == 0) {
                         log(instance, "src: %s", argv[i]);
                         fflush(stdout);
                     }
                 }
-            } else if (strcasecmp(argn[i], "cleardocumentduringnew") == 0)
+            } else if (strcasecmp(argn[i], "cleardocumentduringnew") == 0) {
                 executeScript(obj, "document.body.innerHTML = ''");
+            } else if (strcasecmp(argn[i], "testdocumentopenindestroystream") == 0) {
+                obj->testDocumentOpenInDestroyStream = TRUE;
+            } else if (strcasecmp(argn[i], "testwindowopen") == 0) {
+                obj->testWindowOpen = 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)
@@ skipping 23 matching lines @@
 NPError NPP_SetWindow(NPP instance, NPWindow *window)
 {
     PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
 
     if (obj) {
         if (obj->logSetWindow) {
             log(instance, "NPP_SetWindow: %d %d", (int)window->width, (int)window->height);
             fflush(stdout);
             obj->logSetWindow = false;
         }
+
+        if (obj->testWindowOpen) {
+            testWindowOpen(instance);
+            obj->testWindowOpen = FALSE;
+        }
     }
 
     return NPERR_NO_ERROR;
 }
 
 static void executeScript(const PluginObject* obj, const char* script)
 {
     NPObject *windowScriptObject;
     browser->getvalue(obj->npp, NPNVWindowNPObject, &windowScriptObject);
 
@@ skipping 25 matching lines @@
     return NPERR_NO_ERROR;
 }
 
 NPError NPP_DestroyStream(NPP instance, NPStream *stream, NPReason reason)
 {
     PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
 
     if (obj->onStreamDestroy)
         executeScript(obj, obj->onStreamDestroy);
 
+    if (obj->testDocumentOpenInDestroyStream) {
+        testDocumentOpen(instance);
+        obj->testDocumentOpenInDestroyStream = FALSE;
+    }
+
     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)
 {
@@ skipping 235 matching lines @@
 EXPORT const char* NPAPI NP_GetMIMEDescription(void) {
     // The layout test LayoutTests/fast/js/navigator-mimeTypes-length.html
     // asserts that the number of mimetypes handled by plugins should be
     // greater than the number of plugins.  This isn't true if we're
     // the only plugin and we only handle one mimetype, so specify
     // multiple mimetypes here.
     return "application/x-webkit-test-netscape:testnetscape:test netscape content;"
            "application/x-webkit-test-netscape2:testnetscape2:test netscape content2";
 }
 #endif