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

aroben at apple.com aroben at apple.com
Wed Dec 22 15:01:52 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit aff4375341134291710c07e4a28a9366784612ae
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 16:12:20 2010 +0000

    Check in file I forgot in r70653
    
    * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
    (NP_Initialize): Save the NPPluginFuncs struct the browser passed to us
    so we can be naughty and modify it later.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70655 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b674b0f..5e0c005 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
 2010-10-27  Adam Roben  <aroben at apple.com>
 
+        Check in file I forgot in r70653
+
+        * DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:
+        (NP_Initialize): Save the NPPluginFuncs struct the browser passed to us
+        so we can be naughty and modify it later.
+
+2010-10-27  Adam Roben  <aroben at apple.com>
+
         Test that WebKit doesn't crash if the plugin passes 0 for its
         NPP_GetValue pointer
 
diff --git a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
index c312375..66f6831 100644
--- a/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
+++ b/WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp
@@ -386,6 +386,7 @@ NP_Initialize (NPNetscapeFuncs *aMozillaVTable, NPPluginFuncs *aPluginVTable)
         return NPERR_INVALID_FUNCTABLE_ERROR;
 
     browser = aMozillaVTable;
+    pluginFunctions = aPluginVTable;
 
         aPluginVTable->size           = sizeof (NPPluginFuncs);
         aPluginVTable->version        = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list