[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 3c0df3b95539b562e730de99d6209425709c2caa
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 01:29:38 2010 +0000

    Another build fix attempt.
    
    * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
    * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
    * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
    (webkit_test_plugin_new_instance):
    * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64328 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 27b898f..4f63354 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-07-29  Anders Carlsson  <andersca at apple.com>
 
+        Another build fix attempt.
+
+        * DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp:
+        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        * GNUmakefile.am:
+
+2010-07-29  Anders Carlsson  <andersca at apple.com>
+
         Try to fix Windows and Unix builds.
 
         * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.vcproj:
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
index a684e95..ec3a2d7 100644
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp
@@ -25,6 +25,7 @@
 
 #include "PluginTest.h"
 
+#include <assert.h>
 
 using namespace std;
 extern NPNetscapeFuncs *browser;
diff --git a/WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
index 6ab22fc..54651a3 100644
--- a/WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+++ b/WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
@@ -26,7 +26,8 @@ INCLUDEPATH += ../../../../JavaScriptCore \
                ../../TestNetscapePlugIn
 
 SOURCES = PluginObject.cpp \
-          TestObject.cpp
+          TestObject.cpp \
+          Test/DocumentOpenInDestroyStream.cpp
 
 mac {
     SOURCES += ../../TestNetscapePlugIn/main.cpp
diff --git a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
index 55c556d..53914c5 100644
--- a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -64,6 +64,8 @@ webkit_test_plugin_new_instance(NPMIMEType /*mimetype*/,
         PluginObject* obj = (PluginObject*)browser->createobject(instance, getPluginClass());
         instance->pdata = obj;
 
+        string testIdentifier;
+
         for (int i = 0; i < argc; i++) {
             if (strcasecmp(argn[i], "test") == 0)
                 testIdentifier = argv[i];
diff --git a/WebKitTools/GNUmakefile.am b/WebKitTools/GNUmakefile.am
index ef0d735..0eff139 100644
--- a/WebKitTools/GNUmakefile.am
+++ b/WebKitTools/GNUmakefile.am
@@ -158,6 +158,9 @@ TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \
 	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \
 	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npruntime.h \
 	WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp \
+	WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h \
 	WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.cpp \
 	WebKitTools/DumpRenderTree/TestNetscapePlugIn/PluginObject.h \
 	WebKitTools/DumpRenderTree/TestNetscapePlugIn/TestObject.cpp \

-- 
WebKit Debian packaging