Remove feature: CSS variables
authorantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Nov 2013 15:46:53 +0000 (15:46 +0000)
committerantti@apple.com <antti@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 28 Nov 2013 15:46:53 +0000 (15:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114119

.:

Reviewed by Andreas Kling.

* Source/cmakeconfig.h.cmake:

Source/JavaScriptCore:

Reviewed by Andreas Kling.

* Configurations/FeatureDefines.xcconfig:

Source/WebCore:

Reviewed by Andreas Kling.

The feature is unmaintained and it is getting in the way of refactoring. Code quality is not up to
WebKit standards either.

* Configurations/FeatureDefines.xcconfig:
* GNUmakefile.list.am:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSBasicShapes.cpp:
* css/CSSBasicShapes.h:
* css/CSSCalculationValue.cpp:
(WebCore::unitCategory):
(WebCore::hasDoubleValue):
(WebCore::CSSCalcPrimitiveValue::toCalcValue):
(WebCore::CSSCalcPrimitiveValue::computeLengthPx):
(WebCore::determineCategory):
(WebCore::CSSCalcBinaryOperation::primitiveType):
* css/CSSCalculationValue.h:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSGrammar.y.in:
* css/CSSParser.cpp:
(WebCore::CSSParserContext::CSSParserContext):
(WebCore::operator==):
(WebCore::filterProperties):
(WebCore::CSSParser::createStylePropertySet):
(WebCore::CSSParser::addProperty):
(WebCore::CSSParser::validCalculationUnit):
(WebCore::CSSParser::validUnit):
(WebCore::CSSParser::createPrimitiveNumericValue):
(WebCore::CSSParser::parseValidPrimitive):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseReflect):
(WebCore::CSSParser::detectDashToken):
(WebCore::CSSParser::realLex):
* css/CSSParser.h:
* css/CSSParserMode.h:
* css/CSSParserValues.cpp:
(WebCore::CSSParserValue::createCSSValue):
* css/CSSParserValues.h:
* css/CSSPrimitiveValue.cpp:
(WebCore::isValidCSSUnitTypeForDoubleConversion):
(WebCore::CSSPrimitiveValue::primitiveType):
(WebCore::CSSPrimitiveValue::cleanup):
(WebCore::CSSPrimitiveValue::getStringValue):
(WebCore::CSSPrimitiveValue::customCSSText):
(WebCore::CSSPrimitiveValue::equals):
* css/CSSPrimitiveValue.h:
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::convertToLength):
* css/CSSProperty.cpp:
* css/CSSProperty.h:
(WebCore::CSSProperty::CSSProperty):
* css/CSSReflectValue.cpp:
* css/CSSReflectValue.h:
* css/CSSValue.cpp:
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
* css/CSSValue.h:
(WebCore::CSSValue::setCssText):
* css/CSSValueList.cpp:
* css/CSSValueList.h:
* css/CSSVariableValue.h: Removed.
* css/Pair.h:
* css/Rect.h:
* css/StylePropertySet.cpp:
(WebCore::StylePropertySet::asText):
(WebCore::StylePropertySet::PropertyReference::cssName):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::styleForPage):
(WebCore::StyleResolver::applyProperties):
(WebCore::StyleResolver::applyMatchedProperties):
(WebCore::StyleResolver::applyProperty):
* css/StyleResolver.h:
* css/WebKitCSSTransformValue.cpp:
* css/WebKitCSSTransformValue.h:
(WebCore::WebKitCSSTransformValue::equals):
* css/makeprop.pl:
* page/Settings.cpp:
(WebCore::Settings::Settings):
* page/Settings.h:
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareInheritedData.cpp:
(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):
* rendering/style/StyleRareInheritedData.h:
* rendering/style/StyleVariableData.h: Removed.
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
* testing/InternalSettings.h:
* testing/InternalSettings.idl:

Source/WebKit/mac:

Reviewed by Andreas Kling.

* Configurations/FeatureDefines.xcconfig:

Source/WebKit2:

Reviewed by Andreas Kling.

* Configurations/FeatureDefines.xcconfig:

Source/WTF:

Reviewed by Andreas Kling.

* wtf/FeatureDefines.h:

Tools:

Reviewed by Andreas Kling.

* Scripts/webkitperl/FeatureList.pm:

LayoutTests:

Reviewed by Andreas Kling.

* fast/css/variables: Removed.
* fast/css/variables/border-width-expected.html: Removed.
* fast/css/variables/border-width.html: Removed.
* fast/css/variables/build-supports-variables-expected.txt: Removed.
* fast/css/variables/build-supports-variables.html: Removed.
* fast/css/variables/calc-expected.html: Removed.
* fast/css/variables/calc-inside-calc-expected.html: Removed.
* fast/css/variables/calc-inside-calc.html: Removed.
* fast/css/variables/calc-invalid-value-expected.html: Removed.
* fast/css/variables/calc-invalid-value.html: Removed.
* fast/css/variables/calc-invalid-variable-expected.html: Removed.
* fast/css/variables/calc-invalid-variable.html: Removed.
* fast/css/variables/calc-negated-variable-expected.html: Removed.
* fast/css/variables/calc-negated-variable.html: Removed.
* fast/css/variables/calc-vw-crash-expected.txt: Removed.
* fast/css/variables/calc-vw-crash.html: Removed.
* fast/css/variables/calc.html: Removed.
* fast/css/variables/case-sensitive-expected.html: Removed.
* fast/css/variables/case-sensitive.html: Removed.
* fast/css/variables/colors-test-expected.html: Removed.
* fast/css/variables/colors-test.html: Removed.
* fast/css/variables/complex-cycle-expected.html: Removed.
* fast/css/variables/complex-cycle.html: Removed.
* fast/css/variables/computed-style-expected.html: Removed.
* fast/css/variables/computed-style.html: Removed.
* fast/css/variables/deferred-image-load-from-variable-expected.txt: Removed.
* fast/css/variables/deferred-image-load-from-variable.html: Removed.
* fast/css/variables/inherited-values-expected.html: Removed.
* fast/css/variables/inherited-values.html: Removed.
* fast/css/variables/inline-styles-expected.html: Removed.
* fast/css/variables/inline-styles.html: Removed.
* fast/css/variables/invalid-font-reference-expected.txt: Removed.
* fast/css/variables/invalid-font-reference.html: Removed.
* fast/css/variables/invalid-shorthand-expected.html: Removed.
* fast/css/variables/invalid-shorthand.html: Removed.
* fast/css/variables/invalid-value-list-crash-expected.txt: Removed.
* fast/css/variables/invalid-value-list-crash.html: Removed.
* fast/css/variables/invalid-variable-value-expected.html: Removed.
* fast/css/variables/invalid-variable-value.html: Removed.
* fast/css/variables/multi-level-cycle-expected.html: Removed.
* fast/css/variables/multi-level-cycle.html: Removed.
* fast/css/variables/redefinition-expected.html: Removed.
* fast/css/variables/redefinition.html: Removed.
* fast/css/variables/root-background-size-expected.html: Removed.
* fast/css/variables/root-background-size.html: Removed.
* fast/css/variables/shorthand-expected.html: Removed.
* fast/css/variables/shorthand.html: Removed.
* fast/css/variables/simple-cycle-expected.html: Removed.
* fast/css/variables/simple-cycle.html: Removed.
* fast/css/variables/transform-test-expected.html: Removed.
* fast/css/variables/transform-test.html: Removed.
* fast/css/variables/undefined-expected.html: Removed.
* fast/css/variables/undefined.html: Removed.
* fast/css/variables/use-before-defined-expected.html: Removed.
* fast/css/variables/use-before-defined.html: Removed.
* fast/css/variables/var-filter-expected.txt: Removed.
* fast/css/variables/var-filter.html: Removed.
* fast/css/variables/var-inside-box-reflect-expected.html: Removed.
* fast/css/variables/var-inside-box-reflect.html: Removed.
* fast/css/variables/var-inside-pair-expected.html: Removed.
* fast/css/variables/var-inside-pair.html: Removed.
* fast/css/variables/var-inside-quad-expected.html: Removed.
* fast/css/variables/var-inside-quad.html: Removed.
* fast/css/variables/var-inside-shape-expected.html: Removed.
* fast/css/variables/var-inside-shape.html: Removed.
* fast/css/variables/var-inside-shorthand-expected.html: Removed.
* fast/css/variables/var-inside-shorthand.html: Removed.
* fast/css/variables/variable-chain-expected.html: Removed.
* fast/css/variables/variable-chain.html: Removed.
* fast/css/variables/variable-unparseable-value-crash-expected.txt: Removed.
* fast/css/variables/variable-unparseable-value-crash.html: Removed.

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

132 files changed:
ChangeLog
LayoutTests/ChangeLog
LayoutTests/fast/css/variables/border-width-expected.html [deleted file]
LayoutTests/fast/css/variables/border-width.html [deleted file]
LayoutTests/fast/css/variables/build-supports-variables-expected.txt [deleted file]
LayoutTests/fast/css/variables/build-supports-variables.html [deleted file]
LayoutTests/fast/css/variables/calc-expected.html [deleted file]
LayoutTests/fast/css/variables/calc-inside-calc-expected.html [deleted file]
LayoutTests/fast/css/variables/calc-inside-calc.html [deleted file]
LayoutTests/fast/css/variables/calc-invalid-value-expected.html [deleted file]
LayoutTests/fast/css/variables/calc-invalid-value.html [deleted file]
LayoutTests/fast/css/variables/calc-invalid-variable-expected.html [deleted file]
LayoutTests/fast/css/variables/calc-invalid-variable.html [deleted file]
LayoutTests/fast/css/variables/calc-negated-variable-expected.html [deleted file]
LayoutTests/fast/css/variables/calc-negated-variable.html [deleted file]
LayoutTests/fast/css/variables/calc-vw-crash-expected.txt [deleted file]
LayoutTests/fast/css/variables/calc-vw-crash.html [deleted file]
LayoutTests/fast/css/variables/calc.html [deleted file]
LayoutTests/fast/css/variables/case-sensitive-expected.html [deleted file]
LayoutTests/fast/css/variables/case-sensitive.html [deleted file]
LayoutTests/fast/css/variables/colors-test-expected.html [deleted file]
LayoutTests/fast/css/variables/colors-test.html [deleted file]
LayoutTests/fast/css/variables/complex-cycle-expected.html [deleted file]
LayoutTests/fast/css/variables/complex-cycle.html [deleted file]
LayoutTests/fast/css/variables/computed-style-expected.html [deleted file]
LayoutTests/fast/css/variables/computed-style.html [deleted file]
LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt [deleted file]
LayoutTests/fast/css/variables/deferred-image-load-from-variable.html [deleted file]
LayoutTests/fast/css/variables/inherited-values-expected.html [deleted file]
LayoutTests/fast/css/variables/inherited-values.html [deleted file]
LayoutTests/fast/css/variables/inline-styles-expected.html [deleted file]
LayoutTests/fast/css/variables/inline-styles.html [deleted file]
LayoutTests/fast/css/variables/invalid-font-reference-expected.txt [deleted file]
LayoutTests/fast/css/variables/invalid-font-reference.html [deleted file]
LayoutTests/fast/css/variables/invalid-shorthand-expected.html [deleted file]
LayoutTests/fast/css/variables/invalid-shorthand.html [deleted file]
LayoutTests/fast/css/variables/invalid-value-list-crash-expected.txt [deleted file]
LayoutTests/fast/css/variables/invalid-value-list-crash.html [deleted file]
LayoutTests/fast/css/variables/invalid-variable-value-expected.html [deleted file]
LayoutTests/fast/css/variables/invalid-variable-value.html [deleted file]
LayoutTests/fast/css/variables/multi-level-cycle-expected.html [deleted file]
LayoutTests/fast/css/variables/multi-level-cycle.html [deleted file]
LayoutTests/fast/css/variables/redefinition-expected.html [deleted file]
LayoutTests/fast/css/variables/redefinition.html [deleted file]
LayoutTests/fast/css/variables/root-background-size-expected.html [deleted file]
LayoutTests/fast/css/variables/root-background-size.html [deleted file]
LayoutTests/fast/css/variables/shorthand-expected.html [deleted file]
LayoutTests/fast/css/variables/shorthand.html [deleted file]
LayoutTests/fast/css/variables/simple-cycle-expected.html [deleted file]
LayoutTests/fast/css/variables/simple-cycle.html [deleted file]
LayoutTests/fast/css/variables/transform-test-expected.html [deleted file]
LayoutTests/fast/css/variables/transform-test.html [deleted file]
LayoutTests/fast/css/variables/undefined-expected.html [deleted file]
LayoutTests/fast/css/variables/undefined.html [deleted file]
LayoutTests/fast/css/variables/use-before-defined-expected.html [deleted file]
LayoutTests/fast/css/variables/use-before-defined.html [deleted file]
LayoutTests/fast/css/variables/var-filter-expected.txt [deleted file]
LayoutTests/fast/css/variables/var-filter.html [deleted file]
LayoutTests/fast/css/variables/var-inside-box-reflect-expected.html [deleted file]
LayoutTests/fast/css/variables/var-inside-box-reflect.html [deleted file]
LayoutTests/fast/css/variables/var-inside-pair-expected.html [deleted file]
LayoutTests/fast/css/variables/var-inside-pair.html [deleted file]
LayoutTests/fast/css/variables/var-inside-quad-expected.html [deleted file]
LayoutTests/fast/css/variables/var-inside-quad.html [deleted file]
LayoutTests/fast/css/variables/var-inside-shape-expected.html [deleted file]
LayoutTests/fast/css/variables/var-inside-shape.html [deleted file]
LayoutTests/fast/css/variables/var-inside-shorthand-expected.html [deleted file]
LayoutTests/fast/css/variables/var-inside-shorthand.html [deleted file]
LayoutTests/fast/css/variables/variable-chain-expected.html [deleted file]
LayoutTests/fast/css/variables/variable-chain.html [deleted file]
LayoutTests/fast/css/variables/variable-unparseable-value-crash-expected.txt [deleted file]
LayoutTests/fast/css/variables/variable-unparseable-value-crash.html [deleted file]
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/WTF/wtf/nix/FeatureDefinesNix.h
Source/WebCore/ChangeLog
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/GNUmakefile.list.am
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/css/CSSBasicShapes.cpp
Source/WebCore/css/CSSBasicShapes.h
Source/WebCore/css/CSSCalculationValue.cpp
Source/WebCore/css/CSSCalculationValue.h
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSGrammar.y.in
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSParser.h
Source/WebCore/css/CSSParserMode.h
Source/WebCore/css/CSSParserValues.cpp
Source/WebCore/css/CSSParserValues.h
Source/WebCore/css/CSSPrimitiveValue.cpp
Source/WebCore/css/CSSPrimitiveValue.h
Source/WebCore/css/CSSPrimitiveValueMappings.h
Source/WebCore/css/CSSProperty.cpp
Source/WebCore/css/CSSProperty.h
Source/WebCore/css/CSSReflectValue.cpp
Source/WebCore/css/CSSReflectValue.h
Source/WebCore/css/CSSValue.cpp
Source/WebCore/css/CSSValue.h
Source/WebCore/css/CSSValueList.cpp
Source/WebCore/css/CSSValueList.h
Source/WebCore/css/CSSVariableValue.h [deleted file]
Source/WebCore/css/Pair.h
Source/WebCore/css/Rect.h
Source/WebCore/css/StylePropertySet.cpp
Source/WebCore/css/StyleResolver.cpp
Source/WebCore/css/StyleResolver.h
Source/WebCore/css/WebKitCSSTransformValue.cpp
Source/WebCore/css/WebKitCSSTransformValue.h
Source/WebCore/css/makeprop.pl
Source/WebCore/page/Settings.cpp
Source/WebCore/page/Settings.h
Source/WebCore/rendering/style/RenderStyle.h
Source/WebCore/rendering/style/StyleRareInheritedData.cpp
Source/WebCore/rendering/style/StyleRareInheritedData.h
Source/WebCore/rendering/style/StyleVariableData.h [deleted file]
Source/WebCore/testing/InternalSettings.cpp
Source/WebCore/testing/InternalSettings.h
Source/WebCore/testing/InternalSettings.idl
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
Source/WebKit2/ChangeLog
Source/WebKit2/Configurations/FeatureDefines.xcconfig
Source/autotools/SetupWebKitFeatures.m4
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmakeconfig.h.cmake
Tools/ChangeLog
Tools/Scripts/webkitperl/FeatureList.pm

index 8209283..94399e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * Source/cmakeconfig.h.cmake:
+
 2013-11-27  László Langó  <lango@inf.u-szeged.hu>
 
         [EFL] The remote inspector does not show the base page.
