diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1910950..c76deed 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-21  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by NOBODY (OOPS!).
+
+        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  Gabor Rapcsanyi  <rgabor@inf.u-szeged.hu>

         Reviewed by Csaba Osztrogonác.
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)