Disable CSS regions at compile time

https://bugs.webkit.org/show_bug.cgi?id=175630

Reviewed by Antti Koivisto.

.:

* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/OptionsWPE.cmake:
* Source/cmake/OptionsWin.cmake:
* Source/cmake/tools/vsprops/FeatureDefines.props:
* Source/cmake/tools/vsprops/FeatureDefinesCairo.props:

Source/JavaScriptCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

* Configurations/FeatureDefines.xcconfig:

Source/WebCore/PAL:

* Configurations/FeatureDefines.xcconfig:

Source/WebKit:

* Configurations/FeatureDefines.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/FeatureDefines.xcconfig:

Tools:

* Scripts/webkitperl/FeatureList.pm:
* TestWebKitAPI/Configurations/FeatureDefines.xcconfig:

LayoutTests:

Skip tests that are entirely about regions, and tweak logic
and/or expectations for tests that test regions in addition to
other things.

* TestExpectations:
* fast/css/will-change/resources/will-change-stacking-helper.js:
* fast/dom/collection-iterators-expected.txt:
* fast/dom/collection-iterators.html:
* js/dom/dom-static-property-for-in-iteration-expected.txt:
* platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt:
* platform/ios/fast/dom/collection-iterators-expected.txt:
* platform/mac-wk2/TestExpectations:
* platform/win/js/dom/dom-static-property-for-in-iteration-expected.txt:
* platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt:

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

diff --git a/ChangeLog b/ChangeLog
index 23d452d7e78bda97773910c46cadcab9f6a980d1..9ffd37201ce3e4f4bf4d388b57337d295fab0291 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/OptionsWPE.cmake:
+        * Source/cmake/OptionsWin.cmake:
+        * Source/cmake/tools/vsprops/FeatureDefines.props:
+        * Source/cmake/tools/vsprops/FeatureDefinesCairo.props:
+
 2017-08-14  Simon Fraser  <simon.fraser@apple.com>
 
         Remove Proximity Events and related code

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 70ba16cd91ba0eadd4907613588669f6cadb5f7f..9dd8374fd772ff4ac84358ab8d5189a4925c2f55 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        Skip tests that are entirely about regions, and tweak logic
+        and/or expectations for tests that test regions in addition to
+        other things.
+
+        * TestExpectations:
+        * fast/css/will-change/resources/will-change-stacking-helper.js:
+        * fast/dom/collection-iterators-expected.txt:
+        * fast/dom/collection-iterators.html:
+        * js/dom/dom-static-property-for-in-iteration-expected.txt:
+        * platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt:
+        * platform/ios/fast/dom/collection-iterators-expected.txt:
+        * platform/mac-wk2/TestExpectations:
+        * platform/win/js/dom/dom-static-property-for-in-iteration-expected.txt:
+        * platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt:
+
 2017-08-17  Antti Koivisto  <antti@apple.com>
 
         RenderListItem - Avoid render tree mutation during layout

diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 3794c98393bd73c17bb56058f8f32c9fd6cd1a0e..4dcf7ec0afe66423c8344f3ad30868614bc915fd 100644 (file)
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -1445,3 +1445,10 @@ webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpayment
 webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
 webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]
 webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]
+
+# CSS Regions are being phased out.
+fast/regions [ Skip ]
+compositing/regions [ Skip ]
+fast/ruby/ruby-rt-with-region-crash.html [ Skip ]
+inspector/dom/content-node-region-info.html [ Skip ]
+fast/shapes/shape-outside-floats/shape-outside-floats-layout-after-initial-layout-pass.html [ Skip ]

diff --git a/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js b/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js
index d7ce64d0567451993763601d2494d6c011b545d4..2056a1d611d76bb85a2d38453966ae357616c358 100644 (file)
--- a/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js
+++ b/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js
@@ -24,7 +24,6 @@ var willChangeValues = [
     { 'property' : '-webkit-mask-box-image', 'stacking' : true },
     { 'property' : '-webkit-transform', 'stacking' : true },
     { 'property' : '-webkit-transform-style', 'stacking' : true },
-    { 'property' : '-webkit-flow-from', 'stacking' : true },
 ];
 
 function makeStackingElement(stackingProperty, value)