index d81f367..45e76d0 100644 (file)
@@ -1,3 +1,82 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * fast/css/variables: Removed.
+        * fast/css/variables/border-width-expected.html: Removed.
+        * fast/css/variables/border-width.html: Removed.
+        * fast/css/variables/build-supports-variables-expected.txt: Removed.
+        * fast/css/variables/build-supports-variables.html: Removed.
+        * fast/css/variables/calc-expected.html: Removed.
+        * fast/css/variables/calc-inside-calc-expected.html: Removed.
+        * fast/css/variables/calc-inside-calc.html: Removed.
+        * fast/css/variables/calc-invalid-value-expected.html: Removed.
+        * fast/css/variables/calc-invalid-value.html: Removed.
+        * fast/css/variables/calc-invalid-variable-expected.html: Removed.
+        * fast/css/variables/calc-invalid-variable.html: Removed.
+        * fast/css/variables/calc-negated-variable-expected.html: Removed.
+        * fast/css/variables/calc-negated-variable.html: Removed.
+        * fast/css/variables/calc-vw-crash-expected.txt: Removed.
+        * fast/css/variables/calc-vw-crash.html: Removed.
+        * fast/css/variables/calc.html: Removed.
+        * fast/css/variables/case-sensitive-expected.html: Removed.
+        * fast/css/variables/case-sensitive.html: Removed.
+        * fast/css/variables/colors-test-expected.html: Removed.
+        * fast/css/variables/colors-test.html: Removed.
+        * fast/css/variables/complex-cycle-expected.html: Removed.
+        * fast/css/variables/complex-cycle.html: Removed.
+        * fast/css/variables/computed-style-expected.html: Removed.
+        * fast/css/variables/computed-style.html: Removed.
+        * fast/css/variables/deferred-image-load-from-variable-expected.txt: Removed.
+        * fast/css/variables/deferred-image-load-from-variable.html: Removed.
+        * fast/css/variables/inherited-values-expected.html: Removed.
+        * fast/css/variables/inherited-values.html: Removed.
+        * fast/css/variables/inline-styles-expected.html: Removed.
+        * fast/css/variables/inline-styles.html: Removed.
+        * fast/css/variables/invalid-font-reference-expected.txt: Removed.
+        * fast/css/variables/invalid-font-reference.html: Removed.
+        * fast/css/variables/invalid-shorthand-expected.html: Removed.
+        * fast/css/variables/invalid-shorthand.html: Removed.
+        * fast/css/variables/invalid-value-list-crash-expected.txt: Removed.
+        * fast/css/variables/invalid-value-list-crash.html: Removed.
+        * fast/css/variables/invalid-variable-value-expected.html: Removed.
+        * fast/css/variables/invalid-variable-value.html: Removed.
+        * fast/css/variables/multi-level-cycle-expected.html: Removed.
+        * fast/css/variables/multi-level-cycle.html: Removed.
+        * fast/css/variables/redefinition-expected.html: Removed.
+        * fast/css/variables/redefinition.html: Removed.
+        * fast/css/variables/root-background-size-expected.html: Removed.
+        * fast/css/variables/root-background-size.html: Removed.
+        * fast/css/variables/shorthand-expected.html: Removed.
+        * fast/css/variables/shorthand.html: Removed.
+        * fast/css/variables/simple-cycle-expected.html: Removed.
+        * fast/css/variables/simple-cycle.html: Removed.
+        * fast/css/variables/transform-test-expected.html: Removed.
+        * fast/css/variables/transform-test.html: Removed.
+        * fast/css/variables/undefined-expected.html: Removed.
+        * fast/css/variables/undefined.html: Removed.
+        * fast/css/variables/use-before-defined-expected.html: Removed.
+        * fast/css/variables/use-before-defined.html: Removed.
+        * fast/css/variables/var-filter-expected.txt: Removed.
+        * fast/css/variables/var-filter.html: Removed.
+        * fast/css/variables/var-inside-box-reflect-expected.html: Removed.
+        * fast/css/variables/var-inside-box-reflect.html: Removed.
+        * fast/css/variables/var-inside-pair-expected.html: Removed.
+        * fast/css/variables/var-inside-pair.html: Removed.
+        * fast/css/variables/var-inside-quad-expected.html: Removed.
+        * fast/css/variables/var-inside-quad.html: Removed.
+        * fast/css/variables/var-inside-shape-expected.html: Removed.
+        * fast/css/variables/var-inside-shape.html: Removed.
+        * fast/css/variables/var-inside-shorthand-expected.html: Removed.
+        * fast/css/variables/var-inside-shorthand.html: Removed.
+        * fast/css/variables/variable-chain-expected.html: Removed.
+        * fast/css/variables/variable-chain.html: Removed.
+        * fast/css/variables/variable-unparseable-value-crash-expected.txt: Removed.
+        * fast/css/variables/variable-unparseable-value-crash.html: Removed.
+
 2013-11-28  Jongwoo Choi  <jw0330.choi@samsung.com>
 
         [EFL] Layout tests need to be rebaselined.
