<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[159842] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/159842">159842</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2013-11-28 07:46:53 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWTFwtfnixFeatureDefinesNixh">trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig">trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapescpp">trunk/Source/WebCore/css/CSSBasicShapes.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSBasicShapesh">trunk/Source/WebCore/css/CSSBasicShapes.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSCalculationValuecpp">trunk/Source/WebCore/css/CSSCalculationValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSCalculationValueh">trunk/Source/WebCore/css/CSSCalculationValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/css/CSSGrammar.y.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserModeh">trunk/Source/WebCore/css/CSSParserMode.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/WebCore/css/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCore/css/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertycpp">trunk/Source/WebCore/css/CSSProperty.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyh">trunk/Source/WebCore/css/CSSProperty.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSReflectValuecpp">trunk/Source/WebCore/css/CSSReflectValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSReflectValueh">trunk/Source/WebCore/css/CSSReflectValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListcpp">trunk/Source/WebCore/css/CSSValueList.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueListh">trunk/Source/WebCore/css/CSSValueList.h</a></li>
<li><a href="#trunkSourceWebCorecssPairh">trunk/Source/WebCore/css/Pair.h</a></li>
<li><a href="#trunkSourceWebCorecssRecth">trunk/Source/WebCore/css/Rect.h</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertySetcpp">trunk/Source/WebCore/css/StylePropertySet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSTransformValuecpp">trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssWebKitCSSTransformValueh">trunk/Source/WebCore/css/WebKitCSSTransformValue.h</a></li>
<li><a href="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingscpp">trunk/Source/WebCore/testing/InternalSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsh">trunk/Source/WebCore/testing/InternalSettings.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalSettingsidl">trunk/Source/WebCore/testing/InternalSettings.idl</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig">trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig</a></li>
<li><a href="#trunkSourceautotoolsSetupWebKitFeaturesm4">trunk/Source/autotools/SetupWebKitFeatures.m4</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeconfighcmake">trunk/Source/cmakeconfig.h.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/LayoutTests/fast/css/variables/</li>
<li><a href="#trunkSourceWebCorecssCSSVariableValueh">trunk/Source/WebCore/css/CSSVariableValue.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleVariableDatah">trunk/Source/WebCore/rendering/style/StyleVariableData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-27 László Langó <lango@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> [EFL] The remote inspector does not show the base page.
</span></span></pre></div>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/LayoutTests/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,82 @@
</span><ins>+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.
+
</ins><span class="cx"> 2013-11-28 Jongwoo Choi <jw0330.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Layout tests need to be rebaselined.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-28 Peter Gal <galpeter@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Typo fix after r159834 to fix 32 bit builds.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><del>-ENABLE_CSS_VARIABLES = ;
</del><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
</span><span class="lines">@@ -188,4 +187,4 @@
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WTF/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-26 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Do bytecode validation as part of testing
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FeatureDefines.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -426,10 +426,6 @@
</span><span class="cx"> #define ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_CSS_VARIABLES)
-#define ENABLE_CSS_VARIABLES 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CUSTOM_SCHEME_HANDLER)
</span><span class="cx"> #define ENABLE_CUSTOM_SCHEME_HANDLER 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfnixFeatureDefinesNixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WTF/wtf/nix/FeatureDefinesNix.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -94,10 +94,6 @@
</span><span class="cx"> #define ENABLE_CSS_SHADERS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_CSS_VARIABLES)
-#define ENABLE_CSS_VARIABLES 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_DATALIST_ELEMENT)
</span><span class="cx"> #define ENABLE_DATALIST_ELEMENT 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,102 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-28 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> Updating RTCPeerConnectionHandlerMock after r159769
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><del>-ENABLE_CSS_VARIABLES = ;
</del><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
</span><span class="lines">@@ -188,4 +187,4 @@
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx"> ENABLE_LLINT_C_LOOP = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -2622,7 +2622,6 @@
</span><span class="cx"> Source/WebCore/css/CSSValueList.h \
</span><span class="cx"> Source/WebCore/css/CSSValuePool.cpp \
</span><span class="cx"> Source/WebCore/css/CSSValuePool.h \
</span><del>- Source/WebCore/css/CSSVariableValue.h \
</del><span class="cx"> Source/WebCore/css/DOMWindowCSS.cpp \
</span><span class="cx"> Source/WebCore/css/DOMWindowCSS.h \
</span><span class="cx"> Source/WebCore/css/DashboardRegion.h \
</span><span class="lines">@@ -4640,7 +4639,6 @@
</span><span class="cx"> Source/WebCore/rendering/style/StyleSurroundData.h \
</span><span class="cx"> Source/WebCore/rendering/style/StyleTransformData.cpp \
</span><span class="cx"> Source/WebCore/rendering/style/StyleTransformData.h \
</span><del>- Source/WebCore/rendering/style/StyleVariableData.h \
</del><span class="cx"> Source/WebCore/rendering/style/StyleVisualData.cpp \
</span><span class="cx"> Source/WebCore/rendering/style/StyleVisualData.h \
</span><span class="cx"> Source/WebCore/rendering/TableLayout.h \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -4880,7 +4880,6 @@
</span><span class="cx"> BC5EB67F0E81D4A700B25965 /* StyleDashboardRegion.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC5EB6990E81DA6300B25965 /* StyleVisualData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */; };
</span><span class="cx"> BC5EB69A0E81DA6300B25965 /* StyleVisualData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6980E81DA6300B25965 /* StyleVisualData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- BC5EB69A0E81DA6300B25966 /* StyleVariableData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB6980E81DA6300B25966 /* StyleVariableData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> BC5EB69E0E81DAEB00B25965 /* FillLayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */; };
</span><span class="cx"> BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB69D0E81DAEB00B25965 /* FillLayer.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BC5EB6A20E81DC4F00B25965 /* StyleBackgroundData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB6A00E81DC4F00B25965 /* StyleBackgroundData.cpp */; };
</span><span class="lines">@@ -5308,7 +5307,6 @@
</span><span class="cx"> CA3BF67E10D99BAE00E6CE53 /* ScrollAnimator.h in Headers */ = {isa = PBXBuildFile; fileRef = CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CAE9F90F146441F000C245B0 /* CSSAspectRatioValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */; };
</span><span class="cx"> CAE9F910146441F000C245B0 /* CSSAspectRatioValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE9F90E146441F000C245B0 /* CSSAspectRatioValue.h */; };
</span><del>- CAE9F910146441F000C245B1 /* CSSVariableValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CAE9F90E146441F000C245B1 /* CSSVariableValue.h */; };
</del><span class="cx"> CCC2B51415F613060048CDD6 /* DeviceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CCC2B51015F613060048CDD6 /* DeviceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> CCC2B51515F613060048CDD6 /* DeviceController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CCC2B51115F613060048CDD6 /* DeviceController.cpp */; };
</span><span class="cx"> CCC2B51615F613060048CDD6 /* DeviceController.h in Headers */ = {isa = PBXBuildFile; fileRef = CCC2B51215F613060048CDD6 /* DeviceController.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -11888,7 +11886,6 @@
</span><span class="cx"> BC5EB67E0E81D4A700B25965 /* StyleDashboardRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleDashboardRegion.h; path = style/StyleDashboardRegion.h; sourceTree = "<group>"; };
</span><span class="cx"> BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleVisualData.cpp; path = style/StyleVisualData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC5EB6980E81DA6300B25965 /* StyleVisualData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleVisualData.h; path = style/StyleVisualData.h; sourceTree = "<group>"; };
</span><del>- BC5EB6980E81DA6300B25966 /* StyleVariableData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleVariableData.h; path = style/StyleVariableData.h; sourceTree = "<group>"; };
</del><span class="cx"> BC5EB69C0E81DAEB00B25965 /* FillLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FillLayer.cpp; path = style/FillLayer.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC5EB69D0E81DAEB00B25965 /* FillLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FillLayer.h; path = style/FillLayer.h; sourceTree = "<group>"; };
</span><span class="cx"> BC5EB6A00E81DC4F00B25965 /* StyleBackgroundData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleBackgroundData.cpp; path = style/StyleBackgroundData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -12357,7 +12354,6 @@
</span><span class="cx"> CA3BF67D10D99BAE00E6CE53 /* ScrollAnimator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimator.h; sourceTree = "<group>"; };
</span><span class="cx"> CAE9F90D146441F000C245B0 /* CSSAspectRatioValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSAspectRatioValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CAE9F90E146441F000C245B0 /* CSSAspectRatioValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSAspectRatioValue.h; sourceTree = "<group>"; };
</span><del>- CAE9F90E146441F000C245B1 /* CSSVariableValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSVariableValue.h; sourceTree = "<group>"; };
</del><span class="cx"> CCC2B51015F613060048CDD6 /* DeviceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceClient.h; sourceTree = "<group>"; };
</span><span class="cx"> CCC2B51115F613060048CDD6 /* DeviceController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CCC2B51215F613060048CDD6 /* DeviceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceController.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -19878,7 +19874,6 @@
</span><span class="cx"> BC5EB5E40E81BF6D00B25965 /* StyleSurroundData.h */,
</span><span class="cx"> BC5EB80D0E81F2CE00B25965 /* StyleTransformData.cpp */,
</span><span class="cx"> BC5EB80E0E81F2CE00B25965 /* StyleTransformData.h */,
</span><del>- BC5EB6980E81DA6300B25966 /* StyleVariableData.h */,
</del><span class="cx"> BC5EB6970E81DA6300B25965 /* StyleVisualData.cpp */,
</span><span class="cx"> BC5EB6980E81DA6300B25965 /* StyleVisualData.h */,
</span><span class="cx"> BC2274740E8366E200E7F975 /* SVGRenderStyle.cpp */,
</span><span class="lines">@@ -20472,7 +20467,6 @@
</span><span class="cx"> E1C6571E1816E50300256CDD /* CryptoAlgorithmHmacParams.h */,
</span><span class="cx"> E1BD331D182D8F4200C05D9F /* CryptoAlgorithmRsaKeyGenParams.h */,
</span><span class="cx"> E1C266DA18319935003F8B33 /* CryptoAlgorithmRsaKeyParamsWithHash.h */,
</span><del>- E1FE136C183FE21D00892F13 /* CryptoAlgorithmRsaOaepParams.h */,
</del><span class="cx"> E1BD331B182D8EE900C05D9F /* CryptoAlgorithmRsaSsaParams.h */,
</span><span class="cx"> );
</span><span class="cx"> name = parameters;
</span><span class="lines">@@ -20825,7 +20819,6 @@
</span><span class="cx"> A8D0651C0A23C1FE005E7203 /* CSSValueList.idl */,
</span><span class="cx"> E49BDA0A131FD3E5003C56F0 /* CSSValuePool.cpp */,
</span><span class="cx"> E49BD9F9131FD2ED003C56F0 /* CSSValuePool.h */,
</span><del>- CAE9F90E146441F000C245B1 /* CSSVariableValue.h */,
</del><span class="cx"> A80E6CE10A1989CA007FB8C5 /* DashboardRegion.h */,
</span><span class="cx"> E100EE731546EAC100BA11D1 /* DeprecatedStyleBuilder.cpp */,
</span><span class="cx"> E100EE741546EAC100BA11D1 /* DeprecatedStyleBuilder.h */,
</span><span class="lines">@@ -22376,7 +22369,6 @@
</span><span class="cx"> 078E091417D14D1C00420AA1 /* MediaConstraintsImpl.h in Headers */,
</span><span class="cx"> A80E6CE90A1989CA007FB8C5 /* CSSValueList.h in Headers */,
</span><span class="cx"> E49BD9FA131FD2ED003C56F0 /* CSSValuePool.h in Headers */,
</span><del>- CAE9F910146441F000C245B1 /* CSSVariableValue.h in Headers */,
</del><span class="cx"> 93F1992F08245E59001E9ABC /* Cursor.h in Headers */,
</span><span class="cx"> BC2272A20E82E87C00E7F975 /* CursorData.h in Headers */,
</span><span class="cx"> BC2272AD0E82E8F300E7F975 /* CursorList.h in Headers */,
</span><span class="lines">@@ -24659,7 +24651,6 @@
</span><span class="cx"> A8EA800A0A19516E00A8EF5F /* StyleSheetList.h in Headers */,
</span><span class="cx"> BC5EB5E50E81BF6D00B25965 /* StyleSurroundData.h in Headers */,
</span><span class="cx"> BC5EB8100E81F2CE00B25965 /* StyleTransformData.h in Headers */,
</span><del>- BC5EB69A0E81DA6300B25966 /* StyleVariableData.h in Headers */,
</del><span class="cx"> BC5EB69A0E81DA6300B25965 /* StyleVisualData.h in Headers */,
</span><span class="cx"> D000ED2811C1B9CD00C47726 /* SubframeLoader.h in Headers */,
</span><span class="cx"> 1FC40FBA1655CCB90040F29E /* SubimageCacheWithTimer.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSBasicShapes.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -96,30 +96,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_box, other.m_box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static String buildCircleString(const String& radius, const String& centerX, const String& centerY, const String& box)
</span><span class="cx"> {
</span><span class="cx"> char opening[] = "circle(";
</span><span class="lines">@@ -169,24 +145,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_box, other.m_box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static String buildDeprecatedCircleString(const String& x, const String& y, const String& radius, const String& box)
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="lines">@@ -223,24 +181,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_box, other.m_box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static String buildEllipseString(const String& x, const String& y, const String& radiusX, const String& radiusY, const String& box)
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><span class="lines">@@ -280,26 +220,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_box, other.m_box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static String buildPolygonString(const WindRule& windRule, const Vector<String>& points, const String& box)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!(points.size() % 2));
</span><span class="lines">@@ -368,34 +288,6 @@
</span><span class="cx"> && compareCSSValueVector<CSSPrimitiveValue>(m_values, rhs.m_values);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static String buildInsetRectangleString(const String& top, const String& right, const String& bottom, const String& left, const String& radiusX, const String& radiusY, const String& box)
</span><span class="cx"> {
</span><span class="cx"> char opening[] = "inset-rectangle(";
</span><span class="lines">@@ -453,29 +345,5 @@
</span><span class="cx"> && compareCSSValuePtr(m_box, other.m_box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSBasicShapesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSBasicShapes.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSBasicShapes.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSBasicShapes.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -56,11 +56,6 @@
</span><span class="cx"> CSSPrimitiveValue* box() const { return m_box.get(); }
</span><span class="cx"> void setBox(PassRefPtr<CSSPrimitiveValue> box) { m_box = box; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const = 0;
- virtual bool hasVariableReference() const = 0;
-#endif
-
</del><span class="cx"> public:
</span><span class="cx"> virtual ~CSSBasicShape() { }
</span><span class="cx">
</span><span class="lines">@@ -91,11 +86,6 @@
</span><span class="cx"> virtual String cssText() const OVERRIDE;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const OVERRIDE;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> CSSBasicShapeRectangle() { }
</span><span class="cx">
</span><span class="lines">@@ -129,11 +119,6 @@
</span><span class="cx"> virtual String cssText() const OVERRIDE;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const OVERRIDE;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> CSSBasicShapeInsetRectangle() { }
</span><span class="cx">
</span><span class="lines">@@ -161,11 +146,6 @@
</span><span class="cx"> void setCenterY(PassRefPtr<CSSPrimitiveValue> centerY) { m_centerY = centerY; }
</span><span class="cx"> void setRadius(PassRefPtr<CSSPrimitiveValue> radius) { m_radius = radius; }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> CSSBasicShapeCircle() { }
</span><span class="cx">
</span><span class="lines">@@ -190,11 +170,6 @@
</span><span class="cx"> virtual String cssText() const OVERRIDE;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const OVERRIDE;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> CSSDeprecatedBasicShapeCircle() { }
</span><span class="cx">
</span><span class="lines">@@ -221,11 +196,6 @@
</span><span class="cx"> virtual String cssText() const OVERRIDE;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const OVERRIDE;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> CSSBasicShapeEllipse() { }
</span><span class="cx">
</span><span class="lines">@@ -255,10 +225,6 @@
</span><span class="cx"> virtual Type type() const OVERRIDE { return CSSBasicShapePolygonType; }
</span><span class="cx"> virtual String cssText() const OVERRIDE;
</span><span class="cx"> virtual bool equals(const CSSBasicShape&) const OVERRIDE;
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- virtual bool hasVariableReference() const;
-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CSSBasicShapePolygon()
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -70,10 +70,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_REMS:
</span><span class="cx"> case CSSPrimitiveValue::CSS_CHS:
</span><span class="cx"> return CalcLength;
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPrimitiveValue::CSS_VARIABLE_NAME:
- return CalcVariable;
-#endif
</del><span class="cx"> default:
</span><span class="cx"> return CalcOther;
</span><span class="cx"> }
</span><span class="lines">@@ -132,9 +128,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_CALC:
</span><span class="cx"> case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER:
</span><span class="cx"> case CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> case CSSPrimitiveValue::CSS_PROPERTY_ID:
</span><span class="cx"> case CSSPrimitiveValue::CSS_VALUE_ID:
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="lines">@@ -169,18 +162,6 @@
</span><span class="cx"> return compareCSSValuePtr(m_expression, other.m_expression);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> double CSSCalcValue::clampToPermittedRange(double value) const
</span><span class="cx"> {
</span><span class="cx"> return m_nonNegative && value < 0 ? 0 : value;
</span><span class="lines">@@ -226,18 +207,6 @@
</span><span class="cx"> return m_value->cssText();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> virtual PassOwnPtr<CalcExpressionNode> toCalcValue(const RenderStyle* style, const RenderStyle* rootStyle, double zoom) const
</span><span class="cx"> {
</span><span class="cx"> switch (m_category) {
</span><span class="lines">@@ -255,9 +224,6 @@
</span><span class="cx"> // Only types that could be part of a Length expression can be converted
</span><span class="cx"> // to a CalcExpressionNode. CalcPercentNumber makes no sense as a Length.
</span><span class="cx"> case CalcPercentNumber:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CalcVariable:
-#endif
</del><span class="cx"> case CalcOther:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -282,9 +248,6 @@
</span><span class="cx"> return m_value->getDoubleValue();
</span><span class="cx"> case CalcPercentLength:
</span><span class="cx"> case CalcPercentNumber:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CalcVariable:
-#endif
</del><span class="cx"> case CalcOther:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="lines">@@ -334,11 +297,6 @@
</span><span class="cx"> if (leftCategory == CalcOther || rightCategory == CalcOther)
</span><span class="cx"> return CalcOther;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- if (leftCategory == CalcVariable || rightCategory == CalcVariable)
- return CalcVariable;
-#endif
-
</del><span class="cx"> switch (op) {
</span><span class="cx"> case CalcAdd:
</span><span class="cx"> case CalcSubtract:
</span><span class="lines">@@ -483,18 +441,7 @@
</span><span class="cx"> return buildCssText(m_leftSide->customCSSText(), m_rightSide->customCSSText(), m_operator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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);
- }
</del><span class="cx">
</span><del>- virtual bool hasVariableReference() const
- {
- return m_leftSide->hasVariableReference() || m_rightSide->hasVariableReference();
- }
-#endif
-
</del><span class="cx"> virtual bool equals(const CSSCalcExpressionNode& exp) const
</span><span class="cx"> {
</span><span class="cx"> if (type() != exp.type())
</span><span class="lines">@@ -527,10 +474,6 @@
</span><span class="cx"> return leftType;
</span><span class="cx"> return CSSPrimitiveValue::CSS_UNKNOWN;
</span><span class="cx"> }
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CalcVariable:
- return CSSPrimitiveValue::CSS_VARIABLE_NAME;
-#endif
</del><span class="cx"> case CalcPercentLength:
</span><span class="cx"> case CalcPercentNumber:
</span><span class="cx"> case CalcOther:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSCalculationValue.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -54,9 +54,6 @@
</span><span class="cx"> CalcPercent,
</span><span class="cx"> CalcPercentNumber,
</span><span class="cx"> CalcPercentLength,
</span><del>-#if ENABLE(CSS_VARIABLES)
- CalcVariable,
-#endif
</del><span class="cx"> CalcOther
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -73,10 +70,6 @@
</span><span class="cx"> virtual double doubleValue() const = 0;
</span><span class="cx"> virtual double computeLengthPx(const RenderStyle* currentStyle, const RenderStyle* rootStyle, double multiplier = 1.0, bool computingFontSize = false) const = 0;
</span><span class="cx"> virtual String customCSSText() const = 0;
</span><del>-#if ENABLE(CSS_VARIABLES)
- virtual String serializeResolvingVariables(const HashMap<AtomicString, String>&) const = 0;
- virtual bool hasVariableReference() const = 0;
-#endif
</del><span class="cx"> virtual bool equals(const CSSCalcExpressionNode& other) const { return m_category == other.m_category && m_isInteger == other.m_isInteger; }
</span><span class="cx"> virtual Type type() const = 0;
</span><span class="cx">
</span><span class="lines">@@ -120,10 +113,6 @@
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="cx"> bool equals(const CSSCalcValue&) const;
</span><del>-#if ENABLE(CSS_VARIABLES)
- String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- bool hasVariableReference() const;
-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CSSCalcValue(PassRefPtr<CSSCalcExpressionNode> expression, CalculationPermittedValueRange range)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1788,9 +1788,6 @@
</span><span class="cx">
</span><span class="cx"> switch (propertyID) {
</span><span class="cx"> case CSSPropertyInvalid:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPropertyVariable:
-#endif
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case CSSPropertyBackgroundColor:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGrammaryin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.y.in (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> case CALCFUNCTION:
</span><span class="cx"> case MINFUNCTION:
</span><span class="cx"> case MAXFUNCTION:
</span><del>- case VAR_DEFINITION:
</del><span class="cx"> case UNICODERANGE:
</span><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="lines">@@ -72,9 +71,9 @@
</span><span class="cx"> %}
</span><span class="cx">
</span><span class="cx"> #if ENABLE_SHADOW_DOM
</span><del>-%expect 31
-#else
</del><span class="cx"> %expect 30
</span><ins>+#else
+%expect 29
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> %nonassoc LOWEST_PREC
</span><span class="lines">@@ -109,7 +108,6 @@
</span><span class="cx"> %token FONT_FACE_SYM
</span><span class="cx"> %token CHARSET_SYM
</span><span class="cx"> %token NAMESPACE_SYM
</span><del>-%token VARFUNCTION
</del><span class="cx"> %token WEBKIT_RULE_SYM
</span><span class="cx"> %token WEBKIT_DECLS_SYM
</span><span class="cx"> %token WEBKIT_KEYFRAME_RULE_SYM
</span><span class="lines">@@ -183,7 +181,6 @@
</span><span class="cx"> %token <string> CALCFUNCTION
</span><span class="cx"> %token <string> MINFUNCTION
</span><span class="cx"> %token <string> MAXFUNCTION
</span><del>-%token <string> VAR_DEFINITION
</del><span class="cx">
</span><span class="cx"> %token <string> UNICODERANGE
</span><span class="cx">
</span><span class="lines">@@ -1392,18 +1389,8 @@
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="cx"> declaration:
</span><del>- 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;
</del><ins>+ property ':' maybe_space expr priority {
</ins><span class="cx"> $$ = false;
</span><del>-#endif
- }
- | property ':' maybe_space expr priority {
- $$ = false;
</del><span class="cx"> bool isPropertyParsed = false;
</span><span class="cx"> OwnPtr<CSSParserValueList> propertyValue = adoptPtr($4);
</span><span class="cx"> if ($1 && propertyValue) {
</span><span class="lines">@@ -1486,16 +1473,6 @@
</span><span class="cx"> | UNICODERANGE maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
</span><span class="cx"> | HEX maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
</span><span class="cx"> | '#' maybe_space { $$.id = CSSValueInvalid; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
</span><del>- | 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
- }
</del><span class="cx"> /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
</span><span class="cx"> | function maybe_space
</span><span class="cx"> | calc_function maybe_space
</span><span class="lines">@@ -1573,16 +1550,6 @@
</span><span class="cx">
</span><span class="cx"> calc_func_term:
</span><span class="cx"> unary_term
</span><del>- | 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
- }
</del><span class="cx"> | unary_operator unary_term { $$ = $2; $$.fValue *= $1; }
</span><span class="cx"> ;
</span><span class="cx">
</span><span class="lines">@@ -1732,7 +1699,7 @@
</span><span class="cx"> invalid_parentheses_block: opening_parenthesis error_recovery closing_parenthesis;
</span><span class="cx">
</span><span class="cx"> opening_parenthesis:
</span><del>- '(' | FUNCTION | CALCFUNCTION | VARFUNCTION | MINFUNCTION | MAXFUNCTION | ANYFUNCTION | NOTFUNCTION
</del><ins>+ '(' | FUNCTION | CALCFUNCTION | MINFUNCTION | MAXFUNCTION | ANYFUNCTION | NOTFUNCTION
</ins><span class="cx"> #if ENABLE_VIDEO_TRACK
</span><span class="cx"> | CUEFUNCTION
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -97,10 +97,6 @@
</span><span class="cx"> #include "CSSImageSetValue.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> #include "WebKitCSSFilterValue.h"
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="lines">@@ -264,9 +260,6 @@
</span><span class="cx"> , isCSSRegionsEnabled(false)
</span><span class="cx"> , isCSSCompositingEnabled(false)
</span><span class="cx"> , isCSSGridLayoutEnabled(false)
</span><del>-#if ENABLE(CSS_VARIABLES)
- , isCSSVariablesEnabled(false)
-#endif
</del><span class="cx"> , needsSiteSpecificQuirks(false)
</span><span class="cx"> , enforcesCSSMIMETypeInNoQuirksMode(true)
</span><span class="cx"> , useLegacyBackgroundSizeShorthandBehavior(false)
</span><span class="lines">@@ -283,9 +276,6 @@
</span><span class="cx"> , isCSSRegionsEnabled(document.cssRegionsEnabled())
</span><span class="cx"> , isCSSCompositingEnabled(document.cssCompositingEnabled())
</span><span class="cx"> , isCSSGridLayoutEnabled(document.cssGridLayoutEnabled())
</span><del>-#if ENABLE(CSS_VARIABLES)
- , isCSSVariablesEnabled(document.settings() ? document.settings()->cssVariablesEnabled() : false)
-#endif
</del><span class="cx"> , needsSiteSpecificQuirks(document.settings() ? document.settings()->needsSiteSpecificQuirks() : false)
</span><span class="cx"> , enforcesCSSMIMETypeInNoQuirksMode(!document.settings() || document.settings()->enforceCSSMIMETypeInNoQuirksMode())
</span><span class="cx"> , useLegacyBackgroundSizeShorthandBehavior(document.settings() ? document.settings()->useLegacyBackgroundSizeShorthandBehavior() : false)
</span><span class="lines">@@ -303,9 +293,6 @@
</span><span class="cx"> && a.isCSSRegionsEnabled == b.isCSSRegionsEnabled
</span><span class="cx"> && a.isCSSCompositingEnabled == b.isCSSCompositingEnabled
</span><span class="cx"> && a.isCSSGridLayoutEnabled == b.isCSSGridLayoutEnabled
</span><del>-#if ENABLE(CSS_VARIABLES)
- && a.isCSSVariablesEnabled == b.isCSSVariablesEnabled
-#endif
</del><span class="cx"> && a.needsSiteSpecificQuirks == b.needsSiteSpecificQuirks
</span><span class="cx"> && a.enforcesCSSMIMETypeInNoQuirksMode == b.enforcesCSSMIMETypeInNoQuirksMode
</span><span class="cx"> && a.useLegacyBackgroundSizeShorthandBehavior == b.useLegacyBackgroundSizeShorthandBehavior;
</span><span class="lines">@@ -391,17 +378,6 @@
</span><span class="cx"> makeLower(characters16(), characters16(), length());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void CSSParser::setupParser(const char* prefix, unsigned prefixLength, const String& string, const char* suffix, unsigned suffixLength)
</span><span class="cx"> {
</span><span class="cx"> m_parsedTextPrefixLength = prefixLength;
</span><span class="lines">@@ -1312,25 +1288,6 @@
</span><span class="cx"> return static_pointer_cast<CSSValueList>(fontFamily.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> bool CSSParser::parseValue(MutableStylePropertySet* declaration, CSSPropertyID propertyID, const String& string, bool important, CSSParserMode cssParserMode, StyleSheetContents* contextStyleSheet)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!string.isEmpty());
</span><span class="lines">@@ -1522,27 +1479,13 @@
</span><span class="cx"> return m_mediaQuery.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx"> // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
</span><span class="cx"> for (int i = input.size() - 1; i >= 0; --i) {
</span><span class="cx"> const CSSProperty& property = input[i];
</span><span class="cx"> if (property.isImportant() != important)
</span><span class="cx"> continue;
</span><del>-#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
</del><span class="cx"> const unsigned propertyIDIndex = property.id() - firstCSSProperty;
</span><span class="cx"> if (seenProperties.get(propertyIDIndex))
</span><span class="cx"> continue;
</span><span class="lines">@@ -1558,14 +1501,8 @@
</span><span class="cx"> Vector<CSSProperty, 256> results(unusedEntries);
</span><span class="cx">
</span><span class="cx"> // Important properties have higher priority, so add them first. Duplicate definitions can then be ignored when found.
</span><del>-#if ENABLE(CSS_VARIABLES)
- HashSet<AtomicString> seenVariables;
- filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties, seenVariables);
- filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties, seenVariables);
-#else
</del><span class="cx"> filterProperties(true, m_parsedProperties, results, unusedEntries, seenProperties);
</span><span class="cx"> filterProperties(false, m_parsedProperties, results, unusedEntries, seenProperties);
</span><del>-#endif
</del><span class="cx"> if (unusedEntries)
</span><span class="cx"> results.remove(0, unusedEntries);
</span><span class="cx">
</span><span class="lines">@@ -1593,11 +1530,7 @@
</span><span class="cx"> void CSSParser::addProperty(CSSPropertyID propId, PassRefPtr<CSSValue> value, bool important, bool implicit)
</span><span class="cx"> {
</span><span class="cx"> // This property doesn't belong to a shorthand or is a CSS variable (which will be resolved later).
</span><del>- if (!m_currentShorthand
-#if ENABLE(CSS_VARIABLES)
- || (value->isPrimitiveValue() && toCSSPrimitiveValue(value.get())->isVariableName())
-#endif
- ) {
</del><ins>+ if (!m_currentShorthand) {
</ins><span class="cx"> m_parsedProperties.append(CSSProperty(propId, value, important, false, CSSPropertyInvalid, m_implicitShorthand || implicit));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -1667,11 +1600,6 @@
</span><span class="cx"> case CalcPercentNumber:
</span><span class="cx"> b = (unitflags & FPercent) && (unitflags & FNumber);
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CalcVariable:
- b = true;
- break;
-#endif
</del><span class="cx"> case CalcOther:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1693,12 +1621,6 @@
</span><span class="cx">
</span><span class="cx"> bool b = false;
</span><span class="cx"> switch (value->unit) {
</span><del>-#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
</del><span class="cx"> case CSSPrimitiveValue::CSS_NUMBER:
</span><span class="cx"> b = (unitflags & FNumber);
</span><span class="cx"> if (!b && shouldAcceptUnitLessValues(value, unitflags, cssParserMode)) {
</span><span class="lines">@@ -1761,11 +1683,6 @@
</span><span class="cx">
</span><span class="cx"> inline PassRefPtr<CSSPrimitiveValue> CSSParser::createPrimitiveNumericValue(CSSParserValue* value)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_VARIABLES)
- if (value->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME)
- return createPrimitiveVariableNameValue(value);
-#endif
-
</del><span class="cx"> if (m_parsedCalculation) {
</span><span class="cx"> ASSERT(isCalculation(value));
</span><span class="cx"> return CSSPrimitiveValue::create(m_parsedCalculation.release());
</span><span class="lines">@@ -1790,14 +1707,6 @@
</span><span class="cx"> return cssValuePool().createValue(value->string, CSSPrimitiveValue::CSS_STRING);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static inline bool isComma(CSSParserValue* value)
</span><span class="cx"> {
</span><span class="cx"> return value && value->unit == CSSParserValue::Operator && value->iValue == ',';
</span><span class="lines">@@ -1842,10 +1751,6 @@
</span><span class="cx"> if (value->unit >= CSSPrimitiveValue::CSS_DPPX && value->unit <= CSSPrimitiveValue::CSS_DPCM)
</span><span class="cx"> return createPrimitiveNumericValue(value);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- if (value->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME)
- return createPrimitiveVariableNameValue(value);
-#endif
</del><span class="cx"> if (value->unit >= CSSParserValue::Q_EMS)
</span><span class="cx"> return CSSPrimitiveValue::createAllowingMarginQuirk(value->fValue, CSSPrimitiveValue::CSS_EMS);
</span><span class="cx"> if (isCalculation(value))
</span><span class="lines">@@ -1901,15 +1806,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> if (isKeywordPropertyID(propId)) {
</span><span class="cx"> if (!isValidKeywordPropertyAndValue(propId, id, m_context))
</span><span class="cx"> return false;
</span><span class="lines">@@ -3098,9 +2994,6 @@
</span><span class="cx"> case CSSPropertyTextTransform:
</span><span class="cx"> case CSSPropertyTextUnderlineMode:
</span><span class="cx"> case CSSPropertyTextUnderlineStyle:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPropertyVariable:
-#endif
</del><span class="cx"> case CSSPropertyVisibility:
</span><span class="cx"> case CSSPropertyWebkitAppearance:
</span><span class="cx"> case CSSPropertyWebkitBackfaceVisibility:
</span><span class="lines">@@ -3388,36 +3281,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void CSSParser::addAnimationValue(RefPtr<CSSValue>& lval, PassRefPtr<CSSValue> rval)
</span><span class="cx"> {
</span><span class="cx"> if (lval) {
</span><span class="lines">@@ -7055,11 +6918,6 @@
</span><span class="cx"> // Direction comes first.
</span><span class="cx"> CSSParserValue* val = m_valueList->current();
</span><span class="cx"> RefPtr<CSSPrimitiveValue> direction;
</span><del>-#if ENABLE(CSS_VARIABLES)
- if (val->unit == CSSPrimitiveValue::CSS_VARIABLE_NAME)
- direction = createPrimitiveVariableNameValue(val);
- else
-#endif
</del><span class="cx"> switch (val->id) {
</span><span class="cx"> case CSSValueAbove:
</span><span class="cx"> case CSSValueBelow:
</span><span class="lines">@@ -11204,10 +11062,6 @@
</span><span class="cx"> m_token = MINFUNCTION;
</span><span class="cx"> else if (isASCIIAlphaCaselessEqual(name[10], 'x') && isEqualToCSSIdentifier(name + 1, "webkit-ma"))
</span><span class="cx"> m_token = MAXFUNCTION;
</span><del>-#if ENABLE(CSS_VARIABLES)
- else if (cssVariablesEnabled() && isASCIIAlphaCaselessEqual(name[10], 'r') && isEqualToCSSIdentifier(name + 1, "webkit-va"))
- m_token = VARFUNCTION;
-#endif
</del><span class="cx"> } else if (length == 12 && isEqualToCSSIdentifier(name + 1, "webkit-calc"))
</span><span class="cx"> m_token = CALCFUNCTION;
</span><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="lines">@@ -11654,11 +11508,6 @@
</span><span class="cx"> parseIdentifier(result, resultString, hasEscape);
</span><span class="cx"> m_token = IDENT;
</span><span class="cx">
</span><del>-#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
</del><span class="cx"> if (*currentCharacter<SrcCharacterType>() == '(') {
</span><span class="cx"> m_token = FUNCTION;
</span><span class="cx"> if (!hasEscape)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSParser.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -115,12 +115,6 @@
</span><span class="cx"> bool parseQuotes(CSSPropertyID, bool important);
</span><span class="cx"> bool parseAlt(CSSPropertyID, bool important);
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> PassRefPtr<CSSValue> parseAttr(CSSParserValueList* args);
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> parseBackgroundColor();
</span><span class="lines">@@ -431,9 +425,6 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSParserValue*);
</span><span class="cx"> PassRefPtr<CSSPrimitiveValue> createPrimitiveStringValue(CSSParserValue*);
</span><del>-#if ENABLE(CSS_VARIABLES)
- PassRefPtr<CSSPrimitiveValue> createPrimitiveVariableNameValue(CSSParserValue*);
-#endif
</del><span class="cx">
</span><span class="cx"> static URL completeURL(const CSSParserContext&, const String& url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserModeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserMode.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserMode.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSParserMode.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -69,9 +69,6 @@
</span><span class="cx"> bool isCSSRegionsEnabled;
</span><span class="cx"> bool isCSSCompositingEnabled;
</span><span class="cx"> bool isCSSGridLayoutEnabled;
</span><del>-#if ENABLE(CSS_VARIABLES)
- bool isCSSVariablesEnabled;
-#endif
</del><span class="cx"> bool needsSiteSpecificQuirks;
</span><span class="cx"> bool enforcesCSSMIMETypeInNoQuirksMode;
</span><span class="cx"> bool useLegacyBackgroundSizeShorthandBehavior;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -25,9 +25,6 @@
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSSelector.h"
</span><span class="cx"> #include "CSSSelectorList.h"
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -92,9 +89,6 @@
</span><span class="cx"> return CSSPrimitiveValue::create(fValue, isInt ? CSSPrimitiveValue::CSS_PARSER_INTEGER : CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPrimitiveValue::CSS_STRING:
</span><span class="cx"> case CSSPrimitiveValue::CSS_URI:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> case CSSPrimitiveValue::CSS_PARSER_HEXCOLOR:
</span><span class="cx"> return CSSPrimitiveValue::create(string, primitiveUnit);
</span><span class="cx"> case CSSPrimitiveValue::CSS_PERCENTAGE:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserValues.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParserValues.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -95,10 +95,6 @@
</span><span class="cx"> operator String() const { return is8Bit() ? String(m_data.characters8, m_length) : String(m_data.characters16, m_length); }
</span><span class="cx"> operator AtomicString() const { return is8Bit() ? AtomicString(m_data.characters8, m_length) : AtomicString(m_data.characters16, m_length); }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- AtomicString substring(unsigned position, unsigned length) const;
-#endif
-
</del><span class="cx"> union {
</span><span class="cx"> LChar* characters8;
</span><span class="cx"> UChar* characters16;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -123,9 +123,6 @@
</span><span class="cx"> case CSSPrimitiveValue::CSS_UNICODE_RANGE:
</span><span class="cx"> case CSSPrimitiveValue::CSS_UNKNOWN:
</span><span class="cx"> case CSSPrimitiveValue::CSS_URI:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPrimitiveValue::CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -202,10 +199,6 @@
</span><span class="cx"> return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_NUMBER;
</span><span class="cx"> case CalcPercentLength:
</span><span class="cx"> return CSSPrimitiveValue::CSS_CALC_PERCENTAGE_WITH_LENGTH;
</span><del>-#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
</del><span class="cx"> case CalcOther:
</span><span class="cx"> return CSSPrimitiveValue::CSS_UNKNOWN;
</span><span class="cx"> }
</span><span class="lines">@@ -448,9 +441,6 @@
</span><span class="cx"> case CSS_URI:
</span><span class="cx"> case CSS_ATTR:
</span><span class="cx"> case CSS_COUNTER_NAME:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> case CSS_PARSER_HEXCOLOR:
</span><span class="cx"> if (m_value.string)
</span><span class="cx"> m_value.string->deref();
</span><span class="lines">@@ -838,9 +828,6 @@
</span><span class="cx"> case CSS_STRING:
</span><span class="cx"> case CSS_ATTR:
</span><span class="cx"> case CSS_URI:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> return m_value.string;
</span><span class="cx"> case CSS_VALUE_ID:
</span><span class="cx"> return valueName(m_value.valueID);
</span><span class="lines">@@ -860,9 +847,6 @@
</span><span class="cx"> case CSS_STRING:
</span><span class="cx"> case CSS_ATTR:
</span><span class="cx"> case CSS_URI:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> return m_value.string;
</span><span class="cx"> case CSS_VALUE_ID:
</span><span class="cx"> return valueName(m_value.valueID);
</span><span class="lines">@@ -1199,11 +1183,6 @@
</span><span class="cx"> case CSS_VMAX:
</span><span class="cx"> text = formatNumber(m_value.num, "vmax");
</span><span class="cx"> break;
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSS_VARIABLE_NAME:
- text = "-webkit-var(" + String(m_value.string) + ')';
- break;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(!cssTextCache().contains(this));
</span><span class="lines">@@ -1212,40 +1191,6 @@
</span><span class="cx"> return text;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void CSSPrimitiveValue::addSubresourceStyleURLs(ListHashSet<URL>& urls, const StyleSheetContents* styleSheet) const
</span><span class="cx"> {
</span><span class="cx"> if (m_primitiveUnitType == CSS_URI)
</span><span class="lines">@@ -1418,9 +1363,6 @@
</span><span class="cx"> case CSS_COUNTER_NAME:
</span><span class="cx"> case CSS_PARSER_IDENTIFIER:
</span><span class="cx"> case CSS_PARSER_HEXCOLOR:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSS_VARIABLE_NAME:
-#endif
</del><span class="cx"> return equal(m_value.string, other.m_value.string);
</span><span class="cx"> case CSS_COUNTER:
</span><span class="cx"> return m_value.counter && other.m_value.counter && m_value.counter->equals(*other.m_value.counter);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -134,9 +134,6 @@
</span><span class="cx"> CSS_CALC_PERCENTAGE_WITH_NUMBER = 114,
</span><span class="cx"> CSS_CALC_PERCENTAGE_WITH_LENGTH = 115,
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- CSS_VARIABLE_NAME = 116,
-#endif
</del><span class="cx"> CSS_PROPERTY_ID = 117,
</span><span class="cx"> CSS_VALUE_ID = 118
</span><span class="cx"> };
</span><span class="lines">@@ -200,9 +197,6 @@
</span><span class="cx"> return type >= CSS_DPPX && type <= CSS_DPCM;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- bool isVariableName() const { return primitiveType() == CSS_VARIABLE_NAME; }
-#endif
</del><span class="cx"> bool isViewportPercentageLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMAX; }
</span><span class="cx"> bool isViewportPercentageWidth() const { return m_primitiveUnitType == CSS_VW; }
</span><span class="cx"> bool isViewportPercentageHeight() const { return m_primitiveUnitType == CSS_VH; }
</span><span class="lines">@@ -327,10 +321,6 @@
</span><span class="cx"> template<typename T> inline operator T() const; // Defined in CSSPrimitiveValueMappings.h
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><del>-#if ENABLE(CSS_VARIABLES)
- String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
- bool hasVariableReference() const;
-#endif
</del><span class="cx">
</span><span class="cx"> bool isQuirkValue() { return m_isQuirkValue; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -4714,9 +4714,6 @@
</span><span class="cx">
</span><span class="cx"> template<int supported> Length CSSPrimitiveValue::convertToLength(const RenderStyle* style, const RenderStyle* rootStyle, double multiplier, bool computingFontSize) const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_VARIABLES)
- ASSERT(!hasVariableReference());
-#endif
</del><span class="cx"> if ((supported & (FixedIntegerConversion | FixedFloatConversion)) && isFontRelativeLength() && (!style || !rootStyle))
</span><span class="cx"> return Length(Undefined);
</span><span class="cx"> if ((supported & FixedIntegerConversion) && isLength())
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperty.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperty.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSProperty.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -25,10 +25,6 @@
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><span class="cx"> #include "StylePropertyShorthand.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperty.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperty.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSProperty.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -59,9 +59,6 @@
</span><span class="cx"> : m_metadata(propertyID, isSetFromShorthand, indexInShorthandsVector, important, implicit, isInheritedProperty(propertyID))
</span><span class="cx"> , m_value(value)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_VARIABLES)
- ASSERT((propertyID == CSSPropertyVariable) == (m_value && m_value->isVariableValue()));
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this.
</span><span class="lines">@@ -69,9 +66,6 @@
</span><span class="cx"> : m_metadata(metadata)
</span><span class="cx"> , m_value(value)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_VARIABLES)
- ASSERT((metadata.m_propertyID == CSSPropertyVariable) == (m_value && m_value->isVariableValue()));
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CSSPropertyID id() const { return static_cast<CSSPropertyID>(m_metadata.m_propertyID); }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSReflectValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSReflectValue.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSReflectValue.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSReflectValue.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -38,15 +38,6 @@
</span><span class="cx"> return m_direction->cssText() + ' ' + m_offset->cssText();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void CSSReflectValue::addSubresourceStyleURLs(ListHashSet<URL>& urls, const StyleSheetContents* styleSheet) const
</span><span class="cx"> {
</span><span class="cx"> if (m_mask)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSReflectValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSReflectValue.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSReflectValue.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSReflectValue.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx"> CSSValue* mask() const { return m_mask.get(); }
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><del>-#if ENABLE(CSS_VARIABLES)
- String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
</del><span class="cx">
</span><span class="cx"> void addSubresourceStyleURLs(ListHashSet<URL>&, const StyleSheetContents*) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -62,10 +62,6 @@
</span><span class="cx"> #include "WebKitCSSShaderValue.h"
</span><span class="cx"> #include "WebKitCSSTransformValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> #include "WebKitCSSSVGDocumentValue.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -239,10 +235,6 @@
</span><span class="cx"> return compareCSSValues<WebKitCSSShaderValue>(*this, other);
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- case VariableClass:
- return compareCSSValues<CSSVariableValue>(*this, other);
-#endif
</del><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> case SVGColorClass:
</span><span class="cx"> return compareCSSValues<SVGColor>(*this, other);
</span><span class="lines">@@ -343,10 +335,6 @@
</span><span class="cx"> return toWebKitCSSShaderValue(this)->customCSSText();
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- case VariableClass:
- return toCSSVariableValue(this)->value();
-#endif
</del><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> case SVGColorClass:
</span><span class="cx"> return toSVGColor(this)->customCSSText();
</span><span class="lines">@@ -360,24 +348,6 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void CSSValue::destroy()
</span><span class="cx"> {
</span><span class="cx"> if (m_isTextClone) {
</span><span class="lines">@@ -490,11 +460,6 @@
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- case VariableClass:
- delete toCSSVariableValue(this);
- return;
-#endif
</del><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> case SVGColorClass:
</span><span class="cx"> delete toSVGColor(this);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSValue.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -59,9 +59,6 @@
</span><span class="cx">
</span><span class="cx"> String cssText() const;
</span><span class="cx"> void setCssText(const String&, ExceptionCode&) { } // FIXME: Not implemented.
</span><del>-#if ENABLE(CSS_VARIABLES)
- String serializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
</del><span class="cx">
</span><span class="cx"> bool isPrimitiveValue() const { return m_classType == PrimitiveClass; }
</span><span class="cx"> bool isValueList() const { return m_classType >= ValueListClass; }
</span><span class="lines">@@ -106,9 +103,6 @@
</span><span class="cx"> bool isWebKitCSSShaderValue() const { return m_classType == WebKitCSSShaderClass; }
</span><span class="cx"> #endif
</span><span class="cx"> #endif // ENABLE(CSS_FILTERS)
</span><del>-#if ENABLE(CSS_VARIABLES)
- bool isVariableValue() const { return m_classType == VariableClass; }
-#endif
</del><span class="cx"> bool isGridTemplateValue() const { return m_classType == GridTemplateClass; }
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; }
</span><span class="lines">@@ -177,9 +171,6 @@
</span><span class="cx"> #if ENABLE(CSS_FILTERS) && ENABLE(CSS_SHADERS)
</span><span class="cx"> WebKitCSSShaderClass,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- VariableClass,
-#endif
</del><span class="cx"> GridTemplateClass,
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> SVGColorClass,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSValueList.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -135,36 +135,6 @@
</span><span class="cx"> return value && value->equals(other);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void CSSValueList::addSubresourceStyleURLs(ListHashSet<URL>& urls, const StyleSheetContents* styleSheet) const
</span><span class="cx"> {
</span><span class="cx"> size_t size = m_values.size();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueList.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueList.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSValueList.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -62,9 +62,6 @@
</span><span class="cx"> String customCSSText() const;
</span><span class="cx"> bool equals(const CSSValueList&) const;
</span><span class="cx"> bool equals(const CSSValue&) const;
</span><del>-#if ENABLE(CSS_VARIABLES)
- String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
</del><span class="cx">
</span><span class="cx"> void addSubresourceStyleURLs(ListHashSet<URL>&, const StyleSheetContents*) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSVariableValueh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSVariableValue.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSVariableValue.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/CSSVariableValue.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,69 +0,0 @@
</span><del>-/*
- * 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 */
</del></span></pre></div>
<a id="trunkSourceWebCorecssPairh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/Pair.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Pair.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/Pair.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -58,16 +58,6 @@
</span><span class="cx">
</span><span class="cx"> bool equals(const Pair& other) const { return compareCSSValuePtr(m_first, other.m_first) && compareCSSValuePtr(m_second, other.m_second); }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> private:
</span><span class="cx"> Pair() : m_first(0), m_second(0) { }
</span><span class="cx"> Pair(PassRefPtr<CSSPrimitiveValue> first, PassRefPtr<CSSPrimitiveValue> second)
</span></span></pre></div>
<a id="trunkSourceWebCorecssRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/Rect.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Rect.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/Rect.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -47,16 +47,6 @@
</span><span class="cx"> && compareCSSValuePtr(m_bottom, other.m_bottom);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- bool hasVariableReference() const
- {
- return m_top->hasVariableReference()
- || m_right->hasVariableReference()
- || m_bottom->hasVariableReference()
- || m_left->hasVariableReference();
- }
-#endif
-
</del><span class="cx"> protected:
</span><span class="cx"> RectBase() { }
</span><span class="cx"> RectBase(const RectBase& cloneFrom)
</span><span class="lines">@@ -87,16 +77,6 @@
</span><span class="cx"> return generateCSSString(top()->cssText(), right()->cssText(), bottom()->cssText(), left()->cssText());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> private:
</span><span class="cx"> Rect() { }
</span><span class="cx"> Rect(const Rect& cloneFrom) : RectBase(cloneFrom), RefCounted<Rect>() { }
</span><span class="lines">@@ -117,16 +97,6 @@
</span><span class="cx"> return generateCSSString(top()->cssText(), right()->cssText(), bottom()->cssText(), left()->cssText());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> private:
</span><span class="cx"> Quad() { }
</span><span class="cx"> Quad(const Quad& cloneFrom) : RectBase(cloneFrom), RefCounted<Quad>() { }
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertySetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertySet.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertySet.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/StylePropertySet.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -35,10 +35,6 @@
</span><span class="cx"> #include <wtf/BitArray.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="lines">@@ -793,13 +789,6 @@
</span><span class="cx"> String value;
</span><span class="cx">
</span><span class="cx"> switch (propertyID) {
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPropertyVariable:
- if (numDecls++)
- result.append(' ');
- result.append(property.cssText());
- continue;
-#endif
</del><span class="cx"> case CSSPropertyBackgroundPositionX:
</span><span class="cx"> positionXPropertyIndex = n;
</span><span class="cx"> continue;
</span><span class="lines">@@ -1265,14 +1254,6 @@
</span><span class="cx">
</span><span class="cx"> String StylePropertySet::PropertyReference::cssName() const
</span><span class="cx"> {
</span><del>-#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
</del><span class="cx"> return getPropertyNameString(id());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -161,10 +161,6 @@
</span><span class="cx"> #include "CachedResourceLoader.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "CSSVariableValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> #include "DashboardRegion.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1037,9 +1033,6 @@
</span><span class="cx"> bool inheritedOnly = false;
</span><span class="cx">
</span><span class="cx"> MatchResult& result = collector.matchedResult();
</span><del>-#if ENABLE(CSS_VARIABLES)
- applyMatchedProperties<VariableDefinitions>(result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
-#endif
</del><span class="cx"> applyMatchedProperties<HighPriorityProperties>(result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
</span><span class="cx">
</span><span class="cx"> // If our font got dirtied, go ahead and update it now.
</span><span class="lines">@@ -1554,13 +1547,6 @@
</span><span class="cx"> continue;
</span><span class="cx"> #endif
</span><span class="cx"> switch (pass) {
</span><del>-#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
</del><span class="cx"> case HighPriorityProperties:
</span><span class="cx"> COMPILE_ASSERT(firstCSSProperty == CSSPropertyColor, CSS_color_is_first_property);
</span><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="lines">@@ -1569,10 +1555,6 @@
</span><span class="cx"> COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyColor + 17, CSS_zoom_is_end_of_first_prop_range);
</span><span class="cx"> #endif
</span><span class="cx"> COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyZoom + 1, CSS_line_height_is_after_zoom);
</span><del>-#if ENABLE(CSS_VARIABLES)
- if (property == CSSPropertyVariable)
- continue;
-#endif
</del><span class="cx"> // give special priority to font-xxx, color properties, etc
</span><span class="cx"> if (property < CSSPropertyLineHeight)
</span><span class="cx"> applyProperty(current.id(), current.value());
</span><span class="lines">@@ -1736,14 +1718,6 @@
</span><span class="cx"> applyInheritedOnly = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> // Now we have all of the matched rules in the appropriate order. Walk the rules and apply
</span><span class="cx"> // high-priority properties first, i.e., those properties that other properties depend on.
</span><span class="cx"> // The order is (1) high-priority not important, (2) high-priority important, (3) normal not important
</span><span class="lines">@@ -2051,67 +2025,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_VARIABLES)
- if (id != CSSPropertyVariable && hasVariableReference(value)) {
- Vector<std::pair<CSSPropertyID, String>> knownExpressions;
- resolveVariables(id, value, knownExpressions);
- return;
- }
-#endif
-
</del><span class="cx"> // CSS variables don't resolve shorthands at parsing time, so this should be *after* handling variables.
</span><span class="cx"> ASSERT_WITH_MESSAGE(!isExpandedShorthand(id), "Shorthand property id = %d wasn't expanded at parsing time", id);
</span><span class="cx">
</span><span class="lines">@@ -2130,16 +2045,6 @@
</span><span class="cx"> if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSProperty::isInheritedProperty(id))
</span><span class="cx"> state.parentStyle()->setHasExplicitlyInheritedProperties();
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> // Check lookup table for implementations and use when available.
</span><span class="cx"> const PropertyHandler& handler = m_deprecatedStyleBuilder.propertyHandler(id);
</span><span class="cx"> if (handler.isValid()) {
</span><span class="lines">@@ -3001,9 +2906,6 @@
</span><span class="cx"> case CSSPropertyTextTransform:
</span><span class="cx"> case CSSPropertyTop:
</span><span class="cx"> case CSSPropertyUnicodeBidi:
</span><del>-#if ENABLE(CSS_VARIABLES)
- case CSSPropertyVariable:
-#endif
</del><span class="cx"> case CSSPropertyVerticalAlign:
</span><span class="cx"> case CSSPropertyVisibility:
</span><span class="cx"> case CSSPropertyWebkitAnimationDelay:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/StyleResolver.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -353,9 +353,6 @@
</span><span class="cx"> void applyMatchedProperties(const MatchResult&, const Element*);
</span><span class="cx">
</span><span class="cx"> enum StyleApplicationPass {
</span><del>-#if ENABLE(CSS_VARIABLES)
- VariableDefinitions,
-#endif
</del><span class="cx"> HighPriorityProperties,
</span><span class="cx"> LowPriorityProperties
</span><span class="cx"> };
</span><span class="lines">@@ -363,9 +360,6 @@
</span><span class="cx"> void applyMatchedProperties(const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
</span><span class="cx"> template <StyleApplicationPass pass>
</span><span class="cx"> void applyProperties(const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
</span><del>-#if ENABLE(CSS_VARIABLES)
- void resolveVariables(CSSPropertyID, CSSValue*, Vector<std::pair<CSSPropertyID, String>>& knownExpressions);
-#endif
</del><span class="cx"> static bool isValidRegionStyleProperty(CSSPropertyID);
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> static bool isValidCueStyleProperty(CSSPropertyID);
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSTransformValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/WebKitCSSTransformValue.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -78,13 +78,6 @@
</span><span class="cx"> return transformValueToCssString(m_type, CSSValueList::customCSSText());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-String WebKitCSSTransformValue::customSerializeResolvingVariables(const HashMap<AtomicString, String>& variables) const
-{
- return transformValueToCssString(m_type, CSSValueList::customSerializeResolvingVariables(variables));
-}
-#endif
-
</del><span class="cx"> WebKitCSSTransformValue::WebKitCSSTransformValue(const WebKitCSSTransformValue& cloneFrom)
</span><span class="cx"> : CSSValueList(cloneFrom)
</span><span class="cx"> , m_type(cloneFrom.m_type)
</span></span></pre></div>
<a id="trunkSourceWebCorecssWebKitCSSTransformValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/WebKitCSSTransformValue.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/WebKitCSSTransformValue.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/WebKitCSSTransformValue.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -67,9 +67,6 @@
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="cx"> bool equals(const WebKitCSSTransformValue& other) const { return m_type == other.m_type && CSSValueList::equals(other); }
</span><del>-#if ENABLE(CSS_VARIABLES)
- String customSerializeResolvingVariables(const HashMap<AtomicString, String>&) const;
-#endif
</del><span class="cx">
</span><span class="cx"> TransformOperationType operationType() const { return m_type; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/css/makeprop.pl 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> my %namesHash;
</span><span class="cx"> my @duplicates = ();
</span><span class="cx">
</span><del>-my $numPredefinedProperties = 2;
</del><ins>+my $numPredefinedProperties = 1;
</ins><span class="cx"> my @names = ();
</span><span class="cx"> my %nameIsInherited;
</span><span class="cx"> my %nameToId;
</span><span class="lines">@@ -204,7 +204,6 @@
</span><span class="cx">
</span><span class="cx"> static const bool isInheritedPropertyTable[numCSSProperties + $numPredefinedProperties] = {
</span><span class="cx"> false, // CSSPropertyInvalid
</span><del>- false, // CSSPropertyVariable
</del><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><span class="lines">@@ -250,9 +249,6 @@
</span><span class="cx">
</span><span class="cx"> enum CSSPropertyID {
</span><span class="cx"> CSSPropertyInvalid = 0,
</span><del>-#if ENABLE(CSS_VARIABLES)
- CSSPropertyVariable = 1,
-#endif
</del><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> my $first = $numPredefinedProperties;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/page/Settings.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -165,9 +165,6 @@
</span><span class="cx"> #if ENABLE(CSS_STICKY_POSITION)
</span><span class="cx"> , m_cssStickyPositionEnabled(true)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- , m_cssVariablesEnabled(false)
-#endif
</del><span class="cx"> , m_showTiledScrollingIndicator(false)
</span><span class="cx"> , m_tiledBackingStoreEnabled(false)
</span><span class="cx"> , m_dnsPrefetchingEnabled(false)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/page/Settings.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -193,14 +193,6 @@
</span><span class="cx"> bool cssStickyPositionEnabled() const { return false; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> void setShowTiledScrollingIndicator(bool);
</span><span class="cx"> bool showTiledScrollingIndicator() const { return m_showTiledScrollingIndicator; }
</span><span class="cx">
</span><span class="lines">@@ -307,9 +299,6 @@
</span><span class="cx"> #if ENABLE(CSS_STICKY_POSITION)
</span><span class="cx"> bool m_cssStickyPositionEnabled : 1;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- bool m_cssVariablesEnabled : 1;
-#endif
</del><span class="cx"> bool m_showTiledScrollingIndicator : 1;
</span><span class="cx"> bool m_tiledBackingStoreEnabled : 1;
</span><span class="cx"> bool m_dnsPrefetchingEnabled : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -369,11 +369,6 @@
</span><span class="cx">
</span><span class="cx"> const PseudoStyleCache* cachedPseudoStyles() const { return m_cachedPseudoStyles.get(); }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> bool affectedByHover() const { return noninherited_flags.affectedByHover(); }
</span><span class="cx"> bool affectedByActive() const { return noninherited_flags.affectedByActive(); }
</span><span class="cx"> bool affectedByDrag() const { return noninherited_flags.affectedByDrag(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -60,10 +60,6 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> Color touchColors;
</span><span class="cx"> #endif
</span><del>-
-#if ENABLE(CSS_VARIABLES)
- void* variableDataRefs[1];
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack);
</span><span class="lines">@@ -136,9 +132,6 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> , tapHighlightColor(RenderStyle::initialTapHighlightColor())
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- , m_variables(StyleVariableData::create())
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -223,9 +216,6 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> , tapHighlightColor(o.tapHighlightColor)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_VARIABLES)
- , m_variables(o.m_variables)
-#endif
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -329,9 +319,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> && m_rubyPosition == o.m_rubyPosition
</span><span class="cx"> && m_lineSnap == o.m_lineSnap
</span><del>-#if ENABLE(CSS_VARIABLES)
- && m_variables == o.m_variables
-#endif
</del><span class="cx"> && m_lineAlign == o.m_lineAlign
</span><span class="cx"> && StyleImage::imagesEquivalent(listStyleImage.get(), o.listStyleImage.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/rendering/style/StyleRareInheritedData.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -31,11 +31,6 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
-#include "DataRef.h"
-#include "StyleVariableData.h"
-#endif
-
</del><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> #include "TextSizeAdjustment.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -160,10 +155,6 @@
</span><span class="cx"> Color tapHighlightColor;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_VARIABLES)
- DataRef<StyleVariableData> m_variables;
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> StyleRareInheritedData();
</span><span class="cx"> StyleRareInheritedData(const StyleRareInheritedData&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleVariableDatah"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/rendering/style/StyleVariableData.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleVariableData.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/rendering/style/StyleVariableData.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * 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 */
</del></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.cpp 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> InternalSettings::Backup::Backup(Settings& settings)
</span><span class="cx"> : m_originalCSSExclusionsEnabled(RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
</span><span class="cx"> , m_originalCSSShapesEnabled(RuntimeEnabledFeatures::sharedFeatures().cssShapesEnabled())
</span><del>- , m_originalCSSVariablesEnabled(settings.cssVariablesEnabled())
</del><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> , m_originalShadowDOMEnabled(RuntimeEnabledFeatures::sharedFeatures().shadowDOMEnabled())
</span><span class="cx"> , m_originalAuthorShadowDOMForAnyElementEnabled(RuntimeEnabledFeatures::sharedFeatures().authorShadowDOMForAnyElementEnabled())
</span><span class="lines">@@ -102,7 +101,6 @@
</span><span class="cx"> {
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSExclusionsEnabled(m_originalCSSExclusionsEnabled);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSShapesEnabled(m_originalCSSShapesEnabled);
</span><del>- settings.setCSSVariablesEnabled(m_originalCSSVariablesEnabled);
</del><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setShadowDOMEnabled(m_originalShadowDOMEnabled);
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setAuthorShadowDOMForAnyElementEnabled(m_originalAuthorShadowDOMForAnyElementEnabled);
</span><span class="lines">@@ -391,18 +389,6 @@
</span><span class="cx"> RuntimeEnabledFeatures::sharedFeatures().setCSSShapesEnabled(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InternalSettings::setCSSVariablesEnabled(bool enabled, ExceptionCode& ec)
-{
- InternalSettingsGuardForSettings();
- settings()->setCSSVariablesEnabled(enabled);
-}
-
-bool InternalSettings::cssVariablesEnabled(ExceptionCode& ec)
-{
- InternalSettingsGuardForSettingsReturn(false);
- return settings()->cssVariablesEnabled();
-}
-
</del><span class="cx"> void InternalSettings::setCanStartMedia(bool enabled, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> InternalSettingsGuardForSettings();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.h (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.h 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_originalCSSExclusionsEnabled;
</span><span class="cx"> bool m_originalCSSShapesEnabled;
</span><del>- bool m_originalCSSVariablesEnabled;
</del><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> bool m_originalShadowDOMEnabled;
</span><span class="cx"> bool m_originalAuthorShadowDOMForAnyElementEnabled;
</span><span class="lines">@@ -122,8 +121,6 @@
</span><span class="cx"> void setMediaTypeOverride(const String& mediaType, ExceptionCode&);
</span><span class="cx"> void setCSSExclusionsEnabled(bool enabled, ExceptionCode&);
</span><span class="cx"> void setCSSShapesEnabled(bool enabled, ExceptionCode&);
</span><del>- void setCSSVariablesEnabled(bool enabled, ExceptionCode&);
- bool cssVariablesEnabled(ExceptionCode&);
</del><span class="cx"> void setCanStartMedia(bool, ExceptionCode&);
</span><span class="cx"> void setEditingBehavior(const String&, ExceptionCode&);
</span><span class="cx"> void setShouldDisplayTrackKind(const String& kind, bool enabled, ExceptionCode&);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalSettingsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/InternalSettings.idl (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/InternalSettings.idl 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebCore/testing/InternalSettings.idl 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -44,8 +44,6 @@
</span><span class="cx"> [RaisesException] void setMediaTypeOverride(DOMString mediaTypeOverride);
</span><span class="cx"> [RaisesException] void setCSSExclusionsEnabled(boolean enabled);
</span><span class="cx"> [RaisesException] void setCSSShapesEnabled(boolean enabled);
</span><del>- [RaisesException] void setCSSVariablesEnabled(boolean enabled);
- [RaisesException] boolean cssVariablesEnabled();
</del><span class="cx"> [RaisesException] void setCanStartMedia(boolean enabled);
</span><span class="cx"> [RaisesException] void setEditingBehavior(DOMString behavior);
</span><span class="cx"> void setLangAttributeAwareFormControlUIEnabled(boolean enabled);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-27 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><del>-ENABLE_CSS_VARIABLES = ;
</del><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS3_TEXT_DECORATION;
</span><span class="lines">@@ -187,4 +186,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-27 Gustavo Noronha Silva <gustavo.noronha@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Support custom types for drag and drop data
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsFeatureDefinesxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ENABLE_CSS_SHAPES = ENABLE_CSS_SHAPES;
</span><span class="cx"> ENABLE_CSS_STICKY_POSITION = ENABLE_CSS_STICKY_POSITION;
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED = ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED;
</span><del>-ENABLE_CSS_VARIABLES = ;
</del><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES = ;
</span><span class="cx"> ENABLE_CSS3_TEXT = ;
</span><span class="cx"> ENABLE_CSS3_TEXT_DECORATION = ENABLE_CSS_TEXT_DECORATION;
</span><span class="lines">@@ -187,4 +186,4 @@
</span><span class="cx">
</span><span class="cx"> ENABLE_FTL_JIT = ;
</span><span class="cx">
</span><del>-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));
</del><ins>+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));
</ins></span></pre></div>
<a id="trunkSourceautotoolsSetupWebKitFeaturesm4"></a>
<div class="modfile"><h4>Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/autotools/SetupWebKitFeatures.m4 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> ENABLE_CSS_SHAPES=0 \
</span><span class="cx"> ENABLE_CSS_STICKY_POSITION=1 \
</span><span class="cx"> ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0 \
</span><del>- ENABLE_CSS_VARIABLES=0 \
</del><span class="cx"> ENABLE_CSS3_CONDITIONAL_RULES=0 \
</span><span class="cx"> ENABLE_CUSTOM_SCHEME_HANDLER=0 \
</span><span class="cx"> ENABLE_DASHBOARD_SUPPORT=0 \
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/cmake/OptionsEfl.cmake 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_VARIABLES ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -12,7 +12,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_VARIABLES ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_STICKY_POSITION "Toggle CSS sticky position support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED "Toggle support for unprefixed CSS animations and transforms" ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_CSS_VARIABLES "Toggle CSS Variables support" OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DATALIST_ELEMENT "Toggle HTML5 datalist support" OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_DATA_TRANSFER_ITEMS "Toggle HTML5 data transfer items support" OFF)
</span></span></pre></div>
<a id="trunkSourcecmakeconfighcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmakeconfig.h.cmake (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmakeconfig.h.cmake 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Source/cmakeconfig.h.cmake 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_SHAPES
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_STICKY_POSITION
</span><span class="cx"> #cmakedefine01 ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED
</span><del>-#cmakedefine01 ENABLE_CSS_VARIABLES
</del><span class="cx"> #cmakedefine01 ENABLE_CSS3_CONDITIONAL_RULES
</span><span class="cx"> #cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
</span><span class="cx"> #cmakedefine01 ENABLE_DATALIST_ELEMENT
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Tools/ChangeLog 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-11-28 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Move PrettyPatch related code to prettypatch.py
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (159841 => 159842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-11-28 15:27:04 UTC (rev 159841)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-11-28 15:46:53 UTC (rev 159842)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> $cssStickyPositionSupport,
</span><span class="cx"> $cssCompositingSupport,
</span><span class="cx"> $cssAnimationsTransformsUnprefixedSupport,
</span><del>- $cssVariablesSupport,
</del><span class="cx"> $customSchemeHandlerSupport,
</span><span class="cx"> $dataTransferItemsSupport,
</span><span class="cx"> $datalistElementSupport,
</span><span class="lines">@@ -234,9 +233,6 @@
</span><span class="cx"> { option => "css-transforms-animations-unprefixed", desc => "Toggle support for unprefixed CSS animations and transforms",
</span><span class="cx"> define => "ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED", default => 1, value => \$cssAnimationsTransformsUnprefixedSupport },
</span><span class="cx">
</span><del>- { option => "css-variables", desc => "Toggle CSS Variable support",
- define => "ENABLE_CSS_VARIABLES", default => (isBlackBerry() || isEfl() || isGtk()), value => \$cssVariablesSupport },
-
</del><span class="cx"> { option => "custom-scheme-handler", desc => "Toggle Custom Scheme Handler support",
</span><span class="cx"> define => "ENABLE_CUSTOM_SCHEME_HANDLER", default => (isBlackBerry() || isEfl()), value => \$customSchemeHandlerSupport },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>