Add an argument to pass the link text in the hovering signal

Signed-off-by: Simon Hausmann <hausmann@kde.org>
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27919 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 20356d2a8c18eb838412d9a0568b5bd45da0fdb3..8d8e842ff27fb127c66205f4d983c691fb9f4717 100644 (file)
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -83,7 +83,7 @@ signals:
     void loadDone(bool ok);
     void provisionalLoad();
     void titleChanged(const QString &title);
-    void hoveringOverLink(const QString &link, const QString &title);
+    void hoveringOverLink(const QString &link, const QString &title, const QString &textContent);
 
 private:
     friend class QWebPage;

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 98fd3951529b7fe3f006c61738fef6f9d52be8e4..ec3dfff46fecf53c9086d64a722b1aecd4fa8c7c 100644 (file)
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -127,8 +127,8 @@ void QWebPagePrivate::createMainFrame()
         mainFrame = new QWebFrame(q, &frameData);
         QObject::connect(mainFrame, SIGNAL(titleChanged(const QString&)),
                 q, SIGNAL(titleChanged(const QString&)));
-        QObject::connect(mainFrame, SIGNAL(hoveringOverLink(const QString&, const QString&)),
-                q, SIGNAL(hoveringOverLink(const QString&, const QString&)));
+        QObject::connect(mainFrame, SIGNAL(hoveringOverLink(const QString&, const QString&, const QString&)),
+                q, SIGNAL(hoveringOverLink(const QString&, const QString&, const QString&)));
         
         mainFrame->d->frameView->setFrameGeometry(q->geometry());
 
@@ -860,7 +860,7 @@ void QWebPage::mouseMoveEvent(QMouseEvent *ev)
     WebCore::Element *link = result.URLElement();
     if (link != frame->lastHoverElement) {
         frame->lastHoverElement = link;
-        emit hoveringOverLink(result.absoluteLinkURL().prettyURL(), result.title());
+        emit hoveringOverLink(result.absoluteLinkURL().prettyURL(), result.title(), result.textContent());
     }
 }
 

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 68a351db7f478f532a70daddd41289457b9f9264..082a4ae53efa01117de383c344242d634a106d2b 100644 (file)
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -204,10 +204,10 @@ signals:
     /**
      * Signal is emitted when the mouse is hovering over a link.
      * The first parameter is the link url, the second is the link title
-     * if any. Method is emitter with both empty parameters when the mouse
-     * isn't hovering over any link element.
+     * if any, and third is the text content. Method is emitter with both
+     * empty parameters when the mouse isn't hovering over any link element.
      */
-    void hoveringOverLink(const QString &link, const QString &title);
+    void hoveringOverLink(const QString &link, const QString &title, const QString &textContent);
     /**
      * Signal is emitted when the statusbar text is changed by the page.
      */

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8dcaefe64fe367b1bc60dab771522f5ed6509471..615d60d10236d10f6e577a676498ad4fbacf910b 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2007-11-20  George Staikos  <staikos@kde.org>
+
+        Reviewed by Simon Hausmann <hausmann@kde.org>.
+
+        Add an argument to pass the link text in the hovering signal
+        
+
+        * Api/qwebframe.h:
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::createMainFrame):
+        (QWebPage::mouseMoveEvent):
+        * Api/qwebpage.h:
+
 2007-11-20  Adam Treat  <treat@kde.org>
 
         Reviewed by Simon and George.