diff --git a/LayoutTests/fast/css/variables/border-width-expected.html b/LayoutTests/fast/css/variables/border-width-expected.html
deleted file mode 100644 (file)
index c33b30f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-div {
-    border-color: green;
-    border-style: solid;
-    border-width: 3px 10px;
-}
-</style>
-<div>This text should have top and bottom borders of 3px and left and right borders of 10px</div>
diff --git a/LayoutTests/fast/css/variables/border-width.html b/LayoutTests/fast/css/variables/border-width.html
deleted file mode 100644 (file)
index ff31300..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  border-color: green;
-  border-style: solid;
-  border-width: -webkit-var(a) -webkit-var(b);
-  -webkit-var-a: 3px;
-  -webkit-var-b: 10px
-}
-</style>
-<div>This text should have top and bottom borders of 3px and left and right borders of 10px</div>
diff --git a/LayoutTests/fast/css/variables/build-supports-variables-expected.txt b/LayoutTests/fast/css/variables/build-supports-variables-expected.txt
deleted file mode 100644 (file)
index f033a50..0000000
+++ /dev/null
@@ -1 +0,0 @@
-YES
diff --git a/LayoutTests/fast/css/variables/build-supports-variables.html b/LayoutTests/fast/css/variables/build-supports-variables.html
deleted file mode 100644 (file)
index 4900cb5..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<body>NO</body>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-
-internals.settings.setCSSVariablesEnabled(true);
-if (internals.settings.cssVariablesEnabled())
-    document.body.innerHTML = "YES";
-</script>
diff --git a/LayoutTests/fast/css/variables/calc-expected.html b/LayoutTests/fast/css/variables/calc-expected.html
deleted file mode 100644 (file)
index d82f924..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    border-color: green;
-    border-style: solid;
-    border-width: 3px 10px;
-}
-</style>
-<div>This text should have top and bottom borders of 3px and left and right borders of 10px</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-inside-calc-expected.html b/LayoutTests/fast/css/variables/calc-inside-calc-expected.html
deleted file mode 100644 (file)
index ac3939e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    border-color: green;
-    border-style: solid;
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-inside-calc.html b/LayoutTests/fast/css/variables/calc-inside-calc.html
deleted file mode 100644 (file)
index f74837a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  border-color: green;
-  border-style: solid;
-  border-width: -webkit-calc(-webkit-var(a) + 1px);
-  -webkit-var-a: -webkit-calc(1px + 3px);
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-invalid-value-expected.html b/LayoutTests/fast/css/variables/calc-invalid-value-expected.html
deleted file mode 100644 (file)
index ac3939e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    border-color: green;
-    border-style: solid;
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-invalid-value.html b/LayoutTests/fast/css/variables/calc-invalid-value.html
deleted file mode 100644 (file)
index d040102..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  border-color: green;
-  border-style: solid;
-  border-width: -webkit-calc(-webkit-var(a) + 1px);
-  -webkit-var-a: black;
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-invalid-variable-expected.html b/LayoutTests/fast/css/variables/calc-invalid-variable-expected.html
deleted file mode 100644 (file)
index ac3939e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    border-color: green;
-    border-style: solid;
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-invalid-variable.html b/LayoutTests/fast/css/variables/calc-invalid-variable.html
deleted file mode 100644 (file)
index 3f273f0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  border-color: green;
-  border-style: solid;
-  border-width: -webkit-calc(-webkit-var(a) + 1px);
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-negated-variable-expected.html b/LayoutTests/fast/css/variables/calc-negated-variable-expected.html
deleted file mode 100644 (file)
index ac3939e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    border-color: green;
-    border-style: solid;
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-negated-variable.html b/LayoutTests/fast/css/variables/calc-negated-variable.html
deleted file mode 100644 (file)
index 56336c4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  border-color: green;
-  border-style: solid;
-  border-width: -webkit-calc(--webkit-var(a) + 1px);
-  -webkit-var-a: 5px;
-}
-</style>
-<div>This text should have the default border width</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/calc-vw-crash-expected.txt b/LayoutTests/fast/css/variables/calc-vw-crash-expected.txt
deleted file mode 100644 (file)
index ef0b6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/calc-vw-crash.html b/LayoutTests/fast/css/variables/calc-vw-crash.html
deleted file mode 100644 (file)
index c4645bb..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    internals.settings.setCSSVariablesEnabled(true);
-}
-</script>
-<style>
-#foo {
-  -webkit-var-var23: -webkit-calc(0vw);
-}
-</style>
-This test is successful if it does not crash.
-</html>
diff --git a/LayoutTests/fast/css/variables/calc.html b/LayoutTests/fast/css/variables/calc.html
deleted file mode 100644 (file)
index a6a1b36..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  border-color: green;
-  border-style: solid;
-  border-width: -webkit-calc(-webkit-var(a) + -webkit-var(b)) -webkit-calc(-webkit-var(c) * -webkit-var(d));
-  -webkit-var-a: 2px;
-  -webkit-var-b: 1px;
-  -webkit-var-c: 5;
-  -webkit-var-d: 2px;
-
-}
-</style>
-<div>This text should have top and bottom borders of 3px and left and right borders of 10px</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/case-sensitive-expected.html b/LayoutTests/fast/css/variables/case-sensitive-expected.html
deleted file mode 100644 (file)
index 26e48c8..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<html>
-<div>This text should have a transparent background and no left padding.</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/case-sensitive.html b/LayoutTests/fast/css/variables/case-sensitive.html
deleted file mode 100644 (file)
index 430176f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  background-color: -webkit-var(NaMe);
-  -webkit-var-nAmE: green;
-  padding-left: -webkit-var(padding);
-  -WEBKIT-VAR-padding: 200px;
-}
-</style>
-<div>This text should have a transparent background and no left padding.</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/colors-test-expected.html b/LayoutTests/fast/css/variables/colors-test-expected.html
deleted file mode 100644 (file)
index e02389a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-body {
-    color: green;
-    background-color: red;
-    background-color: rgb(255, 255, 255);
-}
-</style>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/colors-test.html b/LayoutTests/fast/css/variables/colors-test.html
deleted file mode 100644 (file)
index aafdb27..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-foreground: green;
-    -webkit-var-background: rgb(255, 255, 255);
-    color: -webkit-var(foreground);
-    background-color: red;
-    background-color: -webkit-var(background);
-}
-</style>
-This text should be green on a white background. There should be no red visible.
diff --git a/LayoutTests/fast/css/variables/complex-cycle-expected.html b/LayoutTests/fast/css/variables/complex-cycle-expected.html
deleted file mode 100644 (file)
index 550c887..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not result in a crash.
diff --git a/LayoutTests/fast/css/variables/complex-cycle.html b/LayoutTests/fast/css/variables/complex-cycle.html
deleted file mode 100644 (file)
index 359c8bf..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-a: -webkit-var(f);
-    -webkit-var-b: -webkit-var(a);
-    -webkit-var-c: -webkit-var(b);
-    -webkit-var-d: -webkit-var(c);
-    -webkit-var-e: -webkit-var(d);
-    -webkit-var-f: -webkit-var(e);
-    color: -webkit-var(a);
-}
-</style>
-This test is successful if it does not result in a crash.
diff --git a/LayoutTests/fast/css/variables/computed-style-expected.html b/LayoutTests/fast/css/variables/computed-style-expected.html
deleted file mode 100644 (file)
index b6f4006..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-body {
-    font-weight: bold;
-}
-</style>
-<body>
-Test passed - computed font weight is bold
-</body>
diff --git a/LayoutTests/fast/css/variables/computed-style.html b/LayoutTests/fast/css/variables/computed-style.html
deleted file mode 100644 (file)
index c4d642f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-a: bold;
-    font-weight: normal;
-    font-weight: -webkit-var(a);
-}
-</style>
-<body>
-Test failed - JS did not run
-</body>
-<script>
-var element = document.body;
-var weight = window.getComputedStyle(element, null).getPropertyValue("font-weight");
-if (weight == "bold")
-  element.innerHTML = "Test passed - computed font weight is bold";
-else
-  element.innerHTML = "Test failed - computed color is " + weight;
-</script>
diff --git a/LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt b/LayoutTests/fast/css/variables/deferred-image-load-from-variable-expected.txt
deleted file mode 100644 (file)
index ef0b6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/deferred-image-load-from-variable.html b/LayoutTests/fast/css/variables/deferred-image-load-from-variable.html
deleted file mode 100644 (file)
index 7f6aced..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<script>
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    internals.settings.setCSSVariablesEnabled(true);
-}
-</script>
-<style>
-div {
-  -webkit-var-a: url(1);
-  -webkit-mask: -webkit-var(a);
-}
-</style>
-<div></div>
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/inherited-values-expected.html b/LayoutTests/fast/css/variables/inherited-values-expected.html
deleted file mode 100644 (file)
index 0ef5c17..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<style>
-div {
-    color: green;
-    background-color: rgb(255, 255, 255);
-}
-</style>
-<div>
-This text should be green on a white background. There should be no red visible.
-</div>
diff --git a/LayoutTests/fast/css/variables/inherited-values.html b/LayoutTests/fast/css/variables/inherited-values.html
deleted file mode 100644 (file)
index a2e3f09..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-foreground: green;
-    -webkit-var-background: rgb(255, 255, 255);
-}
-div {
-    color: -webkit-var(foreground);
-    background-color: red;
-    background-color: -webkit-var(background);
-}
-</style>
-<div>
-This text should be green on a white background. There should be no red visible.
-</div>
diff --git a/LayoutTests/fast/css/variables/inline-styles-expected.html b/LayoutTests/fast/css/variables/inline-styles-expected.html
deleted file mode 100644 (file)
index a6756cb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="color: green;">
-This text should be green on a white background.
-</div>
diff --git a/LayoutTests/fast/css/variables/inline-styles.html b/LayoutTests/fast/css/variables/inline-styles.html
deleted file mode 100644 (file)
index 1dc23bd..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<body style="-webkit-var-a: green;">
-<div style="color: -webkit-var(a);">
-This text should be green on a white background.
-</div>
-</body>
diff --git a/LayoutTests/fast/css/variables/invalid-font-reference-expected.txt b/LayoutTests/fast/css/variables/invalid-font-reference-expected.txt
deleted file mode 100644 (file)
index ef0b6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/invalid-font-reference.html b/LayoutTests/fast/css/variables/invalid-font-reference.html
deleted file mode 100644 (file)
index 0d8d0c1..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.testRunner) {
-    testRunner.dumpAsText();
-    internals.settings.setCSSVariablesEnabled(true);
-}
-</script>
-<style>
-body {
-  font: -webkit-var(var6) hangul mongolian;
-}
-</style>
-This test is successful if it does not crash.
-</html>
diff --git a/LayoutTests/fast/css/variables/invalid-shorthand-expected.html b/LayoutTests/fast/css/variables/invalid-shorthand-expected.html
deleted file mode 100644 (file)
index 5fdfbea..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-This text should not be surrounded by a border.
-</div>
diff --git a/LayoutTests/fast/css/variables/invalid-shorthand.html b/LayoutTests/fast/css/variables/invalid-shorthand.html
deleted file mode 100644 (file)
index 57ff7ee..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-    -webkit-var-a: 10px solid green;
-    border: 10px -webkit-var(a) blue;
-}
-</style>
-<div>
-This text should not be surrounded by a border.
-</div>
diff --git a/LayoutTests/fast/css/variables/invalid-value-list-crash-expected.txt b/LayoutTests/fast/css/variables/invalid-value-list-crash-expected.txt
deleted file mode 100644 (file)
index ef0b6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/invalid-value-list-crash.html b/LayoutTests/fast/css/variables/invalid-value-list-crash.html
deleted file mode 100644 (file)
index f258da3..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
--webkit-var-a: -webkit-var(b) &#0;
-}
-</style>
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/invalid-variable-value-expected.html b/LayoutTests/fast/css/variables/invalid-variable-value-expected.html
deleted file mode 100644 (file)
index ddfe2b5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-This text should be black.
-</div>
diff --git a/LayoutTests/fast/css/variables/invalid-variable-value.html b/LayoutTests/fast/css/variables/invalid-variable-value.html
deleted file mode 100644 (file)
index de18d79..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-    -webkit-var-a: green;
-    -webkit-var-a: 10px;
-    color: -webkit-var(a);
-}
-</style>
-<div>
-This text should be black.
-</div>
diff --git a/LayoutTests/fast/css/variables/multi-level-cycle-expected.html b/LayoutTests/fast/css/variables/multi-level-cycle-expected.html
deleted file mode 100644 (file)
index 23b5330..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<div>
-<div>
-<div>
-This test is successful if this text is black, and the test does not result in a crash.
-</div>
-</div>
-</div>
diff --git a/LayoutTests/fast/css/variables/multi-level-cycle.html b/LayoutTests/fast/css/variables/multi-level-cycle.html
deleted file mode 100644 (file)
index 3772b14..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-.a {
-    -webkit-var-a: -webkit-var(b);
-    -webkit-var-b: red;
-}
-.b {
-    -webkit-var-b: -webkit-var(a);
-}
-.c {
-    -webkit-var-c: -webkit-var(a);
-    color: -webkit-var(c);
-}
-</style>
-<div id="a">
-<div id="b">
-<div id="c">
-This test is successful if this text is black, and the test does not result in a crash.
-</div>
-</div>
-</div>
diff --git a/LayoutTests/fast/css/variables/redefinition-expected.html b/LayoutTests/fast/css/variables/redefinition-expected.html
deleted file mode 100644 (file)
index 402db2e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<div style="color: red;">
-This text should be red.
-</div>
-<div id="a" style="color: green;">
-This text should be green.
-</div>
-<div id="b" style="color: blue;">
-This text should be blue.
-</div>
diff --git a/LayoutTests/fast/css/variables/redefinition.html b/LayoutTests/fast/css/variables/redefinition.html
deleted file mode 100644 (file)
index a0218b1..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-a: red;
-}
-#a {
-    -webkit-var-a: green;
-}
-#b {
-    -webkit-var-a: blue;
-}
-div {
-    color: -webkit-var(a);
-}
-</style>
-<div>
-This text should be red.
-</div>
-<div id="a">
-This text should be green.
-</div>
-<div id="b">
-This text should be blue.
-</div>
diff --git a/LayoutTests/fast/css/variables/root-background-size-expected.html b/LayoutTests/fast/css/variables/root-background-size-expected.html
deleted file mode 100644 (file)
index e353672..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<!DOCTYPE html>
-<html>
-This test is successful if it does not crash.
-</html>
diff --git a/LayoutTests/fast/css/variables/root-background-size.html b/LayoutTests/fast/css/variables/root-background-size.html
deleted file mode 100644 (file)
index 45873c7..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals)
-    internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-:root {
-  -webkit-background-size: -webkit-calc(-webkit-var(a));
-}
-</style>
-<style></style>
-This test is successful if it does not crash.
-</html>
diff --git a/LayoutTests/fast/css/variables/shorthand-expected.html b/LayoutTests/fast/css/variables/shorthand-expected.html
deleted file mode 100644 (file)
index 6eca82f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-div {
-    border: 10px solid green;
-}
-</style>
-<div>
-This text should be surrounded by a green border. There should not be a red border.
-</div>
diff --git a/LayoutTests/fast/css/variables/shorthand.html b/LayoutTests/fast/css/variables/shorthand.html
deleted file mode 100644 (file)
index 58abfb0..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-    -webkit-var-myborder: 10px solid green;
-    border: 10px dashed red;
-    border: -webkit-var(myborder);
-}
-</style>
-<div>
-This text should be surrounded by a green border. There should not be a red border.
-</div>
diff --git a/LayoutTests/fast/css/variables/simple-cycle-expected.html b/LayoutTests/fast/css/variables/simple-cycle-expected.html
deleted file mode 100644 (file)
index 550c887..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not result in a crash.
diff --git a/LayoutTests/fast/css/variables/simple-cycle.html b/LayoutTests/fast/css/variables/simple-cycle.html
deleted file mode 100644 (file)
index 6a8f3fc..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-a: -webkit-var(a);
-    color: -webkit-var(a);
-}
-</style>
-This test is successful if it does not result in a crash.
diff --git a/LayoutTests/fast/css/variables/transform-test-expected.html b/LayoutTests/fast/css/variables/transform-test-expected.html
deleted file mode 100644 (file)
index 029859c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-div {
-    display: inline-block;
-    -webkit-transform: matrix(0.866,0.5,-0.5,0.866,0,0);
-    background-color: green;
-}
-</style>
-<div>Rotated</div>
diff --git a/LayoutTests/fast/css/variables/transform-test.html b/LayoutTests/fast/css/variables/transform-test.html
deleted file mode 100644 (file)
index 310ed3d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-    display: inline-block;
-    -webkit-var-a: 0.866;
-    -webkit-var-b: 0.5;
-    -webkit-var-c: -0.5;
-    -webkit-var-d: 0;
-    -webkit-transform: matrix(-webkit-var(a),-webkit-var(b),-webkit-var(c),-webkit-var(a),-webkit-var(d),-webkit-var(d));
-    background-color: green;
-}
-</style>
-<div>Rotated</div>
diff --git a/LayoutTests/fast/css/variables/undefined-expected.html b/LayoutTests/fast/css/variables/undefined-expected.html
deleted file mode 100644 (file)
index 7314c04..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Test successful if it does not cause a crash.
diff --git a/LayoutTests/fast/css/variables/undefined.html b/LayoutTests/fast/css/variables/undefined.html
deleted file mode 100644 (file)
index 0db9e73..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    border: -webkit-var(myborder);
-}
-</style>
-Test successful if it does not cause a crash.
diff --git a/LayoutTests/fast/css/variables/use-before-defined-expected.html b/LayoutTests/fast/css/variables/use-before-defined-expected.html
deleted file mode 100644 (file)
index 806c774..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-div {
-    color: green;
-}
-</style>
-<div>
-This text should be green on a white background. There should be no red visible.
-</div>
diff --git a/LayoutTests/fast/css/variables/use-before-defined.html b/LayoutTests/fast/css/variables/use-before-defined.html
deleted file mode 100644 (file)
index 3b2689c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-    color: -webkit-var(a);
-    -webkit-var-a: -webkit-var(b);
-}
-body {
-    -webkit-var-b: -webkit-var(c);
-    -webkit-var-c: green;
-}
-</style>
-<div>
-This text should be green on a white background. There should be no red visible.
-</div>
diff --git a/LayoutTests/fast/css/variables/var-filter-expected.txt b/LayoutTests/fast/css/variables/var-filter-expected.txt
deleted file mode 100644 (file)
index ef0b6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/var-filter.html b/LayoutTests/fast/css/variables/var-filter.html
deleted file mode 100644 (file)
index a7f9be9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-  -webkit-var-a: url(1);
-  -webkit-filter: -webkit-var(a);
-}
-</style>
-This test is successful if it does not crash.
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-box-reflect-expected.html b/LayoutTests/fast/css/variables/var-inside-box-reflect-expected.html
deleted file mode 100644 (file)
index 851223b..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-  -webkit-box-reflect: below 5px;
-}
-</style>
-<div>This text should be reflected on the right.</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-box-reflect.html b/LayoutTests/fast/css/variables/var-inside-box-reflect.html
deleted file mode 100644 (file)
index 1a66059..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals)
-    internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-  -webkit-box-reflect: -webkit-var(a) -webkit-calc(-webkit-var(b));
-  -webkit-var-a: below;
-  -webkit-var-b: 5px;
-}
-</style>
-<div>This text should be reflected on the right.</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-pair-expected.html b/LayoutTests/fast/css/variables/var-inside-pair-expected.html
deleted file mode 100644 (file)
index 1e229b7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-body {
-    border: 1px solid green;
-    border-top-left-radius: 3px 6px;
-}
-</style>
-This text should be surrounded by a green border with a rounded top left corner.
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-pair.html b/LayoutTests/fast/css/variables/var-inside-pair.html
deleted file mode 100644 (file)
index 61854d1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals)
-    internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    border: 1px solid green;
-    border-top-left-radius: -webkit-var(a) -webkit-var(b);
-    -webkit-var-a: 3px;
-    -webkit-var-b: 6px;
-}
-</style>
-This text should be surrounded by a green border with a rounded top left corner.
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-quad-expected.html b/LayoutTests/fast/css/variables/var-inside-quad-expected.html
deleted file mode 100644 (file)
index 627aed7..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-body {
-    border-color: green;
-    border-width: 1px 2px 3px 4px;
-    border-style: solid;
-}
-</style>
-This text should be surrounded by a green border with 1px top, 2px right, 3px bottom, 4px left.
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-quad.html b/LayoutTests/fast/css/variables/var-inside-quad.html
deleted file mode 100644 (file)
index d59ef0e..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals)
-    internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    border-color: green;
-    border-width: -webkit-var(a) -webkit-var(b) -webkit-var(c) -webkit-var(d);
-    border-style: solid;
-    -webkit-var-a: 1px;
-    -webkit-var-b: 2px;
-    -webkit-var-c: 3px;
-    -webkit-var-d: 4px;
-}
-</style>
-This text should be surrounded by a green border with 1px top, 2px right, 3px bottom, 4px left.
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-shape-expected.html b/LayoutTests/fast/css/variables/var-inside-shape-expected.html
deleted file mode 100644 (file)
index a71c000..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals)
-    internals.settings.setCSSExclusionsEnabled(true);
-</script>
-<style>
-.a {
-    -webkit-shape-inside: ellipse(100px, 100px, 100px, 100px);
-}
-.b {
-    -webkit-shape-inside: circle(100px, 100px, 100px);
-}
-.c {
-    -webkit-shape-inside: rectangle(100px, 100px, 100px, 100px);
-}
-.d {
-    height: 100px;
-    -webkit-shape-inside: polygon(10% 100%, 100% 50%, 50% 10%);
-}
-</style>
-<div class="a">
-Some text inside an area inside which inline content can flow.
-</div>
-<div class="b">
-Some text inside an area inside which inline content can flow.
-</div>
-<div class="c">
-Some text inside an area inside which inline content can flow.
-</div>
-<div class="d">
-Some text inside an area inside which inline content can flow.
-</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-shape.html b/LayoutTests/fast/css/variables/var-inside-shape.html
deleted file mode 100644 (file)
index 6d07a80..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script>
-if (window.internals) {
-    internals.settings.setCSSVariablesEnabled(true);
-    internals.settings.setCSSExclusionsEnabled(true);
-}
-</script>
-<style>
-:root {
-    -webkit-var-a: 100px;
-    -webkit-var-b: 100%;
-    -webkit-var-c: 50%;
-    -webkit-var-d: 10%;
-}
-.a {
-    -webkit-shape-inside: ellipse(-webkit-var(a), -webkit-var(a), -webkit-var(a), -webkit-var(a));
-}
-.b {
-    -webkit-shape-inside: circle(-webkit-var(a), -webkit-var(a), -webkit-var(a));
-}
-.c {
-    -webkit-shape-inside: rectangle(-webkit-var(a), -webkit-var(a), -webkit-var(a), -webkit-var(a));
-}
-.d {
-    height: -webkit-var(a);
-    -webkit-shape-inside: polygon(-webkit-var(d) -webkit-var(b), -webkit-var(b) -webkit-var(c), -webkit-var(c) -webkit-var(d));
-}
-</style>
-<div class="a">
-Some text inside an area inside which inline content can flow.
-</div>
-<div class="b">
-Some text inside an area inside which inline content can flow.
-</div>
-<div class="c">
-Some text inside an area inside which inline content can flow.
-</div>
-<div class="d">
-Some text inside an area inside which inline content can flow.
-</div>
-</html>
diff --git a/LayoutTests/fast/css/variables/var-inside-shorthand-expected.html b/LayoutTests/fast/css/variables/var-inside-shorthand-expected.html
deleted file mode 100644 (file)
index 7c90b19..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<style>
-body {
-    border: 10px solid green;
-}
-</style>
-This text should be surrounded by a green border. There should be no red visible.
-
diff --git a/LayoutTests/fast/css/variables/var-inside-shorthand.html b/LayoutTests/fast/css/variables/var-inside-shorthand.html
deleted file mode 100644 (file)
index c2a790b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-MyBorderColor: green;
-    border: 10px solid red;
-    border: 10px solid -webkit-var(MyBorderColor);
-}
-</style>
-This text should be surrounded by a green border. There should be no red visible.
-
diff --git a/LayoutTests/fast/css/variables/variable-chain-expected.html b/LayoutTests/fast/css/variables/variable-chain-expected.html
deleted file mode 100644 (file)
index 806c774..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<style>
-div {
-    color: green;
-}
-</style>
-<div>
-This text should be green on a white background. There should be no red visible.
-</div>
diff --git a/LayoutTests/fast/css/variables/variable-chain.html b/LayoutTests/fast/css/variables/variable-chain.html
deleted file mode 100644 (file)
index c432605..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<script>
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-body {
-    -webkit-var-c: green;
-    -webkit-var-b: -webkit-var(c);
-}
-div {
-    color: red;
-    -webkit-var-a: -webkit-var(b);
-    color: -webkit-var(a);
-}
-</style>
-<div>
-This text should be green on a white background. There should be no red visible.
-</div>
diff --git a/LayoutTests/fast/css/variables/variable-unparseable-value-crash-expected.txt b/LayoutTests/fast/css/variables/variable-unparseable-value-crash-expected.txt
deleted file mode 100644 (file)
index ef0b6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test is successful if it does not crash.
diff --git a/LayoutTests/fast/css/variables/variable-unparseable-value-crash.html b/LayoutTests/fast/css/variables/variable-unparseable-value-crash.html
deleted file mode 100644 (file)
index f8f8d4b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<script>
-if (window.testRunner)
-    testRunner.dumpAsText();
-internals.settings.setCSSVariablesEnabled(true);
-</script>
-<style>
-div {
-    -webkit-var-b: 1pxpx;
-}
-</style>
-This test is successful if it does not crash.
index 2efdd4f..88a831b 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-11-28  Peter Gal  <galpeter@inf.u-szeged.hu>
 
         Typo fix after r159834 to fix 32 bit builds.
index 789315e..0ab14ce 100644 (file)
@@ -52,7 +52,6 @@ ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
 ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
-ENABLE_CSS_VARIABLES = ;
 ENABLE_CSS3_CONDITIONAL_RULES = ;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
@@ -188,4 +187,4 @@ ENABLE_XSLT = ENABLE_XSLT;
 ENABLE_FTL_JIT = ;
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 4b6f1a9..616f673 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * wtf/FeatureDefines.h:
+
 2013-11-26  Filip Pizlo  <fpizlo@apple.com>
 
         Do bytecode validation as part of testing
index 57bc7de..f1c683f 100644 (file)
 #define ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED 0
 #endif
 
-#if !defined(ENABLE_CSS_VARIABLES)
-#define ENABLE_CSS_VARIABLES 0
-#endif
-
 #if !defined(ENABLE_CUSTOM_SCHEME_HANDLER)
 #define ENABLE_CUSTOM_SCHEME_HANDLER 0
 #endif
index f16e154..ecc281e 100644 (file)
 #define ENABLE_CSS_SHADERS 1
 #endif
 
-#if !defined(ENABLE_CSS_VARIABLES)
-#define ENABLE_CSS_VARIABLES 1
-#endif
-
 #if !defined(ENABLE_DATALIST_ELEMENT)
 #define ENABLE_DATALIST_ELEMENT 1
 #endif
index 2c7c19e..5ceec00 100644 (file)
@@ -1,3 +1,102 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+        
+        The feature is unmaintained and it is getting in the way of refactoring. Code quality is not up to
+        WebKit standards either.
+
+        * Configurations/FeatureDefines.xcconfig:
+        * GNUmakefile.list.am:
+        * WebCore.xcodeproj/project.pbxproj:
+        * css/CSSBasicShapes.cpp:
+        * css/CSSBasicShapes.h:
+        * css/CSSCalculationValue.cpp:
+        (WebCore::unitCategory):
+        (WebCore::hasDoubleValue):
+        (WebCore::CSSCalcPrimitiveValue::toCalcValue):
+        (WebCore::CSSCalcPrimitiveValue::computeLengthPx):
+        (WebCore::determineCategory):
+        (WebCore::CSSCalcBinaryOperation::primitiveType):
+        * css/CSSCalculationValue.h:
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSGrammar.y.in:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParserContext::CSSParserContext):
+        (WebCore::operator==):
+        (WebCore::filterProperties):
+        (WebCore::CSSParser::createStylePropertySet):
+        (WebCore::CSSParser::addProperty):
+        (WebCore::CSSParser::validCalculationUnit):
+        (WebCore::CSSParser::validUnit):
+        (WebCore::CSSParser::createPrimitiveNumericValue):
+        (WebCore::CSSParser::parseValidPrimitive):
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseReflect):
+        (WebCore::CSSParser::detectDashToken):
+        (WebCore::CSSParser::realLex):
+        * css/CSSParser.h:
+        * css/CSSParserMode.h:
+        * css/CSSParserValues.cpp:
+        (WebCore::CSSParserValue::createCSSValue):
+        * css/CSSParserValues.h:
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::isValidCSSUnitTypeForDoubleConversion):
+        (WebCore::CSSPrimitiveValue::primitiveType):
+        (WebCore::CSSPrimitiveValue::cleanup):
+        (WebCore::CSSPrimitiveValue::getStringValue):
+        (WebCore::CSSPrimitiveValue::customCSSText):
+        (WebCore::CSSPrimitiveValue::equals):
+        * css/CSSPrimitiveValue.h:
+        * css/CSSPrimitiveValueMappings.h:
+        (WebCore::CSSPrimitiveValue::convertToLength):
+        * css/CSSProperty.cpp:
+        * css/CSSProperty.h:
+        (WebCore::CSSProperty::CSSProperty):
+        * css/CSSReflectValue.cpp:
+        * css/CSSReflectValue.h:
+        * css/CSSValue.cpp:
+        (WebCore::CSSValue::equals):
+        (WebCore::CSSValue::cssText):
+        (WebCore::CSSValue::destroy):
+        * css/CSSValue.h:
+        (WebCore::CSSValue::setCssText):
+        * css/CSSValueList.cpp:
+        * css/CSSValueList.h:
+        * css/CSSVariableValue.h: Removed.
+        * css/Pair.h:
+        * css/Rect.h:
+        * css/StylePropertySet.cpp:
+        (WebCore::StylePropertySet::asText):
+        (WebCore::StylePropertySet::PropertyReference::cssName):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::styleForPage):
+        (WebCore::StyleResolver::applyProperties):
+        (WebCore::StyleResolver::applyMatchedProperties):
+        (WebCore::StyleResolver::applyProperty):
+        * css/StyleResolver.h:
+        * css/WebKitCSSTransformValue.cpp:
+        * css/WebKitCSSTransformValue.h:
+        (WebCore::WebKitCSSTransformValue::equals):
+        * css/makeprop.pl:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        * rendering/style/RenderStyle.h:
+        * rendering/style/StyleRareInheritedData.cpp:
+        (WebCore::StyleRareInheritedData::StyleRareInheritedData):
+        (WebCore::StyleRareInheritedData::operator==):
+        * rendering/style/StyleRareInheritedData.h:
+        * rendering/style/StyleVariableData.h: Removed.
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+
 2013-11-28  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 
         Updating RTCPeerConnectionHandlerMock after r159769
