Title: [103093] trunk/Source/WebKit2
- Revision
- 103093
- Author
- commit-qu...@webkit.org
- Date
- 2011-12-16 12:41:09 -0800 (Fri, 16 Dec 2011)
Log Message
[Qt][WK2] Move webView.page into experimental
https://bugs.webkit.org/show_bug.cgi?id=74406
Patch by Rafael Brandao <rafael.l...@openbossa.org> on 2011-12-16
Reviewed by Simon Hausmann.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewExperimental::page):
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
(tst_QQuickWebView::accessPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (103092 => 103093)
--- trunk/Source/WebKit2/ChangeLog 2011-12-16 20:24:02 UTC (rev 103092)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-16 20:41:09 UTC (rev 103093)
@@ -1,3 +1,16 @@
+2011-12-16 Rafael Brandao <rafael.l...@openbossa.org>
+
+ [Qt][WK2] Move webView.page into experimental
+ https://bugs.webkit.org/show_bug.cgi?id=74406
+
+ Reviewed by Simon Hausmann.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewExperimental::page):
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp:
+ (tst_QQuickWebView::accessPage):
+
2011-12-16 Mark Hahnenberg <mhahnenb...@apple.com>
De-virtualize destructors
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (103092 => 103093)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-16 20:24:02 UTC (rev 103092)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-16 20:41:09 UTC (rev 103093)
@@ -670,6 +670,11 @@
return m_viewportInfo;
}
+QQuickWebPage* QQuickWebViewExperimental::page()
+{
+ return q_ptr->page();
+}
+
QQuickWebView::QQuickWebView(QQuickItem* parent)
: QQuickItem(parent)
, d_ptr(new QQuickWebViewPrivate(this))
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (103092 => 103093)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-16 20:24:02 UTC (rev 103092)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-16 20:41:09 UTC (rev 103093)
@@ -58,7 +58,6 @@
Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY navigationStateChanged FINAL)
Q_PROPERTY(bool loading READ loading NOTIFY navigationStateChanged FINAL)
Q_PROPERTY(bool canReload READ canReload NOTIFY navigationStateChanged FINAL)
- Q_PROPERTY(QQuickWebPage* page READ page CONSTANT FINAL)
Q_ENUMS(NavigationRequestAction)
Q_ENUMS(ErrorType)
@@ -166,6 +165,7 @@
class QWEBKIT_EXPORT QQuickWebViewExperimental : public QObject {
Q_OBJECT
+ Q_PROPERTY(QQuickWebPage* page READ page CONSTANT FINAL)
Q_PROPERTY(QWebNavigationHistory* navigationHistory READ navigationHistory CONSTANT FINAL)
Q_PROPERTY(QDeclarativeComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)
Q_PROPERTY(QDeclarativeComponent* confirmDialog READ confirmDialog WRITE setConfirmDialog NOTIFY confirmDialogChanged)
@@ -193,6 +193,7 @@
QWebPreferences* preferences() const;
bool useTraditionalDesktopBehaviour() const;
QWebNavigationHistory* navigationHistory() const;
+ QQuickWebPage* page();
public Q_SLOTS:
void setUseTraditionalDesktopBehaviour(bool enable);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp (103092 => 103093)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2011-12-16 20:24:02 UTC (rev 103092)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/tst_qquickwebview.cpp 2011-12-16 20:41:09 UTC (rev 103093)
@@ -82,7 +82,7 @@
{
QQuickWebPage* const pageDirectAccess = webView()->page();
- QVariant pagePropertyValue = webView()->property("page");
+ QVariant pagePropertyValue = webView()->experimental()->property("page");
QQuickWebPage* const pagePropertyAccess = pagePropertyValue.value<QQuickWebPage*>();
QCOMPARE(pagePropertyAccess, pageDirectAccess);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
