[CSS Grid Layout] Remove runtime feature
authorrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 May 2014 09:56:14 +0000 (09:56 +0000)
committerrego@igalia.com <rego@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 May 2014 09:56:14 +0000 (09:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132382

Reviewed by Benjamin Poulain.

PerformanceTests:
Remove set of WebKitCSSGridLayoutEnabled preference.

* Layout/auto-grid-lots-of-data.html:
* Layout/fixed-grid-lots-of-data.html:

Source/WebCore:
Remove cssGridLayoutEnabled setting. Update methods using it accordingly.

* WebCore.order:
* css/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGridTemplateShorthand):
(WebCore::CSSParser::parseGridAreaShorthand):
(WebCore::CSSParser::cssGridLayoutEnabled): Deleted.
* css/CSSParser.h:
* css/CSSParserMode.h:
* dom/Document.cpp:
(WebCore::Document::cssGridLayoutEnabled): Deleted.
* dom/Document.h:
* page/Settings.in:

Source/WebKit/efl:
Remove cssGridLayoutEnabled setting usage.

* WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
(DumpRenderTreeSupportEfl::setCSSGridLayoutEnabled): Deleted.
* WebCoreSupport/DumpRenderTreeSupportEfl.h:

Source/WebKit/mac:
Remove cssGridLayoutEnabled setting usage.

* WebKit.order:
* WebView/WebPreferenceKeysPrivate.h:
* WebView/WebPreferences.mm:
(+[WebPreferences initialize]):
(-[WebPreferences cssGridLayoutEnabled]): Deleted.
(-[WebPreferences setCSSGridLayoutEnabled:]): Deleted.
* WebView/WebPreferencesPrivate.h:
* WebView/WebView.mm:
(-[WebView _preferencesChanged:]):

Source/WebKit2:
Remove cssGridLayoutEnabled setting usage.

* Shared/WebPreferencesStore.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetCSSGridLayoutEnabled): Deleted.
(WKPreferencesGetCSSGridLayoutEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/gtk/WebKitSettings.cpp:
(webKitSettingsConstructed):
* UIProcess/gtk/ExperimentalFeatures.cpp:
* UIProcess/gtk/ExperimentalFeatures.h:
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
* mac/WebKit2.order:

Tools:
Remove cssGridLayoutEnabled setting usage.

* DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
(DumpRenderTreeChrome::resetDefaultsToConsistentValues):
* DumpRenderTree/efl/TestRunnerEfl.cpp:
(TestRunner::overridePreference):
* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):

LayoutTests:
Remove set of WebKitCSSGridLayoutEnabled preference.
Remove fast/css-grid-layout/grid-disabled.html patch as the setting is not available anymore.

* fast/css-grid-layout/anonymous-grid-items-expected.html:
* fast/css-grid-layout/anonymous-grid-items.html:
* fast/css-grid-layout/auto-content-resolution-columns.html:
* fast/css-grid-layout/auto-content-resolution-rows.html:
* fast/css-grid-layout/breadth-size-resolution-grid.html:
* fast/css-grid-layout/calc-resolution-grid-item.html:
* fast/css-grid-layout/containing-block-grids.html:
* fast/css-grid-layout/display-grid-set-get.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
* fast/css-grid-layout/flex-content-resolution-columns.html:
* fast/css-grid-layout/flex-content-resolution-rows.html:
* fast/css-grid-layout/flex-content-sized-column-use-available-width.html:
* fast/css-grid-layout/flex-content-sized-columns-resize.html:
* fast/css-grid-layout/floating-empty-grids.html:
* fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
* fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-update.html:
* fast/css-grid-layout/grid-auto-flow-get-set.html:
* fast/css-grid-layout/grid-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-flow-update.html:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html:
* fast/css-grid-layout/grid-disabled-expected.txt: Removed.
* fast/css-grid-layout/grid-disabled.html: Removed.
* fast/css-grid-layout/grid-dynamic-updates-relayout.html:
* fast/css-grid-layout/grid-element-border-grid-item.html:
* fast/css-grid-layout/grid-element-border-padding-grid-item.html:
* fast/css-grid-layout/grid-element-change-columns-repaint.html:
* fast/css-grid-layout/grid-element-change-rows-repaint.html:
* fast/css-grid-layout/grid-element-empty-row-column.html:
* fast/css-grid-layout/grid-element-min-max-height.html:
* fast/css-grid-layout/grid-element-min-max-width.html:
* fast/css-grid-layout/grid-element-padding-grid-item.html:
* fast/css-grid-layout/grid-element-padding-margin.html:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-element-shrink-to-fit.html:
* fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
* fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
* fast/css-grid-layout/grid-item-area-get-set.html:
* fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
* fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
* fast/css-grid-layout/grid-item-change-column-repaint.html:
* fast/css-grid-layout/grid-item-change-row-repaint.html:
* fast/css-grid-layout/grid-item-column-row-get-set.html:
* fast/css-grid-layout/grid-item-end-after-get-set.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows.html:
* fast/css-grid-layout/grid-item-margin-resolution.html:
* fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
* fast/css-grid-layout/grid-item-negative-indexes.html:
* fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
* fast/css-grid-layout/grid-item-negative-position-resolution.html:
* fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
* fast/css-grid-layout/grid-item-order-paint-order.html:
* fast/css-grid-layout/grid-item-position-changed-dynamic.html:
* fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
* fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
* fast/css-grid-layout/grid-item-spanning-resolution.html:
* fast/css-grid-layout/grid-item-start-before-get-set.html:
* fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
* fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
* fast/css-grid-layout/grid-preferred-logical-widths.html:
* fast/css-grid-layout/grid-strict-ordering-crash.html:
* fast/css-grid-layout/grid-template-areas-get-set.html:
* fast/css-grid-layout/grid-template-shorthand-get-set.html:
* fast/css-grid-layout/implicit-columns-auto-resolution.html:
* fast/css-grid-layout/implicit-position-dynamic-change.html:
* fast/css-grid-layout/implicit-rows-auto-resolution.html:
* fast/css-grid-layout/minmax-fixed-logical-height-only.html:
* fast/css-grid-layout/minmax-fixed-logical-width-only.html:
* fast/css-grid-layout/minmax-max-content-resolution-columns.html:
* fast/css-grid-layout/minmax-max-content-resolution-rows.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
* fast/css-grid-layout/minmax-spanning-resolution-columns.html:
* fast/css-grid-layout/minmax-spanning-resolution-rows.html:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set.html:
* fast/css-grid-layout/non-grid-element-repeat-get-set.html:
* fast/css-grid-layout/non-named-grid-line-get-set.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
* fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
* fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
* fast/css-grid-layout/percent-resolution-grid-item.html:
* fast/css-grid-layout/place-cell-by-index.html:
* fast/css-grid-layout/should-not-collapse-anonymous-blocks.html:
* ietestcenter/css3/grid/grid-column-002.htm:
* ietestcenter/css3/grid/testRunnerEnableGrid.js: Removed.

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

