Title: [202848] trunk
Revision
202848
Author
[email protected]
Date
2016-07-05 22:51:20 -0700 (Tue, 05 Jul 2016)

Log Message

[Win] Layout Test http/tests/security/contentSecurityPolicy/source-list-parsing-10.html is failing
https://bugs.webkit.org/show_bug.cgi?id=147646

Reviewed by Brent Fulgham.

.:

Disable CSP_NEXT. We can then use the common expected test results for this test. 

* Source/cmake/OptionsWin.cmake:

Source/WebCore:

Fix build error when CSP_NEXT is disabled.

* DerivedSources.cpp:

LayoutTests:

Update test expectations.

* platform/win/TestExpectations:

Modified Paths

Diff

Modified: trunk/ChangeLog (202847 => 202848)


--- trunk/ChangeLog	2016-07-06 05:25:06 UTC (rev 202847)
+++ trunk/ChangeLog	2016-07-06 05:51:20 UTC (rev 202848)
@@ -1,3 +1,14 @@
+2016-07-05  Per Arne Vollan  <[email protected]>
+
+        [Win] Layout Test http/tests/security/contentSecurityPolicy/source-list-parsing-10.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=147646
+
+        Reviewed by Brent Fulgham.
+
+        Disable CSP_NEXT. We can then use the common expected test results for this test. 
+
+        * Source/cmake/OptionsWin.cmake:
+
 2016-07-04  Gyuyoung Kim  <[email protected]>
 
         [EFL] Remove mac configuration dependency in WebKit Version definition

Modified: trunk/LayoutTests/ChangeLog (202847 => 202848)


--- trunk/LayoutTests/ChangeLog	2016-07-06 05:25:06 UTC (rev 202847)
+++ trunk/LayoutTests/ChangeLog	2016-07-06 05:51:20 UTC (rev 202848)
@@ -1,3 +1,14 @@
+2016-07-05  Per Arne Vollan  <[email protected]>
+
+        [Win] Layout Test http/tests/security/contentSecurityPolicy/source-list-parsing-10.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=147646
+
+        Reviewed by Brent Fulgham.
+
+        Update test expectations.
+
+        * platform/win/TestExpectations:
+
 2016-07-05  Joseph Pecoraro  <[email protected]>
 
         RELEASE_ASSERT(!thisObject) in ObjCCallbackFunctionImpl::call when calling JSExport ObjC Constructor without operator new

Modified: trunk/LayoutTests/platform/win/TestExpectations (202847 => 202848)


--- trunk/LayoutTests/platform/win/TestExpectations	2016-07-06 05:25:06 UTC (rev 202847)
+++ trunk/LayoutTests/platform/win/TestExpectations	2016-07-06 05:51:20 UTC (rev 202848)
@@ -2181,7 +2181,6 @@
 http/tests/security/contentSecurityPolicy/object-src-url-allowed.html [ Failure ]
 http/tests/security/contentSecurityPolicy/object-src-url-blocked.html [ Failure ]
 http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html [ Failure ]
-webkit.org/b/147646 http/tests/security/contentSecurityPolicy/source-list-parsing-10.html [ Failure ]
 
 # Crashes
 http/tests/misc/drag-not-loaded-image.html [ Skip ] # Crash

Modified: trunk/Source/WebCore/ChangeLog (202847 => 202848)


--- trunk/Source/WebCore/ChangeLog	2016-07-06 05:25:06 UTC (rev 202847)
+++ trunk/Source/WebCore/ChangeLog	2016-07-06 05:51:20 UTC (rev 202848)
@@ -1,3 +1,14 @@
+2016-07-05  Per Arne Vollan  <[email protected]>
+
+        [Win] Layout Test http/tests/security/contentSecurityPolicy/source-list-parsing-10.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=147646
+
+        Reviewed by Brent Fulgham.
+
+        Fix build error when CSP_NEXT is disabled.
+
+        * DerivedSources.cpp:
+
 2016-07-05  David Kilzer  <[email protected]>
 
         Throw exceptions for invalid number of channels for ConvolverNode

Modified: trunk/Source/WebCore/DerivedSources.cpp (202847 => 202848)


--- trunk/Source/WebCore/DerivedSources.cpp	2016-07-06 05:25:06 UTC (rev 202847)
+++ trunk/Source/WebCore/DerivedSources.cpp	2016-07-06 05:51:20 UTC (rev 202848)
@@ -421,9 +421,7 @@
 #include "JSRTCTrackEvent.cpp"
 #include "JSScreen.cpp"
 #include "JSScriptProcessorNode.cpp"
-#if ENABLE(CSP_NEXT)
 #include "JSSecurityPolicyViolationEvent.cpp"
-#endif
 #include "JSSourceBuffer.cpp"
 #include "JSSourceBufferList.cpp"
 #include "JSSourceInfo.cpp"

Modified: trunk/Source/cmake/OptionsWin.cmake (202847 => 202848)


--- trunk/Source/cmake/OptionsWin.cmake	2016-07-06 05:25:06 UTC (rev 202847)
+++ trunk/Source/cmake/OptionsWin.cmake	2016-07-06 05:51:20 UTC (rev 202848)
@@ -10,7 +10,7 @@
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PROXY PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSP_NEXT PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSP_NEXT PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PUBLIC OFF)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to