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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit efc313a7fc1bd84bed800a9748d9a06bfaabed42
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 15:18:55 2010 +0000

    Teach WindowGeometryInitializedBeforeSetWindow that NPP_SetWindow can be called more than once
    
    The NPP_SetWindow call made when the plugin is torn down was confusing
    us, and was causing us to spew an error into the next test.
    
    Fixes <http://webkit.org/b/46900> <rdar://problem/8496888> REGRESSION
    (r68520): plugins/access-after-page-destroyed.html failing on Windows
    
    Reviewed by Anders Carlsson.
    
    * DumpRenderTree/TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp:
    (WindowGeometryInitializedBeforeSetWindow::WindowGeometryInitializedBeforeSetWindow):
    Initialize member.
    (WindowGeometryInitializedBeforeSetWindow::NPP_SetWindow): Bail if
    this isn't the first time this is called.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68785 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 98e2211..47ade4d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-30  Adam Roben  <aroben at apple.com>
+
+        Teach WindowGeometryInitializedBeforeSetWindow that NPP_SetWindow can
+        be called more than once
+
+        The NPP_SetWindow call made when the plugin is torn down was confusing
+        us, and was causing us to spew an error into the next test.
+
+        Fixes <http://webkit.org/b/46900> <rdar://problem/8496888> REGRESSION
+        (r68520): plugins/access-after-page-destroyed.html failing on Windows
+
+        Reviewed by Anders Carlsson.
+
+        * DumpRenderTree/TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp:
+        (WindowGeometryInitializedBeforeSetWindow::WindowGeometryInitializedBeforeSetWindow):
+        Initialize member.
+        (WindowGeometryInitializedBeforeSetWindow::NPP_SetWindow): Bail if
+        this isn't the first time this is called.
+
 2010-09-30  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
index 40bceb9..8054497 100644
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
@@ -35,12 +35,17 @@ class WindowGeometryInitializedBeforeSetWindow : public PluginTest {
 public:
     WindowGeometryInitializedBeforeSetWindow(NPP npp, const string& identifier)
         : PluginTest(npp, identifier)
+        , m_didReceiveInitialSetWindowCall(false)
     {
     }
 
 private:
     virtual NPError NPP_SetWindow(NPP instance, NPWindow* window)
     {
+        if (m_didReceiveInitialSetWindowCall)
+            return NPERR_NO_ERROR;
+        m_didReceiveInitialSetWindowCall = true;
+
         if (window->type != NPWindowTypeWindow) {
             pluginLog(instance, "window->type should be NPWindowTypeWindow but was %d", window->type);
             return NPERR_GENERIC_ERROR;
@@ -77,7 +82,9 @@ private:
 
         pluginLog(instance, "Plugin's HWND has been sized and positioned before NPP_SetWindow was called");
         return NPERR_NO_ERROR;
-    }        
+    }
+
+    bool m_didReceiveInitialSetWindowCall;
 };
 
 static PluginTest::Register<WindowGeometryInitializedBeforeSetWindow> windowGeometryInitializedBeforeSetWindow("window-geometry-initialized-before-set-window");

-- 
WebKit Debian packaging