[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 3eb7597945572f9e6c4cab729bc4780b823ad73c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 13 15:45:39 2011 +0000

    2011-01-13  Viatcheslav Ostapenko  <ostapenko.viatcheslav at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Need a way to inform the application when a Netscape plugin is created.
            https://bugs.webkit.org/show_bug.cgi?id=30179
    
            Added "c" style static method for the application to hook up for
            receiving notifications when a plugin is created.
    
            * plugins/symbian/PluginViewSymbian.cpp:
            (qtwebkit_setPluginCreatedCallback):
            (WebCore::PluginView::platformStart):
    2011-01-13  Viatcheslav Ostapenko  <ostapenko.viatcheslav at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Need a way to inform the application when a Netscape plugin is created.
            https://bugs.webkit.org/show_bug.cgi?id=30179
    
            Added "c" style static method for the application to hook up for
            receiving notifications when a plugin is created.
    
            * symbian/bwins/QtWebKitu.def:
            * symbian/eabi/QtWebKitu.def:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 7715eaf..f52b214 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-13  Viatcheslav Ostapenko  <ostapenko.viatcheslav at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Need a way to inform the application when a Netscape plugin is created.
+        https://bugs.webkit.org/show_bug.cgi?id=30179
+
+        Added "c" style static method for the application to hook up for
+        receiving notifications when a plugin is created.
+
+        * plugins/symbian/PluginViewSymbian.cpp:
+        (qtwebkit_setPluginCreatedCallback):
+        (WebCore::PluginView::platformStart):
+
 2011-01-13  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
index df4e9f6..1e5b26f 100644
--- a/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/Source/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -53,6 +53,8 @@
 #include "npinterface.h"
 #include "npruntime_impl.h"
 #include "qgraphicswebview.h"
+#include "qwebframe.h"
+#include "qwebframe_p.h"
 #include "runtime_root.h"
 #include <QGraphicsProxyWidget>
 #include <QKeyEvent>
@@ -63,6 +65,13 @@
 #include <runtime/JSLock.h>
 #include <runtime/JSValue.h>
 
+typedef void (*_qtwebkit_page_plugin_created)(QWebFrame*, void*, void*); // frame, plugin instance, plugin functions
+static _qtwebkit_page_plugin_created qt_page_plugin_created = 0;
+QWEBKIT_EXPORT void qtwebkit_setPluginCreatedCallback(_qtwebkit_page_plugin_created cb)
+{
+    qtwebkit_page_plugin_created = cb;
+}
+
 using JSC::ExecState;
 using JSC::Interpreter;
 using JSC::JSLock;
@@ -415,7 +424,10 @@ bool PluginView::platformStart()
     }    
     updatePluginWidget();
     setNPWindowIfNeeded();
-    
+
+    if (qtwebkit_page_plugin_created)
+        qtwebkit_page_plugin_created(QWebFramePrivate::kit(m_parentFrame.get()), m_instance, (void*)(m_plugin->pluginFuncs()));
+
     return true;
 }
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index bf20eaf..4169459 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-13  Viatcheslav Ostapenko  <ostapenko.viatcheslav at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Need a way to inform the application when a Netscape plugin is created.
+        https://bugs.webkit.org/show_bug.cgi?id=30179
+
+        Added "c" style static method for the application to hook up for
+        receiving notifications when a plugin is created.
+
+        * symbian/bwins/QtWebKitu.def:
+        * symbian/eabi/QtWebKitu.def:
+
 2011-01-13  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/symbian/bwins/QtWebKitu.def b/WebKit/qt/symbian/bwins/QtWebKitu.def
index 0f4e4b2..f1a545e 100644
--- a/WebKit/qt/symbian/bwins/QtWebKitu.def
+++ b/WebKit/qt/symbian/bwins/QtWebKitu.def
@@ -650,4 +650,4 @@ EXPORTS
 	?setResizesToContents at QGraphicsWebView@@QAEX_N at Z @ 649 NONAME ; void QGraphicsWebView::setResizesToContents(bool)
 	?setTiledBackingStoreFrozen at QGraphicsWebView@@QAEX_N at Z @ 650 NONAME ; void QGraphicsWebView::setTiledBackingStoreFrozen(bool)
 	?qtwebkit_webframe_scrollOverflow@@YA_NPAVQWebFrame@@HHABVQPoint@@@Z @ 651 NONAME ; bool qtwebkit_webframe_scrollOverflow(QWebFrame *, int, int, const QPoint&)
-
+        ?qtwebkit_setPluginCreatedCallback@@YAXP6AXPAVQWebFrame@@PAX1 at Z@Z @ 652 NONAME ; void qtwebkit_setPluginCreatedCallback(void (*)(class QWebFrame *, void *, void *))
diff --git a/WebKit/qt/symbian/eabi/QtWebKitu.def b/WebKit/qt/symbian/eabi/QtWebKitu.def
index 23edc58..1e06c11 100644
--- a/WebKit/qt/symbian/eabi/QtWebKitu.def
+++ b/WebKit/qt/symbian/eabi/QtWebKitu.def
@@ -835,4 +835,4 @@ EXPORTS
 	_ZN8QWebPage20setFeaturePermissionEP9QWebFrameNS_7FeatureENS_16PermissionPolicyE @ 834 NONAME
 	_ZN8QWebPage26featurePermissionRequestedEP9QWebFrameNS_7FeatureE @ 835 NONAME
 	_ZN8QWebPage32featurePermissionRequestCanceledEP9QWebFrameNS_7FeatureE @ 836 NONAME
-
+        _Z33qtwebkit_setPluginCreatedCallbackPFvP9QWebFramePvS1_E @ 837 NONAME

-- 
WebKit Debian packaging