Changeset 117613 in webkit for trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

Timestamp:

May 18, 2012, 12:23:14 PM (13 years ago)

Author:

[email protected]

Message:

remove the CSS_GRID_LAYOUT compiler define, but default grid layout to off
​https://bugs.webkit.org/show_bug.cgi?id=86767

Reviewed by Ojan Vafai.

Source/JavaScriptCore:

• Configurations/FeatureDefines.xcconfig: Remove ENABLE_CSS_GRID_LAYOUT.

Source/WebCore:

We disable grid by ignoring the display type at CSS parse time.

Test: fast/css-grid-layout/grid-disabled-by-default.html

• Configurations/FeatureDefines.xcconfig:
• css/CSSComputedStyleDeclaration.cpp: Remove compile checks.

(WebCore):
(WebCore::valueForGridPosition):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• css/CSSParser.cpp:

(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):
(WebCore::isValidKeywordPropertyAndValue): Move display into parseValue.
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue): Ignore while parsing if not enabled.
(WebCore::CSSParser::parseGridTrackList):
(WebCore::CSSParser::cssGridLayoutEnabled):
(WebCore):

• css/CSSParser.h:
• css/CSSParserMode.h:

(CSSParserContext):

• css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):

• css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

• css/CSSPropertyNames.in:
• css/CSSValueKeywords.in:
• css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRulesForList):

• dom/Document.cpp:

(WebCore::Document::cssGridLayoutEnabled): Added to keep track of whether grid is enabled or not.
(WebCore):

• dom/Document.h:
• page/Settings.cpp:

(WebCore::Settings::Settings):

• page/Settings.h:

(WebCore::Settings::setCSSGridLayoutEnabled): Added.
(WebCore::Settings::cssGridLayoutEnabled): Added.
(Settings):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::createObject):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::RenderStyle):
(WebCore::RenderStyle::diff):

• rendering/style/RenderStyle.h:
• rendering/style/RenderStyleConstants.h:
• rendering/style/StyleGridData.cpp:
• rendering/style/StyleGridData.h:
• rendering/style/StyleGridItemData.cpp:
• rendering/style/StyleGridItemData.h:
• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

• rendering/style/StyleRareNonInheritedData.h:

(WebCore):
(StyleRareNonInheritedData):

Source/WebKit/chromium:

• public/WebSettings.h:
• src/WebSettingsImpl.cpp:

(WebKit::WebSettingsImpl::setExperimentalCSSGridLayoutEnabled):
(WebKit):

• src/WebSettingsImpl.h:

(WebSettingsImpl):

Source/WebKit/mac:

• Configurations/FeatureDefines.xcconfig:
• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.mm:

(+[WebPreferences initialize]):
(-[WebPreferences cssGridLayoutEnabled]):
(-[WebPreferences setCSSGridLayoutEnabled:]):

• WebView/WebPreferencesPrivate.h:
• WebView/WebView.mm:

(-[WebView _preferencesChanged:]):

Source/WebKit2:

• Configurations/FeatureDefines.xcconfig:
• Shared/WebPreferencesStore.h:

(WebKit):

• UIProcess/API/C/WKPreferences.cpp:

(WKPreferencesSetCSSGridLayoutEnabled):
(WKPreferencesGetCSSGridLayoutEnabled):

• UIProcess/API/C/WKPreferencesPrivate.h:
• WebProcess/InjectedBundle/InjectedBundle.cpp:

(WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences):

Tools:

• DumpRenderTree/chromium/LayoutTestController.cpp:

(LayoutTestController::overridePreference):

• DumpRenderTree/chromium/WebPreferences.cpp:

(WebPreferences::reset):
(WebPreferences::applyTo):

• DumpRenderTree/chromium/WebPreferences.h:

(WebPreferences):

• Scripts/webkitperl/FeatureList.pm:

LayoutTests:

• fast/css-grid-layout/display-grid-set-get.html: Enable grid layout for the test.
• fast/css-grid-layout/grid-columns-rows-get-set-multiple.html: Enable grid layout for the test.
• fast/css-grid-layout/grid-columns-rows-get-set.html: Enable grid layout for the test.
• fast/css-grid-layout/grid-disabled-by-default-expected.txt: Added.
• fast/css-grid-layout/grid-disabled-by-default.html: Added.
• fast/css-grid-layout/grid-item-column-row-get-set.html: Enable grid layout for the test.
• platform/chromium/test_expectations.txt: Run grid layout tests.

File:

• trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (2 diffs)

trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

@@ -38 +38 @@
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
 ENABLE_CSS_FILTERS = ENABLE_CSS_FILTERS;
-ENABLE_CSS_GRID_LAYOUT = ENABLE_CSS_GRID_LAYOUT;
 ENABLE_CSS_VARIABLES = ;
 ENABLE_DASHBOARD_SUPPORT = $(ENABLE_DASHBOARD_SUPPORT_$(REAL_PLATFORM_NAME));
@@ -124 +123 @@
 ENABLE_XSLT = ENABLE_XSLT;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ANIMATION_API) $(ENABLE_BLOB) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_VARIABLES) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_FILE_SYSTEM) $(ENABLE_FILTERS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LINK_PREFETCH) $(ENABLE_LINK_PRERENDER) $(ENABLE_MATHML) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_TAG) $(ENABLE_MICRODATA) $(ENABLE_MUTATION_OBSERVERS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PROGRESS_TAG) $(ENABLE_QUOTA) $(ENABLE_REGISTER_PROTOCOL_HANDLER) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SQL_DATABASE) $(ENABLE_STYLE_SCOPED) $(ENABLE_SVG) $(ENABLE_SVG_DOM_OBJC_BINDINGS) $(ENABLE_SVG_FONTS) $(ENABLE_TEXT_NOTIFICATIONS_ONLY) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XSLT);