Title: [136339] trunk
Revision
136339
Author
[email protected]
Date
2012-12-02 04:40:17 -0800 (Sun, 02 Dec 2012)

Log Message

[gtk] Enable the CSP_NEXT runtime flag.
https://bugs.webkit.org/show_bug.cgi?id=103810

Reviewed by Adam Barth.

Source/WebKit/gtk:

This patch adds methods to DumpRenderTreeSupport in order to ensure that
CSP 1.1 features are enabled when running DRT tests in the GTK port.

* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::setExperimentalContentSecurityPolicyFeaturesEnabled):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
(DumpRenderTreeSupportGtk):

Tools:

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
    Turn on the CSP_NEXT runtime flag when running tests under GTK.

LayoutTests:

* platform/gtk/TestExpectations:
    Unskipping CSP 1.1 tests for GTK.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (136338 => 136339)


--- trunk/LayoutTests/ChangeLog	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/LayoutTests/ChangeLog	2012-12-02 12:40:17 UTC (rev 136339)
@@ -1,5 +1,15 @@
 2012-12-02  Mike West  <[email protected]>
 
+        [gtk] Enable the CSP_NEXT runtime flag.
+        https://bugs.webkit.org/show_bug.cgi?id=103810
+
+        Reviewed by Adam Barth.
+
+        * platform/gtk/TestExpectations:
+            Unskipping CSP 1.1 tests for GTK.
+
+2012-12-02  Mike West  <[email protected]>
+
         [chromium] Unreviewed gardening.
 
         Skipping failing tests on mac.

Modified: trunk/LayoutTests/platform/gtk/TestExpectations (136338 => 136339)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2012-12-02 12:40:17 UTC (rev 136339)
@@ -1380,9 +1380,6 @@
 
 webkit.org/b/103109 fast/dom/shadow/host-wrapper-reclaimed.html [ Failure ]
 
-# Fails after CSP_NEXT became runtime enabled in r136305
-webkit.org/b/103810 http/tests/security/contentSecurityPolicy/1.1 [ Skip ]
-
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Tests failing
 #////////////////////////////////////////////////////////////////////////////////////////

Modified: trunk/Source/WebKit/gtk/ChangeLog (136338 => 136339)


--- trunk/Source/WebKit/gtk/ChangeLog	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/Source/WebKit/gtk/ChangeLog	2012-12-02 12:40:17 UTC (rev 136339)
@@ -1,3 +1,18 @@
+2012-12-02  Mike West  <[email protected]>
+
+        [gtk] Enable the CSP_NEXT runtime flag.
+        https://bugs.webkit.org/show_bug.cgi?id=103810
+
+        Reviewed by Adam Barth.
+
+        This patch adds methods to DumpRenderTreeSupport in order to ensure that
+        CSP 1.1 features are enabled when running DRT tests in the GTK port.
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        (DumpRenderTreeSupportGtk::setExperimentalContentSecurityPolicyFeaturesEnabled):
+        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+        (DumpRenderTreeSupportGtk):
+
 2012-11-30  Mihai Maerean  <[email protected]>
 
         [CSSRegions] when WebKit uses V8, there should be a single variable to store if the CSS Regions feature is enabled

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (136338 => 136339)


--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp	2012-12-02 12:40:17 UTC (rev 136339)
@@ -700,6 +700,13 @@
 #endif
 }
 
+void DumpRenderTreeSupportGtk::setExperimentalContentSecurityPolicyFeaturesEnabled(bool enabled)
+{
+#if ENABLE(CSP_NEXT)
+    RuntimeEnabledFeatures::setExperimentalContentSecurityPolicyFeaturesEnabled(enabled);
+#endif
+}
+
 void DumpRenderTreeSupportGtk::setShadowDOMEnabled(bool enabled)
 {
 #if ENABLE(SHADOW_DOM)

Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (136338 => 136339)


--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h	2012-12-02 12:40:17 UTC (rev 136339)
@@ -119,6 +119,7 @@
     static void setCSSGridLayoutEnabled(WebKitWebView*, bool enabled);
     static void setCSSRegionsEnabled(WebKitWebView*, bool enabled);
     static void setCSSCustomFilterEnabled(WebKitWebView*, bool enabled);
+    static void setExperimentalContentSecurityPolicyFeaturesEnabled(bool);
     static void setShadowDOMEnabled(bool);
     static void setStyleScopedEnabled(bool);
 

Modified: trunk/Tools/ChangeLog (136338 => 136339)


--- trunk/Tools/ChangeLog	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/Tools/ChangeLog	2012-12-02 12:40:17 UTC (rev 136339)
@@ -1,3 +1,14 @@
+2012-12-02  Mike West  <[email protected]>
+
+        [gtk] Enable the CSP_NEXT runtime flag.
+        https://bugs.webkit.org/show_bug.cgi?id=103810
+
+        Reviewed by Adam Barth.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (resetDefaultsToConsistentValues):
+            Turn on the CSP_NEXT runtime flag when running tests under GTK.
+
 2012-12-02  Eric Seidel  <[email protected]>
 
         run-perf-tests --profile should use iprofiler instead of instruments on Mac

Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (136338 => 136339)


--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2012-12-02 12:38:22 UTC (rev 136338)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp	2012-12-02 12:40:17 UTC (rev 136339)
@@ -518,6 +518,7 @@
     DumpRenderTreeSupportGtk::setCSSGridLayoutEnabled(webView, false);
     DumpRenderTreeSupportGtk::setCSSRegionsEnabled(webView, true);
     DumpRenderTreeSupportGtk::setCSSCustomFilterEnabled(webView, false);
+    DumpRenderTreeSupportGtk::setExperimentalContentSecurityPolicyFeaturesEnabled(true);
     DumpRenderTreeSupportGtk::setShadowDOMEnabled(true);
     DumpRenderTreeSupportGtk::setStyleScopedEnabled(true);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to