Changeset 72602 in webkit


Ignore:
Timestamp:
Nov 23, 2010 6:23:46 AM (13 years ago)
Author:
Simon Hausmann
Message:

[Qt] Review the setUserPermission & friends API
https://bugs.webkit.org/show_bug.cgi?id=46810

Reviewed by Tor Arne Vestbø.

Rename setUserPermission to setFeaturePermission

WebKit/qt:

  • Api/qwebpage.cpp:

(QWebPage::setFeaturePermission):

  • Api/qwebpage.h:
  • tests/qwebpage/tst_qwebpage.cpp:

(JSTestPage::requestPermission):

WebKitTools:

  • DumpRenderTree/qt/DumpRenderTreeQt.cpp:

(WebCore::WebPage::requestPermission):
(WebCore::WebPage::permissionSet):

  • DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::grantDesktopNotificationPermission):

  • QtTestBrowser/webpage.cpp:

(WebPage::requestPermission):

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/Api/qwebpage.cpp

    r72601 r72602  
    21122112}
    21132113
    2114 void QWebPage::setUserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)
     2114void QWebPage::setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)
    21152115{
    21162116    switch (feature) {
  • trunk/WebKit/qt/Api/qwebpage.h

    r72601 r72602  
    309309    QMenu *createStandardContextMenu();
    310310
    311     void setUserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy);
     311    void setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy);
    312312
    313313    QStringList supportedContentTypes() const;
  • trunk/WebKit/qt/ChangeLog

    r72601 r72602  
     12010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] Review the setUserPermission & friends API
     6        https://bugs.webkit.org/show_bug.cgi?id=46810
     7
     8        Rename setUserPermission to setFeaturePermission
     9
     10        * Api/qwebpage.cpp:
     11        (QWebPage::setFeaturePermission):
     12        * Api/qwebpage.h:
     13        * tests/qwebpage/tst_qwebpage.cpp:
     14        (JSTestPage::requestPermission):
     15
    1162010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
    217
  • trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

    r72601 r72602  
    224224    {
    225225        if (m_allowGeolocation)
    226             setUserPermission(frame, feature, PermissionGrantedByUser);
     226            setFeaturePermission(frame, feature, PermissionGrantedByUser);
    227227        else
    228             setUserPermission(frame, feature, PermissionDeniedByUser);
     228            setFeaturePermission(frame, feature, PermissionDeniedByUser);
    229229    }
    230230
  • trunk/WebKitTools/ChangeLog

    r72601 r72602  
     12010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Reviewed by Tor Arne Vestbø.
     4
     5        [Qt] Review the setUserPermission & friends API
     6        https://bugs.webkit.org/show_bug.cgi?id=46810
     7
     8        Rename setUserPermission to setFeaturePermission
     9
     10        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
     11        (WebCore::WebPage::requestPermission):
     12        (WebCore::WebPage::permissionSet):
     13        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
     14        (LayoutTestController::grantDesktopNotificationPermission):
     15        * QtTestBrowser/webpage.cpp:
     16        (WebPage::requestPermission):
     17
    1182010-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
    219
  • trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

    r72601 r72602  
    225225    case Notifications:
    226226        if (!m_drt->layoutTestController()->ignoreReqestForPermission())
    227             setUserPermission(frame, feature, PermissionGrantedByUser);
     227            setFeaturePermission(frame, feature, PermissionGrantedByUser);
    228228        break;
    229229    case Geolocation:
    230230        if (m_drt->layoutTestController()->isGeolocationPermissionSet())
    231231            if (m_drt->layoutTestController()->geolocationPermission())
    232                 setUserPermission(frame, feature, PermissionGrantedByUser);
     232                setFeaturePermission(frame, feature, PermissionGrantedByUser);
    233233            else
    234                 setUserPermission(frame, feature, PermissionDeniedByUser);
     234                setFeaturePermission(frame, feature, PermissionDeniedByUser);
    235235        else
    236236            m_pendingGeolocationRequests.append(frame);
     
    260260        foreach (QWebFrame* frame, m_pendingGeolocationRequests)
    261261            if (m_drt->layoutTestController()->geolocationPermission())
    262                 setUserPermission(frame, feature, PermissionGrantedByUser);
     262                setFeaturePermission(frame, feature, PermissionGrantedByUser);
    263263            else
    264                 setUserPermission(frame, feature, PermissionDeniedByUser);
     264                setFeaturePermission(frame, feature, PermissionDeniedByUser);
    265265
    266266        m_pendingGeolocationRequests.clear();
  • trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

    r72601 r72602  
    199199{
    200200    QWebFrame* frame = m_drt->webPage()->mainFrame();
    201     m_drt->webPage()->setUserPermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser);
     201    m_drt->webPage()->setFeaturePermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser);
    202202    m_desktopNotificationAllowedOrigins.append(origin);
    203203}
  • trunk/WebKitTools/QtTestBrowser/webpage.cpp

    r72601 r72602  
    170170void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature)
    171171{
    172     setUserPermission(frame, feature, PermissionGrantedByUser);
     172    setFeaturePermission(frame, feature, PermissionGrantedByUser);
    173173}
    174174
Note: See TracChangeset for help on using the changeset viewer.