Changeset 72602 in webkit
- Timestamp:
- Nov 23, 2010 6:23:46 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebpage.cpp
r72601 r72602 2112 2112 } 2113 2113 2114 void QWebPage::set UserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy)2114 void QWebPage::setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy) 2115 2115 { 2116 2116 switch (feature) { -
trunk/WebKit/qt/Api/qwebpage.h
r72601 r72602 309 309 QMenu *createStandardContextMenu(); 310 310 311 void set UserPermission(QWebFrame* frame, Feature feature, PermissionPolicy policy);311 void setFeaturePermission(QWebFrame* frame, Feature feature, PermissionPolicy policy); 312 312 313 313 QStringList supportedContentTypes() const; -
trunk/WebKit/qt/ChangeLog
r72601 r72602 1 2010-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 1 16 2010-11-23 Simon Hausmann <simon.hausmann@nokia.com> 2 17 -
trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
r72601 r72602 224 224 { 225 225 if (m_allowGeolocation) 226 set UserPermission(frame, feature, PermissionGrantedByUser);226 setFeaturePermission(frame, feature, PermissionGrantedByUser); 227 227 else 228 set UserPermission(frame, feature, PermissionDeniedByUser);228 setFeaturePermission(frame, feature, PermissionDeniedByUser); 229 229 } 230 230 -
trunk/WebKitTools/ChangeLog
r72601 r72602 1 2010-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 1 18 2010-11-23 Simon Hausmann <simon.hausmann@nokia.com> 2 19 -
trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
r72601 r72602 225 225 case Notifications: 226 226 if (!m_drt->layoutTestController()->ignoreReqestForPermission()) 227 set UserPermission(frame, feature, PermissionGrantedByUser);227 setFeaturePermission(frame, feature, PermissionGrantedByUser); 228 228 break; 229 229 case Geolocation: 230 230 if (m_drt->layoutTestController()->isGeolocationPermissionSet()) 231 231 if (m_drt->layoutTestController()->geolocationPermission()) 232 set UserPermission(frame, feature, PermissionGrantedByUser);232 setFeaturePermission(frame, feature, PermissionGrantedByUser); 233 233 else 234 set UserPermission(frame, feature, PermissionDeniedByUser);234 setFeaturePermission(frame, feature, PermissionDeniedByUser); 235 235 else 236 236 m_pendingGeolocationRequests.append(frame); … … 260 260 foreach (QWebFrame* frame, m_pendingGeolocationRequests) 261 261 if (m_drt->layoutTestController()->geolocationPermission()) 262 set UserPermission(frame, feature, PermissionGrantedByUser);262 setFeaturePermission(frame, feature, PermissionGrantedByUser); 263 263 else 264 set UserPermission(frame, feature, PermissionDeniedByUser);264 setFeaturePermission(frame, feature, PermissionDeniedByUser); 265 265 266 266 m_pendingGeolocationRequests.clear(); -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
r72601 r72602 199 199 { 200 200 QWebFrame* frame = m_drt->webPage()->mainFrame(); 201 m_drt->webPage()->set UserPermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser);201 m_drt->webPage()->setFeaturePermission(frame, QWebPage::Notifications, QWebPage::PermissionGrantedByUser); 202 202 m_desktopNotificationAllowedOrigins.append(origin); 203 203 } -
trunk/WebKitTools/QtTestBrowser/webpage.cpp
r72601 r72602 170 170 void WebPage::requestPermission(QWebFrame* frame, QWebPage::Feature feature) 171 171 { 172 set UserPermission(frame, feature, PermissionGrantedByUser);172 setFeaturePermission(frame, feature, PermissionGrantedByUser); 173 173 } 174 174
Note: See TracChangeset
for help on using the changeset viewer.