diff --git a/LayoutTests/fast/dom/collection-iterators-expected.txt b/LayoutTests/fast/dom/collection-iterators-expected.txt
index 65641577e4c902aadfbf0b99efb7089c60db824d..7577660d2ac8e42c8c82fdb7f097f727a45604f2 100644 (file)
--- a/LayoutTests/fast/dom/collection-iterators-expected.txt
+++ b/LayoutTests/fast/dom/collection-iterators-expected.txt
@@ -48,14 +48,6 @@ PASS 'keys' in obj is false
 PASS 'forEach' in obj is false
 PASS 'values' in obj is false
 
-* WebKitNamedFlowCollection
-PASS Symbol.iterator in obj is true
-PASS for..of did not throw an exception
-PASS 'entries' in obj is false
-PASS 'keys' in obj is false
-PASS 'forEach' in obj is false
-PASS 'values' in obj is false
-
 * Plugin
 PASS obj.__proto__ is Plugin.prototype
 PASS Symbol.iterator in obj is true

diff --git a/LayoutTests/fast/dom/collection-iterators.html b/LayoutTests/fast/dom/collection-iterators.html
index ba385c255f9776f924e2ad218c888ebcbf778147..aafdecc82e8dbcc4d5daac407c6b5e2456cd2d92 100644 (file)
--- a/LayoutTests/fast/dom/collection-iterators.html
+++ b/LayoutTests/fast/dom/collection-iterators.html
@@ -45,7 +45,6 @@ checkHasIterator("CSSRuleList", window.getMatchedCSSRules(document.body));
 checkHasIterator("CSSStyleDeclaration", window.getComputedStyle(document.body));
 checkHasIterator("CSSValueList", window.getComputedStyle(document.body).getPropertyCSSValue('background-position'));
 checkHasIterator("MimeTypeArray", navigator.mimeTypes);
-checkHasIterator("WebKitNamedFlowCollection", document.webkitGetNamedFlows());
 if (navigator.plugins.length)
     checkHasIterator("Plugin", navigator.plugins[0]);
 checkHasIterator("PluginArray", navigator.plugins);

diff --git a/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt b/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt
index 84b4456a363f76b266c000440eaa48a52c1fc4df..d4aa13faaa421d348be034301cccffca5431b749 100644 (file)
--- a/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt
+++ b/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt
@@ -134,7 +134,6 @@ PASS a["clientWidth"] is 0
 PASS a["clientHeight"] is 0
 PASS a["innerHTML"] is nerget
 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a>
-PASS a["webkitRegionOverset"] is undefined
 PASS a["oncopy"] is null
 PASS a["oncut"] is null
 PASS a["onpaste"] is null

diff --git a/LayoutTests/platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt b/LayoutTests/platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt
index b307b7f75605604f89f64ca94bb19838ab99eb2f..69ae0b790d494e65d35a06f943dba37143971025 100644 (file)
--- a/LayoutTests/platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt
+++ b/LayoutTests/platform/gtk/js/dom/dom-static-property-for-in-iteration-expected.txt
@@ -134,7 +134,6 @@ PASS a["clientWidth"] is 0
 PASS a["clientHeight"] is 0
 PASS a["innerHTML"] is nerget
 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a>
-PASS a["webkitRegionOverset"] is undefined
 PASS a["oncopy"] is null
 PASS a["oncut"] is null
 PASS a["onpaste"] is null

diff --git a/LayoutTests/platform/ios/fast/dom/collection-iterators-expected.txt b/LayoutTests/platform/ios/fast/dom/collection-iterators-expected.txt
index cd77acdcc4541933b253275241b857476d3a9853..9d6448720454ae50ffa931028bc37b8d7fe2366e 100644 (file)
--- a/LayoutTests/platform/ios/fast/dom/collection-iterators-expected.txt
+++ b/LayoutTests/platform/ios/fast/dom/collection-iterators-expected.txt
@@ -48,14 +48,6 @@ PASS 'keys' in obj is false
 PASS 'forEach' in obj is false
 PASS 'values' in obj is false
 