index 97c643a..7851039 100644 (file)
@@ -52,7 +52,6 @@ ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
 ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
-ENABLE_CSS_VARIABLES = ;
 ENABLE_CSS3_CONDITIONAL_RULES = ;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
@@ -188,4 +187,4 @@ ENABLE_XSLT = ENABLE_XSLT;
 ENABLE_FTL_JIT = ;
 ENABLE_LLINT_C_LOOP = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index 676ab56..ede571b 100644 (file)
@@ -2622,7 +2622,6 @@ webcore_sources += \
        Source/WebCore/css/CSSValueList.h \
        Source/WebCore/css/CSSValuePool.cpp \
        Source/WebCore/css/CSSValuePool.h \
-       Source/WebCore/css/CSSVariableValue.h \
        Source/WebCore/css/DOMWindowCSS.cpp \
        Source/WebCore/css/DOMWindowCSS.h \
        Source/WebCore/css/DashboardRegion.h \
@@ -4640,7 +4639,6 @@ webcore_sources += \
        Source/WebCore/rendering/style/StyleSurroundData.h \
        Source/WebCore/rendering/style/StyleTransformData.cpp \
        Source/WebCore/rendering/style/StyleTransformData.h \
-       Source/WebCore/rendering/style/StyleVariableData.h \
        Source/WebCore/rendering/style/StyleVisualData.cpp \
        Source/WebCore/rendering/style/StyleVisualData.h \
        Source/WebCore/rendering/TableLayout.h \
index 147804d..9961dde 100644 (file)
                BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC5EB6990E81DA6300B25965 /* StyleVisualData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */; };
                BC5EB69A0E81DA6300B25965 /* StyleVisualData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6980E81DA6300B25965 /* StyleVisualData.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC5EB69A0E81DA6300B25966 /* StyleVariableData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6980E81DA6300B25966 /* StyleVariableData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC5EB69E0E81DAEB00B25965 /* FillLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */; };
                BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB69D0E81DAEB00B25965 /* FillLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC5EB6A20E81DC4F00B25965 /* StyleBackgroundData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB6A00E81DC4F00B25965 /* StyleBackgroundData.cpp */; };
                CA3BF67E10D99BAE00E6CE53 /* ScrollAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */; };
                CAE9F910146441F000C245B0 /* CSSAspectRatioValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE9F90E146441F000C245B0 /* CSSAspectRatioValue.h */; };
-               CAE9F910146441F000C245B1 /* CSSVariableValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE9F90E146441F000C245B1 /* CSSVariableValue.h */; };
                CCC2B51415F613060048CDD6 /* DeviceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CCC2B51015F613060048CDD6 /* DeviceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
                CCC2B51515F613060048CDD6 /* DeviceController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCC2B51115F613060048CDD6 /* DeviceController.cpp */; };
                CCC2B51615F613060048CDD6 /* DeviceController.h in Headers */ = {isa = PBXBuildFile; fileRef = CCC2B51215F613060048CDD6 /* DeviceController.h */; settings = {ATTRIBUTES = (Private, ); }; };
                BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleDashboardRegion.h; path = style/StyleDashboardRegion.h; sourceTree = "<group>"; };
                BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleVisualData.cpp; path = style/StyleVisualData.cpp; sourceTree = "<group>"; };
                BC5EB6980E81DA6300B25965 /* StyleVisualData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleVisualData.h; path = style/StyleVisualData.h; sourceTree = "<group>"; };
-               BC5EB6980E81DA6300B25966 /* StyleVariableData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleVariableData.h; path = style/StyleVariableData.h; sourceTree = "<group>"; };
                BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FillLayer.cpp; path = style/FillLayer.cpp; sourceTree = "<group>"; };
                BC5EB69D0E81DAEB00B25965 /* FillLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FillLayer.h; path = style/FillLayer.h; sourceTree = "<group>"; };
                BC5EB6A00E81DC4F00B25965 /* StyleBackgroundData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleBackgroundData.cpp; path = style/StyleBackgroundData.cpp; sourceTree = "<group>"; };
                CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimator.h; sourceTree = "<group>"; };
                CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAspectRatioValue.cpp; sourceTree = "<group>"; };
                CAE9F90E146441F000C245B0 /* CSSAspectRatioValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSAspectRatioValue.h; sourceTree = "<group>"; };
-               CAE9F90E146441F000C245B1 /* CSSVariableValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableValue.h; sourceTree = "<group>"; };
                CCC2B51015F613060048CDD6 /* DeviceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceClient.h; sourceTree = "<group>"; };
                CCC2B51115F613060048CDD6 /* DeviceController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceController.cpp; sourceTree = "<group>"; };
                CCC2B51215F613060048CDD6 /* DeviceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceController.h; sourceTree = "<group>"; };
                                BC5EB5E40E81BF6D00B25965 /* StyleSurroundData.h */,
                                BC5EB80D0E81F2CE00B25965 /* StyleTransformData.cpp */,
                                BC5EB80E0E81F2CE00B25965 /* StyleTransformData.h */,
-                               BC5EB6980E81DA6300B25966 /* StyleVariableData.h */,
                                BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */,
                                BC5EB6980E81DA6300B25965 /* StyleVisualData.h */,
                                BC2274740E8366E200E7F975 /* SVGRenderStyle.cpp */,
                                E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */,
                                E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h */,
                                E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h */,
-                               E1FE136C183FE21D00892F13 /* CryptoAlgorithmRsaOaepParams.h */,
                                E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h */,
                        );
                        name = parameters;
                                A8D0651C0A23C1FE005E7203 /* CSSValueList.idl */,
                                E49BDA0A131FD3E5003C56F0 /* CSSValuePool.cpp */,
                                E49BD9F9131FD2ED003C56F0 /* CSSValuePool.h */,
-                               CAE9F90E146441F000C245B1 /* CSSVariableValue.h */,
                                A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
                                E100EE731546EAC100BA11D1 /* DeprecatedStyleBuilder.cpp */,
                                E100EE741546EAC100BA11D1 /* DeprecatedStyleBuilder.h */,
                                078E091417D14D1C00420AA1 /* MediaConstraintsImpl.h in Headers */,
                                A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
                                E49BD9FA131FD2ED003C56F0 /* CSSValuePool.h in Headers */,
-                               CAE9F910146441F000C245B1 /* CSSVariableValue.h in Headers */,
                                93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
                                BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
                                BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */,
                                A8EA800A0A19516E00A8EF5F /* StyleSheetList.h in Headers */,
                                BC5EB5E50E81BF6D00B25965 /* StyleSurroundData.h in Headers */,
                                BC5EB8100E81F2CE00B25965 /* StyleTransformData.h in Headers */,
-                               BC5EB69A0E81DA6300B25966 /* StyleVariableData.h in Headers */,
                                BC5EB69A0E81DA6300B25965 /* StyleVisualData.h in Headers */,
                                D000ED2811C1B9CD00C47726 /* SubframeLoader.h in Headers */,
                                1FC40FBA1655CCB90040F29E /* SubimageCacheWithTimer.h in Headers */,
