[webkit-changes] [109113] trunk/Source/WebKit2

Tue, 28 Feb 2012 09:03:39 -0800

Title: [109113] trunk/Source/WebKit2
Revision
109113
Author
[email protected]
Date
2012-02-28 09:03:23 -0800 (Tue, 28 Feb 2012)

Log Message

[Qt] Fix build for WK2, do not use enum type if values can be outside the enum
https://bugs.webkit.org/show_bug.cgi?id=79800

Reviewed by Csaba Osztrogonác.

We have two different enums called NavigationRequestAction. If we use one of them
to store the variables, compilers can rightfully warn about comparison with
values from other enums.

We might revisit the strategy of exposing different enumerations in experimental,
but for now, fallback to using int for the 'action' property in
QWebNavigationRequest.

* 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 (109112 => 109113)


--- trunk/Source/WebKit2/ChangeLog	2012-02-28 16:52:35 UTC (rev 109112)
+++ trunk/Source/WebKit2/ChangeLog	2012-02-28 17:03:23 UTC (rev 109113)
@@ -1,3 +1,25 @@
+2012-02-28  Caio Marcelo de Oliveira Filho  <[email protected]>
+
+        [Qt] Fix build for WK2, do not use enum type if values can be outside the enum
+        https://bugs.webkit.org/show_bug.cgi?id=79800
+
+        Reviewed by Csaba Osztrogonác.
+
+        We have two different enums called NavigationRequestAction. If we use one of them
+        to store the variables, compilers can rightfully warn about comparison with
+        values from other enums.
+
+        We might revisit the strategy of exposing different enumerations in experimental,
+        but for now, fallback to using int for the 'action' property in
+        QWebNavigationRequest.
+
+        * 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-02-27  Caio Marcelo de Oliveira Filho  <[email protected]>
 
         [Qt] API changes to QWebNavigationRequest

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp (109112 => 109113)


--- trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp	2012-02-28 16:52:35 UTC (rev 109112)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp	2012-02-28 17:03:23 UTC (rev 109113)
@@ -41,7 +41,7 @@
     QUrl url;
     Qt::MouseButton mouseButton;
     Qt::KeyboardModifiers keyboardModifiers;
-    QQuickWebView::NavigationRequestAction action;
+    int action;
     QQuickWebView::NavigationType navigationType;
 };
 
@@ -56,7 +56,7 @@
     delete d;
 }
 
-void QWebNavigationRequest::setAction(QQuickWebView::NavigationRequestAction action)
+void QWebNavigationRequest::setAction(int action)
 {
     if (d->action == action)
         return;
@@ -80,7 +80,7 @@
     return int(d->keyboardModifiers);
 }
 
-QQuickWebView::NavigationRequestAction QWebNavigationRequest::action() const
+int QWebNavigationRequest::action() const
 {
     return d->action;
 }

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h (109112 => 109113)


--- trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h	2012-02-28 16:52:35 UTC (rev 109112)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h	2012-02-28 17:03:23 UTC (rev 109113)
@@ -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(QQuickWebView::NavigationRequestAction action READ action WRITE setAction NOTIFY actionChanged FINAL)
+    Q_PROPERTY(int 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;
-    QQuickWebView::NavigationRequestAction action() const;
+    int action() const;
 
-    void setAction(QQuickWebView::NavigationRequestAction action);
+    void setAction(int action);
     QQuickWebView::NavigationType navigationType() const;
 
 Q_SIGNALS:

Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp (109112 => 109113)


--- trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp	2012-02-28 16:52:35 UTC (rev 109112)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp	2012-02-28 17:03:23 UTC (rev 109113)
@@ -85,7 +85,7 @@
     << "QWebNavigationRequest.url --> QUrl"
     << "QWebNavigationRequest.mouseButton --> int"
     << "QWebNavigationRequest.keyboardModifiers --> int"
-    << "QWebNavigationRequest.action --> QQuickWebView::NavigationRequestAction"
+    << "QWebNavigationRequest.action --> int"
     << "QWebNavigationRequest.navigationType --> QQuickWebView::NavigationType"
     << "QWebNavigationRequest.actionChanged() --> void"
     ;

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to