-* WebKitNamedFlowCollection
-PASS Symbol.iterator in obj is true
-PASS for..of did not throw an exception
-PASS 'entries' in obj is false
-PASS 'keys' in obj is false
-PASS 'forEach' in obj is false
-PASS 'values' in obj is false
-
 * PluginArray
 PASS obj.__proto__ is PluginArray.prototype
 PASS Symbol.iterator in obj is true

diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
index 34897afe3467222c5c5435605a23092b3c365db6..b4f0ec30734f79675e17cda715fc6eab95a7c2a2 100644 (file)
--- a/LayoutTests/platform/mac-wk2/TestExpectations
+++ b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -747,3 +747,6 @@ webkit.org/b/172148 tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-ma
 webkit.org/b/173946 [ Debug ] media/modern-media-controls/fullscreen-support/fullscreen-support-press.html [ Pass Failure ]
 
 webkit.org/b/175270 [ Debug ] plugins/crash-restoring-plugin-page-from-page-cache.html [ Skip ]
+
+# CSS Regions are being phased out.
+tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html [ Skip ]

diff --git a/LayoutTests/platform/win/js/dom/dom-static-property-for-in-iteration-expected.txt b/LayoutTests/platform/win/js/dom/dom-static-property-for-in-iteration-expected.txt
index c14d83005ffea01cdf2d2e91f7c8065754895832..506a80d2f57d508ef5814e92d778e86607bc34a9 100644 (file)
--- a/LayoutTests/platform/win/js/dom/dom-static-property-for-in-iteration-expected.txt
+++ b/LayoutTests/platform/win/js/dom/dom-static-property-for-in-iteration-expected.txt
@@ -50,7 +50,6 @@ PASS a["dataset"] is [object DOMStringMap]
 PASS a["clientWidth"] is 0
 PASS a["scrollWidth"] is 0
 PASS a["attributes"] is [object NamedNodeMap]
-PASS a["webkitRegionOverset"] is undefined
 PASS a["ALLOW_KEYBOARD_INPUT"] is 1
 PASS a["offsetWidth"] is 39
 PASS a["classList"] is 

diff --git a/LayoutTests/platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt b/LayoutTests/platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt
index f5686001d4665ddce7d76f03237669b8865a31da..48f16bd0eaac73c81cab6e3d2f6fa8b19bd6150b 100644 (file)
--- a/LayoutTests/platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt
+++ b/LayoutTests/platform/wpe/js/dom/dom-static-property-for-in-iteration-expected.txt
@@ -133,7 +133,6 @@ PASS a["clientWidth"] is 0
 PASS a["clientHeight"] is 0
 PASS a["innerHTML"] is nerget
 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a>
-PASS a["webkitRegionOverset"] is undefined
 PASS a["oncopy"] is null
 PASS a["oncut"] is null
 PASS a["onpaste"] is null

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7c59497dab1671f739a88d31c6a5937488f15a6d..1219f3ab7a502e7a829629ee7dd74a7479d87673 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-08-17  Jacobo Aragunde Pérez  <jaragunde@igalia.com>
 
         [WPE][GTK] Ensure proper casting of data in gvariants

diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
index dc5414020d4378efb00beb4ccf68a3b447325e1e..8ebae0dd1876e886abdb0ae6a4247bfc5c5a5a66 100644 (file)
--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
@@ -79,7 +79,7 @@ ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
 ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
-ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
+ENABLE_CSS_REGIONS = ;
 ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 14657d445721700c0e58b6adb257e2cf3f0c728b..418882e9b12a24e87019ed751a8dfbadc9af481f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-08-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS] Respect type fidelities when copying image elements to the pasteboard

diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
index dc5414020d4378efb00beb4ccf68a3b447325e1e..8ebae0dd1876e886abdb0ae6a4247bfc5c5a5a66 100644 (file)
--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
@@ -79,7 +79,7 @@ ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
 ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
-ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
+ENABLE_CSS_REGIONS = ;
 ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;

diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
index 86122770a52ad8c8d943e9384ec6eb87001a790d..d3be37f4280f90d90c0134dd7f1f26ea806b6f5f 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-08-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS] Respect type fidelities when copying image elements to the pasteboard

