Changeset 56456 in webkit
- Timestamp:
- Mar 24, 2010 1:55:40 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/qt/Api/qwebsettings.cpp
r56373 r56456 235 235 settings->setAllowFileAccessFromFileURLs(value); 236 236 237 value = attributes.value(QWebSettings::XSSAudit orEnabled,238 global->attributes.value(QWebSettings::XSSAudit orEnabled));237 value = attributes.value(QWebSettings::XSSAuditingEnabled, 238 global->attributes.value(QWebSettings::XSSAuditingEnabled)); 239 239 settings->setXSSAuditorEnabled(value); 240 240 … … 397 397 \value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls. 398 398 \value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls. 399 \value XSSAudit orEnabled Specifies whether load requests should be monitored for cross-site scripting attempts.399 \value XSSAuditingEnabled Specifies whether load requests should be monitored for cross-site scripting attempts. 400 400 \value AcceleratedCompositingEnabled This feature, when used in conjunction with 401 401 QGraphicsWebView, accelerates animations of web content. CSS animations of the transform and -
trunk/WebKit/qt/Api/qwebsettings.h
r55978 r56456 69 69 LocalContentCanAccessRemoteUrls, 70 70 DnsPrefetchEnabled, 71 XSSAudit orEnabled,71 XSSAuditingEnabled, 72 72 AcceleratedCompositingEnabled, 73 73 WebGLEnabled, -
trunk/WebKit/qt/ChangeLog
r56450 r56456 1 2010-03-24 Kent Hansen <kent.hansen@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled 6 https://bugs.webkit.org/show_bug.cgi?id=36522 7 8 For consistency with other QWebSettings attributes. 9 10 * Api/qwebsettings.cpp: 11 (QWebSettingsPrivate::apply): 12 * Api/qwebsettings.h: 13 1 14 2010-03-23 Kenneth Rohde Christiansen <kenneth@webkit.org> 2 15 -
trunk/WebKitTools/ChangeLog
r56437 r56456 1 2010-03-24 Kent Hansen <kent.hansen@nokia.com> 2 3 Reviewed by Simon Hausmann. 4 5 [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled 6 https://bugs.webkit.org/show_bug.cgi?id=36522 7 8 * DumpRenderTree/qt/LayoutTestControllerQt.cpp: 9 (LayoutTestController::setXSSAuditorEnabled): Use the new name. 10 1 11 2010-03-24 Chris Jerdonek <cjerdonek@webkit.org> 2 12 -
trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
r56262 r56456 384 384 void LayoutTestController::setXSSAuditorEnabled(bool enable) 385 385 { 386 // Set XSSAudit orEnabled globally so that windows created by the test inherit it too.386 // Set XSSAuditingEnabled globally so that windows created by the test inherit it too. 387 387 // resetSettings() will call this to reset the page and global setting to false again. 388 388 // Needed by http/tests/security/xssAuditor/link-opens-new-window.html 389 389 QWebSettings* globalSettings = QWebSettings::globalSettings(); 390 globalSettings->setAttribute(QWebSettings::XSSAudit orEnabled, enable);391 m_drt->webPage()->settings()->setAttribute(QWebSettings::XSSAudit orEnabled, enable);390 globalSettings->setAttribute(QWebSettings::XSSAuditingEnabled, enable); 391 m_drt->webPage()->settings()->setAttribute(QWebSettings::XSSAuditingEnabled, enable); 392 392 } 393 393
Note: See TracChangeset
for help on using the changeset viewer.