Attachment 67421 Details for Bug 45436 – Patch against webkit Git head.

[patch] Patch against webkit Git head.

web-security-setting-patch.txt (text/plain), 3.01 KB, created by Eugene Ostroukhov on 2010-09-13 10:08:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Ostroukhov

Created: 2010-09-13 10:08:16 PDT

Size: 3.01 KB

patch

obsolete

>diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
>index b71de25..0067176 100644
>--- a/WebKit/qt/Api/qwebsettings.cpp
>+++ b/WebKit/qt/Api/qwebsettings.cpp
>@@ -247,6 +247,10 @@ void QWebSettingsPrivate::apply()
>                                       global->attributes.value(QWebSettings::XSSAuditingEnabled));
>         settings->setXSSAuditorEnabled(value);
> 
>+        value = attributes.value(QWebSettings::WebSecurityEnabled,
>+                                      global->attributes.value(QWebSettings::WebSecurityEnabled));
>+        settings->setWebSecurityEnabled(value);
>+
> #if ENABLE(TILED_BACKING_STORE)
>         value = attributes.value(QWebSettings::TiledBackingStoreEnabled,
>                                       global->attributes.value(QWebSettings::TiledBackingStoreEnabled));
>@@ -421,6 +425,8 @@ QWebSettings* QWebSettings::globalSettings()
>         scripting attempts. Suspicious scripts will be blocked and reported in the inspector's
>         JavaScript console. Enabling this feature might have an impact on performance
>         and it is disabled by default.
>+	\value WebSecurityEnabled Specifies whether browser should enforce same-origin policy. Note that
>+        setting this flag is strongly discouraged as it makes the browser more prone to malicious code.
>     \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.
>@@ -498,6 +504,7 @@ QWebSettings::QWebSettings()
>     d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false);
>     d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false);
>     d->attributes.insert(QWebSettings::SiteSpecificQuirksEnabled, true);
>+    d->attributes.insert(QWebSettings::WebSecurityEnabled, true);
>     d->offlineStorageDefaultQuota = 5 * 1024 * 1024;
>     d->defaultTextEncoding = QLatin1String("iso-8859-1");
> }
>diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
>index 8967e7c..615f1a4 100644
>--- a/WebKit/qt/Api/qwebsettings.h
>+++ b/WebKit/qt/Api/qwebsettings.h
>@@ -69,6 +69,7 @@ public:
>         LocalContentCanAccessRemoteUrls,
>         DnsPrefetchEnabled,
>         XSSAuditingEnabled,
>+        WebSecurityEnabled,
>         AcceleratedCompositingEnabled,
>         SpatialNavigationEnabled,
>         LocalContentCanAccessFileUrls,
>diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
>index 1564753..1f2dfed 100644
>--- a/WebKit/qt/ChangeLog
>+++ b/WebKit/qt/ChangeLog
>@@ -1,3 +1,15 @@
>+2010-09-12  Eugene Ostroukhov  <eostroukhov@gmail.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [Qt] Expose the web security setting 
>+        https://bugs.webkit.org/show_bug.cgi?id=45436
>+
>+        * Api/qwebsettings.cpp:
>+        (QWebSettingsPrivate::apply):
>+        (QWebSettings::QWebSettings):
>+        * Api/qwebsettings.h:
>+
> 2010-09-12  Martin Smith  <martin.smith@nokia.com>
> 
>         Reviewed by Simon Hausmann.

Actions: View | Formatted Diff | Diff

Attachments on bug 45436: 67421 | 67647 | 67680 | 70386 | 74803 | 74808 | 204802