[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 693bc9167cd58b5f2729b666aa8f598e2b1c87cd
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 14:11:16 2009 +0000

    WebCore: Set m_hasPendingGeometryChange to true by default, so that
    at least one call to NPP_SetWindow is executed, which is
    needed by the DRT plugin testing framework.
    
    Reviewed by Mark Rowe.
    
    * plugins/PluginView.cpp:
    (WebCore::PluginView::PluginView):
    
    WebKitTools: Implement the functionality needed by plugins/window-open.html
    
    Reviewed by Mark Rowe.
    
    * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
    (webkit_test_plugin_new_instance):
    (webkit_test_plugin_set_window):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50804 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 52b65d1..c70d313 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Set m_hasPendingGeometryChange to true by default, so that
+        at least one call to NPP_SetWindow is executed, which is
+        needed by the DRT plugin testing framework.
+
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::PluginView):
+
 2009-11-11  Csaba Osztrogonác  <ossy at webkit.org>
 
         Rubber-stamped by Kenneth Rohde Christiansen.
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index 77b7523..d2518d7 100644
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -819,7 +819,7 @@ PluginView::PluginView(Frame* parentFrame, const IntSize& size, PluginPackage* p
     , m_eventModel(NPEventModel(-1))
 #endif
 #if defined(Q_WS_X11) && ENABLE(NETSCAPE_PLUGIN_API)
-    , m_hasPendingGeometryChange(false)
+    , m_hasPendingGeometryChange(true)
     , m_drawable(0)
     , m_visual(0)
     , m_colormap(0)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f018a33..d1fad4b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-11  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Implement the functionality needed by plugins/window-open.html
+
+        * DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (webkit_test_plugin_new_instance):
+        (webkit_test_plugin_set_window):
+
 2009-11-11  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
index 6c62a7c..3fd755a 100644
--- a/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -75,7 +75,8 @@ 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)
+                obj->testWindowOpen = TRUE;
         }
 
         instance->pdata = obj;
@@ -117,6 +118,12 @@ webkit_test_plugin_set_window(NPP instance, NPWindow *window)
             pluginLog(instance, "NPP_SetWindow: %d %d", (int)window->width, (int)window->height);
             obj->logSetWindow = false;
         }
+
+        if (obj->testWindowOpen) {
+            testWindowOpen(instance);
+            obj->testWindowOpen = FALSE;
+        }
+
     }
 
     return NPERR_NO_ERROR;

-- 
WebKit Debian packaging