diff --git a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
index dc5414020d4378efb00beb4ccf68a3b447325e1e..8ebae0dd1876e886abdb0ae6a4247bfc5c5a5a66 100644 (file)
--- a/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
@@ -79,7 +79,7 @@ ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
 ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
-ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
+ENABLE_CSS_REGIONS = ;
 ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 78f50f0685f936547018216433c0d7295633687c..1403e06eb775669ff06ae8e869cc1aafdfa8e145 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-08-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS] Respect type fidelities when copying image elements to the pasteboard

diff --git a/Source/WebKit/Configurations/FeatureDefines.xcconfig b/Source/WebKit/Configurations/FeatureDefines.xcconfig
index dc5414020d4378efb00beb4ccf68a3b447325e1e..8ebae0dd1876e886abdb0ae6a4247bfc5c5a5a66 100644 (file)
--- a/Source/WebKit/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebKit/Configurations/FeatureDefines.xcconfig
@@ -79,7 +79,7 @@ ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
 ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
-ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
+ENABLE_CSS_REGIONS = ;
 ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;

diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
index ff20fee1ec950cd22c1ac5581ce869c7740e0bbd..1ebddceeb2bc7496b495280256b0828f16f47820 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2017-08-17  Don Olmstead  <don.olmstead@sony.com>
 
         [PAL] Move SessionID into PAL

diff --git a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
index dc5414020d4378efb00beb4ccf68a3b447325e1e..8ebae0dd1876e886abdb0ae6a4247bfc5c5a5a66 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
@@ -79,7 +79,7 @@ ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
 ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
-ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
+ENABLE_CSS_REGIONS = ;
 ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index ce61a4f00e5e57c07c3797fd8b99b208fc79f304..2ce7b265f8bc1a19a74816ca13a71b086b3f22c2 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -154,7 +154,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(USE_SYSTEM_MALLOC PUBLIC OFF)
 # Changing these options is completely unsupported.
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTPDIR PRIVATE OFF)

diff --git a/Source/cmake/OptionsMac.cmake b/Source/cmake/OptionsMac.cmake
index 72627a10a1928772c8b8c9971c300e99a5e77713..1afb09e3ac647f4146a374184d26f4237aa49d8e 100644 (file)
--- a/Source/cmake/OptionsMac.cmake
+++ b/Source/cmake/OptionsMac.cmake
@@ -17,7 +17,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PRIVATE ON)

diff --git a/Source/cmake/OptionsWPE.cmake b/Source/cmake/OptionsWPE.cmake
index 951ace0f333a4347c47cb88fd841c019d2f2033c..9aaf8c44329377919b179fa8e67caed729194dcf 100644 (file)
--- a/Source/cmake/OptionsWPE.cmake
+++ b/Source/cmake/OptionsWPE.cmake
@@ -13,7 +13,7 @@ WEBKIT_OPTION_DEFINE(EXPORT_DEPRECATED_WEBKIT2_C_API "Whether to export the WebK
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_2D_CANVAS PUBLIC OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DEVICE_ORIENTATION PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA PUBLIC OFF)

diff --git a/Source/cmake/OptionsWin.cmake b/Source/cmake/OptionsWin.cmake
index 0e2f19ae47a026544f5fb14e2b4e744a0cabc08a..70f88339cac06e7f9ad0602e19fe8165f210cb22 100644 (file)
--- a/Source/cmake/OptionsWin.cmake
+++ b/Source/cmake/OptionsWin.cmake
@@ -22,7 +22,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CHANNEL_MESSAGING PUBLIC ON)
 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_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CURSOR_VISIBILITY PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PUBLIC OFF)

diff --git a/Source/cmake/tools/vsprops/FeatureDefines.props b/Source/cmake/tools/vsprops/FeatureDefines.props
index 39aca3cc03e892ecb7c489449782e110c460e6ca..a64c144a89e1d254195e9f5dd75397c823fb48a5 100644 (file)
--- a/Source/cmake/tools/vsprops/FeatureDefines.props
+++ b/Source/cmake/tools/vsprops/FeatureDefines.props
@@ -12,7 +12,7 @@
     <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
     <ENABLE_CSS_COMPOSITING />
     <ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
