Ignore:
Timestamp:
Nov 28, 2013, 7:46:53 AM (11 years ago)
Author:
Antti Koivisto
Message:

Remove feature: CSS variables
​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.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/css/CSSValue.cpp

    r157286 r159842  
    6262#include "WebKitCSSShaderValue.h"
    6363#include "WebKitCSSTransformValue.h"
    64 
    65 #if ENABLE(CSS_VARIABLES)
    66 #include "CSSVariableValue.h"
    67 #endif
    6864
    6965#if ENABLE(SVG)
    … …  
    240236#endif
    241237#endif
    242 #if ENABLE(CSS_VARIABLES)
    243         case VariableClass:
    244             return compareCSSValues<CSSVariableValue>(*this, other);
    245 #endif
    246238#if ENABLE(SVG)
    247239        case SVGColorClass:
    … …  
    344336#endif
    345337#endif
    346 #if ENABLE(CSS_VARIABLES)
    347     case VariableClass:
    348         return toCSSVariableValue(this)->value();
    349 #endif
    350338#if ENABLE(SVG)
    351339    case SVGColorClass:
    … …  
    361349}
    362350
    363 #if ENABLE(CSS_VARIABLES)
    364 String CSSValue::serializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
    365 {
    366     switch (classType()) {
    367     case PrimitiveClass:
    368         return toCSSPrimitiveValue(this)->customSerializeResolvingVariables(variables);
    369     case ReflectClass:
    370         return toCSSReflectValue(this)->customSerializeResolvingVariables(variables);
    371     case ValueListClass:
    372         return toCSSValueList(this)->customSerializeResolvingVariables(variables);
    373     case WebKitCSSTransformClass:
    374         return toWebKitCSSTransformValue(this)->customSerializeResolvingVariables(variables);
    375     default:
    376         return cssText();
    377     }
    378 }
    379 #endif
    380 
    381351void CSSValue::destroy()
    382352{
    … …  
    490460        return;
    491461#endif
    492 #endif
    493 #if ENABLE(CSS_VARIABLES)
    494     case VariableClass:
    495         delete toCSSVariableValue(this);
    496         return;
    497462#endif
    498463#if ENABLE(SVG)
Note: See TracChangeset for help on using the changeset viewer.