[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0c4ad9745f0e01b8088e184c60f10acbeac4bf35
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 01:39:29 2010 +0000

    Another attempt at fixing the Qt and GTK+ build.
    
    * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
    (webkit_test_plugin_new_instance):
    (webkit_test_plugin_destroy_stream):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4f63354..76640c3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
 2010-07-29  Anders Carlsson  <andersca at apple.com>
 
+        Another attempt at fixing the Qt and GTK+ build.
+
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        (webkit_test_plugin_destroy_stream):
+
+2010-07-29  Anders Carlsson  <andersca at apple.com>
+
         Another build fix attempt.
 
         * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
diff --git a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
index 53914c5..2993028 100644
--- a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -97,9 +97,9 @@ webkit_test_plugin_new_instance(NPMIMEType /*mimetype*/,
         }
 
         browser->getvalue(instance, NPNVprivateModeBool, (void *)&obj->cachedPrivateBrowsingMode);
-    }
 
-    obj->pluginTest = PluginTest::create(instance, testIdentifier);
+        obj->pluginTest = PluginTest::create(instance, testIdentifier);
+    }
 
     return NPERR_NO_ERROR;
 }
@@ -198,7 +198,7 @@ webkit_test_plugin_new_stream(NPP instance,
 }
 
 static NPError
-webkit_test_plugin_destroy_stream(NPP instance, NPStream* /*stream*/, NPError reason)
+webkit_test_plugin_destroy_stream(NPP instance, NPStream* stream, NPError reason)
 {
     PluginObject* obj = (PluginObject*)instance->pdata;
 

-- 
WebKit Debian packaging