[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 4968ba6194b5539626e0c9c1c0d5c0bea20287f9
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 3 15:26:55 2010 +0000

    [Qt] Platform plugin interface for Haptics
    https://bugs.webkit.org/show_bug.cgi?id=43143
    
    Patch by Kim Grönholm <kim.1.gronholm at nokia.com> on 2010-08-03
    Reviewed by Simon Hausmann.
    
    Platform plugin interface for playing haptic feedback
    
    * Api/qwebkitplatformplugin.h:
    (QWebHapticFeedbackPlayer::):
    (QWebKitPlatformPlugin::):
    * examples/platformplugin/WebPlugin.h:
    (WebPlugin::createHapticFeedbackPlayer):
    * examples/platformplugin/qwebkitplatformplugin.h:
    (QWebHapticFeedbackPlayer::):
    (QWebKitPlatformPlugin::):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64557 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebkitplatformplugin.h b/WebKit/qt/Api/qwebkitplatformplugin.h
index 32d22d4..3c56c98 100644
--- a/WebKit/qt/Api/qwebkitplatformplugin.h
+++ b/WebKit/qt/Api/qwebkitplatformplugin.h
@@ -81,6 +81,20 @@ Q_SIGNALS:
     void notificationClosed();
 };
 
+class QWebHapticFeedbackPlayer
+{
+public:
+    enum HapticStrength {
+        None, Weak, Medium, Strong
+    };
+
+    enum HapticEvent {
+        Press, Release
+    };
+
+    virtual void playHapticFeedback(const HapticEvent, const QString& hapticType, const HapticStrength) = 0;
+};
+
 class QWebKitPlatformPlugin
 {
 public:
@@ -88,15 +102,17 @@ public:
 
     enum Extension {
         MultipleSelections,
-        Notifications
+        Notifications,
+        Haptics
     };
 
     virtual bool supportsExtension(Extension extension) const = 0;
     virtual QWebSelectMethod* createSelectInputMethod() const = 0;
     virtual QWebNotificationPresenter* createNotificationPresenter() const = 0;
+    virtual QWebHapticFeedbackPlayer* createHapticFeedbackPlayer() const = 0;
 
 };
 
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.2");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.3");
 
 #endif // QWEBKITPLATFORMPLUGIN_H
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b49385a..4a70c4c 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-03  Kim Grönholm  <kim.1.gronholm at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Platform plugin interface for Haptics
+        https://bugs.webkit.org/show_bug.cgi?id=43143
+
+        Platform plugin interface for playing haptic feedback
+
+        * Api/qwebkitplatformplugin.h:
+        (QWebHapticFeedbackPlayer::):
+        (QWebKitPlatformPlugin::):
+        * examples/platformplugin/WebPlugin.h:
+        (WebPlugin::createHapticFeedbackPlayer):
+        * examples/platformplugin/qwebkitplatformplugin.h:
+        (QWebHapticFeedbackPlayer::):
+        (QWebKitPlatformPlugin::):
+
 2010-07-27  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebKit/qt/examples/platformplugin/WebPlugin.h b/WebKit/qt/examples/platformplugin/WebPlugin.h
index 9a99d0b..4af19f9 100644
--- a/WebKit/qt/examples/platformplugin/WebPlugin.h
+++ b/WebKit/qt/examples/platformplugin/WebPlugin.h
@@ -92,6 +92,9 @@ public:
     virtual QWebNotificationPresenter* createNotificationPresenter() const {
         return new WebNotificationPresenter();
     }
+    virtual QWebHapticFeedbackPlayer* createHapticFeedbackPlayer() const {
+        return 0;
+    }
 };
 
 #endif // WEBPLUGIN_H
diff --git a/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h b/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
index 32d22d4..3c56c98 100644
--- a/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
+++ b/WebKit/qt/examples/platformplugin/qwebkitplatformplugin.h
@@ -81,6 +81,20 @@ Q_SIGNALS:
     void notificationClosed();
 };
 
+class QWebHapticFeedbackPlayer
+{
+public:
+    enum HapticStrength {
+        None, Weak, Medium, Strong
+    };
+
+    enum HapticEvent {
+        Press, Release
+    };
+
+    virtual void playHapticFeedback(const HapticEvent, const QString& hapticType, const HapticStrength) = 0;
+};
+
 class QWebKitPlatformPlugin
 {
 public:
@@ -88,15 +102,17 @@ public:
 
     enum Extension {
         MultipleSelections,
-        Notifications
+        Notifications,
+        Haptics
     };
 
     virtual bool supportsExtension(Extension extension) const = 0;
     virtual QWebSelectMethod* createSelectInputMethod() const = 0;
     virtual QWebNotificationPresenter* createNotificationPresenter() const = 0;
+    virtual QWebHapticFeedbackPlayer* createHapticFeedbackPlayer() const = 0;
 
 };
 
-Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.2");
+Q_DECLARE_INTERFACE(QWebKitPlatformPlugin, "com.nokia.Qt.WebKit.PlatformPlugin/1.3");
 
 #endif // QWEBKITPLATFORMPLUGIN_H

-- 
WebKit Debian packaging