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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c1f1cea372d728e2f6dfcd6d727ee8a6a7bc9b32
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 23 22:08:51 2010 +0000

    2010-09-23  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Fix QWebHapticFeedbackPlayer exposure via QWebKitPlatformPlugin
    
            [Qt] QWebHapticFeedbackPlayer needs correct exposure through QWebKitPlatformPlugin
            https://bugs.webkit.org/show_bug.cgi?id=46402
    
            QWebHapticFeedbackPlayer is exported through
            QWebKitPlatformPlugin::createExtension(), but
            createHapticFeedbackPlayer() and the correct
            inheritage are missing.
    
            * Api/qwebkitplatformplugin.h:
            * WebCoreSupport/QtPlatformPlugin.cpp:
            (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer):
            * WebCoreSupport/QtPlatformPlugin.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68204 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebkitplatformplugin.h b/WebKit/qt/Api/qwebkitplatformplugin.h
index faa6989..a851d56 100644
--- a/WebKit/qt/Api/qwebkitplatformplugin.h
+++ b/WebKit/qt/Api/qwebkitplatformplugin.h
@@ -84,9 +84,13 @@ Q_SIGNALS:
     void notificationClicked();
 };
 
-class QWebHapticFeedbackPlayer
+class QWebHapticFeedbackPlayer: public QObject
 {
+    Q_OBJECT
 public:
+    QWebHapticFeedbackPlayer() {}
+    virtual ~QWebHapticFeedbackPlayer() {}
+
     enum HapticStrength {
         None, Weak, Medium, Strong
     };
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 50da0d6..08052c5 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-23  Ademar de Souza Reis Jr  <ademar.reis at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix QWebHapticFeedbackPlayer exposure via QWebKitPlatformPlugin
+
+        [Qt] QWebHapticFeedbackPlayer needs correct exposure through QWebKitPlatformPlugin
+        https://bugs.webkit.org/show_bug.cgi?id=46402
+
+        QWebHapticFeedbackPlayer is exported through
+        QWebKitPlatformPlugin::createExtension(), but
+        createHapticFeedbackPlayer() and the correct
+        inheritage are missing.
+
+        * Api/qwebkitplatformplugin.h:
+        * WebCoreSupport/QtPlatformPlugin.cpp:
+        (WebCore::QtPlatformPlugin::createHapticFeedbackPlayer):
+        * WebCoreSupport/QtPlatformPlugin.h:
+
 2010-09-23  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
index 6dd91a1..1f91d8c 100644
--- a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
+++ b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp
@@ -101,4 +101,10 @@ QWebNotificationPresenter* QtPlatformPlugin::createNotificationPresenter()
     return p ? qobject_cast<QWebNotificationPresenter*>(p->createExtension(QWebKitPlatformPlugin::Notifications)) : 0;
 }
 
+QWebHapticFeedbackPlayer* QtPlatformPlugin::createHapticFeedbackPlayer()
+{
+    QWebKitPlatformPlugin* p = plugin();
+    return p ? qobject_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0;
+}
+
 }
diff --git a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
index 9bdab75..a3e50c2 100644
--- a/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
+++ b/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h
@@ -26,6 +26,7 @@
 class QWebSelectMethod;
 class QWebKitPlatformPlugin;
 class QWebNotificationPresenter;
+class QWebHapticFeedbackPlayer;
 class QWebSelectData;
 
 namespace WebCore {
@@ -37,6 +38,7 @@ public:
 
     QWebSelectMethod* createSelectInputMethod();
     QWebNotificationPresenter* createNotificationPresenter();
+    QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
 
     QWebKitPlatformPlugin* plugin();
 

-- 
WebKit Debian packaging