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

[hausmann at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit dfbbb44c850b2a3ab0a97186ff055abdcafe09c9
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 4 08:09:12 2010 +0000

    [Qt] Fix platform plugin support after r68128
    
    Rubber-stamped by Tor Arne Vestbø.
    
    Replaced the qobject_cast from the QObject derived extension to a
    static_cast. qobject_cast works by comparing pointers to meta-object
    instances, of which there are two each: one compiled into WebKit and
    one compiled into the plugin.
    
    The platform plugin ensures the validity of the interface contract
    through its version and the initial safe qobject_cast from QObject
    to QWebKitPlatformPlugin. After that it is safe to use static_cast,
    and with the recent changes even required.
    
    * WebCoreSupport/QtPlatformPlugin.cpp:
    (WebCore::QtPlatformPlugin::createSelectInputMethod):
    (WebCore::QtPlatformPlugin::createNotificationPresenter):
    (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b7ce89c..cf4e8a6 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-04  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Rubber-stamped by Tor Arne Vestbø.
+
+        [Qt] Fix platform plugin support after r68128
+
+        Replaced the qobject_cast from the QObject derived extension to a
+        static_cast. qobject_cast works by comparing pointers to meta-object
+        instances, of which there are two each: one compiled into WebKit and
+        one compiled into the plugin.
+
+        The platform plugin ensures the validity of the interface contract
+        through its version and the initial safe qobject_cast from QObject
+        to QWebKitPlatformPlugin. After that it is safe to use static_cast,
+        and with the recent changes even required.
+
+        * WebCoreSupport/QtPlatformPlugin.cpp:
+        (WebCore::QtPlatformPlugin::createSelectInputMethod):
+        (WebCore::QtPlatformPlugin::createNotificationPresenter):
+        (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer):
+
 2010-10-02  Diego Gonzalez  <diegohcg at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
index 1f91d8c..9786967 100644
--- a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
+++ b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
@@ -91,20 +91,20 @@ QWebKitPlatformPlugin* QtPlatformPlugin::plugin()
 QWebSelectMethod* QtPlatformPlugin::createSelectInputMethod()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? qobject_cast<QWebSelectMethod*>(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0;
+    return p ? static_cast<QWebSelectMethod*>(p->createExtension(QWebKitPlatformPlugin::MultipleSelections)) : 0;
 }
 
 
 QWebNotificationPresenter* QtPlatformPlugin::createNotificationPresenter()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? qobject_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0;
+    return p ? static_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0;
 }
 
 QWebHapticFeedbackPlayer* QtPlatformPlugin::createHapticFeedbackPlayer()
 {
     QWebKitPlatformPlugin* p = plugin();
-    return p ? qobject_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0;
+    return p ? static_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0;
 }
 
 }

-- 
WebKit Debian packaging