Changeset 109113 in webkit


Ignore:
Timestamp:
Feb 28, 2012 9:03:23 AM (12 years ago)
Author:
caio.oliveira@openbossa.org
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:
Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r109106 r109113  
     12012-02-28  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
     2
     3        [Qt] Fix build for WK2, do not use enum type if values can be outside the enum
     4        https://bugs.webkit.org/show_bug.cgi?id=79800
     5
     6        Reviewed by Csaba Osztrogonác.
     7
     8        We have two different enums called NavigationRequestAction. If we use one of them
     9        to store the variables, compilers can rightfully warn about comparison with
     10        values from other enums.
     11
     12        We might revisit the strategy of exposing different enumerations in experimental,
     13        but for now, fallback to using int for the 'action' property in
     14        QWebNavigationRequest.
     15
     16        * UIProcess/API/qt/qwebnavigationrequest.cpp:
     17        (QWebNavigationRequestPrivate):
     18        (QWebNavigationRequest::setAction):
     19        (QWebNavigationRequest::action):
     20        * UIProcess/API/qt/qwebnavigationrequest_p.h:
     21        * UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp:
     22
    1232012-02-27  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
    224

  • trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp

    r109106 r109113  
    4242    Qt::MouseButton mouseButton;
    4343    Qt::KeyboardModifiers keyboardModifiers;
    44     QQuickWebView::NavigationRequestAction action;
     44    int action;
    4545    QQuickWebView::NavigationType navigationType;
    4646};
    … …  
    5757}
    5858
    59 void QWebNavigationRequest::setAction(QQuickWebView::NavigationRequestAction action)
     59void QWebNavigationRequest::setAction(int action)
    6060{
    6161    if (d->action == action)
    … …  
    8181}
    8282
    83 QQuickWebView::NavigationRequestAction QWebNavigationRequest::action() const
     83int QWebNavigationRequest::action() const
    8484{
    8585    return d->action;

  • trunk/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest_p.h

    r109106 r109113  
    3434    Q_PROPERTY(int mouseButton READ mouseButton CONSTANT FINAL)
    3535    Q_PROPERTY(int keyboardModifiers READ keyboardModifiers CONSTANT FINAL)
    36     Q_PROPERTY(QQuickWebView::NavigationRequestAction action READ action WRITE setAction NOTIFY actionChanged FINAL)
     36    Q_PROPERTY(int action READ action WRITE setAction NOTIFY actionChanged FINAL)
    3737    Q_PROPERTY(QQuickWebView::NavigationType navigationType READ navigationType CONSTANT FINAL)
    3838
    … …  
    4444    int mouseButton() const;
    4545    int keyboardModifiers() const;
    46     QQuickWebView::NavigationRequestAction action() const;
     46    int action() const;
    4747
    48     void setAction(QQuickWebView::NavigationRequestAction action);
     48    void setAction(int action);
    4949    QQuickWebView::NavigationType navigationType() const;
    5050

  • trunk/Source/WebKit2/UIProcess/API/qt/tests/publicapi/tst_publicapi.cpp

    r109106 r109113  
    8686    << "QWebNavigationRequest.mouseButton --> int"
    8787    << "QWebNavigationRequest.keyboardModifiers --> int"
    88     << "QWebNavigationRequest.action --> QQuickWebView::NavigationRequestAction"
     88    << "QWebNavigationRequest.action --> int"
    8989    << "QWebNavigationRequest.navigationType --> QQuickWebView::NavigationType"
    9090    << "QWebNavigationRequest.actionChanged() --> void"
Note: See TracChangeset for help on using the changeset viewer.