132 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/css-grid-layout/anonymous-grid-items-expected.html
LayoutTests/fast/css-grid-layout/anonymous-grid-items.html
LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
LayoutTests/fast/css-grid-layout/containing-block-grids.html
LayoutTests/fast/css-grid-layout/display-grid-set-get.html
LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/flex-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/flex-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/flex-content-sized-column-use-available-width.html
LayoutTests/fast/css-grid-layout/flex-content-sized-columns-resize.html
LayoutTests/fast/css-grid-layout/floating-empty-grids.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-get-set.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html
LayoutTests/fast/css-grid-layout/grid-disabled-expected.txt [deleted file]
LayoutTests/fast/css-grid-layout/grid-disabled.html [deleted file]
LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
LayoutTests/fast/css-grid-layout/grid-element-min-max-height.html
LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
LayoutTests/fast/css-grid-layout/grid-element-shrink-to-fit.html
LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html
LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-double-span.html
LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows.html
LayoutTests/fast/css-grid-layout/grid-item-margin-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html
LayoutTests/fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-negative-position-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-order-auto-flow-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-order-paint-order.html
LayoutTests/fast/css-grid-layout/grid-item-position-changed-dynamic.html
LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
LayoutTests/fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html
LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
LayoutTests/fast/css-grid-layout/grid-strict-ordering-crash.html
LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html
LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html
LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html
LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html
LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html
LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html
LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-set.html
LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html
LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
LayoutTests/fast/css-grid-layout/place-cell-by-index.html
LayoutTests/fast/css-grid-layout/should-not-collapse-anonymous-blocks.html
LayoutTests/ietestcenter/css3/grid/grid-column-002.htm
LayoutTests/ietestcenter/css3/grid/testRunnerEnableGrid.js [deleted file]
PerformanceTests/ChangeLog
PerformanceTests/Layout/auto-grid-lots-of-data.html
PerformanceTests/Layout/fixed-grid-lots-of-data.html
Source/WebCore/ChangeLog
Source/WebCore/WebCore.order
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSParser.h
Source/WebCore/css/CSSParserMode.h
Source/WebCore/dom/Document.cpp
Source/WebCore/dom/Document.h
Source/WebCore/page/Settings.in
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp
Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebKit.order
Source/WebKit/mac/WebView/WebPreferenceKeysPrivate.h
Source/WebKit/mac/WebView/WebPreferences.mm
Source/WebKit/mac/WebView/WebPreferencesPrivate.h
Source/WebKit/mac/WebView/WebView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebPreferencesStore.h
Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
Source/WebKit2/UIProcess/API/C/WKPreferencesRefPrivate.h
Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
Source/WebKit2/UIProcess/gtk/ExperimentalFeatures.cpp
Source/WebKit2/UIProcess/gtk/ExperimentalFeatures.h
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/mac/WebKit2.order
Tools/ChangeLog
Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
Tools/DumpRenderTree/efl/TestRunnerEfl.cpp
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index 2e6f954..7b01508 100644 (file)
@@ -1,3 +1,111 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove set of WebKitCSSGridLayoutEnabled preference.
+        Remove fast/css-grid-layout/grid-disabled.html patch as the setting is not available anymore.
+
+        * fast/css-grid-layout/anonymous-grid-items-expected.html:
+        * fast/css-grid-layout/anonymous-grid-items.html:
+        * fast/css-grid-layout/auto-content-resolution-columns.html:
+        * fast/css-grid-layout/auto-content-resolution-rows.html:
+        * fast/css-grid-layout/breadth-size-resolution-grid.html:
+        * fast/css-grid-layout/calc-resolution-grid-item.html:
+        * fast/css-grid-layout/containing-block-grids.html:
+        * fast/css-grid-layout/display-grid-set-get.html:
+        * fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
+        * fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
+        * fast/css-grid-layout/flex-content-resolution-columns.html:
+        * fast/css-grid-layout/flex-content-resolution-rows.html:
+        * fast/css-grid-layout/flex-content-sized-column-use-available-width.html:
+        * fast/css-grid-layout/flex-content-sized-columns-resize.html:
+        * fast/css-grid-layout/floating-empty-grids.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
+        * fast/css-grid-layout/grid-auto-columns-rows-update.html:
+        * fast/css-grid-layout/grid-auto-flow-get-set.html:
+        * fast/css-grid-layout/grid-auto-flow-resolution.html:
+        * fast/css-grid-layout/grid-auto-flow-update.html:
+        * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
+        * fast/css-grid-layout/grid-columns-rows-get-set.html:
+        * fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html:
+        * fast/css-grid-layout/grid-disabled-expected.txt: Removed.
+        * fast/css-grid-layout/grid-disabled.html: Removed.
+        * fast/css-grid-layout/grid-dynamic-updates-relayout.html:
+        * fast/css-grid-layout/grid-element-border-grid-item.html:
+        * fast/css-grid-layout/grid-element-border-padding-grid-item.html:
+        * fast/css-grid-layout/grid-element-change-columns-repaint.html:
+        * fast/css-grid-layout/grid-element-change-rows-repaint.html:
+        * fast/css-grid-layout/grid-element-empty-row-column.html:
+        * fast/css-grid-layout/grid-element-min-max-height.html:
+        * fast/css-grid-layout/grid-element-min-max-width.html:
+        * fast/css-grid-layout/grid-element-padding-grid-item.html:
+        * fast/css-grid-layout/grid-element-padding-margin.html:
+        * fast/css-grid-layout/grid-element-repeat-get-set.html:
+        * fast/css-grid-layout/grid-element-shrink-to-fit.html:
+        * fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
+        * fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
+        * fast/css-grid-layout/grid-item-area-get-set.html:
+        * fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
+        * fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
+        * fast/css-grid-layout/grid-item-change-column-repaint.html:
+        * fast/css-grid-layout/grid-item-change-row-repaint.html:
+        * fast/css-grid-layout/grid-item-column-row-get-set.html:
+        * fast/css-grid-layout/grid-item-end-after-get-set.html:
+        * fast/css-grid-layout/grid-item-margin-auto-columns-rows.html:
+        * fast/css-grid-layout/grid-item-margin-resolution.html:
+        * fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
+        * fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
+        * fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
+        * fast/css-grid-layout/grid-item-negative-indexes.html:
+        * fast/css-grid-layout/grid-item-negative-integer-explicit-grid-resolution.html:
+        * fast/css-grid-layout/grid-item-negative-position-resolution.html:
+        * fast/css-grid-layout/grid-item-order-auto-flow-resolution.html:
+        * fast/css-grid-layout/grid-item-order-paint-order.html:
+        * fast/css-grid-layout/grid-item-position-changed-dynamic.html:
+        * fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
+        * fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
+        * fast/css-grid-layout/grid-item-spanning-resolution.html:
+        * fast/css-grid-layout/grid-item-start-before-get-set.html:
+        * fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
+        * fast/css-grid-layout/grid-item-with-percent-min-max-height-dynamic.html:
+        * fast/css-grid-layout/grid-preferred-logical-widths.html:
+        * fast/css-grid-layout/grid-strict-ordering-crash.html:
+        * fast/css-grid-layout/grid-template-areas-get-set.html:
+        * fast/css-grid-layout/grid-template-shorthand-get-set.html:
+        * fast/css-grid-layout/implicit-columns-auto-resolution.html:
+        * fast/css-grid-layout/implicit-position-dynamic-change.html:
+        * fast/css-grid-layout/implicit-rows-auto-resolution.html:
+        * fast/css-grid-layout/minmax-fixed-logical-height-only.html:
+        * fast/css-grid-layout/minmax-fixed-logical-width-only.html:
+        * fast/css-grid-layout/minmax-max-content-resolution-columns.html:
+        * fast/css-grid-layout/minmax-max-content-resolution-rows.html:
+        * fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
+        * fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
+        * fast/css-grid-layout/minmax-spanning-resolution-columns.html:
+        * fast/css-grid-layout/minmax-spanning-resolution-rows.html:
+        * fast/css-grid-layout/named-grid-line-get-set.html:
+        * fast/css-grid-layout/named-grid-lines-with-named-grid-areas-get-set.html:
+        * fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
+        * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
+        * fast/css-grid-layout/non-grid-columns-rows-get-set.html:
+        * fast/css-grid-layout/non-grid-element-repeat-get-set.html:
+        * fast/css-grid-layout/non-named-grid-line-get-set.html:
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html:
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html:
+        * fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html:
+        * fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html:
+        * fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html:
+        * fast/css-grid-layout/percent-resolution-grid-item.html:
+        * fast/css-grid-layout/place-cell-by-index.html:
+        * fast/css-grid-layout/should-not-collapse-anonymous-blocks.html:
+        * ietestcenter/css3/grid/grid-column-002.htm:
+        * ietestcenter/css3/grid/testRunnerEnableGrid.js: Removed.
+
 2014-05-07  Lorenzo Tilve  <ltilve@igalia.com>
 
         [GTK] Unreviewed GTK gardening
