Changeset 68204 in webkit

Timestamp:

Sep 23, 2010 3:08:51 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-09-23 Ademar de Souza Reis Jr <Ademar Reis>

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:

Location:

trunk/WebKit/qt

Files:

• Api/qwebkitplatformplugin.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• WebCoreSupport/QtPlatformPlugin.cpp (modified) (1 diff)
• WebCoreSupport/QtPlatformPlugin.h (modified) (2 diffs)

trunk/WebKit/qt/Api/qwebkitplatformplugin.h

@@ -85 +85 @@
 };
 
-class QWebHapticFeedbackPlayer
+class QWebHapticFeedbackPlayer: public QObject
 {
+    Q_OBJECT
 public:
+    QWebHapticFeedbackPlayer() {}
+    virtual ~QWebHapticFeedbackPlayer() {}
+
     enum HapticStrength {
         None, Weak, Medium, Strong

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-09-23  Ademar de Souza Reis Jr  <ademar.reis@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@chromium.org>
 

trunk/WebKit/qt/WebCoreSupport/QtPlatformPlugin.cpp

@@ -102 +102 @@
 }
 
+QWebHapticFeedbackPlayer* QtPlatformPlugin::createHapticFeedbackPlayer()
+{
+    QWebKitPlatformPlugin* p = plugin();
+    return p ? qobject_cast<QWebHapticFeedbackPlayer*>(p->createExtension(QWebKitPlatformPlugin::Haptics)) : 0;
 }
+
+}

trunk/WebKit/qt/WebCoreSupport/QtPlatformPlugin.h

@@ -27 +27 @@
 class QWebKitPlatformPlugin;
 class QWebNotificationPresenter;
+class QWebHapticFeedbackPlayer;
 class QWebSelectData;
 
@@ -38 +39 @@
     QWebSelectMethod* createSelectInputMethod();
     QWebNotificationPresenter* createNotificationPresenter();
+    QWebHapticFeedbackPlayer* createHapticFeedbackPlayer();
 
     QWebKitPlatformPlugin* plugin();