Skip to content
Permalink
Browse files
2010-03-24 Kent Hansen <kent.hansen@nokia.com>
        Reviewed by Simon Hausmann.

        [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled
        https://bugs.webkit.org/show_bug.cgi?id=36522

        For consistency with other QWebSettings attributes.

        * Api/qwebsettings.cpp:
        (QWebSettingsPrivate::apply):
        * Api/qwebsettings.h:
2010-03-24  Kent Hansen  <kent.hansen@nokia.com>

        Reviewed by Simon Hausmann.

        [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled
        https://bugs.webkit.org/show_bug.cgi?id=36522

        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
        (LayoutTestController::setXSSAuditorEnabled): Use the new name.

Canonical link: https://commits.webkit.org/47750@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56456 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Mar 24, 2010
1 parent 22b3606 commit e9e5b102fe2de1f10632dfce02926a5c951bb402
Showing 5 changed files with 30 additions and 7 deletions.
@@ -234,8 +234,8 @@ void QWebSettingsPrivate::apply()
global->attributes.value(QWebSettings::LocalContentCanAccessFileUrls));
settings->setAllowFileAccessFromFileURLs(value);

value = attributes.value(QWebSettings::XSSAuditorEnabled,
global->attributes.value(QWebSettings::XSSAuditorEnabled));
value = attributes.value(QWebSettings::XSSAuditingEnabled,
global->attributes.value(QWebSettings::XSSAuditingEnabled));
settings->setXSSAuditorEnabled(value);

#if ENABLE(TILED_BACKING_STORE)
@@ -396,7 +396,7 @@ QWebSettings* QWebSettings::globalSettings()
QWebSettings::LocalStorageEnabled instead.
\value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
\value LocalContentCanAccessFileUrls Specifies whether locally loaded documents are allowed to access other local urls.
\value XSSAuditorEnabled Specifies whether load requests should be monitored for cross-site scripting attempts.
\value XSSAuditingEnabled Specifies whether load requests should be monitored for cross-site scripting attempts.
\value AcceleratedCompositingEnabled This feature, when used in conjunction with
QGraphicsWebView, accelerates animations of web content. CSS animations of the transform and
opacity properties will be rendered by composing the cached content of the animated elements.
@@ -68,7 +68,7 @@ class QWEBKIT_EXPORT QWebSettings {
#endif
LocalContentCanAccessRemoteUrls,
DnsPrefetchEnabled,
XSSAuditorEnabled,
XSSAuditingEnabled,
AcceleratedCompositingEnabled,
WebGLEnabled,
SpatialNavigationEnabled,
@@ -1,3 +1,16 @@
2010-03-24 Kent Hansen <kent.hansen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled
https://bugs.webkit.org/show_bug.cgi?id=36522

For consistency with other QWebSettings attributes.

* Api/qwebsettings.cpp:
(QWebSettingsPrivate::apply):
* Api/qwebsettings.h:

2010-03-23 Kenneth Rohde Christiansen <kenneth@webkit.org>

Reviewed by Simon Hausmann.
@@ -1,3 +1,13 @@
2010-03-24 Kent Hansen <kent.hansen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled
https://bugs.webkit.org/show_bug.cgi?id=36522

* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
(LayoutTestController::setXSSAuditorEnabled): Use the new name.

2010-03-24 Chris Jerdonek <cjerdonek@webkit.org>

Reviewed by Shinichiro Hamaji.
@@ -383,12 +383,12 @@ void LayoutTestController::setMainFrameIsFirstResponder(bool isFirst)

void LayoutTestController::setXSSAuditorEnabled(bool enable)
{
// Set XSSAuditorEnabled globally so that windows created by the test inherit it too.
// Set XSSAuditingEnabled globally so that windows created by the test inherit it too.
// resetSettings() will call this to reset the page and global setting to false again.
// Needed by http/tests/security/xssAuditor/link-opens-new-window.html
QWebSettings* globalSettings = QWebSettings::globalSettings();
globalSettings->setAttribute(QWebSettings::XSSAuditorEnabled, enable);
m_drt->webPage()->settings()->setAttribute(QWebSettings::XSSAuditorEnabled, enable);
globalSettings->setAttribute(QWebSettings::XSSAuditingEnabled, enable);
m_drt->webPage()->settings()->setAttribute(QWebSettings::XSSAuditingEnabled, enable);
}

bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(const QString& animationName,

0 comments on commit e9e5b10

Please sign in to comment.