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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 05ec4806c8974fc869df943eae06980040c80be7
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 21 16:44:05 2010 +0000

    2010-10-21  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Adam Roben.
    
            TestNetscapePlugIn: Actually call NPP_SetWindow on Unix
    
            We were just returning NPERR_NO_ERROR previously.
    
            * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
            (webkit_test_plugin_set_window):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cd9e458..b6ade73 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-21  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Adam Roben.
+
+        TestNetscapePlugIn: Actually call NPP_SetWindow on Unix
+
+        We were just returning NPERR_NO_ERROR previously.
+
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_set_window):
+
 2010-10-21  David Kilzer  <ddkilzer at apple.com>
 
         <http://webkit.org/b/48051> Move macros from DumpRenderTreeMac.h to config.h
diff --git a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
index 8c4e98d..c312375 100644
--- a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -157,7 +157,7 @@ webkit_test_plugin_set_window(NPP instance, NPWindow *window)
 
     }
 
-    return NPERR_NO_ERROR;
+    return obj->pluginTest->NPP_SetWindow(instance, window);
 }
 
 static void executeScript(const PluginObject* obj, const char* script)

-- 
WebKit Debian packaging