[GTK] Enable CSP 1.1
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Oct 2012 10:14:15 +0000 (10:14 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Oct 2012 10:14:15 +0000 (10:14 +0000)
https://bugs.webkit.org/show_bug.cgi?id=99064

Reviewed by Martin Robinson.

Source/WebCore:

Enable CSP 1.1 in development builds but keep it disabled when the
unstable features should not be enabled (like in stable releases).

No new tests - they already exist and will be unskipped.

* GNUmakefile.am:
* GNUmakefile.features.am:

LayoutTests:

Unskip the CSP 1.1 layout tests as they all pass with the feature enabled.

* platform/gtk/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@132056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/gtk/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.features.am

index 45c13f8..ac8ca4c 100644 (file)
@@ -1,3 +1,14 @@
+2012-10-22  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] Enable CSP 1.1
+        https://bugs.webkit.org/show_bug.cgi?id=99064
+
+        Reviewed by Martin Robinson.
+
+        Unskip the CSP 1.1 layout tests as they all pass with the feature enabled.
+
+        * platform/gtk/TestExpectations:
+
 2012-10-22  Keishi Hattori  <keishi@webkit.org>
 
         Test date-suggestion-picker-reset-value-after-reload.html will timeout when running with other tests
index 6947505..097db9a 100644 (file)
@@ -407,9 +407,6 @@ webkit.org/b/31508 storage/websql/transaction-callback-isolated-world.html [ Ski
 webkit.org/b/31508 storage/websql/transaction-error-callback-isolated-world.html [ Skip ]
 webkit.org/b/31508 storage/websql/transaction-success-callback-isolated-world.html [ Skip ]
 
-# Content Security Policy 1.1 (ENABLE_CSP_NEXT) is not enabled
-webkit.org/b/99064 http/tests/security/contentSecurityPolicy/1.1 [ Skip ]
-
 # Text Autosizing is not yet enabled.
 webkit.org/b/99063 fast/text-autosizing
 
index 21c9cbd..e729f1e 100644 (file)
@@ -1,3 +1,18 @@
+2012-10-22  Zan Dobersek  <zandobersek@gmail.com>
+
+        [GTK] Enable CSP 1.1
+        https://bugs.webkit.org/show_bug.cgi?id=99064
+
+        Reviewed by Martin Robinson.
+
+        Enable CSP 1.1 in development builds but keep it disabled when the
+        unstable features should not be enabled (like in stable releases).
+
+        No new tests - they already exist and will be unskipped.
+
+        * GNUmakefile.am:
+        * GNUmakefile.features.am:
+
 2012-10-22  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
 
         [Qt] Fix "ASSERTION FAILED: !document->inPageCache()" when loading a page
index 07e916e..16ac623 100644 (file)
@@ -349,6 +349,7 @@ endif  # END ENABLE_CSS3_CONDITIONAL_RULES
 # ---
 if !ENABLE_UNSTABLE_FEATURES
 feature_defines_unstable += \
+       ENABLE_CSP_NEXT=0 \
        ENABLE_CSS3_TEXT=0 \
        ENABLE_CSS_STICKY_POSITION=0 \
        ENABLE_LINK_PREFETCH=0 \
index 79087e8..f76723d 100644 (file)
@@ -5,7 +5,7 @@ feature_defines_defaults += \
        ENABLE_BATTERY_STATUS=0 \
        ENABLE_BLOB=1 \
        ENABLE_CHANNEL_MESSAGING=1 \
-       ENABLE_CSP_NEXT=0 \
+       ENABLE_CSP_NEXT=1 \
        ENABLE_CSS3_TEXT=1 \
        ENABLE_CSS_BOX_DECORATION_BREAK=1 \
        ENABLE_CSS_COMPOSITING=0 \