-    <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
+    <ENABLE_CSS_REGIONS />
     <ENABLE_CSS_SELECTORS_LEVEL4>ENABLE_CSS_SELECTORS_LEVEL4</ENABLE_CSS_SELECTORS_LEVEL4>
     <ENABLE_CSS_SHADERS />
     <ENABLE_CSS_SHAPE_INSIDE>ENABLE_CSS_SHAPE_INSIDE</ENABLE_CSS_SHAPE_INSIDE>

diff --git a/Source/cmake/tools/vsprops/FeatureDefinesCairo.props b/Source/cmake/tools/vsprops/FeatureDefinesCairo.props
index 6979109ba86c2974c94d73173058fc1406909f54..aebe07f814deb121300775447646d5603e0ea231 100644 (file)
--- a/Source/cmake/tools/vsprops/FeatureDefinesCairo.props
+++ b/Source/cmake/tools/vsprops/FeatureDefinesCairo.props
@@ -12,7 +12,7 @@
     <ENABLE_CSS_BOX_DECORATION_BREAK>ENABLE_CSS_BOX_DECORATION_BREAK</ENABLE_CSS_BOX_DECORATION_BREAK>
     <ENABLE_CSS_COMPOSITING />
     <ENABLE_CSS_IMAGE_SET>ENABLE_CSS_IMAGE_SET</ENABLE_CSS_IMAGE_SET>
-    <ENABLE_CSS_REGIONS>ENABLE_CSS_REGIONS</ENABLE_CSS_REGIONS>
+    <ENABLE_CSS_REGIONS />
     <ENABLE_CSS_SELECTORS_LEVEL4>ENABLE_CSS_SELECTORS_LEVEL4</ENABLE_CSS_SELECTORS_LEVEL4>
     <ENABLE_CSS_SHADERS />
     <ENABLE_CSS_SHAPE_INSIDE>ENABLE_CSS_SHAPE_INSIDE</ENABLE_CSS_SHAPE_INSIDE>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 5239624f5418edc1135b8e85c645e9f5ba858f7b..49f25a0c5f179f70553bc22f4f277cbd05364d81 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2017-08-17  Andreas Kling  <akling@apple.com>
+
+        Disable CSS regions at compile time
+        https://bugs.webkit.org/show_bug.cgi?id=175630
+
+        Reviewed by Antti Koivisto.
+
+        * Scripts/webkitperl/FeatureList.pm:
+        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
 2017-08-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         Unreviewed, try to fix the internal iOS 10 build after r220865.

diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
index 0cb59f595895f7561731edb9ad56a965a39d02b5..2734961241cf22434bf165a0fe4b46b608f833ea 100644 (file)
--- a/Tools/Scripts/webkitperl/FeatureList.pm
+++ b/Tools/Scripts/webkitperl/FeatureList.pm
@@ -179,7 +179,7 @@ my @features = (
       define => "ENABLE_CSS_IMAGE_SET", default => (isGtk() || isWPE()), value => \$cssImageSetSupport },
 
     { option => "css-regions", desc => "Toggle CSS Regions support",
-      define => "ENABLE_CSS_REGIONS", default => 1, value => \$cssRegionsSupport },
+      define => "ENABLE_CSS_REGIONS", default => 0, value => \$cssRegionsSupport },
 
     { option => "css-shapes", desc => "Toggle CSS Shapes support",
       define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },

diff --git a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
index dc5414020d4378efb00beb4ccf68a3b447325e1e..8ebae0dd1876e886abdb0ae6a4247bfc5c5a5a66 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
@@ -79,7 +79,7 @@ ENABLE_CSS_COMPOSITING = ENABLE_CSS_COMPOSITING;
 ENABLE_CSS_DEVICE_ADAPTATION = ;
 ENABLE_CSS_IMAGE_ORIENTATION = ;
 ENABLE_CSS_IMAGE_RESOLUTION = ;
-ENABLE_CSS_REGIONS = ENABLE_CSS_REGIONS;
+ENABLE_CSS_REGIONS = ;
 ENABLE_CSS_SELECTORS_LEVEL4 = ENABLE_CSS_SELECTORS_LEVEL4;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CURSOR_VISIBILITY = ENABLE_CURSOR_VISIBILITY;