[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
vestbo at webkit.org
vestbo at webkit.org
Thu Dec 3 13:29:16 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 06ffab27e61c17f77a4a35b593d3f7dfe19f9fa3
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 9 13:06:42 2009 +0000
Added QGraphicsWebView::pageAction() and triggerPageAction(), for
consistency with QWebView.
Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-04
Reviewed by Tor Arne Vestbø.
* Api/qgraphicswebview.cpp:
(QGraphicsWebView::pageAction):
(QGraphicsWebView::triggerPageAction):
* Api/qgraphicswebview.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50648 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/Api/qgraphicswebview.cpp b/WebKit/qt/Api/qgraphicswebview.cpp
index 35a1c1a..2edf30f 100644
--- a/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/WebKit/qt/Api/qgraphicswebview.cpp
@@ -600,6 +600,25 @@ QWebSettings* QGraphicsWebView::settings() const
return page()->settings();
}
+/*!
+ Returns a pointer to a QAction that encapsulates the specified web action \a action.
+*/
+QAction *QGraphicsWebView::pageAction(QWebPage::WebAction action) const
+{
+ return page()->action(action);
+}
+
+/*!
+ Triggers the specified \a action. If it is a checkable action the specified
+ \a checked state is assumed.
+
+ \sa pageAction()
+*/
+void QGraphicsWebView::triggerPageAction(QWebPage::WebAction action, bool checked)
+{
+ page()->triggerAction(action, checked);
+}
+
/*! \reimp
*/
void QGraphicsWebView::hoverMoveEvent(QGraphicsSceneHoverEvent* ev)
diff --git a/WebKit/qt/Api/qgraphicswebview.h b/WebKit/qt/Api/qgraphicswebview.h
index f538f40..dcf4041 100644
--- a/WebKit/qt/Api/qgraphicswebview.h
+++ b/WebKit/qt/Api/qgraphicswebview.h
@@ -21,6 +21,7 @@
#define QGraphicsWebView_h
#include "qwebkitglobal.h"
+#include "qwebpage.h"
#include <QtCore/qurl.h>
#include <QtGui/qevent.h>
#include <QtGui/qgraphicswidget.h>
@@ -73,6 +74,9 @@ public:
QWebHistory* history() const;
QWebSettings* settings() const;
+ QAction* pageAction(QWebPage::WebAction action) const;
+ void triggerPageAction(QWebPage::WebAction action, bool checked = false);
+
virtual void setGeometry(const QRectF& rect);
virtual void updateGeometry();
virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = 0);
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 71dcbda..23de9bf 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Tor Arne Vestbø.
+ Added QGraphicsWebView::pageAction() and triggerPageAction(), for
+ consistency with QWebView.
+
+ * Api/qgraphicswebview.cpp:
+ (QGraphicsWebView::pageAction):
+ (QGraphicsWebView::triggerPageAction):
+ * Api/qgraphicswebview.h:
+
+2009-11-04 Simon Hausmann <hausmann at webkit.org>
+
+ Reviewed by Tor Arne Vestbø.
+
Removed QGraphicsWebView::toHtml() after API review.
That's consistent with QWebView and also based on the assumption that
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list