Title: [110047] trunk/Source/WebKit2
- Revision
- 110047
- Author
- [email protected]
- Date
- 2012-03-07 04:28:55 -0800 (Wed, 07 Mar 2012)
Log Message
[Qt] QWebNavigationRequest 'action' property should have an enum type instead of int
https://bugs.webkit.org/show_bug.cgi?id=80164
Reviewed by Simon Hausmann.
Use the appropriate enum type instead of int. Make IgnoreRequest have a bigger
value that give some room for us to put Experimental values in the middle. This
way the Experimental values are in a valid range for the original enumeration. To
avoid confusion, the Experimental enumeration was renamed.
* UIProcess/API/qt/qquickwebview_p.h:
* UIProcess/API/qt/qwebnavigationrequest.cpp:
(QWebNavigationRequestPrivate):
(QWebNavigationRequest::setAction):
(QWebNavigationRequest::action):
* UIProcess/API/qt/qwebnavigationrequest_p.h:
* UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (110046 => 110047)
--- trunk/Source/WebKit2/ChangeLog 2012-03-07 12:04:01 UTC (rev 110046)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-07 12:28:55 UTC (rev 110047)
@@ -1,3 +1,23 @@
+2012-03-05 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ [Qt] QWebNavigationRequest 'action' property should have an enum type instead of int
+ https://bugs.webkit.org/show_bug.cgi?id=80164
+
+ Reviewed by Simon Hausmann.
+
+ Use the appropriate enum type instead of int. Make IgnoreRequest have a bigger
+ value that give some room for us to put Experimental values in the middle. This
+ way the Experimental values are in a valid range for the original enumeration. To
+ avoid confusion, the Experimental enumeration was renamed.
+
+ * UIProcess/API/qt/qquickwebview_p.h:
+ * UIProcess/API/qt/qwebnavigationrequest.cpp:
+ (QWebNavigationRequestPrivate):
+ (QWebNavigationRequest::setAction):
+ (QWebNavigationRequest::action):
+ * UIProcess/API/qt/qwebnavigationrequest_p.h:
+ * UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp:
+
2012-03-07 Andras Becsi <[email protected]>
[WK2] Make it possible to build without geolocation support
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (110046 => 110047)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-03-07 12:04:01 UTC (rev 110046)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-03-07 12:28:55 UTC (rev 110047)
@@ -82,7 +82,8 @@
public:
enum NavigationRequestAction {
AcceptRequest,
- IgnoreRequest
+ // Make room in the valid range of the enum for extra actions exposed in Experimental.
+ IgnoreRequest = 0xFF
};
enum LoadStatus {
LoadStartedStatus,
@@ -249,11 +250,11 @@
Q_PROPERTY(QWebPreferences* preferences READ preferences CONSTANT FINAL)
Q_PROPERTY(QWebViewportInfo* viewportInfo READ viewportInfo CONSTANT FINAL)
Q_PROPERTY(QDeclarativeListProperty<QQuickUrlSchemeDelegate> urlSchemeDelegates READ schemeDelegates)
- Q_ENUMS(NavigationRequestAction)
+ Q_ENUMS(NavigationRequestActionExperimental)
public:
- enum NavigationRequestAction {
- DownloadRequest = 2
+ enum NavigationRequestActionExperimental {
+ DownloadRequest = QQuickWebView::IgnoreRequest - 1
};
QQuickWebViewExperimental(QQuickWebView* webView);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp (110046 => 110047)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp 2012-03-07 12:04:01 UTC (rev 110046)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp 2012-03-07 12:28:55 UTC (rev 110047)
@@ -41,7 +41,7 @@
QUrl url;
Qt::MouseButton mouseButton;
Qt::KeyboardModifiers keyboardModifiers;
- int action;
+ QQuickWebView::NavigationRequestAction action;
QQuickWebView::NavigationType navigationType;
};
@@ -56,7 +56,7 @@
delete d;
}
-void QWebNavigationRequest::setAction(int action)
+void QWebNavigationRequest::setAction(QQuickWebView::NavigationRequestAction action)
{
if (d->action == action)
return;
@@ -80,7 +80,7 @@
return int(d->keyboardModifiers);
}
-int QWebNavigationRequest::action() const
+QQuickWebView::NavigationRequestAction QWebNavigationRequest::action() const
{
return d->action;
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h (110046 => 110047)
--- trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h 2012-03-07 12:04:01 UTC (rev 110046)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h 2012-03-07 12:28:55 UTC (rev 110047)
@@ -33,7 +33,7 @@
Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
Q_PROPERTY(int mouseButton READ mouseButton CONSTANT FINAL)
Q_PROPERTY(int keyboardModifiers READ keyboardModifiers CONSTANT FINAL)
- Q_PROPERTY(int action READ action WRITE setAction NOTIFY actionChanged FINAL)
+ Q_PROPERTY(QQuickWebView::NavigationRequestAction action READ action WRITE setAction NOTIFY actionChanged FINAL)
Q_PROPERTY(QQuickWebView::NavigationType navigationType READ navigationType CONSTANT FINAL)
public:
@@ -43,9 +43,9 @@
QUrl url() const;
int mouseButton() const;
int keyboardModifiers() const;
- int action() const;
+ QQuickWebView::NavigationRequestAction action() const;
- void setAction(int action);
+ void setAction(QQuickWebView::NavigationRequestAction action);
QQuickWebView::NavigationType navigationType() const;
Q_SIGNALS:
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp (110046 => 110047)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp 2012-03-07 12:04:01 UTC (rev 110046)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp 2012-03-07 12:28:55 UTC (rev 110047)
@@ -84,7 +84,7 @@
<< "QWebNavigationRequest.url --> QUrl"
<< "QWebNavigationRequest.mouseButton --> int"
<< "QWebNavigationRequest.keyboardModifiers --> int"
- << "QWebNavigationRequest.action --> int"
+ << "QWebNavigationRequest.action --> QQuickWebView::NavigationRequestAction"
<< "QWebNavigationRequest.navigationType --> QQuickWebView::NavigationType"
<< "QWebNavigationRequest.actionChanged() --> void"
;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
