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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit addfa8f9ef66562818e2b52d5d4016764d2b4441
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 14 20:49:35 2010 +0000

    Add NetscapePlugin::NPP_ member functions for calling into the plug-in
    https://bugs.webkit.org/show_bug.cgi?id=42287
    
    Reviewed by Sam Weinig.
    
    * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
    (WebKit::NetscapePlugin::NPP_New):
    (WebKit::NetscapePlugin::NPP_Destroy):
    (WebKit::NetscapePlugin::NPP_SetWindow):
    (WebKit::NetscapePlugin::NPP_URLNotify):
    (WebKit::NetscapePlugin::callSetWindow):
    (WebKit::NetscapePlugin::initialize):
    (WebKit::NetscapePlugin::destroy):
    * WebProcess/Plugins/Netscape/NetscapePlugin.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63351 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7458101..874a998 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Sam Weinig.
 
+        Add NetscapePlugin::NPP_ member functions for calling into the plug-in
+        https://bugs.webkit.org/show_bug.cgi?id=42287
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::NPP_New):
+        (WebKit::NetscapePlugin::NPP_Destroy):
+        (WebKit::NetscapePlugin::NPP_SetWindow):
+        (WebKit::NetscapePlugin::NPP_URLNotify):
+        (WebKit::NetscapePlugin::callSetWindow):
+        (WebKit::NetscapePlugin::initialize):
+        (WebKit::NetscapePlugin::destroy):
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+
+2010-07-14  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Send JavaScript url request results back to the plug-in
         https://bugs.webkit.org/show_bug.cgi?id=42277
 
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
index 350c05c..cb6c642 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
@@ -108,6 +108,26 @@ void NetscapePlugin::loadURL(const String& urlString, const String& target, bool
     m_pluginController->loadURL(requestID, urlString, target, allowPopups);
 }
 
+NPError NetscapePlugin::NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* savedData)
+{
+    return m_pluginModule->pluginFuncs().newp(pluginType, &m_npp, mode, argc, argn, argv, savedData);
+}
+    
+NPError NetscapePlugin::NPP_Destroy(NPSavedData** savedData)
+{
+    return m_pluginModule->pluginFuncs().destroy(&m_npp, savedData);
+}
+
+NPError NetscapePlugin::NPP_SetWindow(NPWindow* npWindow)
+{
+    return m_pluginModule->pluginFuncs().setwindow(&m_npp, npWindow);
+}
+
+void NetscapePlugin::NPP_URLNotify(const char* url, NPReason reason, void* notifyData)
+{
+    m_pluginModule->pluginFuncs().urlnotify(&m_npp, url, reason, notifyData);
+}
+
 void NetscapePlugin::callSetWindow()
 {
     m_npWindow.x = m_frameRect.x();
@@ -119,7 +139,7 @@ void NetscapePlugin::callSetWindow()
     m_npWindow.clipRect.bottom = m_clipRect.bottom();
     m_npWindow.clipRect.right = m_clipRect.right();
 
-    m_pluginModule->pluginFuncs().setwindow(&m_npp, &m_npWindow);
+    NPP_SetWindow(&m_npWindow);
 }
 
 bool NetscapePlugin::initialize(PluginController* pluginController, const Parameters& parameters)
@@ -152,8 +172,8 @@ bool NetscapePlugin::initialize(PluginController* pluginController, const Parame
         values.append(paramValues[i].data());
     }
     
-    NPError error = m_pluginModule->pluginFuncs().newp(const_cast<char*>(mimeTypeCString.data()), &m_npp, mode, 
-                                                       names.size(), const_cast<char**>(names.data()), const_cast<char**>(values.data()), 0);
+    NPError error = NPP_New(const_cast<char*>(mimeTypeCString.data()), mode, names.size(),
+                            const_cast<char**>(names.data()), const_cast<char**>(values.data()), 0);
     m_inNPPNew = false;
 
     if (error != NPERR_NO_ERROR)
@@ -176,7 +196,8 @@ void NetscapePlugin::destroy()
 {
     ASSERT(m_isStarted);
 
-    m_pluginModule->pluginFuncs().destroy(&m_npp, 0);
+    NPP_Destroy(0);
+
     m_isStarted = false;
     m_pluginController = 0;
 }
diff --git a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
index 445dea2..16ef13d 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
+++ b/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h
@@ -50,7 +50,13 @@ public:
     void invalidate(const NPRect*);
     const char* userAgent();
     void loadURL(const WebCore::String& urlString, const WebCore::String& target, bool sendNotification, void* notificationData);
-    
+
+    // Member functions for calling into the plug-in.
+    NPError NPP_New(NPMIMEType pluginType, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* savedData);
+    NPError NPP_Destroy(NPSavedData** savedData);
+    NPError NPP_SetWindow(NPWindow*);
+    void NPP_URLNotify(const char* url, NPReason reason, void* notifyData);
+
 private:
     NetscapePlugin(PassRefPtr<NetscapePluginModule> pluginModule);
 

-- 
WebKit Debian packaging