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

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 87c38eeb295a12975635d4f9529a9e6abf79a045
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 15:58:18 2009 +0000

    Pull out r49676 as it caused build breakges on Symbian
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22b7b50..54d56da 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
+        Pull out r49676 as it caused build breakges on Symbian
+
+        * plugins/symbian/PluginViewSymbian.cpp:
+
+2009-10-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
         Reviewed by Ariya Hidayat.
 
         Crash fix when loading NPAPI plugins on Qt/Mac
diff --git a/WebCore/plugins/symbian/PluginViewSymbian.cpp b/WebCore/plugins/symbian/PluginViewSymbian.cpp
index 972a211..14e25b1 100644
--- a/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -74,12 +74,6 @@ 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())
@@ -448,18 +442,12 @@ 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 0269101..e3dc11f 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -109,12 +109,6 @@
 
 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 e84749d..6b91445 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-16  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Pull out r49676 as it caused build breakges on Symbian
+
+        * Api/qwebpage.cpp:
+
 2009-10-16  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by Tor Arne Vestbø.

-- 
WebKit Debian packaging