[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
dbates at webkit.org
dbates at webkit.org
Thu Apr 8 00:59:24 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit e84eae568b4651be6c29ea4c54245d5cf57c47f6
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Jan 10 03:12:59 2010 +0000
2010-01-09 Daniel Bates <dbates at webkit.org>
No review, rolling out r53044.
http://trac.webkit.org/changeset/53044
https://bugs.webkit.org/show_bug.cgi?id=33419
We need to look into this some more because the Qt
bot is failing the XSSAuditor tests. See bug #33419
for more details.
* Api/qwebsettings.cpp:
* Api/qwebsettings.h:
2010-01-09 Daniel Bates <dbates at webkit.org>
No review, rolling out r53044.
http://trac.webkit.org/changeset/53044
https://bugs.webkit.org/show_bug.cgi?id=33419
We need to look into this some more because the Qt
bot is failing the XSSAuditor tests. See bug #33419
for more details.
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::WebPage::WebPage):
(WebCore::WebPage::resetSettings):
* DumpRenderTree/qt/LayoutTestControllerQt.cpp:
* DumpRenderTree/qt/LayoutTestControllerQt.h:
2010-01-09 Daniel Bates <dbates at webkit.org>
No review, rolling out r53044.
http://trac.webkit.org/changeset/53044
https://bugs.webkit.org/show_bug.cgi?id=33419
We need to look into this some more because the Qt
bot is failing the XSSAuditor tests. See bug #33419
for more details.
* platform/qt/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53048 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aa68a34..b68637b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
2010-01-09 Daniel Bates <dbates at webkit.org>
+ No review, rolling out r53044.
+ http://trac.webkit.org/changeset/53044
+ https://bugs.webkit.org/show_bug.cgi?id=33419
+
+ We need to look into this some more because the Qt
+ bot is failing the XSSAuditor tests. See bug #33419
+ for more details.
+
+ * platform/qt/Skipped:
+
+2010-01-09 Daniel Bates <dbates at webkit.org>
+
No review, rolling out r53045.
http://trac.webkit.org/changeset/53045
https://bugs.webkit.org/show_bug.cgi?id=33440
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a58b06f..1c445da 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -197,6 +197,9 @@ http/tests/security/feed-urls-from-remote.html
# Missing layoutTestController.setWillSendRequestReturnsNullOnRedirect()
http/tests/misc/will-send-request-returns-null-on-redirect.html
+# Missing layoutTestController.setXSSAuditorEnabled()
+http/tests/security/xssAuditor
+
# Missing layoutTestController.evaluateScriptInIsolatedWorld()
http/tests/security/isolatedWorld
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index e1f8700..ff7d33e 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -354,7 +354,6 @@ QWebSettings* QWebSettings::globalSettings()
\value LocalStorageDatabaseEnabled \e{This enum value is deprecated.} Use
QWebSettings::LocalStorageEnabled instead.
\value LocalContentCanAccessRemoteUrls Specifies whether locally loaded documents are allowed to access remote urls.
- \value XSSAuditorEnabled Enables or disables WebKit's XSSAuditor to mitigate reflective cross-site scripting attacks.
*/
/*!
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index 32af448..69f3b11 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -67,8 +67,7 @@ public:
LocalStorageDatabaseEnabled = LocalStorageEnabled,
#endif
LocalContentCanAccessRemoteUrls,
- DnsPrefetchEnabled,
- XSSAuditorEnabled
+ DnsPrefetchEnabled
};
enum WebGraphic {
MissingImageGraphic,
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 189d5ff..248f07b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,18 @@
2010-01-09 Daniel Bates <dbates at webkit.org>
+ No review, rolling out r53044.
+ http://trac.webkit.org/changeset/53044
+ https://bugs.webkit.org/show_bug.cgi?id=33419
+
+ We need to look into this some more because the Qt
+ bot is failing the XSSAuditor tests. See bug #33419
+ for more details.
+
+ * Api/qwebsettings.cpp:
+ * Api/qwebsettings.h:
+
+2010-01-09 Daniel Bates <dbates at webkit.org>
+
Reviewed by Adam Barth.
https://bugs.webkit.org/show_bug.cgi?id=33419
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 67389b5..fe9c41c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,21 @@
2010-01-09 Daniel Bates <dbates at webkit.org>
+ No review, rolling out r53044.
+ http://trac.webkit.org/changeset/53044
+ https://bugs.webkit.org/show_bug.cgi?id=33419
+
+ We need to look into this some more because the Qt
+ bot is failing the XSSAuditor tests. See bug #33419
+ for more details.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::WebPage::WebPage):
+ (WebCore::WebPage::resetSettings):
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
+2010-01-09 Daniel Bates <dbates at webkit.org>
+
Reviewed by Adam Barth.
https://bugs.webkit.org/show_bug.cgi?id=33419
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index e0b5a68..00fdac5 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -133,7 +133,6 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
globalSettings->setAttribute(QWebSettings::JavascriptEnabled, true);
globalSettings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
globalSettings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, false);
- globalSettings->setAttribute(QWebSettings::XSSAuditorEnabled, false);
connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
this, SLOT(setViewGeometry(const QRect & )));
@@ -168,7 +167,6 @@ void WebPage::resetSettings()
settings()->resetAttribute(QWebSettings::LinksIncludedInFocusChain);
settings()->resetAttribute(QWebSettings::OfflineWebApplicationCacheEnabled);
settings()->resetAttribute(QWebSettings::LocalContentCanAccessRemoteUrls);
- settings()->resetAttribute(QWebSettings::XSSAuditorEnabled);
QWebSettings::setMaximumPagesInCache(0); // reset to default
}
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 7d3accb..adcdbca 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -276,11 +276,6 @@ void LayoutTestController::setPrivateBrowsingEnabled(bool enable)
m_drt->webPage()->settings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, enable);
}
-void LayoutTestController::setXSSAuditorEnabled(bool enable)
-{
- m_drt->webPage()->settings()->setAttribute(QWebSettings::XSSAuditorEnabled, enable);
-}
-
void LayoutTestController::setPopupBlockingEnabled(bool enable)
{
m_drt->webPage()->settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, !enable);
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 61b3159..1913d7c 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -110,7 +110,6 @@ public slots:
void setJavaScriptProfilingEnabled(bool enable);
void setFixedContentsSize(int width, int height);
void setPrivateBrowsingEnabled(bool enable);
- void setXSSAuditorEnabled(bool flag);
void setPopupBlockingEnabled(bool enable);
void setPOSIXLocale(const QString& locale);
void resetLoadFinished() { m_loadFinished = false; }
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list