index c3d0a18..c591744 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <body>
     <div>Checks that anonymous grid items are supported. This should not crash.</div>
     <div style="display: -webkit-grid;">
index 54425ef..c6aee04 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <body>
     <div>Checks that anonymous grid items are supported. This should not crash.</div>
     <div style="display: -webkit-grid;">
index b095b72..d48c948 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
index c6db2fb..fc8898a 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
index 585de1e..34d27c7 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index dd0f810..9cbf884 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 6723016..0187956 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script>
-        if (window.testRunner)
-            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-    </script>
     <link href="resources/grid.css" rel="stylesheet">
     <style>
         div { width: 100px; height: 100px; }
index 1f6e622..9afcaf4 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <script src="../../resources/js-test-pre.js"></script>
 </head>
index 32c96ec..200ef10 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMaxMaxContent {
index 0fe0cb1..905bc17 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMaxMaxContent {
index 679b6b8..b8350a1 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinFlexContent {
index e9b3fb5..e1ca9c6 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinFlexContent {
index f1a3b53..b0e5edf 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script>
-        if (window.testRunner)
-            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-    </script>
     <link href="resources/grid.css" rel="stylesheet">
     <style type="text/css">
         #grid-1 {
index 07d2b2e..ba0928d 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-    if (window.testRunner)
-        testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style type="text/css">
     #grid-1 {
index ae6ac71..073439f 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <script>
-        if (window.testRunner)
-            testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-    </script>
     <style>
         span { width: 100px; height: 100px; }
         .grid { display: -webkit-grid; background-color: green; }
index 3908300..7d752d0 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 7a09f57..39c848a 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoFixedFixed {
index d352601..bdf5275 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 1d966f4..e003fad 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 367ebdf..fa60fcc 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoFlowInherit {
index e924886..360a009 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .smallGrid {
index de79fb2..60a2143 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <script src="../../resources/check-layout.js"></script>
 <style>
index 6a67c2d..f49990e 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index b492969..4fe76cd 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index bfa8f73..9b2f206 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <script src="../../resources/check-layout.js"></script>
 <style type="text/css">
diff --git a/LayoutTests/fast/css-grid-layout/grid-disabled-expected.txt b/LayoutTests/fast/css-grid-layout/grid-disabled-expected.txt
deleted file mode 100644 (file)
index bf84050..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Verifies that display: -webkit-grid does nothing if runtime feature is disabled.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS document.getElementById('grid').style.display is ''
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/css-grid-layout/grid-disabled.html b/LayoutTests/fast/css-grid-layout/grid-disabled.html
deleted file mode 100644 (file)
index f4de9de..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 0);
-</script>
-<body>
-<div id="grid" style="display: -webkit-grid"></div>
-
-<script src="../../resources/js-test-pre.js"></script>
-<script>
-description("Verifies that display: -webkit-grid does nothing if runtime feature is disabled.");
-
-shouldBe("document.getElementById('grid').style.display", "''");
-</script>
-<script src="../../resources/js-test-post.js"></script>
-</body>
-</html>
index ea598ce..4ad30a4 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <script src="../../resources/check-layout.js"></script>
 <script>
index 7d8267c..87b7dea 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <script src="../../resources/check-layout.js"></script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
index 857ceb8..2f4eb78 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <script src="../../resources/check-layout.js"></script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
index b56e83a..6c309d7 100644 (file)
@@ -2,9 +2,6 @@
 <html>
 <script src="../repaint/resources/text-based-repaint.js"></script>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-
 function repaintTest()
 {
     var gridElement = document.getElementsByClassName("grid")[0];
index d5cd174..c020048 100644 (file)
@@ -2,9 +2,6 @@
 <html>
 <script src="../repaint/resources/text-based-repaint.js"></script>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-
 function repaintTest()
 {
     var gridElement = document.getElementsByClassName("grid")[0];
index 567fff3..79d4680 100644 (file)
@@ -1,8 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href=resources/grid.css rel=stylesheet>
 <style>
 .gridNoRow {
index 188c9f2..33afcc3 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
 <style>
index 8d9c07c..b60bc52 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
 <style>
index 2b25368..db6e541 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <script src="../../resources/check-layout.js"></script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
index 2518124..a4da3e6 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index b90e8b2..90e60ed 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 85242dd..4bdabf2 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 0e7861b..4785d6b 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index c0fe271..7a41327 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridFixedContent {
index 23d2d51..488fa49 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 871f9d3..45e9ca7 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet"/>
 <style>
 .grid {
index 13011e4..c418b10 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index efcd43d..25994b2 100644 (file)
@@ -2,9 +2,6 @@
 <html>
 <script src="../repaint/resources/text-based-repaint.js"></script>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-
 function repaintTest()
 {
     var gridItem = document.getElementsByClassName("sizedToGridArea")[0];
index 4d3a606..1753ffc 100644 (file)
@@ -2,9 +2,6 @@
 <html>
 <script src="../repaint/resources/text-based-repaint.js"></script>
 <script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-
 function repaintTest()
 {
     var gridItem = document.getElementsByClassName("sizedToGridArea")[0];
index 425510b..3dcb5a0 100644 (file)
@@ -2,10 +2,6 @@
 <html>
 <head>
 <script src="resources/grid-item-column-row-parsing-utils.js"></script>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <style>
 .grid {
     -webkit-grid-template-areas: "firstArea secondArea"
index 7cc9808..f0291f3 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 06239fc..c1e747a 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index b765d8b..57b2da6 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <script src="../../resources/check-layout.js"></script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
index 62f35a0..7efd2a8 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxAutoWithColumnMinMaxAuto {
index 3c730c1..db4dded 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet"/>
 <style>
 .grid {
index d2af104..13148f8 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridWithoutRepeat {
index 37c3868..2beb8e1 100644 (file)
@@ -1,7 +1,4 @@
 <!DOCTYPE html>
-<script>
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .negativeStartBeforePositionIndexes {
index dec2541..52224e2 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .columnGrid {
index b7097e1..8e4149d 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index ae358e4..b6d0263 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 56e0d5a..bcd0d81 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 067d615..597c1ff 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style type="text/css">
 .grid {
index bcbacae..095214a 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index fb4bbcd..5ec5b71 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
index facdfec..ed0aa54 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index e3b25e1..a89ac4a 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index ed4ca9a..7c6f069 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxMinMax {
index b6a0fad..06a5cf2 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index fb15831..3eed633 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-    if (window.testRunner)
-        testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel=stylesheet>
 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
 <style>
index 3c1fe2f..6bfe5ba 100644 (file)
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <script>
     if (window.testRunner) {
-        testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
         testRunner.dumpAsText();
     }
 </script>
index 7a9666f..009caad 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 #gridWithSingleStringTemplate {
index 4e2a5ff..83aa559 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 #gridTemplateWithNone {
index e2a919e..43a8eae 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
index ad629f4..6bc74bf 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridFixedContent {
index 6ba913a..9ad5833 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoContent {
index 5d9202f..b6d74cd 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index b2bcfd5..b86560c 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 83bcfa2..a929464 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxContent {
index 5429d06..5803ad2 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMaxContent {
index 6c725ee..0b95555 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMinContent {
index 7c0a31e..145ad5d 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridMinMinContent {
index 27e31dc..a04ebbf 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoAutoContent {
index fdef885..3ef6d1a 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridAutoAutoContent {
index 7d5481f..2eaa4df 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index af2d345..65e01e0 100644 (file)
@@ -2,10 +2,6 @@
 <html>
 <head>
 <link href="resources/grid.css" rel="stylesheet">
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <style type="text/css">
 
   .gridAreas {
index 0b98232..31ce82a 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style type="text/css">
 
index 8280410..a67f9eb 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridWithFixed {
index d99ef26..b03520f 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridWithNone {
index 6443313..98ca84b 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .singleSingleTrackRepeat {
index d6b7891..2b30582 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .gridItem {
index fb88bcb..d3c72ad 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .container {
index b653727..584c731 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 1367ba6..e7962a4 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index b5a2cdc..a2ddc23 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index 91136d7..1d6ef98 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index cdb1a08..56dd96d 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index e690f3d..34c3897 100644 (file)
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <link href="resources/grid.css" rel="stylesheet">
 <style>
 .grid {
index d4c1ef2..6e1855d 100644 (file)
@@ -2,7 +2,6 @@
 <html>
 <script>
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
     testRunner.dumpAsText();
 }
 </script>
index c4aa863..0403d72 100644 (file)
@@ -33,7 +33,6 @@
         <link rel="help" href="http://dev.w3.org/csswg/css3-grid-align/#grid-declaration" />
         <meta name="flags" content="ahem invalid" />
         <meta name="assert" content="The 'grid-column' with a value of '0' is invalid and inserts the grid-item in the first column." />
-        <script src="testRunnerEnableGrid.js"></script>
         <style type="text/css">
             #test
             {
diff --git a/LayoutTests/ietestcenter/css3/grid/testRunnerEnableGrid.js b/LayoutTests/ietestcenter/css3/grid/testRunnerEnableGrid.js
deleted file mode 100644 (file)
index 64de24d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
index c37ea7e..5c3970e 100644 (file)
@@ -1,3 +1,15 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove set of WebKitCSSGridLayoutEnabled preference.
+
+        * Layout/auto-grid-lots-of-data.html:
+        * Layout/fixed-grid-lots-of-data.html:
+
 2014-05-06  Radu Stavila  <stavila@adobe.com>
 
         [CSSRegions] Enabled regions performance tests by default
index f643095..5aa8081 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <style>
 html, body {
     margin: 0;
index e997c2d..ab3e5d0 100644 (file)
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html>
 <head>
-<script>
-if (window.testRunner)
-    testRunner.overridePreference("WebKitCSSGridLayoutEnabled", 1);
-</script>
 <style>
 html, body {
     margin: 0;
index 7b51642..5df9527 100644 (file)
@@ -1,3 +1,28 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove cssGridLayoutEnabled setting. Update methods using it accordingly.
+
+        * WebCore.order:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParserContext::CSSParserContext):
+        (WebCore::operator==):
+        (WebCore::isValidKeywordPropertyAndValue):
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseGridTemplateShorthand):
+        (WebCore::CSSParser::parseGridAreaShorthand):
+        (WebCore::CSSParser::cssGridLayoutEnabled): Deleted.
+        * css/CSSParser.h:
+        * css/CSSParserMode.h:
+        * dom/Document.cpp:
+        (WebCore::Document::cssGridLayoutEnabled): Deleted.
+        * dom/Document.h:
+        * page/Settings.in:
+
 2014-05-07  Praveen R Jadhav  <praveen.j@samsung.com>
 
         Fix build errors for BlobDataItem after r168391.
index 6bad227..d52a69a 100644 (file)
@@ -4324,7 +4324,6 @@ __ZN7WebCore16CSSParserContextC1EPNS_8DocumentERKNS_4KURLERKN3WTF6StringE
 __ZN7WebCore16CSSParserContextC2EPNS_8DocumentERKNS_4KURLERKN3WTF6StringE
 __ZNK7WebCore8Document24cssStickyPositionEnabledEv
 __ZNK7WebCore8Document21cssCompositingEnabledEv
-__ZNK7WebCore8Document20cssGridLayoutEnabledEv
 __ZN7WebCore18StyleSheetContents14registerClientEPNS_13CSSStyleSheetE
 __ZN3WTF6VectorIPN7WebCore13CSSStyleSheetELm0ENS_15CrashOnOverflowEE14expandCapacityEmPKS3_
 __ZN3WTF6VectorIPN7WebCore13CSSStyleSheetELm0ENS_15CrashOnOverflowEE15reserveCapacityEm
index 443e408..ae236a5 100644 (file)
@@ -251,9 +251,6 @@ CSSParserContext::CSSParserContext(CSSParserMode mode, const URL& baseURL)
     , isHTMLDocument(false)
     , isCSSRegionsEnabled(false)
     , isCSSCompositingEnabled(false)
-#if ENABLE(CSS_GRID_LAYOUT)
-    , isCSSGridLayoutEnabled(false)
-#endif
     , needsSiteSpecificQuirks(false)
     , enforcesCSSMIMETypeInNoQuirksMode(true)
     , useLegacyBackgroundSizeShorthandBehavior(false)
@@ -273,9 +270,6 @@ CSSParserContext::CSSParserContext(Document& document, const URL& baseURL, const
     , isHTMLDocument(document.isHTMLDocument())
     , isCSSRegionsEnabled(document.cssRegionsEnabled())
     , isCSSCompositingEnabled(document.cssCompositingEnabled())
-#if ENABLE(CSS_GRID_LAYOUT)
-    , isCSSGridLayoutEnabled(document.cssGridLayoutEnabled())
-#endif
     , needsSiteSpecificQuirks(document.settings() ? document.settings()->needsSiteSpecificQuirks() : false)
     , enforcesCSSMIMETypeInNoQuirksMode(!document.settings() || document.settings()->enforceCSSMIMETypeInNoQuirksMode())
     , useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
@@ -296,9 +290,6 @@ bool operator==(const CSSParserContext& a, const CSSParserContext& b)
         && a.isHTMLDocument == b.isHTMLDocument
         && a.isCSSRegionsEnabled == b.isCSSRegionsEnabled
         && a.isCSSCompositingEnabled == b.isCSSCompositingEnabled
-#if ENABLE(CSS_GRID_LAYOUT)
-        && a.isCSSGridLayoutEnabled == b.isCSSGridLayoutEnabled
-#endif
         && a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
         && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
         && a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior;
@@ -683,7 +674,7 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
         if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone)
             return true;
 #if ENABLE(CSS_GRID_LAYOUT)
-        if (parserContext.isCSSGridLayoutEnabled && (valueID == CSSValueWebkitGrid || valueID == CSSValueWebkitInlineGrid))
+        if (valueID == CSSValueWebkitGrid || valueID == CSSValueWebkitInlineGrid)
             return true;
 #endif
         break;
@@ -2564,15 +2555,11 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
 #if ENABLE(CSS_GRID_LAYOUT)
     case CSSPropertyWebkitGridAutoColumns:
     case CSSPropertyWebkitGridAutoRows:
-        if (!cssGridLayoutEnabled())
-            return false;
         parsedValue = parseGridTrackSize(*m_valueList);
         break;
 
     case CSSPropertyWebkitGridTemplateColumns:
     case CSSPropertyWebkitGridTemplateRows:
-        if (!cssGridLayoutEnabled())
-            return false;
         parsedValue = parseGridTrackList();
         break;
 
@@ -2580,34 +2567,21 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyWebkitGridColumnEnd:
     case CSSPropertyWebkitGridRowStart:
     case CSSPropertyWebkitGridRowEnd:
-        if (!cssGridLayoutEnabled())
-            return false;
-
         parsedValue = parseGridPosition();
         break;
 
     case CSSPropertyWebkitGridColumn:
     case CSSPropertyWebkitGridRow: {
-        if (!cssGridLayoutEnabled())
-            return false;
-
         return parseGridItemPositionShorthand(propId, important);
     }
 
     case CSSPropertyWebkitGridTemplate:
-        if (!cssGridLayoutEnabled())
-            return false;
         return parseGridTemplateShorthand(important);
 
     case CSSPropertyWebkitGridArea:
-        if (!cssGridLayoutEnabled())
-            return false;
         return parseGridAreaShorthand(important);
 
     case CSSPropertyWebkitGridTemplateAreas:
-        if (!cssGridLayoutEnabled())
-            return false;
-
         parsedValue = parseGridTemplateAreas();
         break;
 #endif /* ENABLE(CSS_GRID_LAYOUT) */
@@ -4861,8 +4835,6 @@ bool CSSParser::parseGridTemplateRowsAndAreas(PassRefPtr<CSSValue> templateColum
 
 bool CSSParser::parseGridTemplateShorthand(bool important)
 {
-    ASSERT(cssGridLayoutEnabled());
-
     ShorthandScope scope(this, CSSPropertyWebkitGridTemplate);
     ASSERT(shorthandForProperty(CSSPropertyWebkitGridTemplate).length() == 3);
 
@@ -4910,8 +4882,6 @@ bool CSSParser::parseGridTemplateShorthand(bool important)
 
 bool CSSParser::parseGridAreaShorthand(bool important)
 {
-    ASSERT(cssGridLayoutEnabled());
-
     ShorthandScope scope(this, CSSPropertyWebkitGridArea);
     ASSERT(shorthandForProperty(CSSPropertyWebkitGridArea).length() == 4);
 
@@ -9138,13 +9108,6 @@ bool CSSParser::cssCompositingEnabled() const
     return m_context.isCSSCompositingEnabled;
 }
 
-#if ENABLE(CSS_GRID_LAYOUT)
-bool CSSParser::cssGridLayoutEnabled() const
-{
-    return m_context.isCSSGridLayoutEnabled;
-}
-#endif
-
 #if ENABLE(CSS_REGIONS)
 
 // none | <ident>
index 7935c05..edc4394 100644 (file)
@@ -158,7 +158,6 @@ public:
     bool parseAnimationShorthand(bool important);
 
 #if ENABLE(CSS_GRID_LAYOUT)
-    bool cssGridLayoutEnabled() const;
     PassRefPtr<CSSValue> parseGridPosition();
     bool parseGridItemPositionShorthand(CSSPropertyID, bool important);
     bool parseGridTemplateRowsAndAreas(PassRefPtr<CSSValue>, bool important);
index 558fd5d..44cdabc 100644 (file)
@@ -66,9 +66,6 @@ public:
     bool isHTMLDocument;
     bool isCSSRegionsEnabled;
     bool isCSSCompositingEnabled;
-#if ENABLE(CSS_GRID_LAYOUT)
-    bool isCSSGridLayoutEnabled;
-#endif
     bool needsSiteSpecificQuirks;
     bool enforcesCSSMIMETypeInNoQuirksMode;
     bool useLegacyBackgroundSizeShorthandBehavior;
index b096a4a..96c4052 100644 (file)
@@ -1109,13 +1109,6 @@ bool Document::cssCompositingEnabled() const
     return RuntimeEnabledFeatures::sharedFeatures().cssCompositingEnabled();
 }
 
-#if ENABLE(CSS_GRID_LAYOUT)
-bool Document::cssGridLayoutEnabled() const
-{
-    return settings() && settings()->cssGridLayoutEnabled();
-}
-#endif
-
 #if ENABLE(CSS_REGIONS)
 
 PassRefPtr<DOMNamedFlowCollection> Document::webkitGetNamedFlows()
index cac1d8a..3742251 100644 (file)
@@ -436,10 +436,6 @@ public:
 
     NamedFlowCollection* namedFlows();
 
-#if ENABLE(CSS_GRID_LAYOUT)
-    bool cssGridLayoutEnabled() const;
-#endif
-
     Element* elementFromPoint(int x, int y) const;
     PassRefPtr<Range> caretRangeFromPoint(int x, int y);
 
index 8bbec16..d1dc8e6 100644 (file)
@@ -85,7 +85,6 @@ canvasUsesAcceleratedDrawing initial=false
 acceleratedDrawingEnabled initial=false
 acceleratedFiltersEnabled initial=false
 regionBasedColumnsEnabled initial=true
-cssGridLayoutEnabled initial=true
 useLegacyTextAlignPositionedElementBehavior initial=false
 
 # FIXME: This should really be disabled by default as it makes platforms that don't support the feature download files
index c74402e..f524972 100644 (file)
@@ -1,3 +1,16 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove cssGridLayoutEnabled setting usage.
+
+        * WebCoreSupport/DumpRenderTreeSupportEfl.cpp:
+        (DumpRenderTreeSupportEfl::setCSSGridLayoutEnabled): Deleted.
+        * WebCoreSupport/DumpRenderTreeSupportEfl.h:
+
 2014-05-01  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL][WK1] Drop ewk_view_setting_tiled_backingstore APIs
index 21ed442..fce2dae 100644 (file)
@@ -311,13 +311,6 @@ bool DumpRenderTreeSupportEfl::findString(const Evas_Object* ewkView, const Stri
     return page->findString(text, options);
 }
 
-void DumpRenderTreeSupportEfl::setCSSGridLayoutEnabled(const Evas_Object* ewkView, bool enabled)
-{
-    DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
-
-    page->settings().setCSSGridLayoutEnabled(enabled);
-}
-
 void DumpRenderTreeSupportEfl::setCSSRegionsEnabled(const Evas_Object* ewkView, bool enabled)
 {
     DRT_SUPPRT_PAGE_GET_OR_RETURN(ewkView, page);
index 49bb7c6..4956b29 100644 (file)
@@ -78,7 +78,6 @@ public:
     static void executeCoreCommandByName(const Evas_Object* ewkView, const char* name, const char* value);
     static bool findString(const Evas_Object* ewkView, const String& text, WebCore::FindOptions);
     static bool isCommandEnabled(const Evas_Object* ewkView, const char* name);
-    static void setCSSGridLayoutEnabled(const Evas_Object* ewkView, bool enabled);
     static void setCSSRegionsEnabled(const Evas_Object* ewkView, bool enabled);
     static void setWebAudioEnabled(Evas_Object* ewkView, bool);
 
index 857597d..3704300 100644 (file)
@@ -1,3 +1,22 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove cssGridLayoutEnabled setting usage.
+
+        * WebKit.order:
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.mm:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences cssGridLayoutEnabled]): Deleted.
+        (-[WebPreferences setCSSGridLayoutEnabled:]): Deleted.
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.mm:
+        (-[WebView _preferencesChanged:]):
+
 2014-05-06  Dean Jackson  <dino@apple.com>
 
         [Mac] Allow focus rings to redraw themselves if necessary
index 66e2104..ad880a1 100644 (file)
@@ -316,7 +316,6 @@ _WKAppVersionCheckLessThan
 -[WebPreferences(WebPrivate) cssCompositingEnabled]
 -[WebPreferences(WebPrivate) webAudioEnabled]
 -[WebPreferences(WebPrivate) seamlessIFramesEnabled]
--[WebPreferences(WebPrivate) cssGridLayoutEnabled]
 -[WebPreferences(WebPrivate) fullScreenEnabled]
 -[WebPreferences(WebPrivate) asynchronousSpellCheckingEnabled]
 -[WebPreferences(WebPrivate) hyperlinkAuditingEnabled]
@@ -1263,7 +1262,6 @@ _WKCreatePrivateStorageSession
 -[WebPreferences(WebPrivate) setCanvasUsesAcceleratedDrawing:]
 -[WebPreferences(WebPrivate) setAcceleratedDrawingEnabled:]
 -[WebPreferences(WebPrivate) setCSSRegionsEnabled:]
--[WebPreferences(WebPrivate) setCSSGridLayoutEnabled:]
 -[WebPreferences(WebPrivate) setUsePreHTML5ParserQuirks:]
 -[WebPreferences(WebPrivate) setAsynchronousSpellCheckingEnabled:]
 -[WebPreferences(WebPrivate) setMockScrollbarsEnabled:]
index de53de5..cf871a9 100644 (file)
 #define WebKitAcceleratedCompositingEnabledPreferenceKey @"WebKitAcceleratedCompositingEnabled"
 #define WebKitCSSRegionsEnabledPreferenceKey @"WebKitCSSRegionsEnabled"
 #define WebKitCSSCompositingEnabledPreferenceKey @"WebKitCSSCompositingEnabled"
-#define WebKitCSSGridLayoutEnabledPreferenceKey @"WebKitCSSGridLayoutEnabled"
 #define WebKitShowDebugBordersPreferenceKey @"WebKitShowDebugBorders"
 #define WebKitShowRepaintCounterPreferenceKey @"WebKitShowRepaintCounter"
 #define WebKitWebAudioEnabledPreferenceKey @"WebKitWebAudioEnabled"
index 601f031..71c68d1 100644 (file)
@@ -482,7 +482,6 @@ public:
         [NSNumber numberWithBool:YES],  WebKitAcceleratedCompositingEnabledPreferenceKey,
         [NSNumber numberWithBool:YES], WebKitCSSRegionsEnabledPreferenceKey,
         [NSNumber numberWithBool:YES], WebKitCSSCompositingEnabledPreferenceKey,
-        [NSNumber numberWithBool:YES],  WebKitCSSGridLayoutEnabledPreferenceKey,
 #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
         [NSNumber numberWithBool:YES],  WebKitAcceleratedDrawingEnabledPreferenceKey,
         [NSNumber numberWithBool:YES],  WebKitCanvasUsesAcceleratedDrawingPreferenceKey,
@@ -1881,16 +1880,6 @@ static NSString *classIBCreatorID = nil;
     [self _setBoolValue:enabled forKey:WebKitCSSCompositingEnabledPreferenceKey];
 }
 
-- (BOOL)cssGridLayoutEnabled
-{
-    return [self _boolValueForKey:WebKitCSSGridLayoutEnabledPreferenceKey];
-}
-
-- (void)setCSSGridLayoutEnabled:(BOOL)enabled
-{
-    [self _setBoolValue:enabled forKey:WebKitCSSGridLayoutEnabledPreferenceKey];
-}
-
 - (BOOL)showDebugBorders
 {
     return [self _boolValueForKey:WebKitShowDebugBordersPreferenceKey];
index 5e04414..3eb7ddf 100644 (file)
@@ -205,9 +205,6 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification;
 - (BOOL)cssCompositingEnabled;
 - (void)setCSSCompositingEnabled:(BOOL)enabled;
 
-- (BOOL)cssGridLayoutEnabled;
-- (void)setCSSGridLayoutEnabled:(BOOL)enabled;
-
 - (BOOL)showDebugBorders;
 - (void)setShowDebugBorders:(BOOL)show;
 
index 2921ac0..e4c36a5 100644 (file)
@@ -2338,7 +2338,6 @@ static bool needsSelfRetainWhileLoadingQuirk()
 #if ENABLE(WEB_AUDIO)
     settings.setWebAudioEnabled([preferences webAudioEnabled]);
 #endif
-    settings.setCSSGridLayoutEnabled([preferences cssGridLayoutEnabled]);
 #if ENABLE(FULLSCREEN_API)
     settings.setFullScreenEnabled([preferences fullScreenEnabled]);
 #endif
index b07bbc0..346375b 100644 (file)
@@ -1,3 +1,27 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove cssGridLayoutEnabled setting usage.
+
+        * Shared/WebPreferencesStore.h:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetCSSGridLayoutEnabled): Deleted.
+        (WKPreferencesGetCSSGridLayoutEnabled): Deleted.
+        * UIProcess/API/C/WKPreferencesRefPrivate.h:
+        * UIProcess/API/gtk/WebKitSettings.cpp:
+        (webKitSettingsConstructed):
+        * UIProcess/gtk/ExperimentalFeatures.cpp:
+        * UIProcess/gtk/ExperimentalFeatures.h:
+        * WebProcess/InjectedBundle/InjectedBundle.cpp:
+        (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+        * mac/WebKit2.order:
+
 2014-05-07  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         URTBF after r168393 to fix !IOS builds.
index 0e440e0..32620ab 100644 (file)
@@ -133,7 +133,6 @@ namespace WebKit {
     macro(Accelerated2dCanvasEnabled, accelerated2dCanvasEnabled, Bool, bool, false) \
     macro(CSSRegionsEnabled, cssRegionsEnabled, Bool, bool, true) \
     macro(CSSCompositingEnabled, cssCompositingEnabled, Bool, bool, true) \
-    macro(CSSGridLayoutEnabled, cssGridLayoutEnabled, Bool, bool, true) \
     macro(RegionBasedColumnsEnabled, regionBasedColumnsEnabled, Bool, bool, true) \
     macro(ForceFTPDirectoryListings, forceFTPDirectoryListings, Bool, bool, false) \
     macro(TabsToLinks, tabsToLinks, Bool, bool, DEFAULT_WEBKIT_TABSTOLINKS_ENABLED) \
index 7d9471b..6a3831f 100644 (file)
@@ -509,16 +509,6 @@ bool WKPreferencesGetCSSRegionsEnabled(WKPreferencesRef preferencesRef)
     return toImpl(preferencesRef)->cssRegionsEnabled();
 }
 
-void WKPreferencesSetCSSGridLayoutEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
-    toImpl(preferencesRef)->setCSSGridLayoutEnabled(flag);
-}
-
-bool WKPreferencesGetCSSGridLayoutEnabled(WKPreferencesRef preferencesRef)
-{
-    return toImpl(preferencesRef)->cssGridLayoutEnabled();
-}
-
 void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef preferencesRef, bool flag)
 {
     toImpl(preferencesRef)->setRegionBasedColumnsEnabled(flag);
index 386edaf..da2d61a 100644 (file)
@@ -109,10 +109,6 @@ WK_EXPORT void WKPreferencesSetCSSRegionsEnabled(WKPreferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetCSSRegionsEnabled(WKPreferencesRef);
 
 // Defaults to false
-WK_EXPORT void WKPreferencesSetCSSGridLayoutEnabled(WKPreferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetCSSGridLayoutEnabled(WKPreferencesRef);
-
-// Defaults to false
 WK_EXPORT void WKPreferencesSetRegionBasedColumnsEnabled(WKPreferencesRef, bool flag);
 WK_EXPORT bool WKPreferencesGetRegionBasedColumnsEnabled(WKPreferencesRef);
 
index 0b1db6a..36da0b6 100644 (file)
@@ -147,9 +147,6 @@ static void webKitSettingsConstructed(GObject* object)
 
     WebPreferences* prefs = WEBKIT_SETTINGS(object)->priv->preferences.get();
     ExperimentalFeatures features;
-    bool cssGridLayoutEnabled = features.isEnabled(ExperimentalFeatures::CSSGridLayout);
-    if (prefs->cssGridLayoutEnabled() != cssGridLayoutEnabled)
-        prefs->setCSSGridLayoutEnabled(cssGridLayoutEnabled);
     bool regionBasedColumnsEnabled = features.isEnabled(ExperimentalFeatures::RegionBasedColumns);
     if (prefs->regionBasedColumnsEnabled() != regionBasedColumnsEnabled)
         prefs->setRegionBasedColumnsEnabled(regionBasedColumnsEnabled);
index 0de7a22..2b45fb6 100644 (file)
@@ -39,7 +39,6 @@ struct Setting {
 };
 
 static Setting settings[] = {
-    { ExperimentalFeatures::CSSGridLayout, "CSS_GRID_LAYOUT", true },
     { ExperimentalFeatures::RegionBasedColumns, "REGION_BASED_COLUMNS", false }
 };
 
index 59603cb..eb04228 100644 (file)
@@ -37,7 +37,6 @@ namespace WebKit {
 class ExperimentalFeatures {
 public:
     enum Feature {
-        CSSGridLayout,
         RegionBasedColumns
     };
 
index 4b967a5..0339af0 100644 (file)
@@ -196,7 +196,6 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page
 #define FOR_EACH_OVERRIDE_BOOL_PREFERENCE(macro) \
     macro(WebKitAcceleratedCompositingEnabled, AcceleratedCompositingEnabled, acceleratedCompositingEnabled) \
     macro(WebKitCanvasUsesAcceleratedDrawing, CanvasUsesAcceleratedDrawing, canvasUsesAcceleratedDrawing) \
-    macro(WebKitCSSGridLayoutEnabled, CSSGridLayoutEnabled, cssGridLayoutEnabled) \
     macro(WebKitFrameFlatteningEnabled, FrameFlatteningEnabled, frameFlatteningEnabled) \
     macro(WebKitJavaEnabled, JavaEnabled, javaEnabled) \
     macro(WebKitJavaScriptEnabled, ScriptEnabled, javaScriptEnabled) \
index 83d616a..8464218 100644 (file)
@@ -2579,9 +2579,6 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings.setTemporaryTileCohortRetentionEnabled(store.getBoolValueForKey(WebPreferencesKey::temporaryTileCohortRetentionEnabledKey()));
     RuntimeEnabledFeatures::sharedFeatures().setCSSRegionsEnabled(store.getBoolValueForKey(WebPreferencesKey::cssRegionsEnabledKey()));
     RuntimeEnabledFeatures::sharedFeatures().setCSSCompositingEnabled(store.getBoolValueForKey(WebPreferencesKey::cssCompositingEnabledKey()));
-#if ENABLE(CSS_GRID_LAYOUT)
-    settings.setCSSGridLayoutEnabled(store.getBoolValueForKey(WebPreferencesKey::cssGridLayoutEnabledKey()));
-#endif
     settings.setRegionBasedColumnsEnabled(store.getBoolValueForKey(WebPreferencesKey::regionBasedColumnsEnabledKey()));
     settings.setWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::webGLEnabledKey()));
     settings.setMultithreadedWebGLEnabled(store.getBoolValueForKey(WebPreferencesKey::multithreadedWebGLEnabledKey()));
index ef55ee8..f437df7 100644 (file)
@@ -195,7 +195,6 @@ __ZN6WebKit17WebPreferencesKey30forceSoftwareWebGLRenderingKeyEv
 __ZN6WebKit17WebPreferencesKey29accelerated2dCanvasEnabledKeyEv
 __ZN6WebKit17WebPreferencesKey20cssRegionsEnabledKeyEv
 __ZN6WebKit17WebPreferencesKey24cssCompositingEnabledKeyEv
-__ZN6WebKit17WebPreferencesKey23cssGridLayoutEnabledKeyEv
 __ZN6WebKit17WebPreferencesKey28regionBasedColumnsEnabledKeyEv
 __ZN6WebKit17WebPreferencesKey28forceFTPDirectoryListingsKeyEv
 __ZN6WebKit17WebPreferencesKey14tabsToLinksKeyEv
index 57a29aa..ff82d50 100644 (file)
@@ -1,3 +1,19 @@
+2014-05-07  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [CSS Grid Layout] Remove runtime feature
+        https://bugs.webkit.org/show_bug.cgi?id=132382
+
+        Reviewed by Benjamin Poulain.
+
+        Remove cssGridLayoutEnabled setting usage.
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::resetDefaultsToConsistentValues):
+        * DumpRenderTree/efl/TestRunnerEfl.cpp:
+        (TestRunner::overridePreference):
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebPreferencesToConsistentValues):
+
 2014-05-06  David Kilzer  <ddkilzer@apple.com>
 
         Add Makefile targets for copying static libraries (LLVM and WKSI)
index 7d38cf0..9d15921 100644 (file)
@@ -315,7 +315,6 @@ void DumpRenderTreeChrome::resetDefaultsToConsistentValues()
     DumpRenderTreeSupportEfl::setInteractiveFormValidationEnabled(mainView(), true);
     DumpRenderTreeSupportEfl::setValidationMessageTimerMagnification(mainView(), -1);
     DumpRenderTreeSupportEfl::setAuthorAndUserStylesEnabled(mainView(), true);
-    DumpRenderTreeSupportEfl::setCSSGridLayoutEnabled(mainView(), false);
     DumpRenderTreeSupportEfl::setDefersLoading(mainView(), false);
     DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(mainView(), false);
     DumpRenderTreeSupportEfl::setSerializeHTTPLoads(false);
index a0584af..1ff7bfd 100644 (file)
@@ -649,8 +649,6 @@ void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
         ewk_view_setting_application_cache_set(browser->mainView(), toBool(value));
     else if (equals(key, "WebKitLoadSiteIconsKey"))
         DumpRenderTreeSupportEfl::setLoadsSiteIconsIgnoringImageLoadingSetting(browser->mainView(), toBool(value));
-    else if (equals(key, "WebKitCSSGridLayoutEnabled"))
-        DumpRenderTreeSupportEfl::setCSSGridLayoutEnabled(browser->mainView(), toBool(value));
     else if (equals(key, "WebKitCSSRegionsEnabled"))
         DumpRenderTreeSupportEfl::setCSSRegionsEnabled(browser->mainView(), toBool(value));
     else if (equals(key, "WebKitWebAudioEnabled"))
index 6dfc61b..886ebac 100644 (file)
@@ -878,7 +878,6 @@ static void resetWebPreferencesToConsistentValues()
 #endif
     [preferences setWebGLEnabled:NO];
     [preferences setCSSRegionsEnabled:YES];
-    [preferences setCSSGridLayoutEnabled:NO];
     [preferences setUsePreHTML5ParserQuirks:NO];
     [preferences setAsynchronousSpellCheckingEnabled:NO];
 #if !PLATFORM(IOS)