index cd5bd71..4e7ba90 100644 (file)
@@ -96,30 +96,6 @@ bool CSSBasicShapeRectangle::equals(const CSSBasicShape& shape) const
         && compareCSSValuePtr(m_box, other.m_box);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSBasicShapeRectangle::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return buildRectangleString(m_x->serializeResolvingVariables(variables),
-        m_y->serializeResolvingVariables(variables),
-        m_width->serializeResolvingVariables(variables),
-        m_height->serializeResolvingVariables(variables),
-        m_radiusX.get() ? m_radiusX->serializeResolvingVariables(variables) : String(),
-        m_radiusY.get() ? m_radiusY->serializeResolvingVariables(variables) : String(),
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSBasicShapeRectangle::hasVariableReference() const
-{
-    return m_x->hasVariableReference()
-        || m_y->hasVariableReference()
-        || m_width->hasVariableReference()
-        || m_height->hasVariableReference()
-        || (m_radiusX.get() && m_radiusX->hasVariableReference())
-        || (m_radiusY.get() && m_radiusY->hasVariableReference())
-        || (m_box && m_box->hasVariableReference());
-}
-#endif
-
 static String buildCircleString(const String& radius, const String& centerX, const String& centerY, const String& box)
 {
     char opening[] = "circle(";
@@ -169,24 +145,6 @@ bool CSSBasicShapeCircle::equals(const CSSBasicShape& shape) const
         && compareCSSValuePtr(m_box, other.m_box);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSBasicShapeCircle::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return buildCircleString(m_radius ? m_radius->serializeResolvingVariables(variables) : String(),
-        m_centerX ? m_centerX->serializeResolvingVariables(variables) : String(),
-        m_centerY ? m_centerY->serializeResolvingVariables(variables) : String(),
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSBasicShapeCircle::hasVariableReference() const
-{
-    return (m_centerX && m_centerX->hasVariableReference())
-        || (m_centerY && m_centerY->hasVariableReference())
-        || (m_radius && m_radius->hasVariableReference())
-        || (m_box && m_box->hasVariableReference());
-}
-#endif
-
 static String buildDeprecatedCircleString(const String& x, const String& y, const String& radius, const String& box)
 {
     StringBuilder result;
@@ -223,24 +181,6 @@ bool CSSDeprecatedBasicShapeCircle::equals(const CSSBasicShape& shape) const
         && compareCSSValuePtr(m_box, other.m_box);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSDeprecatedBasicShapeCircle::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return buildDeprecatedCircleString(m_centerX->serializeResolvingVariables(variables),
-        m_centerY->serializeResolvingVariables(variables),
-        m_radius->serializeResolvingVariables(variables),
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSDeprecatedBasicShapeCircle::hasVariableReference() const
-{
-    return m_centerX->hasVariableReference()
-        || m_centerY->hasVariableReference()
-        || m_radius->hasVariableReference()
-        || (m_box && m_box->hasVariableReference());
-}
-#endif
-
 static String buildEllipseString(const String& x, const String& y, const String& radiusX, const String& radiusY, const String& box)
 {
     StringBuilder result;
@@ -280,26 +220,6 @@ bool CSSBasicShapeEllipse::equals(const CSSBasicShape& shape) const
         && compareCSSValuePtr(m_box, other.m_box);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSBasicShapeEllipse::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return buildEllipseString(m_centerX->serializeResolvingVariables(variables),
-        m_centerY->serializeResolvingVariables(variables),
-        m_radiusX->serializeResolvingVariables(variables),
-        m_radiusY->serializeResolvingVariables(variables),
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSBasicShapeEllipse::hasVariableReference() const
-{
-    return m_centerX->hasVariableReference()
-        || m_centerY->hasVariableReference()
-        || m_radiusX->hasVariableReference()
-        || m_radiusY->hasVariableReference()
-        || (m_box && m_box->hasVariableReference());
-}
-#endif
-
 static String buildPolygonString(const WindRule& windRule, const Vector<String>& points, const String& box)
 {
     ASSERT(!(points.size() % 2));
@@ -368,34 +288,6 @@ bool CSSBasicShapePolygon::equals(const CSSBasicShape& shape) const
         && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSBasicShapePolygon::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    Vector<String> points;
-    points.reserveInitialCapacity(m_values.size());
-
-    for (size_t i = 0; i < m_values.size(); ++i)
-        points.append(m_values.at(i)->serializeResolvingVariables(variables));
-
-    return buildPolygonString(m_windRule,
-        points,
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSBasicShapePolygon::hasVariableReference() const
-{
-    if (m_box && m_box->hasVariableReference())
-        return true;
-
-    for (size_t i = 0; i < m_values.size(); ++i) {
-        if (m_values.at(i)->hasVariableReference())
-            return true;
-    }
-
-    return false;
-}
-#endif
-
 static String buildInsetRectangleString(const String& top, const String& right, const String& bottom, const String& left, const String& radiusX, const String& radiusY, const String& box)
 {
     char opening[] = "inset-rectangle(";
@@ -453,29 +345,5 @@ bool CSSBasicShapeInsetRectangle::equals(const CSSBasicShape& shape) const
         && compareCSSValuePtr(m_box, other.m_box);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSBasicShapeInsetRectangle::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return buildInsetRectangleString(m_top->serializeResolvingVariables(variables),
-        m_right->serializeResolvingVariables(variables),
-        m_bottom->serializeResolvingVariables(variables),
-        m_left->serializeResolvingVariables(variables),
-        m_radiusX.get() ? m_radiusX->serializeResolvingVariables(variables) : String(),
-        m_radiusY.get() ? m_radiusY->serializeResolvingVariables(variables) : String(),
-        m_box ? m_box->serializeResolvingVariables(variables) : String());
-}
-
-bool CSSBasicShapeInsetRectangle::hasVariableReference() const
-{
-    return m_top->hasVariableReference()
-        || m_right->hasVariableReference()
-        || m_bottom->hasVariableReference()
-        || m_left->hasVariableReference()
-        || (m_radiusX.get() && m_radiusX->hasVariableReference())
-        || (m_radiusY.get() && m_radiusY->hasVariableReference())
-        || (m_box && m_box->hasVariableReference());
-}
-#endif
-
 } // namespace WebCore
 
index b044b68..5126194 100644 (file)
@@ -56,11 +56,6 @@ public:
     CSSPrimitiveValue* box() const { return m_box.get(); }
     void setBox(PassRefPtr<CSSPrimitiveValue> box) { m_box = box; }
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const = 0;
-    virtual bool hasVariableReference() const = 0;
-#endif
-
 public:
     virtual ~CSSBasicShape() { }
 
@@ -91,11 +86,6 @@ public:
     virtual String cssText() const OVERRIDE;
     virtual bool equals(const CSSBasicShape&) const OVERRIDE;
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
-
 private:
     CSSBasicShapeRectangle() { }
 
@@ -129,11 +119,6 @@ public:
     virtual String cssText() const OVERRIDE;
     virtual bool equals(const CSSBasicShape&) const OVERRIDE;
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
-
 private:
     CSSBasicShapeInsetRectangle() { }
 
@@ -161,11 +146,6 @@ public:
     void setCenterY(PassRefPtr<CSSPrimitiveValue> centerY) { m_centerY = centerY; }
     void setRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_radius = radius; }
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
-
 private:
     CSSBasicShapeCircle() { }
 
@@ -190,11 +170,6 @@ public:
     virtual String cssText() const OVERRIDE;
     virtual bool equals(const CSSBasicShape&) const OVERRIDE;
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
-
 private:
     CSSDeprecatedBasicShapeCircle() { }
 
@@ -221,11 +196,6 @@ public:
     virtual String cssText() const OVERRIDE;
     virtual bool equals(const CSSBasicShape&) const OVERRIDE;
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
-
 private:
     CSSBasicShapeEllipse() { }
 
@@ -255,10 +225,6 @@ public:
     virtual Type type() const OVERRIDE { return CSSBasicShapePolygonType; }
     virtual String cssText() const OVERRIDE;
     virtual bool equals(const CSSBasicShape&) const OVERRIDE;
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    virtual bool hasVariableReference() const;
-#endif
 
 private:
     CSSBasicShapePolygon()
index efe7f1f..d4d3d7b 100644 (file)
@@ -70,10 +70,6 @@ static CalculationCategory unitCategory(CSSPrimitiveValue::UnitTypes type)
     case CSSPrimitiveValue::CSS_REMS:
     case CSSPrimitiveValue::CSS_CHS:
         return CalcLength;
-#if ENABLE(CSS_VARIABLES)
-    case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-        return CalcVariable;
-#endif
     default:
         return CalcOther;
     }
@@ -132,9 +128,6 @@ static bool hasDoubleValue(CSSPrimitiveValue::UnitTypes type)
     case CSSPrimitiveValue::CSS_CALC:
     case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER:
     case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH:
-#if ENABLE(CSS_VARIABLES)
-    case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-#endif
     case CSSPrimitiveValue::CSS_PROPERTY_ID:
     case CSSPrimitiveValue::CSS_VALUE_ID:
 #if ENABLE(DASHBOARD_SUPPORT)
@@ -169,18 +162,6 @@ bool CSSCalcValue::equals(const CSSCalcValue& other) const
     return compareCSSValuePtr(m_expression, other.m_expression);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSCalcValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return buildCssText(m_expression->serializeResolvingVariables(variables));
-}
-
-bool CSSCalcValue::hasVariableReference() const
-{
-    return m_expression->hasVariableReference();
-}
-#endif
-
 double CSSCalcValue::clampToPermittedRange(double value) const
 {
     return m_nonNegative && value < 0 ? 0 : value;
@@ -226,18 +207,6 @@ public:
         return m_value->cssText();
     }
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-    {
-        return m_value->customSerializeResolvingVariables(variables);
-    }
-
-    virtual bool hasVariableReference() const
-    {
-        return m_value->isVariableName();
-    }
-#endif
-
     virtual PassOwnPtr<CalcExpressionNode> toCalcValue(const RenderStyle* style, const RenderStyle* rootStyle, double zoom) const
     {
         switch (m_category) {
@@ -255,9 +224,6 @@ public:
         // Only types that could be part of a Length expression can be converted
         // to a CalcExpressionNode. CalcPercentNumber makes no sense as a Length.
         case CalcPercentNumber:
-#if ENABLE(CSS_VARIABLES)
-        case CalcVariable:
-#endif
         case CalcOther:
             ASSERT_NOT_REACHED();
         }
@@ -282,9 +248,6 @@ public:
             return m_value->getDoubleValue();
         case CalcPercentLength:
         case CalcPercentNumber:
-#if ENABLE(CSS_VARIABLES)
-        case CalcVariable:
-#endif
         case CalcOther:
             ASSERT_NOT_REACHED();
             break;
@@ -334,11 +297,6 @@ static CalculationCategory determineCategory(const CSSCalcExpressionNode& leftSi
     if (leftCategory == CalcOther || rightCategory == CalcOther)
         return CalcOther;
 
-#if ENABLE(CSS_VARIABLES)
-    if (leftCategory == CalcVariable || rightCategory == CalcVariable)
-        return CalcVariable;
-#endif
-
     switch (op) {
     case CalcAdd:
     case CalcSubtract:
@@ -483,17 +441,6 @@ public:
         return buildCssText(m_leftSide->customCSSText(), m_rightSide->customCSSText(), m_operator);
     }
 
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-    {
-        return buildCssText(m_leftSide->serializeResolvingVariables(variables), m_rightSide->serializeResolvingVariables(variables), m_operator);
-    }
-
-    virtual bool hasVariableReference() const
-    {
-        return m_leftSide->hasVariableReference() || m_rightSide->hasVariableReference();
-    }
-#endif
 
     virtual bool equals(const CSSCalcExpressionNode& exp) const
     {
@@ -527,10 +474,6 @@ public:
                 return leftType;
             return CSSPrimitiveValue::CSS_UNKNOWN;
         }
-#if ENABLE(CSS_VARIABLES)
-        case CalcVariable:
-            return CSSPrimitiveValue::CSS_VARIABLE_NAME;
-#endif
         case CalcPercentLength:
         case CalcPercentNumber:
         case CalcOther:
index 0858056..42e803e 100644 (file)
@@ -54,9 +54,6 @@ enum CalculationCategory {
     CalcPercent,
     CalcPercentNumber,
     CalcPercentLength,
-#if ENABLE(CSS_VARIABLES)
-    CalcVariable,
-#endif
     CalcOther
 };
 
@@ -73,10 +70,6 @@ public:
     virtual double doubleValue() const = 0;
     virtual double computeLengthPx(const RenderStyle* currentStyle, const RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const = 0;
     virtual String customCSSText() const = 0;
-#if ENABLE(CSS_VARIABLES)
-    virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const = 0;
-    virtual bool hasVariableReference() const = 0;
-#endif
     virtual bool equals(const CSSCalcExpressionNode& other) const { return m_category == other.m_category && m_isInteger == other.m_isInteger; }
     virtual Type type() const = 0;
 
@@ -120,10 +113,6 @@ public:
 
     String customCSSText() const;
     bool equals(const CSSCalcValue&) const;
-#if ENABLE(CSS_VARIABLES)
-    String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    bool hasVariableReference() const;
-#endif
 
 private:
     CSSCalcValue(PassRefPtr<CSSCalcExpressionNode> expression, CalculationPermittedValueRange range)
index 254d82f..7c374be 100644 (file)
@@ -1788,9 +1788,6 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
 
     switch (propertyID) {
         case CSSPropertyInvalid:
-#if ENABLE(CSS_VARIABLES)
-        case CSSPropertyVariable:
-#endif
             break;
 
         case CSSPropertyBackgroundColor:
index 6da5d52..45dfa5f 100644 (file)
@@ -59,7 +59,6 @@ static inline bool isCSSTokenAString(int yytype)
     case CALCFUNCTION:
     case MINFUNCTION:
     case MAXFUNCTION:
-    case VAR_DEFINITION:
     case UNICODERANGE:
         return true;
     default:
@@ -72,9 +71,9 @@ static inline bool isCSSTokenAString(int yytype)
 %}
 
 #if ENABLE_SHADOW_DOM
-%expect 31
-#else
 %expect 30
+#else
+%expect 29
 #endif
 
 %nonassoc LOWEST_PREC
@@ -109,7 +108,6 @@ static inline bool isCSSTokenAString(int yytype)
 %token FONT_FACE_SYM
 %token CHARSET_SYM
 %token NAMESPACE_SYM
-%token VARFUNCTION
 %token WEBKIT_RULE_SYM
 %token WEBKIT_DECLS_SYM
 %token WEBKIT_KEYFRAME_RULE_SYM
@@ -183,7 +181,6 @@ static inline bool isCSSTokenAString(int yytype)
 %token <string> CALCFUNCTION
 %token <string> MINFUNCTION
 %token <string> MAXFUNCTION
-%token <string> VAR_DEFINITION
 
 %token <string> UNICODERANGE
 
@@ -1392,17 +1389,7 @@ decl_list_recovery:
     ;
 
 declaration:
-    VAR_DEFINITION maybe_space ':' maybe_space expr priority {
-#if ENABLE_CSS_VARIABLES
-        parser->storeVariableDeclaration($1, adoptPtr($5), $6);
-        $$ = true;
-        parser->markPropertyEnd($6, true);
-#else
-        delete $5;
-        $$ = false;
-#endif
-    }
-    | property ':' maybe_space expr priority {
+    property ':' maybe_space expr priority {
         $$ = false;
         bool isPropertyParsed = false;
         OwnPtr<CSSParserValueList> propertyValue = adoptPtr($4);
@@ -1486,16 +1473,6 @@ term:
   | UNICODERANGE maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
   | HEX maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
   | '#' maybe_space { $$.id = CSSValueInvalid; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
-  | VARFUNCTION maybe_space IDENT closing_parenthesis maybe_space {
-#if ENABLE_CSS_VARIABLES
-      $$.id = CSSValueInvalid;
-      $$.string = $3;
-      $$.unit = CSSPrimitiveValue::CSS_VARIABLE_NAME;
-#else
-      $$.id = CSSValueInvalid;
-      $$.unit = 0;
-#endif
-  }
   /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
   | function maybe_space
   | calc_function maybe_space
@@ -1573,16 +1550,6 @@ function:
 
 calc_func_term:
   unary_term
-  | VARFUNCTION maybe_space IDENT closing_parenthesis {
-#if ENABLE_CSS_VARIABLES
-      $$.id = CSSValueInvalid;
-      $$.string = $3;
-      $$.unit = CSSPrimitiveValue::CSS_VARIABLE_NAME;
-#else
-      $$.id = CSSValueInvalid;
-      $$.unit = 0;
-#endif
-  }
   | unary_operator unary_term { $$ = $2; $$.fValue *= $1; }
   ;
 
@@ -1732,7 +1699,7 @@ invalid_square_brackets_block: '[' error_recovery ']' | '[' error_recovery TOKEN
 invalid_parentheses_block: opening_parenthesis error_recovery closing_parenthesis;
 
 opening_parenthesis:
-    '(' | FUNCTION | CALCFUNCTION | VARFUNCTION | MINFUNCTION | MAXFUNCTION | ANYFUNCTION | NOTFUNCTION
+    '(' | FUNCTION | CALCFUNCTION | MINFUNCTION | MAXFUNCTION | ANYFUNCTION | NOTFUNCTION
 #if ENABLE_VIDEO_TRACK
     | CUEFUNCTION
 #endif
index 26fd97b..50462fa 100644 (file)
 #include "CSSImageSetValue.h"
 #endif
 
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
 #if ENABLE(CSS_FILTERS)
 #include "WebKitCSSFilterValue.h"
 #if ENABLE(SVG)
@@ -264,9 +260,6 @@ CSSParserContext::CSSParserContext(CSSParserMode mode, const URL& baseURL)
     , isCSSRegionsEnabled(false)
     , isCSSCompositingEnabled(false)
     , isCSSGridLayoutEnabled(false)
-#if ENABLE(CSS_VARIABLES)
-    , isCSSVariablesEnabled(false)
-#endif
     , needsSiteSpecificQuirks(false)
     , enforcesCSSMIMETypeInNoQuirksMode(true)
     , useLegacyBackgroundSizeShorthandBehavior(false)
@@ -283,9 +276,6 @@ CSSParserContext::CSSParserContext(Document& document, const URL& baseURL, const
     , isCSSRegionsEnabled(document.cssRegionsEnabled())
     , isCSSCompositingEnabled(document.cssCompositingEnabled())
     , isCSSGridLayoutEnabled(document.cssGridLayoutEnabled())
-#if ENABLE(CSS_VARIABLES)
-    , isCSSVariablesEnabled(document.settings() ? document.settings()->cssVariablesEnabled() : false)
-#endif
     , needsSiteSpecificQuirks(document.settings() ? document.settings()->needsSiteSpecificQuirks() : false)
     , enforcesCSSMIMETypeInNoQuirksMode(!document.settings() || document.settings()->enforceCSSMIMETypeInNoQuirksMode())
     , useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
@@ -303,9 +293,6 @@ bool operator==(const CSSParserContext& a, const CSSParserContext& b)
         && a.isCSSRegionsEnabled == b.isCSSRegionsEnabled
         && a.isCSSCompositingEnabled == b.isCSSCompositingEnabled
         && a.isCSSGridLayoutEnabled == b.isCSSGridLayoutEnabled
-#if ENABLE(CSS_VARIABLES)
-        && a.isCSSVariablesEnabled == b.isCSSVariablesEnabled
-#endif
         && a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
         && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
         && a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior;
@@ -391,17 +378,6 @@ void CSSParserString::lower()
     makeLower(characters16(), characters16(), length());
 }
 
-#if ENABLE(CSS_VARIABLES)
-AtomicString CSSParserString::substring(unsigned position, unsigned length) const
-{
-    ASSERT(m_length >= position + length);
-
-    if (is8Bit())
-        return AtomicString(characters8() + position, length);
-    return AtomicString(characters16() + position, length);
-}
-#endif
-
 void CSSParser::setupParser(const char* prefix, unsigned prefixLength, const String& string, const char* suffix, unsigned suffixLength)
 {
     m_parsedTextPrefixLength = prefixLength;
@@ -1312,25 +1288,6 @@ PassRefPtr<CSSValueList> CSSParser::parseFontFaceValue(const AtomicString& strin
     return static_pointer_cast<CSSValueList>(fontFamily.release());
 }
 
-#if ENABLE(CSS_VARIABLES)
-bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, Document& document)
-{
-    ASSERT(!string.isEmpty());
-
-    CSSParserContext context(document);
-
-    if (parseSimpleLengthValue(declaration, propertyID, string, important, context.mode))
-        return true;
-    if (parseColorValue(declaration, propertyID, string, important, context.mode))
-        return true;
-    if (parseKeywordValue(declaration, propertyID, string, important, context))
-        return true;
-
-    CSSParser parser(context);
-    return parser.parseValue(declaration, propertyID, string, important, static_cast<StyleSheetContents*>(0));
-}
-#endif
-
 bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
 {
     ASSERT(!string.isEmpty());
@@ -1522,27 +1479,13 @@ PassOwnPtr<MediaQuery> CSSParser::parseMediaQuery(const String& string)
     return m_mediaQuery.release();
 }
 
-#if ENABLE(CSS_VARIABLES)
-static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenVariables)
-#else
 static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
-#endif
 {
     // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
     for (int i = input.size() - 1; i >= 0; --i) {
         const CSSProperty& property = input[i];
         if (property.isImportant() != important)
             continue;
-#if ENABLE(CSS_VARIABLES)
-        if (property.id() == CSSPropertyVariable) {
-            const AtomicString& name = toCSSVariableValue(property.value())->name();
-            if (seenVariables.contains(name))
-                continue;
-            seenVariables.add(name);
-            output[--unusedEntries] = property;
-            continue;
-        }
-#endif
         const unsigned propertyIDIndex = property.id() - firstCSSProperty;
         if (seenProperties.get(propertyIDIndex))
             continue;
@@ -1558,14 +1501,8 @@ PassRef<ImmutableStylePropertySet> CSSParser::createStylePropertySet()
     Vector<CSSProperty, 256> results(unusedEntries);
 
     // Important properties have higher priority, so add them first. Duplicate definitions can then be ignored when found.
-#if ENABLE(CSS_VARIABLES)
-    HashSet<AtomicString> seenVariables;
-    filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties, seenVariables);
-    filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties, seenVariables);
-#else
     filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties);
     filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties);
-#endif
     if (unusedEntries)
         results.remove(0, unusedEntries);
 
@@ -1593,11 +1530,7 @@ void CSSParser::addPropertyWithPrefixingVariant(CSSPropertyID propId, PassRefPtr
 void CSSParser::addProperty(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important, bool implicit)
 {
     // This property doesn't belong to a shorthand or is a CSS variable (which will be resolved later).
-    if (!m_currentShorthand
-#if ENABLE(CSS_VARIABLES)
-        || (value->isPrimitiveValue() && toCSSPrimitiveValue(value.get())->isVariableName())
-#endif
-        ) {
+    if (!m_currentShorthand) {
         m_parsedProperties.append(CSSProperty(propId, value, important, false, CSSPropertyInvalid, m_implicitShorthand || implicit));
         return;
     }
@@ -1667,11 +1600,6 @@ bool CSSParser::validCalculationUnit(CSSParserValue* value, Units unitflags, Rel
     case CalcPercentNumber:
         b = (unitflags & FPercent) && (unitflags & FNumber);
         break;
-#if ENABLE(CSS_VARIABLES)
-    case CalcVariable:
-        b = true;
-        break;
-#endif
     case CalcOther:
         break;
     }
@@ -1693,12 +1621,6 @@ bool CSSParser::validUnit(CSSParserValue* value, Units unitflags, CSSParserMode
         
     bool b = false;
     switch (value->unit) {
-#if ENABLE(CSS_VARIABLES)
-    case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-        // Variables are checked at the point they are dereferenced because unit type is not available here.
-        b = true;
-        break;
-#endif
     case CSSPrimitiveValue::CSS_NUMBER:
         b = (unitflags & FNumber);
         if (!b && shouldAcceptUnitLessValues(value, unitflags, cssParserMode)) {
@@ -1761,11 +1683,6 @@ bool CSSParser::validUnit(CSSParserValue* value, Units unitflags, CSSParserMode
 
 inline PassRefPtr<CSSPrimitiveValue> CSSParser::createPrimitiveNumericValue(CSSParserValue* value)
 {
-#if ENABLE(CSS_VARIABLES)
-    if (value->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME)
-        return createPrimitiveVariableNameValue(value);
-#endif
-
     if (m_parsedCalculation) {
         ASSERT(isCalculation(value));
         return CSSPrimitiveValue::create(m_parsedCalculation.release());
@@ -1790,14 +1707,6 @@ inline PassRefPtr<CSSPrimitiveValue> CSSParser::createPrimitiveStringValue(CSSPa
     return cssValuePool().createValue(value->string, CSSPrimitiveValue::CSS_STRING);
 }
 
-#if ENABLE(CSS_VARIABLES)
-inline PassRefPtr<CSSPrimitiveValue> CSSParser::createPrimitiveVariableNameValue(CSSParserValue* value)
-{
-    ASSERT(value->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME);
-    return CSSPrimitiveValue::create(value->string, CSSPrimitiveValue::CSS_VARIABLE_NAME);
-}
-#endif
-
 static inline bool isComma(CSSParserValue* value)
 { 
     return value && value->unit == CSSParserValue::Operator && value->iValue == ','; 
@@ -1842,10 +1751,6 @@ inline PassRefPtr<CSSPrimitiveValue> CSSParser::parseValidPrimitive(CSSValueID i
     if (value->unit >= CSSPrimitiveValue::CSS_DPPX && value->unit <= CSSPrimitiveValue::CSS_DPCM)
         return createPrimitiveNumericValue(value);
 #endif
-#if ENABLE(CSS_VARIABLES)
-    if (value->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME)
-        return createPrimitiveVariableNameValue(value);
-#endif
     if (value->unit >= CSSParserValue::Q_EMS)
         return CSSPrimitiveValue::createAllowingMarginQuirk(value->fValue, CSSPrimitiveValue::CSS_EMS);
     if (isCalculation(value))
@@ -1901,15 +1806,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         return true;
     }
 
-#if ENABLE(CSS_VARIABLES)
-    if (!id && value->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME && num == 1) {
-        addProperty(propId, createPrimitiveVariableNameValue(value), important);
-        m_valueList->next();
-        return true;
-    }
-    ASSERT(propId != CSSPropertyVariable);
-#endif
-
     if (isKeywordPropertyID(propId)) {
         if (!isValidKeywordPropertyAndValue(propId, id, m_context))
             return false;
@@ -3098,9 +2994,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
     case CSSPropertyTextTransform:
     case CSSPropertyTextUnderlineMode:
     case CSSPropertyTextUnderlineStyle:
-#if ENABLE(CSS_VARIABLES)
-    case CSSPropertyVariable:
-#endif
     case CSSPropertyVisibility:
     case CSSPropertyWebkitAppearance:
     case CSSPropertyWebkitBackfaceVisibility:
@@ -3388,36 +3281,6 @@ bool CSSParser::parseFillShorthand(CSSPropertyID propId, const CSSPropertyID* pr
     return true;
 }
 
-#if ENABLE(CSS_VARIABLES)
-bool CSSParser::cssVariablesEnabled() const
-{
-    return m_context.isCSSVariablesEnabled;
-}
-
-void CSSParser::storeVariableDeclaration(const CSSParserString& name, PassOwnPtr<CSSParserValueList> value, bool important)
-{
-    // When CSSGrammar.y encounters an invalid declaration it passes null for the CSSParserValueList, just bail.
-    if (!value)
-        return;
-    
-    static const unsigned prefixLength = sizeof("-webkit-var-") - 1;
-    
-    ASSERT(name.length() > prefixLength);
-    AtomicString variableName = name.substring(prefixLength, name.length() - prefixLength);
-
-    StringBuilder builder;
-    for (unsigned i = 0, size = value->size(); i < size; i++) {
-        if (i)
-            builder.append(' ');
-        RefPtr<CSSValue> cssValue = value->valueAt(i)->createCSSValue();
-        if (!cssValue)
-            return;
-        builder.append(cssValue->cssText());
-    }
-    addProperty(CSSPropertyVariable, CSSVariableValue::create(variableName, builder.toString().lower()), important, false);
-}
-#endif
-
 void CSSParser::addAnimationValue(RefPtr<CSSValue>& lval, PassRefPtr<CSSValue> rval)
 {
     if (lval) {
@@ -7055,11 +6918,6 @@ bool CSSParser::parseReflect(CSSPropertyID propId, bool important)
     // Direction comes first.
     CSSParserValue* val = m_valueList->current();
     RefPtr<CSSPrimitiveValue> direction;
-#if ENABLE(CSS_VARIABLES)
-    if (val->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME)
-        direction = createPrimitiveVariableNameValue(val);
-    else
-#endif
     switch (val->id) {
         case CSSValueAbove:
         case CSSValueBelow:
@@ -11204,10 +11062,6 @@ inline void CSSParser::detectDashToken(int length)
             m_token = MINFUNCTION;
         else if (isASCIIAlphaCaselessEqual(name[10], 'x') && isEqualToCSSIdentifier(name + 1, "webkit-ma"))
             m_token = MAXFUNCTION;
-#if ENABLE(CSS_VARIABLES)
-        else if (cssVariablesEnabled() && isASCIIAlphaCaselessEqual(name[10], 'r') && isEqualToCSSIdentifier(name + 1, "webkit-va"))
-            m_token = VARFUNCTION;
-#endif
     } else if (length == 12 && isEqualToCSSIdentifier(name + 1, "webkit-calc"))
         m_token = CALCFUNCTION;
 #if ENABLE(SHADOW_DOM)
@@ -11654,11 +11508,6 @@ restartAfterComment:
             parseIdentifier(result, resultString, hasEscape);
             m_token = IDENT;
 
-#if ENABLE(CSS_VARIABLES)
-            if (cssVariablesEnabled() && isEqualToCSSCaseSensitiveIdentifier(tokenStart<SrcCharacterType>() + 1, "webkit-var") && tokenStart<SrcCharacterType>()[11] == '-' && isIdentifierStartAfterDash(tokenStart<SrcCharacterType>() + 12))
-                m_token = VAR_DEFINITION;
-            else
-#endif
             if (*currentCharacter<SrcCharacterType>() == '(') {
                 m_token = FUNCTION;
                 if (!hasEscape)
index cd75e96..cfabd22 100644 (file)
@@ -115,12 +115,6 @@ public:
     bool parseQuotes(CSSPropertyID, bool important);
     bool parseAlt(CSSPropertyID, bool important);
     
-#if ENABLE(CSS_VARIABLES)
-    static bool parseValue(MutableStylePropertySet*, CSSPropertyID, const String&, bool important, Document&);
-    bool cssVariablesEnabled() const;
-    void storeVariableDeclaration(const CSSParserString&, PassOwnPtr<CSSParserValueList>, bool important);
-#endif
-
     PassRefPtr<CSSValue> parseAttr(CSSParserValueList* args);
 
     PassRefPtr<CSSValue> parseBackgroundColor();
@@ -431,9 +425,6 @@ public:
 
     PassRefPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
     PassRefPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
-#if ENABLE(CSS_VARIABLES)
-    PassRefPtr<CSSPrimitiveValue> createPrimitiveVariableNameValue(CSSParserValue*);
-#endif
 
     static URL completeURL(const CSSParserContext&, const String& url);
 
index b47c019..697a835 100644 (file)
@@ -69,9 +69,6 @@ public:
     bool isCSSRegionsEnabled;
     bool isCSSCompositingEnabled;
     bool isCSSGridLayoutEnabled;
-#if ENABLE(CSS_VARIABLES)
-    bool isCSSVariablesEnabled;
-#endif
     bool needsSiteSpecificQuirks;
     bool enforcesCSSMIMETypeInNoQuirksMode;
     bool useLegacyBackgroundSizeShorthandBehavior;
index 9f4a200..9b47d5b 100644 (file)
@@ -25,9 +25,6 @@
 #include "CSSFunctionValue.h"
 #include "CSSSelector.h"
 #include "CSSSelectorList.h"
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
 
 namespace WebCore {
 
@@ -92,9 +89,6 @@ PassRefPtr<CSSValue> CSSParserValue::createCSSValue()
         return CSSPrimitiveValue::create(fValue, isInt ? CSSPrimitiveValue::CSS_PARSER_INTEGER : CSSPrimitiveValue::CSS_NUMBER);
     case CSSPrimitiveValue::CSS_STRING:
     case CSSPrimitiveValue::CSS_URI:
-#if ENABLE(CSS_VARIABLES)
-    case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-#endif
     case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
         return CSSPrimitiveValue::create(string, primitiveUnit);
     case CSSPrimitiveValue::CSS_PERCENTAGE:
index ec1652e..233b8c2 100644 (file)
@@ -95,10 +95,6 @@ struct CSSParserString {
     operator String() const { return is8Bit() ? String(m_data.characters8, m_length) : String(m_data.characters16, m_length); }
     operator AtomicString() const { return is8Bit() ? AtomicString(m_data.characters8, m_length) : AtomicString(m_data.characters16, m_length); }
 
-#if ENABLE(CSS_VARIABLES)
-    AtomicString substring(unsigned position, unsigned length) const;
-#endif
-
     union {
         LChar* characters8;
         UChar* characters16;
index 375442a..4c6b131 100644 (file)
@@ -123,9 +123,6 @@ static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::Unit
     case CSSPrimitiveValue::CSS_UNICODE_RANGE:
     case CSSPrimitiveValue::CSS_UNKNOWN:
     case CSSPrimitiveValue::CSS_URI:
-#if ENABLE(CSS_VARIABLES)
-    case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-#endif
         return false;
     }
 
@@ -202,10 +199,6 @@ unsigned short CSSPrimitiveValue::primitiveType() const
         return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER;
     case CalcPercentLength:
         return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH;
-#if ENABLE(CSS_VARIABLES)
-    case CalcVariable:
-        return CSSPrimitiveValue::CSS_UNKNOWN; // The type of a calculation containing a variable cannot be known until the value of the variable is determined.
-#endif
     case CalcOther:
         return CSSPrimitiveValue::CSS_UNKNOWN;
     }
@@ -448,9 +441,6 @@ void CSSPrimitiveValue::cleanup()
     case CSS_URI:
     case CSS_ATTR:
     case CSS_COUNTER_NAME:
-#if ENABLE(CSS_VARIABLES)
-    case CSS_VARIABLE_NAME:
-#endif
     case CSS_PARSER_HEXCOLOR:
         if (m_value.string)
             m_value.string->deref();
@@ -838,9 +828,6 @@ String CSSPrimitiveValue::getStringValue(ExceptionCode& ec) const
     case CSS_STRING:
     case CSS_ATTR:
     case CSS_URI:
-#if ENABLE(CSS_VARIABLES)
-    case CSS_VARIABLE_NAME:
-#endif
         return m_value.string;
     case CSS_VALUE_ID:
         return valueName(m_value.valueID);
@@ -860,9 +847,6 @@ String CSSPrimitiveValue::getStringValue() const
     case CSS_STRING:
     case CSS_ATTR:
     case CSS_URI:
-#if ENABLE(CSS_VARIABLES)
-    case CSS_VARIABLE_NAME:
-#endif
         return m_value.string;
     case CSS_VALUE_ID:
         return valueName(m_value.valueID);
@@ -1199,11 +1183,6 @@ String CSSPrimitiveValue::customCSSText() const
         case CSS_VMAX:
             text = formatNumber(m_value.num, "vmax");
             break;
-#if ENABLE(CSS_VARIABLES)
-        case CSS_VARIABLE_NAME:
-            text = "-webkit-var(" + String(m_value.string) + ')';
-            break;
-#endif
     }
 
     ASSERT(!cssTextCache().contains(this));
@@ -1212,40 +1191,6 @@ String CSSPrimitiveValue::customCSSText() const
     return text;
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSPrimitiveValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    if (isVariableName() && variables.contains(m_value.string))
-        return variables.get(m_value.string);
-    if (CSSCalcValue* calcValue = cssCalcValue())
-        return calcValue->customSerializeResolvingVariables(variables);
-    if (Pair* pairValue = getPairValue())
-        return pairValue->serializeResolvingVariables(variables);
-    if (Rect* rectVal = getRectValue())
-        return rectVal->serializeResolvingVariables(variables);
-    if (Quad* quadVal = getQuadValue())
-        return quadVal->serializeResolvingVariables(variables);
-    if (CSSBasicShape* shapeValue = getShapeValue())
-        return shapeValue->serializeResolvingVariables(variables);
-    return customCSSText();
-}
-
-bool CSSPrimitiveValue::hasVariableReference() const
-{
-    if (CSSCalcValue* calcValue = cssCalcValue())
-        return calcValue->hasVariableReference();
-    if (Pair* pairValue = getPairValue())
-        return pairValue->hasVariableReference();
-    if (Quad* quadValue = getQuadValue())
-        return quadValue->hasVariableReference();
-    if (Rect* rectValue = getRectValue())
-        return rectValue->hasVariableReference();
-    if (CSSBasicShape* shapeValue = getShapeValue())
-        return shapeValue->hasVariableReference();
-    return isVariableName();
-}
-#endif
-
 void CSSPrimitiveValue::addSubresourceStyleURLs(ListHashSet<URL>& urls, const StyleSheetContents* styleSheet) const
 {
     if (m_primitiveUnitType == CSS_URI)
@@ -1418,9 +1363,6 @@ bool CSSPrimitiveValue::equals(const CSSPrimitiveValue& other) const
     case CSS_COUNTER_NAME:
     case CSS_PARSER_IDENTIFIER:
     case CSS_PARSER_HEXCOLOR:
-#if ENABLE(CSS_VARIABLES)
-    case CSS_VARIABLE_NAME:
-#endif
         return equal(m_value.string, other.m_value.string);
     case CSS_COUNTER:
         return m_value.counter && other.m_value.counter && m_value.counter->equals(*other.m_value.counter);
index 32f758a..bffcc66 100644 (file)
@@ -134,9 +134,6 @@ public:
         CSS_CALC_PERCENTAGE_WITH_NUMBER = 114,
         CSS_CALC_PERCENTAGE_WITH_LENGTH = 115,
 
-#if ENABLE(CSS_VARIABLES)
-        CSS_VARIABLE_NAME = 116,
-#endif
         CSS_PROPERTY_ID = 117,
         CSS_VALUE_ID = 118
     };
@@ -200,9 +197,6 @@ public:
         return type >= CSS_DPPX && type <= CSS_DPCM;
     }
 
-#if ENABLE(CSS_VARIABLES)
-    bool isVariableName() const { return primitiveType() == CSS_VARIABLE_NAME; }
-#endif
     bool isViewportPercentageLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMAX; }
     bool isViewportPercentageWidth() const { return m_primitiveUnitType == CSS_VW; }
     bool isViewportPercentageHeight() const { return m_primitiveUnitType == CSS_VH; }
@@ -327,10 +321,6 @@ public:
     template<typename T> inline operator T() const; // Defined in CSSPrimitiveValueMappings.h
 
     String customCSSText() const;
-#if ENABLE(CSS_VARIABLES)
-    String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-    bool hasVariableReference() const;
-#endif
 
     bool isQuirkValue() { return m_isQuirkValue; }
 
index 0ffe165..30ff81d 100644 (file)
@@ -4714,9 +4714,6 @@ enum LengthConversion {
 
 template<int supported> Length CSSPrimitiveValue::convertToLength(const RenderStyle* style, const RenderStyle* rootStyle, double multiplier, bool computingFontSize) const
 {
-#if ENABLE(CSS_VARIABLES)
-    ASSERT(!hasVariableReference());
-#endif
     if ((supported & (FixedIntegerConversion | FixedFloatConversion)) && isFontRelativeLength() && (!style || !rootStyle))
         return Length(Undefined);
     if ((supported & FixedIntegerConversion) && isLength())
index 1323caf..38ddefc 100644 (file)
 #include "RenderStyleConstants.h"
 #include "StylePropertyShorthand.h"
 
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
 #include <wtf/text/StringBuilder.h>
 
 namespace WebCore {
index 096ea39..061e870 100644 (file)
@@ -59,9 +59,6 @@ public:
         : m_metadata(propertyID, isSetFromShorthand, indexInShorthandsVector, important, implicit, isInheritedProperty(propertyID))
         , m_value(value)
     {
-#if ENABLE(CSS_VARIABLES)
-    ASSERT((propertyID == CSSPropertyVariable) == (m_value && m_value->isVariableValue()));
-#endif
     }
 
     // FIXME: Remove this.
@@ -69,9 +66,6 @@ public:
         : m_metadata(metadata)
         , m_value(value)
     {
-#if ENABLE(CSS_VARIABLES)
-    ASSERT((metadata.m_propertyID == CSSPropertyVariable) == (m_value && m_value->isVariableValue()));
-#endif
     }
 
     CSSPropertyID id() const { return static_cast<CSSPropertyID>(m_metadata.m_propertyID); }
index 8ae83cf..b497af0 100644 (file)
@@ -38,15 +38,6 @@ String CSSReflectValue::customCSSText() const
     return m_direction->cssText() + ' ' + m_offset->cssText();
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSReflectValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    if (m_mask)
-        return m_direction->customSerializeResolvingVariables(variables) + ' ' + m_offset->customSerializeResolvingVariables(variables) + ' ' + m_mask->serializeResolvingVariables(variables);
-    return m_direction->customSerializeResolvingVariables(variables) + ' ' + m_offset->customSerializeResolvingVariables(variables);
-}
-#endif
-
 void CSSReflectValue::addSubresourceStyleURLs(ListHashSet<URL>& urls, const StyleSheetContents* styleSheet) const
 {
     if (m_mask)
index dd0a25f..544c234 100644 (file)
@@ -48,9 +48,6 @@ public:
     CSSValue* mask() const { return m_mask.get(); }
 
     String customCSSText() const;
-#if ENABLE(CSS_VARIABLES)
-    String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
 
     void addSubresourceStyleURLs(ListHashSet<URL>&, const StyleSheetContents*) const;
 
index d304af1..4b298e8 100644 (file)
 #include "WebKitCSSShaderValue.h"
 #include "WebKitCSSTransformValue.h"
 
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
 #if ENABLE(SVG)
 #include "WebKitCSSSVGDocumentValue.h"
 #endif
@@ -239,10 +235,6 @@ bool CSSValue::equals(const CSSValue& other) const
             return compareCSSValues<WebKitCSSShaderValue>(*this, other);
 #endif
 #endif
-#if ENABLE(CSS_VARIABLES)
-        case VariableClass:
-            return compareCSSValues<CSSVariableValue>(*this, other);
-#endif
 #if ENABLE(SVG)
         case SVGColorClass:
             return compareCSSValues<SVGColor>(*this, other);
@@ -343,10 +335,6 @@ String CSSValue::cssText() const
         return toWebKitCSSShaderValue(this)->customCSSText();
 #endif
 #endif
-#if ENABLE(CSS_VARIABLES)
-    case VariableClass:
-        return toCSSVariableValue(this)->value();
-#endif
 #if ENABLE(SVG)
     case SVGColorClass:
         return toSVGColor(this)->customCSSText();
@@ -360,24 +348,6 @@ String CSSValue::cssText() const
     return String();
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSValue::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    switch (classType()) {
-    case PrimitiveClass:
-        return toCSSPrimitiveValue(this)->customSerializeResolvingVariables(variables);
-    case ReflectClass:
-        return toCSSReflectValue(this)->customSerializeResolvingVariables(variables);
-    case ValueListClass:
-        return toCSSValueList(this)->customSerializeResolvingVariables(variables);
-    case WebKitCSSTransformClass:
-        return toWebKitCSSTransformValue(this)->customSerializeResolvingVariables(variables);
-    default:
-        return cssText();
-    }
-}
-#endif
-
 void CSSValue::destroy()
 {
     if (m_isTextClone) {
@@ -490,11 +460,6 @@ void CSSValue::destroy()
         return;
 #endif
 #endif
-#if ENABLE(CSS_VARIABLES)
-    case VariableClass:
-        delete toCSSVariableValue(this);
-        return;
-#endif
 #if ENABLE(SVG)
     case SVGColorClass:
         delete toSVGColor(this);
index 223deef..0d501c0 100644 (file)
@@ -59,9 +59,6 @@ public:
 
     String cssText() const;
     void setCssText(const String&, ExceptionCode&) { } // FIXME: Not implemented.
-#if ENABLE(CSS_VARIABLES)
-    String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
 
     bool isPrimitiveValue() const { return m_classType == PrimitiveClass; }
     bool isValueList() const { return m_classType >= ValueListClass; }
@@ -106,9 +103,6 @@ public:
     bool isWebKitCSSShaderValue() const { return m_classType == WebKitCSSShaderClass; }
 #endif
 #endif // ENABLE(CSS_FILTERS)
-#if ENABLE(CSS_VARIABLES)
-    bool isVariableValue() const { return m_classType == VariableClass; }
-#endif
     bool isGridTemplateValue() const { return m_classType == GridTemplateClass; }
 #if ENABLE(SVG)
     bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; }
@@ -177,9 +171,6 @@ protected:
 #if ENABLE(CSS_FILTERS) && ENABLE(CSS_SHADERS)
         WebKitCSSShaderClass,
 #endif
-#if ENABLE(CSS_VARIABLES)
-        VariableClass,
-#endif
         GridTemplateClass,
 #if ENABLE(SVG)
         SVGColorClass,
index 11f2ba9..4b45960 100644 (file)
@@ -135,36 +135,6 @@ bool CSSValueList::equals(const CSSValue& other) const
     return value && value->equals(other);
 }
 
-#if ENABLE(CSS_VARIABLES)
-String CSSValueList::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    StringBuilder result;
-    String separator;
-    switch (m_valueListSeparator) {
-    case SpaceSeparator:
-        separator = ASCIILiteral(" ");
-        break;
-    case CommaSeparator:
-        separator = ASCIILiteral(", ");
-        break;
-    case SlashSeparator:
-        separator = ASCIILiteral(" / ");
-        break;
-    default:
-        ASSERT_NOT_REACHED();
-    }
-
-    unsigned size = m_values.size();
-    for (unsigned i = 0; i < size; i++) {
-        if (!result.isEmpty())
-            result.append(separator);
-        result.append(m_values[i]->serializeResolvingVariables(variables));
-    }
-
-    return result.toString();
-}
-#endif
-
 void CSSValueList::addSubresourceStyleURLs(ListHashSet<URL>& urls, const StyleSheetContents* styleSheet) const
 {
     size_t size = m_values.size();
index d75899d..94e2603 100644 (file)
@@ -62,9 +62,6 @@ public:
     String customCSSText() const;
     bool equals(const CSSValueList&) const;
     bool equals(const CSSValue&) const;
-#if ENABLE(CSS_VARIABLES)
-    String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
 
     void addSubresourceStyleURLs(ListHashSet<URL>&, const StyleSheetContents*) const;
 
diff --git a/Source/WebCore/css/CSSVariableValue.h b/Source/WebCore/css/CSSVariableValue.h
deleted file mode 100644 (file)
index 81ac6d9..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1.  Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- * 2.  Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- *     its contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef CSSVariableValue_h
-#define CSSVariableValue_h
-
-#if ENABLE(CSS_VARIABLES)
-
-#include "CSSParserValues.h"
-#include "CSSPropertyNames.h"
-#include "CSSValue.h"
-
-namespace WebCore {
-
-class CSSVariableValue : public CSSValue {
-public:
-    static PassRefPtr<CSSVariableValue> create(const AtomicString& name, const String& value)
-    {
-        return adoptRef(new CSSVariableValue(name, value));
-    }
-
-    const AtomicString& name() const { return m_name; }
-    const String& value() const { return m_value; }
-
-    bool equals(const CSSVariableValue& other) const { return m_name == other.m_name && m_value == other.m_value; }
-
-private:
-    CSSVariableValue(const AtomicString& name, const String& value)
-        : CSSValue(VariableClass)
-        , m_name(name)
-        , m_value(value)
-    {
-    }
-
-    const AtomicString m_name;
-    const String m_value;
-};
-
-CSS_VALUE_TYPE_CASTS(CSSVariableValue, isVariableValue())
-
-}
-
-#endif /* ENABLE(CSS_VARIABLES) */
-#endif /* CSSVariableValue_h */
index faadb20..6211873 100644 (file)
@@ -58,16 +58,6 @@ public:
 
     bool equals(const Pair& other) const { return compareCSSValuePtr(m_first, other.m_first) && compareCSSValuePtr(m_second, other.m_second); }
 
-#if ENABLE(CSS_VARIABLES)
-    String serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-    {
-        return generateCSSString(first()->customSerializeResolvingVariables(variables),
-                                 second()->customSerializeResolvingVariables(variables));
-    }
-    
-    bool hasVariableReference() const { return first()->hasVariableReference() || second()->hasVariableReference(); }
-#endif
-
 private:
     Pair() : m_first(0), m_second(0) { }
     Pair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second)
index 40a2cfe..ffb20a0 100644 (file)
@@ -47,16 +47,6 @@ public:
             && compareCSSValuePtr(m_bottom, other.m_bottom);
     }
 
-#if ENABLE(CSS_VARIABLES)
-    bool hasVariableReference() const
-    {
-        return m_top->hasVariableReference()
-            || m_right->hasVariableReference()
-            || m_bottom->hasVariableReference()
-            || m_left->hasVariableReference();
-    }
-#endif
-
 protected:
     RectBase() { }
     RectBase(const RectBase& cloneFrom)
@@ -87,16 +77,6 @@ public:
         return generateCSSString(top()->cssText(), right()->cssText(), bottom()->cssText(), left()->cssText());
     }
 
-#if ENABLE(CSS_VARIABLES)
-    String serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-    {
-        return generateCSSString(top()->customSerializeResolvingVariables(variables),
-            right()->customSerializeResolvingVariables(variables),
-            bottom()->customSerializeResolvingVariables(variables),
-            left()->customSerializeResolvingVariables(variables));
-    }
-#endif
-
 private:
     Rect() { }
     Rect(const Rect& cloneFrom) : RectBase(cloneFrom), RefCounted<Rect>() { }
@@ -117,16 +97,6 @@ public:
         return generateCSSString(top()->cssText(), right()->cssText(), bottom()->cssText(), left()->cssText());
     }
 
-#if ENABLE(CSS_VARIABLES)
-    String serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-    {
-        return generateCSSString(top()->customSerializeResolvingVariables(variables),
-            right()->customSerializeResolvingVariables(variables),
-            bottom()->customSerializeResolvingVariables(variables),
-            left()->customSerializeResolvingVariables(variables));
-    }
-#endif
-
 private:
     Quad() { }
     Quad(const Quad& cloneFrom) : RectBase(cloneFrom), RefCounted<Quad>() { }
index d06986c..a75c8af 100644 (file)
 #include <wtf/BitArray.h>
 #include <wtf/text/StringBuilder.h>
 
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
 #ifndef NDEBUG
 #include <stdio.h>
 #include <wtf/ASCIICType.h>
@@ -793,13 +789,6 @@ String StylePropertySet::asText() const
         String value;
 
         switch (propertyID) {
-#if ENABLE(CSS_VARIABLES)
-        case CSSPropertyVariable:
-            if (numDecls++)
-                result.append(' ');
-            result.append(property.cssText());
-            continue;
-#endif
         case CSSPropertyBackgroundPositionX:
             positionXPropertyIndex = n;
             continue;
@@ -1265,14 +1254,6 @@ PassRef<MutableStylePropertySet> MutableStylePropertySet::create(const CSSProper
 
 String StylePropertySet::PropertyReference::cssName() const
 {
-#if ENABLE(CSS_VARIABLES)
-    if (id() == CSSPropertyVariable) {
-        ASSERT(propertyValue()->isVariableValue());
-        if (!propertyValue()->isVariableValue())
-            return emptyString(); // Should not happen, but if it does, avoid a bad cast.
-        return "-webkit-var-" + toCSSVariableValue(propertyValue())->name();
-    }
-#endif
     return getPropertyNameString(id());
 }
 
index 8582f4e..27e5287 100644 (file)
 #include "CachedResourceLoader.h"
 #endif
 
-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
 #if ENABLE(DASHBOARD_SUPPORT)
 #include "DashboardRegion.h"
 #endif
@@ -1037,9 +1033,6 @@ PassRef<RenderStyle> StyleResolver::styleForPage(int pageIndex)
     bool inheritedOnly = false;
 
     MatchResult& result = collector.matchedResult();
-#if ENABLE(CSS_VARIABLES)
-    applyMatchedProperties<VariableDefinitions>(result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
-#endif
     applyMatchedProperties<HighPriorityProperties>(result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
 
     // If our font got dirtied, go ahead and update it now.
@@ -1554,13 +1547,6 @@ void StyleResolver::applyProperties(const StylePropertySet* properties, StyleRul
             continue;
 #endif
         switch (pass) {
-#if ENABLE(CSS_VARIABLES)
-        case VariableDefinitions:
-            COMPILE_ASSERT(CSSPropertyVariable < firstCSSProperty, CSS_variable_is_before_first_property);
-            if (property == CSSPropertyVariable)
-                applyProperty(current.id(), current.value());
-            break;
-#endif
         case HighPriorityProperties:
             COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property);
 #if ENABLE(IOS_TEXT_AUTOSIZING)
@@ -1569,10 +1555,6 @@ void StyleResolver::applyProperties(const StylePropertySet* properties, StyleRul
             COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 17, CSS_zoom_is_end_of_first_prop_range);
 #endif
             COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom);
-#if ENABLE(CSS_VARIABLES)
-            if (property == CSSPropertyVariable)
-                continue;
-#endif
             // give special priority to font-xxx, color properties, etc
             if (property < CSSPropertyLineHeight)
                 applyProperty(current.id(), current.value());
@@ -1736,14 +1718,6 @@ void StyleResolver::applyMatchedProperties(const MatchResult& matchResult, const
         applyInheritedOnly = true; 
     }
 
-#if ENABLE(CSS_VARIABLES)
-    // First apply all variable definitions, as they may be used during application of later properties.
-    applyMatchedProperties<VariableDefinitions>(matchResult, false, 0, matchResult.matchedProperties.size() - 1, applyInheritedOnly);
-    applyMatchedProperties<VariableDefinitions>(matchResult, true, matchResult.ranges.firstAuthorRule, matchResult.ranges.lastAuthorRule, applyInheritedOnly);
-    applyMatchedProperties<VariableDefinitions>(matchResult, true, matchResult.ranges.firstUserRule, matchResult.ranges.lastUserRule, applyInheritedOnly);
-    applyMatchedProperties<VariableDefinitions>(matchResult, true, matchResult.ranges.firstUARule, matchResult.ranges.lastUARule, applyInheritedOnly);
-#endif
-
     // Now we have all of the matched rules in the appropriate order. Walk the rules and apply
     // high-priority properties first, i.e., those properties that other properties depend on.
     // The order is (1) high-priority not important, (2) high-priority important, (3) normal not important
@@ -2051,67 +2025,8 @@ static bool createGridPosition(CSSValue* value, GridPosition& position)
     return true;
 }
 
-#if ENABLE(CSS_VARIABLES)
-static bool hasVariableReference(CSSValue* value)
-{
-    if (value->isPrimitiveValue()) {
-        CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
-        return primitiveValue->hasVariableReference();
-    }
-
-    if (value->isCalcValue())
-        return toCSSCalcValue(value)->hasVariableReference();
-
-    if (value->isReflectValue()) {
-        CSSReflectValue* reflectValue = toCSSReflectValue(value);
-        CSSPrimitiveValue* direction = reflectValue->direction();
-        CSSPrimitiveValue* offset = reflectValue->offset();
-        CSSValue* mask = reflectValue->mask();
-        return (direction && hasVariableReference(direction)) || (offset && hasVariableReference(offset)) || (mask && hasVariableReference(mask));
-    }
-
-    for (CSSValueListIterator i = value; i.hasMore(); i.advance()) {
-        if (hasVariableReference(i.value()))
-            return true;
-    }
-
-    return false;
-}
-
-void StyleResolver::resolveVariables(CSSPropertyID id, CSSValue* value, Vector<std::pair<CSSPropertyID, String>>& knownExpressions)
-{
-    std::pair<CSSPropertyID, String> expression(id, value->serializeResolvingVariables(*m_state.style()->variables()));
-
-    if (knownExpressions.contains(expression))
-        return; // cycle detected.
-
-    knownExpressions.append(expression);
-
-    // FIXME: It would be faster not to re-parse from strings, but for now CSS property validation lives inside the parser so we do it there.
-    RefPtr<MutableStylePropertySet> resultSet = MutableStylePropertySet::create();
-    if (!CSSParser::parseValue(resultSet.get(), id, expression.second, false, document()))
-        return; // expression failed to parse.
-
-    for (unsigned i = 0; i < resultSet->propertyCount(); i++) {
-        StylePropertySet::PropertyReference property = resultSet->propertyAt(i);
-        if (property.id() != CSSPropertyVariable && hasVariableReference(property.value()))
-            resolveVariables(property.id(), property.value(), knownExpressions);
-        else
-            applyProperty(property.id(), property.value());
-    }
-}
-#endif
-
 void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
 {
-#if ENABLE(CSS_VARIABLES)
-    if (id != CSSPropertyVariable && hasVariableReference(value)) {
-        Vector<std::pair<CSSPropertyID, String>> knownExpressions;
-        resolveVariables(id, value, knownExpressions);
-        return;
-    }
-#endif
-
     // CSS variables don't resolve shorthands at parsing time, so this should be *after* handling variables.
     ASSERT_WITH_MESSAGE(!isExpandedShorthand(id), "Shorthand property id = %d wasn't expanded at parsing time", id);
 
@@ -2130,16 +2045,6 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
     if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSProperty::isInheritedProperty(id))
         state.parentStyle()->setHasExplicitlyInheritedProperties();
 
-#if ENABLE(CSS_VARIABLES)
-    if (id == CSSPropertyVariable) {
-        CSSVariableValue* variable = toCSSVariableValue(value);
-        ASSERT(!variable->name().isEmpty());
-        ASSERT(!variable->value().isEmpty());
-        state.style()->setVariable(variable->name(), variable->value());
-        return;
-    }
-#endif
-
     // Check lookup table for implementations and use when available.
     const PropertyHandler& handler = m_deprecatedStyleBuilder.propertyHandler(id);
     if (handler.isValid()) {
@@ -3001,9 +2906,6 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
     case CSSPropertyTextTransform:
     case CSSPropertyTop:
     case CSSPropertyUnicodeBidi:
-#if ENABLE(CSS_VARIABLES)
-    case CSSPropertyVariable:
-#endif
     case CSSPropertyVerticalAlign:
     case CSSPropertyVisibility:
     case CSSPropertyWebkitAnimationDelay:
index 9bd46b0..8d038a6 100644 (file)
@@ -353,9 +353,6 @@ private:
     void applyMatchedProperties(const MatchResult&, const Element*);
 
     enum StyleApplicationPass {
-#if ENABLE(CSS_VARIABLES)
-        VariableDefinitions,
-#endif
         HighPriorityProperties,
         LowPriorityProperties
     };
@@ -363,9 +360,6 @@ private:
     void applyMatchedProperties(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
     template <StyleApplicationPass pass>
     void applyProperties(const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
-#if ENABLE(CSS_VARIABLES)
-    void resolveVariables(CSSPropertyID, CSSValue*, Vector<std::pair<CSSPropertyID, String>>& knownExpressions);
-#endif
     static bool isValidRegionStyleProperty(CSSPropertyID);
 #if ENABLE(VIDEO_TRACK)
     static bool isValidCueStyleProperty(CSSPropertyID);
index 6c01a7f..fbb1a80 100644 (file)
@@ -78,13 +78,6 @@ String WebKitCSSTransformValue::customCSSText() const
     return transformValueToCssString(m_type, CSSValueList::customCSSText());
 }
 
-#if ENABLE(CSS_VARIABLES)
-String WebKitCSSTransformValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
-    return transformValueToCssString(m_type, CSSValueList::customSerializeResolvingVariables(variables));
-}
-#endif
-
 WebKitCSSTransformValue::WebKitCSSTransformValue(const WebKitCSSTransformValue& cloneFrom)
     : CSSValueList(cloneFrom)
     , m_type(cloneFrom.m_type)
index 4c464eb..cf9ced6 100644 (file)
@@ -67,9 +67,6 @@ public:
 
     String customCSSText() const;
     bool equals(const WebKitCSSTransformValue& other) const { return m_type == other.m_type && CSSValueList::equals(other); }
-#if ENABLE(CSS_VARIABLES)
-    String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
 
     TransformOperationType operationType() const { return m_type; }
     
index 4b98d20..059ccfc 100644 (file)
@@ -37,7 +37,7 @@ die "We've reached more than 1024 CSS properties, please make sure to update CSS
 my %namesHash;
 my @duplicates = ();
 
-my $numPredefinedProperties = 2;
+my $numPredefinedProperties = 1;
 my @names = ();
 my %nameIsInherited;
 my %nameToId;
@@ -204,7 +204,6 @@ String getJSPropertyName(CSSPropertyID id)
 
 static const bool isInheritedPropertyTable[numCSSProperties + $numPredefinedProperties] = {
     false, // CSSPropertyInvalid
-    false, // CSSPropertyVariable
 EOF
 
 foreach my $name (@names) {
@@ -250,9 +249,6 @@ namespace WebCore {
 
 enum CSSPropertyID {
     CSSPropertyInvalid = 0,
-#if ENABLE(CSS_VARIABLES)
-    CSSPropertyVariable = 1,
-#endif
 EOF
 
 my $first = $numPredefinedProperties;
index 5bf6d87..489491c 100644 (file)
@@ -165,9 +165,6 @@ Settings::Settings(Page* page)
 #if ENABLE(CSS_STICKY_POSITION)
     , m_cssStickyPositionEnabled(true)
 #endif
-#if ENABLE(CSS_VARIABLES)
-    , m_cssVariablesEnabled(false)
-#endif
     , m_showTiledScrollingIndicator(false)
     , m_tiledBackingStoreEnabled(false)
     , m_dnsPrefetchingEnabled(false)
index 6875bf3..19dbf82 100644 (file)
@@ -193,14 +193,6 @@ public:
     bool cssStickyPositionEnabled() const { return false; }
 #endif
 
-#if ENABLE(CSS_VARIABLES)
-    void setCSSVariablesEnabled(bool enabled) { m_cssVariablesEnabled = enabled; }
-    bool cssVariablesEnabled() const { return m_cssVariablesEnabled; }
-#else
-    void setCSSVariablesEnabled(bool) { }
-    bool cssVariablesEnabled() const { return false; }
-#endif
-
     void setShowTiledScrollingIndicator(bool);
     bool showTiledScrollingIndicator() const { return m_showTiledScrollingIndicator; }
 
@@ -307,9 +299,6 @@ private:
 #if ENABLE(CSS_STICKY_POSITION)
     bool m_cssStickyPositionEnabled : 1;
 #endif
-#if ENABLE(CSS_VARIABLES)
-    bool m_cssVariablesEnabled : 1;
-#endif
     bool m_showTiledScrollingIndicator : 1;
     bool m_tiledBackingStoreEnabled : 1;
     bool m_dnsPrefetchingEnabled : 1;
index e23c081..ff59a03 100644 (file)
@@ -369,11 +369,6 @@ public:
 
     const PseudoStyleCache* cachedPseudoStyles() const { return m_cachedPseudoStyles.get(); }
 
-#if ENABLE(CSS_VARIABLES)
-    void setVariable(const AtomicString& name, const String& value) { rareInheritedData.access()->m_variables.access()->setVariable(name, value); }
-    const HashMap<AtomicString, String>* variables() { return &(rareInheritedData->m_variables->m_data); }
-#endif
-
     bool affectedByHover() const { return noninherited_flags.affectedByHover(); }
     bool affectedByActive() const { return noninherited_flags.affectedByActive(); }
     bool affectedByDrag() const { return noninherited_flags.affectedByDrag(); }
index ca39ab2..26ccedc 100644 (file)
@@ -60,10 +60,6 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
 #if ENABLE(TOUCH_EVENTS)
     Color touchColors;
 #endif
-
-#if ENABLE(CSS_VARIABLES)
-    void* variableDataRefs[1];
-#endif
 };
 
 COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
@@ -136,9 +132,6 @@ StyleRareInheritedData::StyleRareInheritedData()
 #if ENABLE(TOUCH_EVENTS)
     , tapHighlightColor(RenderStyle::initialTapHighlightColor())
 #endif
-#if ENABLE(CSS_VARIABLES)
-    , m_variables(StyleVariableData::create())
-#endif
 {
 }
 
@@ -223,9 +216,6 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
 #if ENABLE(TOUCH_EVENTS)
     , tapHighlightColor(o.tapHighlightColor)
 #endif
-#if ENABLE(CSS_VARIABLES)
-    , m_variables(o.m_variables)
-#endif
 {
 }
 
@@ -329,9 +319,6 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
 #endif
         && m_rubyPosition == o.m_rubyPosition
         && m_lineSnap == o.m_lineSnap
-#if ENABLE(CSS_VARIABLES)
-        && m_variables == o.m_variables
-#endif
         && m_lineAlign == o.m_lineAlign
         && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.get());
 }
index 03122c3..0497784 100644 (file)
 #include <wtf/PassRefPtr.h>
 #include <wtf/text/AtomicString.h>
 
-#if ENABLE(CSS_VARIABLES)
-#include "DataRef.h"
-#include "StyleVariableData.h"
-#endif
-
 #if ENABLE(IOS_TEXT_AUTOSIZING)
 #include "TextSizeAdjustment.h"
 #endif
@@ -160,10 +155,6 @@ public:
     Color tapHighlightColor;
 #endif
 
-#if ENABLE(CSS_VARIABLES)
-    DataRef<StyleVariableData> m_variables;
-#endif
-
 private:
     StyleRareInheritedData();
     StyleRareInheritedData(const StyleRareInheritedData&);
diff --git a/Source/WebCore/rendering/style/StyleVariableData.h b/Source/WebCore/rendering/style/StyleVariableData.h
deleted file mode 100644 (file)
index 75652b9..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef StyleVariableData_h
-#define StyleVariableData_h
-#if ENABLE(CSS_VARIABLES)
-
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
-#include <wtf/RefCounted.h>
-#include <wtf/text/AtomicStringHash.h>
-
-namespace WebCore {
-
-class CursorList;
-class QuotesData;
-class ShadowData;
-
-class StyleVariableData : public RefCounted<StyleVariableData> {
-public:
-    static PassRef<StyleVariableData> create() { return adoptRef(*new StyleVariableData()); }
-    PassRef<StyleVariableData> copy() const { return adoptRef(*new StyleVariableData(*this)); }
-
-    bool operator==(const StyleVariableData& other) const { return other.m_data == m_data; }
-    bool operator!=(const StyleVariableData& other) const { return !(*this == other); }
-
-    void setVariable(const AtomicString& name, const String& value) { m_data.set(name, value); }
-
-    HashMap<AtomicString, String> m_data;
-private:
-    explicit StyleVariableData() : RefCounted<StyleVariableData>() { }
-    StyleVariableData(const StyleVariableData& other) : RefCounted<StyleVariableData>(), m_data(HashMap<AtomicString, String>(other.m_data)) { }
-};
-
-} // namespace WebCore
-
-#endif /* ENABLE(CSS_VARIABLES) */
-#endif /* StyleVariableData_h */
index 4363f4f..4da8f74 100644 (file)
@@ -68,7 +68,6 @@ namespace WebCore {
 InternalSettings::Backup::Backup(Settings& settings)
     : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
     , m_originalCSSShapesEnabled(RuntimeEnabledFeatures::sharedFeatures().cssShapesEnabled())
-    , m_originalCSSVariablesEnabled(settings.cssVariablesEnabled())
 #if ENABLE(SHADOW_DOM)
     , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::sharedFeatures().shadowDOMEnabled())
     , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::sharedFeatures().authorShadowDOMForAnyElementEnabled())
@@ -102,7 +101,6 @@ void InternalSettings::Backup::restoreTo(Settings& settings)
 {
     RuntimeEnabledFeatures::sharedFeatures().setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
     RuntimeEnabledFeatures::sharedFeatures().setCSSShapesEnabled(m_originalCSSShapesEnabled);
-    settings.setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
 #if ENABLE(SHADOW_DOM)
     RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(m_originalShadowDOMEnabled);
     RuntimeEnabledFeatures::sharedFeatures().setAuthorShadowDOMForAnyElementEnabled(m_originalAuthorShadowDOMForAnyElementEnabled);
@@ -391,18 +389,6 @@ void InternalSettings::setCSSShapesEnabled(bool enabled, ExceptionCode& ec)
     RuntimeEnabledFeatures::sharedFeatures().setCSSShapesEnabled(enabled);
 }
 
-void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec)
-{
-    InternalSettingsGuardForSettings();
-    settings()->setCSSVariablesEnabled(enabled);
-}
-
-bool InternalSettings::cssVariablesEnabled(ExceptionCode& ec)
-{
-    InternalSettingsGuardForSettingsReturn(false);
-    return settings()->cssVariablesEnabled();
-}
-
 void InternalSettings::setCanStartMedia(bool enabled, ExceptionCode& ec)
 {
     InternalSettingsGuardForSettings();
index 1dcdec3..b153b60 100644 (file)
@@ -54,7 +54,6 @@ public:
 
         bool m_originalCSSExclusionsEnabled;
         bool m_originalCSSShapesEnabled;
-        bool m_originalCSSVariablesEnabled;
 #if ENABLE(SHADOW_DOM)
         bool m_originalShadowDOMEnabled;
         bool m_originalAuthorShadowDOMForAnyElementEnabled;
@@ -122,8 +121,6 @@ public:
     void setMediaTypeOverride(const String& mediaType, ExceptionCode&);
     void setCSSExclusionsEnabled(bool enabled, ExceptionCode&);
     void setCSSShapesEnabled(bool enabled, ExceptionCode&);
-    void setCSSVariablesEnabled(bool enabled, ExceptionCode&);
-    bool cssVariablesEnabled(ExceptionCode&);
     void setCanStartMedia(bool, ExceptionCode&);
     void setEditingBehavior(const String&, ExceptionCode&);
     void setShouldDisplayTrackKind(const String& kind, bool enabled, ExceptionCode&);
index 2678b68..a7de5f8 100644 (file)
@@ -44,8 +44,6 @@
     [RaisesException] void setMediaTypeOverride(DOMString mediaTypeOverride);
     [RaisesException] void setCSSExclusionsEnabled(boolean enabled);
     [RaisesException] void setCSSShapesEnabled(boolean enabled);
-    [RaisesException] void setCSSVariablesEnabled(boolean enabled);
-    [RaisesException] boolean cssVariablesEnabled();
     [RaisesException] void setCanStartMedia(boolean enabled);
     [RaisesException] void setEditingBehavior(DOMString behavior);
     void setLangAttributeAwareFormControlUIEnabled(boolean enabled);
index d310f12..fc7d06d 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-11-27  Sam Weinig  <sam@webkit.org>
 
         Fix the iOS build.
index a1d700a..fa291cb 100644 (file)
@@ -52,7 +52,6 @@ ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
 ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
-ENABLE_CSS_VARIABLES = ;
 ENABLE_CSS3_CONDITIONAL_RULES = ;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
@@ -187,4 +186,4 @@ ENABLE_XSLT = ENABLE_XSLT;
 
 ENABLE_FTL_JIT = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index ec0b6cf..6c0b5d3 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * Configurations/FeatureDefines.xcconfig:
+
 2013-11-27  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 
         [GTK] Support custom types for drag and drop data
index 8f945b2..4e7aecb 100644 (file)
@@ -52,7 +52,6 @@ ENABLE_CSS_SHADERS = ENABLE_CSS_SHADERS;
 ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
 ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
-ENABLE_CSS_VARIABLES = ;
 ENABLE_CSS3_CONDITIONAL_RULES = ;
 ENABLE_CSS3_TEXT = ;
 ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS_TEXT_DECORATION;
@@ -187,4 +186,4 @@ ENABLE_XSLT = ENABLE_XSLT;
 
 ENABLE_FTL_JIT = ;
 
-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS_VARIABLES) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_BLOB) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_EXCLUSIONS) $(ENABLE_CSS_FILTERS) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SHADERS) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS_STICKY_POSITION) $(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED) $(ENABLE_CSS3_CONDITIONAL_RULES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_DECORATION) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DIRECTORY_UPLOAD) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_DRAGGABLE_REGION) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_HIGH_DPI_CANVAS) $(ENABLE_ICONDATABASE) $(ENABLE_IFRAME_SEAMLESS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_SPEECH) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_JAVASCRIPT_DEBUGGER) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NOTIFICATIONS) $(ENABLE_PAGE_VISIBILITY_API) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PLUGIN_PROXY_FOR_VIDEO) $(ENABLE_PROGRESS_ELEMENT) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_SCRIPTED_SPEECH) $(ENABLE_SHADOW_DOM) $(ENABLE_SHARED_WORKERS) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_SQL_DATABASE) $(ENABLE_SUBPIXEL_LAYOUT) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG) $(ENABLE_SVG_FONTS) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_THREADED_HTML_PARSER) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_ANIMATIONS) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WORKERS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(FEATURE_DEFINES_$(PLATFORM_NAME));
index a9384a8..63c1f90 100644 (file)
@@ -111,7 +111,6 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
     ENABLE_CSS_SHAPES=0 \
     ENABLE_CSS_STICKY_POSITION=1 \
     ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0 \
-    ENABLE_CSS_VARIABLES=0 \
     ENABLE_CSS3_CONDITIONAL_RULES=0 \
     ENABLE_CUSTOM_SCHEME_HANDLER=0 \
     ENABLE_DASHBOARD_SUPPORT=0 \
index 0c4a691..79ed85a 100644 (file)
@@ -62,7 +62,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_VARIABLES ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
index bb38c03..3947879 100644 (file)
@@ -12,7 +12,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_VARIABLES ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
index bc49288..ad3c924 100644 (file)
@@ -39,7 +39,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_STICKY_POSITION "Toggle CSS sticky position support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED "Toggle support for unprefixed CSS animations and transforms" ON)
-    WEBKIT_OPTION_DEFINE(ENABLE_CSS_VARIABLES "Toggle CSS Variables support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" OFF)
index 14fd676..eebf2d0 100644 (file)
@@ -28,7 +28,6 @@
 #cmakedefine01 ENABLE_CSS_SHAPES
 #cmakedefine01 ENABLE_CSS_STICKY_POSITION
 #cmakedefine01 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED
-#cmakedefine01 ENABLE_CSS_VARIABLES
 #cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
 #cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
 #cmakedefine01 ENABLE_DATALIST_ELEMENT
index 010c3ad..cdb808a 100644 (file)
@@ -1,3 +1,12 @@
+2013-11-28  Antti Koivisto  <antti@apple.com>
+
+        Remove feature: CSS variables
+        https://bugs.webkit.org/show_bug.cgi?id=114119
+
+        Reviewed by Andreas Kling.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2013-11-28  Dániel Bátyai  <Batyai.Daniel@stud.u-szeged.hu>
 
         Move PrettyPatch related code to prettypatch.py
index 1bb53a0..bdd68f7 100644 (file)
@@ -68,7 +68,6 @@ my (
     $cssStickyPositionSupport,
     $cssCompositingSupport,
     $cssAnimationsTransformsUnprefixedSupport,
-    $cssVariablesSupport,
     $customSchemeHandlerSupport,
     $dataTransferItemsSupport,
     $datalistElementSupport,
@@ -234,9 +233,6 @@ my @features = (
     { option => "css-transforms-animations-unprefixed", desc => "Toggle support for unprefixed CSS animations and transforms",
       define => "ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED", default => 1, value => \$cssAnimationsTransformsUnprefixedSupport },
 
-    { option => "css-variables", desc => "Toggle CSS Variable support",
-      define => "ENABLE_CSS_VARIABLES", default => (isBlackBerry() || isEfl() || isGtk()), value => \$cssVariablesSupport },
-
     { option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
       define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => (isBlackBerry() || isEfl()), value => \$customSchemeHandlerSupport },