[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 59f5c4f405ec1b2aa46d71f1b760004787e78a23
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 13:18:37 2009 +0000

    2009-10-16  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Need a way to inform the application when a Netscape plugin is created or deleted
            https://bugs.webkit.org/show_bug.cgi?id=30179
    
            Inform the application when a plugin is created or destroyed, but only if the
            application registered for these notifications.
    
            * plugins/symbian/PluginViewSymbian.cpp:
            (WebCore::PluginView::platformStart):
            (WebCore::PluginView::platformDestroy):
    2009-10-16  Yael Aharon  <yael.aharon at nokia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Need a way to inform the application when a Netscape plugin is created or deleted
            https://bugs.webkit.org/show_bug.cgi?id=30179
    
            Added "c" style static methods for the application to hook up for
            receiving notifications when a plugin is created or destroyed.
    
            * Api/qwebpage.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0c9a0ad..66b814c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-16  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Need a way to inform the application when a Netscape plugin is created or deleted
+        https://bugs.webkit.org/show_bug.cgi?id=30179
+
+        Inform the application when a plugin is created or destroyed, but only if the 
+        application registered for these notifications.
+
+        * plugins/symbian/PluginViewSymbian.cpp:
+        (WebCore::PluginView::platformStart):
+        (WebCore::PluginView::platformDestroy):
+
 2009-10-16  Shu Chang  <Chang.Shu at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/plugins/symbian/PluginViewSymbian.cpp b/WebCore/plugins/symbian/PluginViewSymbian.cpp
index 14e25b1..972a211 100644
--- a/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -74,6 +74,12 @@ namespace WebCore {
 
 using namespace HTMLNames;
 
+typedef void (*_qt_page_plugin_created)(QWebFrame* frame, void* plugin);
+extern _qt_page_plugin_created qt_page_plugin_created;
+
+typedef void (*_qt_page_plugin_destroyed)(void* plugin);
+extern _qt_page_plugin_destroyed qt_page_plugin_destroyed;
+
 void PluginView::updatePluginWidget()
 {
     if (!parent())
@@ -442,12 +448,18 @@ bool PluginView::platformStart()
         m_npWindow.window = 0; // Not used?
     }    
     setNPWindowIfNeeded();
-    
+
+    if (qt_page_plugin_created)
+        qt_page_plugin_created(QWebFramePrivate::kit(m_parentFrame), m_instance->pdate);
+
     return true;
 }
 
 void PluginView::platformDestroy()
 {
+    if (qt_page_plugin_destroyed)
+        qt_page_plugin_destroyed(m_instance->pdate);
+
     delete platformPluginWidget();
 }
 
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index e3dc11f..0269101 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -109,6 +109,12 @@
 
 using namespace WebCore;
 
+typedef void (*_qt_page_plugin_created)(QWebFrame* frame, void* plugin);
+QWEBKIT_EXPORT _qt_page_plugin_created qt_page_plugin_created = 0;
+
+typedef void (*_qt_page_plugin_destroyed)(void* plugin);
+QWEBKIT_EXPORT _qt_page_plugin_destroyed qt_page_plugin_destroyed = 0;
+
 void QWEBKIT_EXPORT qt_drt_overwritePluginDirectories()
 {
     PluginDatabase* db = PluginDatabase::installedPlugins(/* populate */ false);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b8efa78..e84749d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-16  Yael Aharon  <yael.aharon at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Need a way to inform the application when a Netscape plugin is created or deleted
+        https://bugs.webkit.org/show_bug.cgi?id=30179
+
+        Added "c" style static methods for the application to hook up for
+        receiving notifications when a plugin is created or destroyed.
+
+        * Api/qwebpage.cpp:
+
 2009-10-15  Antonio Gomes  <tonikitoo at webkit.org>
 
         Rubberstamped by Tor Arne.

-- 
WebKit Debian packaging