Title: [102948] trunk/Source/WebKit2
- Revision
- 102948
- Author
- [email protected]
- Date
- 2011-12-15 09:21:56 -0800 (Thu, 15 Dec 2011)
Log Message
[Qt][WK2] Move WebPreferences into experimental
https://bugs.webkit.org/show_bug.cgi?id=74404
Patch by Rafael Brandao <[email protected]> on 2011-12-15
Reviewed by Tor Arne Vestbø.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewExperimental::preferences):
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml:
* UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102947 => 102948)
--- trunk/Source/WebKit2/ChangeLog 2011-12-15 17:09:55 UTC (rev 102947)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-15 17:21:56 UTC (rev 102948)
@@ -1,3 +1,16 @@
+2011-12-15 Rafael Brandao <[email protected]>
+
+ [Qt][WK2] Move WebPreferences into experimental
+ https://bugs.webkit.org/show_bug.cgi?id=74404
+
+ Reviewed by Tor Arne Vestbø.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewExperimental::preferences):
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml:
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml:
+
2011-12-15 Carlos Garcia Campos <[email protected]>
[GTK] Add WebKitWindowProperties to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (102947 => 102948)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-15 17:09:55 UTC (rev 102947)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-15 17:21:56 UTC (rev 102948)
@@ -617,6 +617,14 @@
return d->promptDialog;
}
+QWebPreferences* QQuickWebViewExperimental::preferences() const
+{
+ QQuickWebViewPrivate* const d = d_ptr;
+ if (!d->preferences)
+ d->preferences = adoptPtr(QWebPreferencesPrivate::createPreferences(d));
+ return d->preferences.get();
+}
+
void QQuickWebViewExperimental::setPromptDialog(QDeclarativeComponent* promptDialog)
{
Q_D(QQuickWebView);
@@ -771,14 +779,6 @@
return d->webPageProxy->pageTitle();
}
-QWebPreferences* QQuickWebView::preferences() const
-{
- QQuickWebViewPrivate* const d = d_ptr.data();
- if (!d->preferences)
- d->preferences = adoptPtr(QWebPreferencesPrivate::createPreferences(d));
- return d->preferences.get();
-}
-
QQuickWebViewExperimental* QQuickWebView::experimental() const
{
return m_experimental;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (102947 => 102948)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-15 17:09:55 UTC (rev 102947)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-15 17:21:56 UTC (rev 102948)
@@ -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(QWebPreferences* preferences READ preferences CONSTANT FINAL)
Q_PROPERTY(QQuickWebPage* page READ page CONSTANT FINAL)
Q_ENUMS(NavigationRequestAction)
Q_ENUMS(ErrorType)
@@ -88,7 +87,6 @@
bool loading() const;
bool canReload() const;
- QWebPreferences* preferences() const;
QQuickWebPage* page();
QQuickWebViewExperimental* experimental() const;
@@ -173,6 +171,7 @@
Q_PROPERTY(QDeclarativeComponent* confirmDialog READ confirmDialog WRITE setConfirmDialog NOTIFY confirmDialogChanged)
Q_PROPERTY(QDeclarativeComponent* promptDialog READ promptDialog WRITE setPromptDialog NOTIFY promptDialogChanged)
Q_PROPERTY(QDeclarativeComponent* itemSelector READ itemSelector WRITE setItemSelector NOTIFY itemSelectorChanged)
+ Q_PROPERTY(QWebPreferences* preferences READ preferences CONSTANT FINAL)
Q_PROPERTY(bool useTraditionalDesktopBehaviour READ useTraditionalDesktopBehaviour WRITE setUseTraditionalDesktopBehaviour)
Q_PROPERTY(QWebViewportInfo* viewportInfo READ viewportInfo CONSTANT FINAL)
@@ -191,6 +190,7 @@
QWebViewportInfo* viewportInfo();
+ QWebPreferences* preferences() const;
bool useTraditionalDesktopBehaviour() const;
QWebNavigationHistory* navigationHistory() const;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml (102947 => 102948)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml 2011-12-15 17:09:55 UTC (rev 102947)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior/tst_messaging.qml 2011-12-15 17:21:56 UTC (rev 102948)
@@ -7,7 +7,7 @@
DesktopWebView {
id: webView
property variant lastMessage
- preferences.navigatorQtObjectEnabled: true
+ experimental.preferences.navigatorQtObjectEnabled: true
experimental.onMessageReceived: {
lastMessage = message
}
@@ -16,7 +16,7 @@
DesktopWebView {
id: otherWebView
property variant lastMessage
- preferences.navigatorQtObjectEnabled: true
+ experimental.preferences.navigatorQtObjectEnabled: true
experimental.onMessageReceived: {
lastMessage = message
}
@@ -25,7 +25,7 @@
DesktopWebView {
id: disabledWebView
property bool receivedMessage
- preferences.navigatorQtObjectEnabled: false
+ experimental.preferences.navigatorQtObjectEnabled: false
experimental.onMessageReceived: {
receivedMessage = true
}
@@ -98,7 +98,7 @@
function test_disabled() {
disabledWebView.load(testUrl)
- verify(!disabledWebView.preferences.navigatorQtObjectEnabled)
+ verify(!disabledWebView.experimental.preferences.navigatorQtObjectEnabled)
disabledWebViewLoadSpy.wait()
disabledWebView.experimental.postMessage("HI")
wait(1000)
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml (102947 => 102948)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml 2011-12-15 17:09:55 UTC (rev 102947)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_preferences.qml 2011-12-15 17:21:56 UTC (rev 102948)
@@ -1,17 +1,16 @@
import QtQuick 2.0
import QtTest 1.0
import QtWebKit 3.0
+import QtWebKit.experimental 3.0
WebView {
id: webView
width: 400
height: 300
- preferences {
- _javascript_Enabled: true
- localStorageEnabled: true
- pluginsEnabled: true
- }
+ experimental.preferences._javascript_Enabled: true
+ experimental.preferences.localStorageEnabled: true
+ experimental.preferences.pluginsEnabled: true
SignalSpy {
id: spy
@@ -23,14 +22,14 @@
name: "WebViewPreferences"
function init() {
- webView.preferences._javascript_Enabled = true
- webView.preferences.localStorageEnabled = true
- webView.preferences.pluginsEnabled = true
+ webView.experimental.preferences._javascript_Enabled = true
+ webView.experimental.preferences.localStorageEnabled = true
+ webView.experimental.preferences.pluginsEnabled = true
spy.clear()
}
function test_javascriptEnabled() {
- webView.preferences._javascript_Enabled = true
+ webView.experimental.preferences._javascript_Enabled = true
var testUrl = Qt.resolvedUrl("../common/_javascript_.html")
webView.load(testUrl)
spy.wait()
@@ -38,7 +37,7 @@
}
function test_javascriptDisabled() {
- webView.preferences._javascript_Enabled = false
+ webView.experimental.preferences._javascript_Enabled = false
var testUrl = Qt.resolvedUrl("../common/_javascript_.html")
webView.load(testUrl)
spy.wait()
@@ -46,7 +45,7 @@
}
function test_localStorageDisabled() {
- webView.preferences.localStorageEnabled = false
+ webView.experimental.preferences.localStorageEnabled = false
var testUrl = Qt.resolvedUrl("../common/localStorage.html")
webView.load(testUrl)
spy.wait()
@@ -54,7 +53,7 @@
}
function test_localStorageEnabled() {
- webView.preferences.localStorageEnabled = true
+ webView.experimental.preferences.localStorageEnabled = true
var testUrl = Qt.resolvedUrl("../common/localStorage.html")
webView.load(testUrl)
spy.wait()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
