[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 651296d4617ad0dd3725a53d9d010e6b183bb2e8
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 17:33:25 2009 +0000

    Implement missing functionality in the Gtk/Qt TestNetscapePlugin.
    
    Reviewed by Simon Hausmann.
    
    * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
    (webkit_test_plugin_new_instance):
    (webkit_test_plugin_destroy_instance):
    (webkit_test_plugin_destroy_stream):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50812 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c549f11..3b9c476 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,16 @@
 2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Reviewed by Simon Hausmann.
+
+        Implement missing functionality in the Gtk/Qt TestNetscapePlugin.
+
+        * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        (webkit_test_plugin_destroy_instance):
+        (webkit_test_plugin_destroy_stream):
+
+2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Reviewed by Mark Rowe.
 
         Implement the functionality needed by plugins/window-open.html
diff --git a/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
index 3fd755a..cb01267 100644
--- a/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -45,6 +45,8 @@ extern "C" {
     char* NP_GetMIMEDescription(void);
 }
 
+static void executeScript(const PluginObject* obj, const char* script);
+
 static NPError
 webkit_test_plugin_new_instance(NPMIMEType /*mimetype*/,
                                 NPP instance,
@@ -75,10 +77,15 @@ webkit_test_plugin_new_instance(NPMIMEType /*mimetype*/,
                 for (int i = 0; i < argc; i++)
                     if (strcasecmp(argn[i], "src") == 0)
                         pluginLog(instance, "src: %s", argv[i]);
-            } else if (strcasecmp(argn[i], "testwindowopen") == 0)
+            } else if (strcasecmp(argn[i], "cleardocumentduringnew") == 0)
+                executeScript(obj, "document.body.innerHTML = ''");
+            else if (!strcasecmp(argn[i], "ondestroy"))
+                obj->onDestroy = strdup(argv[i]);
+            else if (strcasecmp(argn[i], "testdocumentopenindestroystream") == 0)
+                obj->testDocumentOpenInDestroyStream = TRUE;
+            else if (strcasecmp(argn[i], "testwindowopen") == 0)
                 obj->testWindowOpen = TRUE;
         }
-
         instance->pdata = obj;
     }
 
@@ -90,6 +97,11 @@ webkit_test_plugin_destroy_instance(NPP instance, NPSavedData** /*save*/)
 {
     PluginObject* obj = static_cast<PluginObject*>(instance->pdata);
     if (obj) {
+        if (obj->onDestroy) {
+            executeScript(obj, obj->onDestroy);
+            free(obj->onDestroy);
+        }
+
         if (obj->onStreamLoad)
             free(obj->onStreamLoad);
 
@@ -174,6 +186,11 @@ webkit_test_plugin_destroy_stream(NPP instance, NPStream* /*stream*/, NPError /*
     if (obj->onStreamDestroy)
         executeScript(obj, obj->onStreamDestroy);
 
+    if (obj->testDocumentOpenInDestroyStream) {
+        testDocumentOpen(instance);
+        obj->testDocumentOpenInDestroyStream = FALSE;
+    }
+
     return NPERR_NO_ERROR;
 }
 

-- 
WebKit Debian packaging