<!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>[209758] trunk/Source/WebCore</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/209758">209758</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 09:39:27 -0800 (Tue, 13 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Rename CSSPrimitiveValue::UnitTypes to CSSPrimitiveValue::UnitType
https://bugs.webkit.org/show_bug.cgi?id=165776
Reviewed by Zalan Bujtas.
* css/CSSCalculationValue.cpp:
(WebCore::unitCategory):
(WebCore::hasDoubleValue):
(WebCore::determineCategory):
(WebCore::CSSCalcExpressionNodeParser::parseValue):
* css/CSSCalculationValue.h:
* css/CSSPrimitiveValue.cpp:
(WebCore::isValidCSSUnitTypeForDoubleConversion):
(WebCore::isStringType):
(WebCore::CSSPrimitiveValue::unitCategory):
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::cleanup):
(WebCore::CSSPrimitiveValue::computeLengthDouble):
(WebCore::CSSPrimitiveValue::computeNonCalcLengthDouble):
(WebCore::CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor):
(WebCore::CSSPrimitiveValue::getFloatValue):
(WebCore::CSSPrimitiveValue::doubleValue):
(WebCore::CSSPrimitiveValue::canonicalUnitTypeForCategory):
(WebCore::CSSPrimitiveValue::doubleValueInternal):
(WebCore::CSSPrimitiveValue::cloneForCSSOM):
* css/CSSPrimitiveValue.h:
(WebCore::CSSPrimitiveValue::isFontRelativeLength):
(WebCore::CSSPrimitiveValue::isLength):
(WebCore::CSSPrimitiveValue::isResolution):
(WebCore::CSSPrimitiveValue::createAllowingMarginQuirk):
* css/CSSValue.h:
* css/CSSValuePool.cpp:
(WebCore::CSSValuePool::createValue):
* css/CSSValuePool.h:
(WebCore::CSSValuePool::createValue):
* css/MediaQueryExp.cpp:
(WebCore::featureWithValidDensity):
(WebCore::MediaQueryExpression::MediaQueryExpression):
* css/parser/CSSParserFastPaths.cpp:
(WebCore::parseSimpleLength):
(WebCore::parseSimpleLengthValue):
(WebCore::parseColorIntOrPercentage):
(WebCore::fastParseColorInternal):
(WebCore::parseTransformTranslateArguments):
(WebCore::parseTransformNumberArguments):
* css/parser/CSSParserToken.cpp:
(WebCore::cssPrimitiveValueUnitFromTrie):
(WebCore::stringToUnitType):
(WebCore::CSSParserToken::CSSParserToken):
(WebCore::CSSParserToken::convertToPercentage):
* css/parser/CSSParserToken.h:
(WebCore::CSSParserToken::unitType):
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::consumeTransformOrigin):
(WebCore::consumeCounter):
(WebCore::consumeAnimationName):
(WebCore::consumePerspective):
(WebCore::consumePositionLonghand):
(WebCore::consumeCounterContent):
(WebCore::consumeReflect):
(WebCore::consumeGridBreadth):
(WebCore::CSSPropertyParser::consumeFlex):
* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::CalcParser::consumeNumber):
(WebCore::CSSPropertyParserHelpers::consumeInteger):
(WebCore::CSSPropertyParserHelpers::consumeLength):
(WebCore::CSSPropertyParserHelpers::consumePercent):
(WebCore::CSSPropertyParserHelpers::consumeAngle):
(WebCore::CSSPropertyParserHelpers::consumeTime):
(WebCore::CSSPropertyParserHelpers::consumeCustomIdent):
(WebCore::CSSPropertyParserHelpers::consumeString):
(WebCore::CSSPropertyParserHelpers::consumeUrl):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientPoint):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientColorStop):
(WebCore::CSSPropertyParserHelpers::consumeCrossFade):
(WebCore::CSSPropertyParserHelpers::consumeImageSet):
(WebCore::CSSPropertyParserHelpers::consumeFilterFunction):
* css/parser/MediaQueryParser.cpp:
(WebCore::MediaQueryParser::readFeatureValue):
* css/parser/SizesAttributeParser.cpp:
(WebCore::SizesAttributeParser::computeLength):
* css/parser/SizesAttributeParser.h:
* dom/StyledElement.cpp:
(WebCore::StyledElement::setInlineStyleProperty):
(WebCore::StyledElement::addPropertyToPresentationAttributeStyle):
* dom/StyledElement.h:
* svg/SVGLengthValue.cpp:
(WebCore::SVGLengthValue::toCSSPrimitiveValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolcpp">trunk/Source/WebCore/css/CSSValuePool.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuePoolh">trunk/Source/WebCore/css/CSSValuePool.h</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryExpcpp">trunk/Source/WebCore/css/MediaQueryExp.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserFastPathscpp">trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserTokencpp">trunk/Source/WebCore/css/parser/CSSParserToken.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserTokenh">trunk/Source/WebCore/css/parser/CSSParserToken.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserHelperscpp">trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserMediaQueryParsercpp">trunk/Source/WebCore/css/parser/MediaQueryParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserSizesAttributeParsercpp">trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserSizesAttributeParserh">trunk/Source/WebCore/css/parser/SizesAttributeParser.h</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementcpp">trunk/Source/WebCore/dom/StyledElement.cpp</a></li>
<li><a href="#trunkSourceWebCoredomStyledElementh">trunk/Source/WebCore/dom/StyledElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGLengthValuecpp">trunk/Source/WebCore/svg/SVGLengthValue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/ChangeLog 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -1,3 +1,94 @@
</span><ins>+2016-12-13 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Rename CSSPrimitiveValue::UnitTypes to CSSPrimitiveValue::UnitType
+ https://bugs.webkit.org/show_bug.cgi?id=165776
+
+ Reviewed by Zalan Bujtas.
+
+ * css/CSSCalculationValue.cpp:
+ (WebCore::unitCategory):
+ (WebCore::hasDoubleValue):
+ (WebCore::determineCategory):
+ (WebCore::CSSCalcExpressionNodeParser::parseValue):
+ * css/CSSCalculationValue.h:
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::isValidCSSUnitTypeForDoubleConversion):
+ (WebCore::isStringType):
+ (WebCore::CSSPrimitiveValue::unitCategory):
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::cleanup):
+ (WebCore::CSSPrimitiveValue::computeLengthDouble):
+ (WebCore::CSSPrimitiveValue::computeNonCalcLengthDouble):
+ (WebCore::CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor):
+ (WebCore::CSSPrimitiveValue::getFloatValue):
+ (WebCore::CSSPrimitiveValue::doubleValue):
+ (WebCore::CSSPrimitiveValue::canonicalUnitTypeForCategory):
+ (WebCore::CSSPrimitiveValue::doubleValueInternal):
+ (WebCore::CSSPrimitiveValue::cloneForCSSOM):
+ * css/CSSPrimitiveValue.h:
+ (WebCore::CSSPrimitiveValue::isFontRelativeLength):
+ (WebCore::CSSPrimitiveValue::isLength):
+ (WebCore::CSSPrimitiveValue::isResolution):
+ (WebCore::CSSPrimitiveValue::createAllowingMarginQuirk):
+ * css/CSSValue.h:
+ * css/CSSValuePool.cpp:
+ (WebCore::CSSValuePool::createValue):
+ * css/CSSValuePool.h:
+ (WebCore::CSSValuePool::createValue):
+ * css/MediaQueryExp.cpp:
+ (WebCore::featureWithValidDensity):
+ (WebCore::MediaQueryExpression::MediaQueryExpression):
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::parseSimpleLength):
+ (WebCore::parseSimpleLengthValue):
+ (WebCore::parseColorIntOrPercentage):
+ (WebCore::fastParseColorInternal):
+ (WebCore::parseTransformTranslateArguments):
+ (WebCore::parseTransformNumberArguments):
+ * css/parser/CSSParserToken.cpp:
+ (WebCore::cssPrimitiveValueUnitFromTrie):
+ (WebCore::stringToUnitType):
+ (WebCore::CSSParserToken::CSSParserToken):
+ (WebCore::CSSParserToken::convertToPercentage):
+ * css/parser/CSSParserToken.h:
+ (WebCore::CSSParserToken::unitType):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::consumeTransformOrigin):
+ (WebCore::consumeCounter):
+ (WebCore::consumeAnimationName):
+ (WebCore::consumePerspective):
+ (WebCore::consumePositionLonghand):
+ (WebCore::consumeCounterContent):
+ (WebCore::consumeReflect):
+ (WebCore::consumeGridBreadth):
+ (WebCore::CSSPropertyParser::consumeFlex):
+ * css/parser/CSSPropertyParserHelpers.cpp:
+ (WebCore::CSSPropertyParserHelpers::CalcParser::consumeNumber):
+ (WebCore::CSSPropertyParserHelpers::consumeInteger):
+ (WebCore::CSSPropertyParserHelpers::consumeLength):
+ (WebCore::CSSPropertyParserHelpers::consumePercent):
+ (WebCore::CSSPropertyParserHelpers::consumeAngle):
+ (WebCore::CSSPropertyParserHelpers::consumeTime):
+ (WebCore::CSSPropertyParserHelpers::consumeCustomIdent):
+ (WebCore::CSSPropertyParserHelpers::consumeString):
+ (WebCore::CSSPropertyParserHelpers::consumeUrl):
+ (WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientPoint):
+ (WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradientColorStop):
+ (WebCore::CSSPropertyParserHelpers::consumeCrossFade):
+ (WebCore::CSSPropertyParserHelpers::consumeImageSet):
+ (WebCore::CSSPropertyParserHelpers::consumeFilterFunction):
+ * css/parser/MediaQueryParser.cpp:
+ (WebCore::MediaQueryParser::readFeatureValue):
+ * css/parser/SizesAttributeParser.cpp:
+ (WebCore::SizesAttributeParser::computeLength):
+ * css/parser/SizesAttributeParser.h:
+ * dom/StyledElement.cpp:
+ (WebCore::StyledElement::setInlineStyleProperty):
+ (WebCore::StyledElement::addPropertyToPresentationAttributeStyle):
+ * dom/StyledElement.h:
+ * svg/SVGLengthValue.cpp:
+ (WebCore::SVGLengthValue::toCSSPrimitiveValue):
+
</ins><span class="cx"> 2016-12-13 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Annotate MediaStream and WebRTC idl with EnabledAtRuntime flag
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSCalculationValue.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> static RefPtr<CSSCalcExpressionNode> createCSS(const CalcExpressionNode&, const RenderStyle&);
</span><span class="cx"> static RefPtr<CSSCalcExpressionNode> createCSS(const Length&, const RenderStyle&);
</span><span class="cx">
</span><del>-static CalculationCategory unitCategory(CSSPrimitiveValue::UnitTypes type)
</del><ins>+static CalculationCategory unitCategory(CSSPrimitiveValue::UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CSSPrimitiveValue::CSS_NUMBER:
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool hasDoubleValue(CSSPrimitiveValue::UnitTypes type)
</del><ins>+static bool hasDoubleValue(CSSPrimitiveValue::UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CSSPrimitiveValue::CSS_FR:
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> return adoptRef(*new CSSCalcPrimitiveValue(WTFMove(value), isInteger));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static RefPtr<CSSCalcPrimitiveValue> create(double value, CSSPrimitiveValue::UnitTypes type, bool isInteger)
</del><ins>+ static RefPtr<CSSCalcPrimitiveValue> create(double value, CSSPrimitiveValue::UnitType type, bool isInteger)
</ins><span class="cx"> {
</span><span class="cx"> if (std::isnan(value) || std::isinf(value))
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -281,14 +281,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Type type() const final { return CssCalcPrimitiveValue; }
</span><del>- CSSPrimitiveValue::UnitTypes primitiveType() const final
</del><ins>+ CSSPrimitiveValue::UnitType primitiveType() const final
</ins><span class="cx"> {
</span><del>- return CSSPrimitiveValue::UnitTypes(m_value->primitiveType());
</del><ins>+ return CSSPrimitiveValue::UnitType(m_value->primitiveType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit CSSCalcPrimitiveValue(Ref<CSSPrimitiveValue>&& value, bool isInteger)
</span><del>- : CSSCalcExpressionNode(unitCategory((CSSPrimitiveValue::UnitTypes)value->primitiveType()), isInteger)
</del><ins>+ : CSSCalcExpressionNode(unitCategory((CSSPrimitiveValue::UnitType)value->primitiveType()), isInteger)
</ins><span class="cx"> , m_value(WTFMove(value))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx">
</span><span class="cx"> // Simplify numbers.
</span><span class="cx"> if (leftCategory == CalcNumber && rightCategory == CalcNumber) {
</span><del>- CSSPrimitiveValue::UnitTypes evaluationType = CSSPrimitiveValue::CSS_NUMBER;
</del><ins>+ CSSPrimitiveValue::UnitType evaluationType = CSSPrimitiveValue::CSS_NUMBER;
</ins><span class="cx"> return CSSCalcPrimitiveValue::create(evaluateOperator(op, leftSide->doubleValue(), rightSide->doubleValue()), evaluationType, isInteger);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -375,14 +375,14 @@
</span><span class="cx"> // Simplify addition and subtraction between same types.
</span><span class="cx"> if (op == CalcAdd || op == CalcSubtract) {
</span><span class="cx"> if (leftCategory == rightSide->category()) {
</span><del>- CSSPrimitiveValue::UnitTypes leftType = leftSide->primitiveType();
</del><ins>+ CSSPrimitiveValue::UnitType leftType = leftSide->primitiveType();
</ins><span class="cx"> if (hasDoubleValue(leftType)) {
</span><del>- CSSPrimitiveValue::UnitTypes rightType = rightSide->primitiveType();
</del><ins>+ CSSPrimitiveValue::UnitType rightType = rightSide->primitiveType();
</ins><span class="cx"> if (leftType == rightType)
</span><span class="cx"> return CSSCalcPrimitiveValue::create(evaluateOperator(op, leftSide->doubleValue(), rightSide->doubleValue()), leftType, isInteger);
</span><span class="cx"> CSSPrimitiveValue::UnitCategory leftUnitCategory = CSSPrimitiveValue::unitCategory(leftType);
</span><span class="cx"> if (leftUnitCategory != CSSPrimitiveValue::UOther && leftUnitCategory == CSSPrimitiveValue::unitCategory(rightType)) {
</span><del>- CSSPrimitiveValue::UnitTypes canonicalType = CSSPrimitiveValue::canonicalUnitTypeForCategory(leftUnitCategory);
</del><ins>+ CSSPrimitiveValue::UnitType canonicalType = CSSPrimitiveValue::canonicalUnitTypeForCategory(leftUnitCategory);
</ins><span class="cx"> if (canonicalType != CSSPrimitiveValue::CSS_UNKNOWN) {
</span><span class="cx"> double leftValue = leftSide->doubleValue() * CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(leftType);
</span><span class="cx"> double rightValue = rightSide->doubleValue() * CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(rightType);
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> if (op == CalcDivide && !number)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- CSSPrimitiveValue::UnitTypes otherType = otherSide->primitiveType();
</del><ins>+ CSSPrimitiveValue::UnitType otherType = otherSide->primitiveType();
</ins><span class="cx"> if (hasDoubleValue(otherType))
</span><span class="cx"> return CSSCalcPrimitiveValue::create(evaluateOperator(op, otherSide->doubleValue(), number), otherType, isInteger);
</span><span class="cx"> }
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx">
</span><span class="cx"> Type type() const final { return CssCalcBinaryOperation; }
</span><span class="cx">
</span><del>- CSSPrimitiveValue::UnitTypes primitiveType() const final
</del><ins>+ CSSPrimitiveValue::UnitType primitiveType() const final
</ins><span class="cx"> {
</span><span class="cx"> switch (category()) {
</span><span class="cx"> case CalcNumber:
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx"> return m_rightSide->primitiveType();
</span><span class="cx"> if (m_rightSide->category() == CalcNumber)
</span><span class="cx"> return m_leftSide->primitiveType();
</span><del>- CSSPrimitiveValue::UnitTypes leftType = m_leftSide->primitiveType();
</del><ins>+ CSSPrimitiveValue::UnitType leftType = m_leftSide->primitiveType();
</ins><span class="cx"> if (leftType == m_rightSide->primitiveType())
</span><span class="cx"> return leftType;
</span><span class="cx"> return CSSPrimitiveValue::CSS_UNKNOWN;
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> if (!(token.type() == NumberToken || token.type() == PercentageToken || token.type() == DimensionToken))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- CSSPrimitiveValue::UnitTypes type = token.unitType();
</del><ins>+ CSSPrimitiveValue::UnitType type = token.unitType();
</ins><span class="cx"> if (unitCategory(type) == CalcOther)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCalculationValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCalculationValue.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSCalculationValue.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSCalculationValue.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> virtual String customCSSText() const = 0;
</span><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><del>- virtual CSSPrimitiveValue::UnitTypes primitiveType() const = 0;
</del><ins>+ virtual CSSPrimitiveValue::UnitType primitiveType() const = 0;
</ins><span class="cx">
</span><span class="cx"> CalculationCategory category() const { return m_category; }
</span><span class="cx"> bool isInteger() const { return m_isInteger; }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::UnitTypes unitType)
</del><ins>+static inline bool isValidCSSUnitTypeForDoubleConversion(CSSPrimitiveValue::UnitType unitType)
</ins><span class="cx"> {
</span><span class="cx"> switch (unitType) {
</span><span class="cx"> case CSSPrimitiveValue::CSS_CALC:
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx">
</span><del>-static inline bool isStringType(CSSPrimitiveValue::UnitTypes type)
</del><ins>+static inline bool isStringType(CSSPrimitiveValue::UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case CSSPrimitiveValue::CSS_STRING:
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> #endif // !ASSERT_DISABLED
</span><span class="cx">
</span><del>-CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(CSSPrimitiveValue::UnitTypes type)
</del><ins>+CSSPrimitiveValue::UnitCategory CSSPrimitiveValue::unitCategory(CSSPrimitiveValue::UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> // Here we violate the spec (http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSPrimitiveValue) and allow conversions
</span><span class="cx"> // between CSS_PX and relative lengths (see cssPixelsPerInch comment in CSSHelper.h for the topic treatment).
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> m_value.propertyID = propertyID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitTypes type)
</del><ins>+CSSPrimitiveValue::CSSPrimitiveValue(double num, UnitType type)
</ins><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span><span class="cx"> m_primitiveUnitType = type;
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> m_value.num = num;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSPrimitiveValue::CSSPrimitiveValue(const String& string, UnitTypes type)
</del><ins>+CSSPrimitiveValue::CSSPrimitiveValue(const String& string, UnitType type)
</ins><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isStringType(type));
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx">
</span><span class="cx"> void CSSPrimitiveValue::cleanup()
</span><span class="cx"> {
</span><del>- auto type = static_cast<UnitTypes>(m_primitiveUnitType);
</del><ins>+ auto type = static_cast<UnitType>(m_primitiveUnitType);
</ins><span class="cx"> switch (type) {
</span><span class="cx"> case CSS_STRING:
</span><span class="cx"> case CSS_URI:
</span><span class="lines">@@ -661,10 +661,10 @@
</span><span class="cx"> // The multiplier and factor is applied to each value in the calc expression individually
</span><span class="cx"> return m_value.calc->computeLengthPx(conversionData);
</span><span class="cx">
</span><del>- return computeNonCalcLengthDouble(conversionData, static_cast<UnitTypes>(primitiveType()), m_value.num);
</del><ins>+ return computeNonCalcLengthDouble(conversionData, static_cast<UnitType>(primitiveType()), m_value.num);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-double CSSPrimitiveValue::computeNonCalcLengthDouble(const CSSToLengthConversionData& conversionData, UnitTypes primitiveType, double value)
</del><ins>+double CSSPrimitiveValue::computeNonCalcLengthDouble(const CSSToLengthConversionData& conversionData, UnitType primitiveType, double value)
</ins><span class="cx"> {
</span><span class="cx"> double factor;
</span><span class="cx">
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> return Exception { NO_MODIFICATION_ALLOWED_ERR };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(UnitTypes unitType)
</del><ins>+double CSSPrimitiveValue::conversionToCanonicalUnitsScaleFactor(UnitType unitType)
</ins><span class="cx"> {
</span><span class="cx"> double factor = 1.0;
</span><span class="cx"> // FIXME: the switch can be replaced by an array of scale factors.
</span><span class="lines">@@ -806,13 +806,13 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<float> CSSPrimitiveValue::getFloatValue(unsigned short unitType) const
</span><span class="cx"> {
</span><del>- auto result = doubleValueInternal(static_cast<UnitTypes>(unitType));
</del><ins>+ auto result = doubleValueInternal(static_cast<UnitType>(unitType));
</ins><span class="cx"> if (!result)
</span><span class="cx"> return Exception { INVALID_ACCESS_ERR };
</span><span class="cx"> return clampTo<float>(result.value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double CSSPrimitiveValue::doubleValue(UnitTypes unitType) const
</del><ins>+double CSSPrimitiveValue::doubleValue(UnitType unitType) const
</ins><span class="cx"> {
</span><span class="cx"> return doubleValueInternal(unitType).value_or(0);
</span><span class="cx"> }
</span><span class="lines">@@ -823,7 +823,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-CSSPrimitiveValue::UnitTypes CSSPrimitiveValue::canonicalUnitTypeForCategory(UnitCategory category)
</del><ins>+CSSPrimitiveValue::UnitType CSSPrimitiveValue::canonicalUnitTypeForCategory(UnitCategory category)
</ins><span class="cx"> {
</span><span class="cx"> // The canonical unit type is chosen according to the way CSSParser::validUnit() chooses the default unit
</span><span class="cx"> // in each category (based on unitflags).
</span><span class="lines">@@ -849,12 +849,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::optional<double> CSSPrimitiveValue::doubleValueInternal(UnitTypes requestedUnitType) const
</del><ins>+std::optional<double> CSSPrimitiveValue::doubleValueInternal(UnitType requestedUnitType) const
</ins><span class="cx"> {
</span><del>- if (!isValidCSSUnitTypeForDoubleConversion(static_cast<UnitTypes>(m_primitiveUnitType)) || !isValidCSSUnitTypeForDoubleConversion(requestedUnitType))
</del><ins>+ if (!isValidCSSUnitTypeForDoubleConversion(static_cast<UnitType>(m_primitiveUnitType)) || !isValidCSSUnitTypeForDoubleConversion(requestedUnitType))
</ins><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><del>- UnitTypes sourceUnitType = static_cast<UnitTypes>(primitiveType());
</del><ins>+ UnitType sourceUnitType = static_cast<UnitType>(primitiveType());
</ins><span class="cx"> if (requestedUnitType == sourceUnitType || requestedUnitType == CSS_DIMENSION)
</span><span class="cx"> return doubleValue();
</span><span class="cx">
</span><span class="lines">@@ -861,7 +861,7 @@
</span><span class="cx"> UnitCategory sourceCategory = unitCategory(sourceUnitType);
</span><span class="cx"> ASSERT(sourceCategory != UOther);
</span><span class="cx">
</span><del>- UnitTypes targetUnitType = requestedUnitType;
</del><ins>+ UnitType targetUnitType = requestedUnitType;
</ins><span class="cx"> UnitCategory targetCategory = unitCategory(targetUnitType);
</span><span class="cx"> ASSERT(targetCategory != UOther);
</span><span class="cx">
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> case CSS_URI:
</span><span class="cx"> case CSS_ATTR:
</span><span class="cx"> case CSS_COUNTER_NAME:
</span><del>- result = CSSPrimitiveValue::create(m_value.string, static_cast<UnitTypes>(m_primitiveUnitType));
</del><ins>+ result = CSSPrimitiveValue::create(m_value.string, static_cast<UnitType>(m_primitiveUnitType));
</ins><span class="cx"> break;
</span><span class="cx"> case CSS_FONT_FAMILY:
</span><span class="cx"> result = CSSPrimitiveValue::create(*m_value.fontFamily);
</span><span class="lines">@@ -1251,7 +1251,7 @@
</span><span class="cx"> case CSS_DPCM:
</span><span class="cx"> #endif
</span><span class="cx"> case CSS_FR:
</span><del>- result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitTypes>(m_primitiveUnitType));
</del><ins>+ result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitType>(m_primitiveUnitType));
</ins><span class="cx"> break;
</span><span class="cx"> case CSS_PROPERTY_ID:
</span><span class="cx"> result = CSSPrimitiveValue::createIdentifier(m_value.propertyID);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx">
</span><span class="cx"> class CSSPrimitiveValue final : public CSSValue {
</span><span class="cx"> public:
</span><del>- enum UnitTypes {
</del><ins>+ enum UnitType {
</ins><span class="cx"> CSS_UNKNOWN = 0,
</span><span class="cx"> CSS_NUMBER = 1,
</span><span class="cx"> CSS_PERCENTAGE = 2,
</span><span class="lines">@@ -164,22 +164,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> UOther
</span><span class="cx"> };
</span><del>- static UnitCategory unitCategory(UnitTypes);
</del><ins>+ static UnitCategory unitCategory(UnitType);
</ins><span class="cx">
</span><span class="cx"> bool isAngle() const;
</span><span class="cx"> bool isAttr() const { return m_primitiveUnitType == CSS_ATTR; }
</span><span class="cx"> bool isCounter() const { return m_primitiveUnitType == CSS_COUNTER; }
</span><span class="cx"> bool isFontIndependentLength() const { return m_primitiveUnitType >= CSS_PX && m_primitiveUnitType <= CSS_PC; }
</span><del>- static bool isFontRelativeLength(UnitTypes);
- bool isFontRelativeLength() const { return isFontRelativeLength(static_cast<UnitTypes>(m_primitiveUnitType)); }
</del><ins>+ static bool isFontRelativeLength(UnitType);
+ bool isFontRelativeLength() const { return isFontRelativeLength(static_cast<UnitType>(m_primitiveUnitType)); }
</ins><span class="cx">
</span><del>- bool isQuirkyEms() const { return primitiveType() == UnitTypes::CSS_QUIRKY_EMS; }
</del><ins>+ bool isQuirkyEms() const { return primitiveType() == UnitType::CSS_QUIRKY_EMS; }
</ins><span class="cx">
</span><del>- static bool isViewportPercentageLength(UnitTypes type) { return type >= CSS_VW && type <= CSS_VMAX; }
- bool isViewportPercentageLength() const { return isViewportPercentageLength(static_cast<UnitTypes>(m_primitiveUnitType)); }
</del><ins>+ static bool isViewportPercentageLength(UnitType type) { return type >= CSS_VW && type <= CSS_VMAX; }
+ bool isViewportPercentageLength() const { return isViewportPercentageLength(static_cast<UnitType>(m_primitiveUnitType)); }
</ins><span class="cx">
</span><del>- static bool isLength(UnitTypes);
- bool isLength() const { return isLength(static_cast<UnitTypes>(primitiveType())); }
</del><ins>+ static bool isLength(UnitType);
+ bool isLength() const { return isLength(static_cast<UnitType>(primitiveType())); }
</ins><span class="cx"> bool isNumber() const { return primitiveType() == CSS_NUMBER; }
</span><span class="cx"> bool isPercentage() const { return primitiveType() == CSS_PERCENTAGE; }
</span><span class="cx"> bool isPx() const { return primitiveType() == CSS_PX; }
</span><span class="lines">@@ -202,8 +202,8 @@
</span><span class="cx"> bool isDotsPerPixel() const { return primitiveType() == CSS_DPPX; }
</span><span class="cx"> bool isDotsPerCentimeter() const { return primitiveType() == CSS_DPCM; }
</span><span class="cx">
</span><del>- static bool isResolution(UnitTypes);
- bool isResolution() const { return isResolution(static_cast<UnitTypes>(primitiveType())); }
</del><ins>+ static bool isResolution(UnitType);
+ bool isResolution() const { return isResolution(static_cast<UnitType>(primitiveType())); }
</ins><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="cx"> bool isViewportPercentageMax() const { return m_primitiveUnitType == CSS_VMAX; }
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> static Ref<CSSPrimitiveValue> createIdentifier(CSSValueID valueID) { return adoptRef(*new CSSPrimitiveValue(valueID)); }
</span><span class="cx"> static Ref<CSSPrimitiveValue> createIdentifier(CSSPropertyID propertyID) { return adoptRef(*new CSSPrimitiveValue(propertyID)); }
</span><span class="cx">
</span><del>- static Ref<CSSPrimitiveValue> create(double value, UnitTypes type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
- static Ref<CSSPrimitiveValue> create(const String& value, UnitTypes type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
</del><ins>+ static Ref<CSSPrimitiveValue> create(double value, UnitType type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
+ static Ref<CSSPrimitiveValue> create(const String& value, UnitType type) { return adoptRef(*new CSSPrimitiveValue(value, type)); }
</ins><span class="cx"> static Ref<CSSPrimitiveValue> create(const Length& value, const RenderStyle& style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
</span><span class="cx"> static Ref<CSSPrimitiveValue> create(const LengthSize& value, const RenderStyle& style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> // The basic idea is that a stylesheet can use the value __qem (for quirky em) instead of em.
</span><span class="cx"> // When the quirky value is used, if you're in quirks mode, the margin will collapse away
</span><span class="cx"> // inside a table cell.
</span><del>- static Ref<CSSPrimitiveValue> createAllowingMarginQuirk(double value, UnitTypes);
</del><ins>+ static Ref<CSSPrimitiveValue> createAllowingMarginQuirk(double value, UnitType);
</ins><span class="cx">
</span><span class="cx"> ~CSSPrimitiveValue();
</span><span class="cx">
</span><span class="lines">@@ -250,16 +250,16 @@
</span><span class="cx">
</span><span class="cx"> bool convertingToLengthRequiresNonNullStyle(int lengthConversion) const;
</span><span class="cx">
</span><del>- double doubleValue(UnitTypes) const;
</del><ins>+ double doubleValue(UnitType) const;
</ins><span class="cx"> double doubleValue() const;
</span><span class="cx">
</span><del>- template<typename T> inline T value(UnitTypes type) const { return clampTo<T>(doubleValue(type)); }
</del><ins>+ template<typename T> inline T value(UnitType type) const { return clampTo<T>(doubleValue(type)); }
</ins><span class="cx"> template<typename T> inline T value() const { return clampTo<T>(doubleValue()); }
</span><span class="cx">
</span><del>- float floatValue(UnitTypes type) const { return value<float>(type); }
</del><ins>+ float floatValue(UnitType type) const { return value<float>(type); }
</ins><span class="cx"> float floatValue() const { return value<float>(); }
</span><span class="cx">
</span><del>- int intValue(UnitTypes type) const { return value<int>(type); }
</del><ins>+ int intValue(UnitType type) const { return value<int>(type); }
</ins><span class="cx"> int intValue() const { return value<int>(); }
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String stringValue() const;
</span><span class="lines">@@ -294,10 +294,10 @@
</span><span class="cx">
</span><span class="cx"> bool equals(const CSSPrimitiveValue&) const;
</span><span class="cx">
</span><del>- static UnitTypes canonicalUnitTypeForCategory(UnitCategory);
- static double conversionToCanonicalUnitsScaleFactor(UnitTypes);
</del><ins>+ static UnitType canonicalUnitTypeForCategory(UnitCategory);
+ static double conversionToCanonicalUnitsScaleFactor(UnitType);
</ins><span class="cx">
</span><del>- static double computeNonCalcLengthDouble(const CSSToLengthConversionData&, UnitTypes, double value);
</del><ins>+ static double computeNonCalcLengthDouble(const CSSToLengthConversionData&, UnitType, double value);
</ins><span class="cx">
</span><span class="cx"> #if COMPILER(MSVC)
</span><span class="cx"> // FIXME: This should be private, but for some reason MSVC then fails to invoke it from LazyNeverDestroyed::construct.
</span><span class="lines">@@ -314,8 +314,8 @@
</span><span class="cx"> CSSPrimitiveValue(const Length&);
</span><span class="cx"> CSSPrimitiveValue(const Length&, const RenderStyle&);
</span><span class="cx"> CSSPrimitiveValue(const LengthSize&, const RenderStyle&);
</span><del>- CSSPrimitiveValue(const String&, UnitTypes);
- CSSPrimitiveValue(double, UnitTypes);
</del><ins>+ CSSPrimitiveValue(const String&, UnitType);
+ CSSPrimitiveValue(double, UnitType);
</ins><span class="cx">
</span><span class="cx"> template<typename T> CSSPrimitiveValue(T); // Defined in CSSPrimitiveValueMappings.h
</span><span class="cx"> template<typename T> CSSPrimitiveValue(RefPtr<T>&&);
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> void init(RefPtr<DashboardRegion>&&); // FIXME: Dashboard region should not be a primitive value.
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- std::optional<double> doubleValueInternal(UnitTypes targetUnitType) const;
</del><ins>+ std::optional<double> doubleValueInternal(UnitType targetUnitType) const;
</ins><span class="cx">
</span><span class="cx"> double computeLengthDouble(const CSSToLengthConversionData&) const;
</span><span class="cx">
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> || m_primitiveUnitType == CSS_TURN;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool CSSPrimitiveValue::isFontRelativeLength(UnitTypes type)
</del><ins>+inline bool CSSPrimitiveValue::isFontRelativeLength(UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> return type == CSS_EMS
</span><span class="cx"> || type == CSS_EXS
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> || type == CSS_QUIRKY_EMS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool CSSPrimitiveValue::isLength(UnitTypes type)
</del><ins>+inline bool CSSPrimitiveValue::isLength(UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> return (type >= CSS_EMS && type <= CSS_PC)
</span><span class="cx"> || type == CSS_REMS
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> || type == CSS_QUIRKY_EMS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool CSSPrimitiveValue::isResolution(UnitTypes type)
</del><ins>+inline bool CSSPrimitiveValue::isResolution(UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> return type >= CSS_DPPX && type <= CSS_DPCM;
</span><span class="cx"> }
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> return adoptRef(*new CSSPrimitiveValue(std::forward<T>(value)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Ref<CSSPrimitiveValue> CSSPrimitiveValue::createAllowingMarginQuirk(double value, UnitTypes type)
</del><ins>+inline Ref<CSSPrimitiveValue> CSSPrimitiveValue::createAllowingMarginQuirk(double value, UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> auto result = adoptRef(*new CSSPrimitiveValue(value, type));
</span><span class="cx"> result->m_isQuirkValue = true;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValue.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSValue.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> // to maximize struct packing.
</span><span class="cx">
</span><span class="cx"> // CSSPrimitiveValue bits:
</span><del>- unsigned m_primitiveUnitType : 7; // CSSPrimitiveValue::UnitTypes
</del><ins>+ unsigned m_primitiveUnitType : 7; // CSSPrimitiveValue::UnitType
</ins><span class="cx"> mutable unsigned m_hasCachedCSSText : 1;
</span><span class="cx"> unsigned m_isQuirkValue : 1;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuePoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSValuePool.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> return *entry.iterator->value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<CSSPrimitiveValue> CSSValuePool::createValue(double value, CSSPrimitiveValue::UnitTypes type)
</del><ins>+Ref<CSSPrimitiveValue> CSSValuePool::createValue(double value, CSSPrimitiveValue::UnitType type)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(std::isfinite(value));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuePoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValuePool.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValuePool.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/CSSValuePool.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> Ref<CSSPrimitiveValue> createIdentifierValue(CSSValueID identifier);
</span><span class="cx"> Ref<CSSPrimitiveValue> createIdentifierValue(CSSPropertyID identifier);
</span><span class="cx"> Ref<CSSPrimitiveValue> createColorValue(const Color&);
</span><del>- Ref<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::UnitTypes);
- Ref<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveValue::UnitTypes type) { return CSSPrimitiveValue::create(value, type); }
</del><ins>+ Ref<CSSPrimitiveValue> createValue(double value, CSSPrimitiveValue::UnitType);
+ Ref<CSSPrimitiveValue> createValue(const String& value, CSSPrimitiveValue::UnitType type) { return CSSPrimitiveValue::create(value, type); }
</ins><span class="cx"> Ref<CSSPrimitiveValue> createValue(const Length& value, const RenderStyle& style) { return CSSPrimitiveValue::create(value, style); }
</span><span class="cx"> Ref<CSSPrimitiveValue> createValue(const LengthSize& value, const RenderStyle& style) { return CSSPrimitiveValue::create(value, style); }
</span><span class="cx"> template<typename T> static Ref<CSSPrimitiveValue> createValue(T&& value) { return CSSPrimitiveValue::create(std::forward<T>(value)); }
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryExp.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/MediaQueryExp.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool featureWithValidDensity(const String& mediaFeature, const CSSParserToken& token)
</span><span class="cx"> {
</span><del>- if (!CSSPrimitiveValue::isResolution(static_cast<CSSPrimitiveValue::UnitTypes>(token.unitType())) || token.numericValue() <= 0)
</del><ins>+ if (!CSSPrimitiveValue::isResolution(static_cast<CSSPrimitiveValue::UnitType>(token.unitType())) || token.numericValue() <= 0)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return mediaFeature == MediaFeatureNames::resolution
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> || featureWithValidPositiveLength(m_mediaFeature, token)) {
</span><span class="cx"> // Media features that must have non-negative <density>, ie. dppx, dpi or dpcm,
</span><span class="cx"> // or Media features that must have non-negative <length> or number value.
</span><del>- m_value = CSSPrimitiveValue::create(token.numericValue(), (CSSPrimitiveValue::UnitTypes) token.unitType());
</del><ins>+ m_value = CSSPrimitiveValue::create(token.numericValue(), (CSSPrimitiveValue::UnitType) token.unitType());
</ins><span class="cx"> m_isValid = true;
</span><span class="cx"> } else if (featureWithPositiveInteger(m_mediaFeature, token)
</span><span class="cx"> || featureWithPositiveNumber(m_mediaFeature, token)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> // Media features that must have non-negative integer value,
</span><span class="cx"> // or media features that must have non-negative number value,
</span><span class="cx"> // or media features that must have (0|1) value.
</span><del>- m_value = CSSPrimitiveValue::create(token.numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ m_value = CSSPrimitiveValue::create(token.numericValue(), CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx"> m_isValid = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserFastPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -101,14 +101,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static inline bool parseSimpleLength(const CharacterType* characters, unsigned length, CSSPrimitiveValue::UnitTypes& unit, double& number)
</del><ins>+static inline bool parseSimpleLength(const CharacterType* characters, unsigned length, CSSPrimitiveValue::UnitType& unit, double& number)
</ins><span class="cx"> {
</span><span class="cx"> if (length > 2 && (characters[length - 2] | 0x20) == 'p' && (characters[length - 1] | 0x20) == 'x') {
</span><span class="cx"> length -= 2;
</span><del>- unit = CSSPrimitiveValue::UnitTypes::CSS_PX;
</del><ins>+ unit = CSSPrimitiveValue::UnitType::CSS_PX;
</ins><span class="cx"> } else if (length > 1 && characters[length - 1] == '%') {
</span><span class="cx"> length -= 1;
</span><del>- unit = CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE;
</del><ins>+ unit = CSSPrimitiveValue::UnitType::CSS_PERCENTAGE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // We rely on charactersToDouble for validation as well. The function
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned length = string.length();
</span><span class="cx"> double number;
</span><del>- CSSPrimitiveValue::UnitTypes unit = CSSPrimitiveValue::UnitTypes::CSS_NUMBER;
</del><ins>+ CSSPrimitiveValue::UnitType unit = CSSPrimitiveValue::UnitType::CSS_NUMBER;
</ins><span class="cx">
</span><span class="cx"> if (string.is8Bit()) {
</span><span class="cx"> if (!parseSimpleLength(string.characters8(), length, unit, number))
</span><span class="lines">@@ -142,10 +142,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (unit == CSSPrimitiveValue::UnitTypes::CSS_NUMBER) {
</del><ins>+ if (unit == CSSPrimitiveValue::UnitType::CSS_NUMBER) {
</ins><span class="cx"> if (number && cssParserMode != SVGAttributeMode)
</span><span class="cx"> return nullptr;
</span><del>- unit = CSSPrimitiveValue::UnitTypes::CSS_PX;
</del><ins>+ unit = CSSPrimitiveValue::UnitType::CSS_PX;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (number < 0 && !acceptsNegativeNumbers)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static bool parseColorIntOrPercentage(const CharacterType*& string, const CharacterType* end, const char terminator, CSSPrimitiveValue::UnitTypes& expect, int& value)
</del><ins>+static bool parseColorIntOrPercentage(const CharacterType*& string, const CharacterType* end, const char terminator, CSSPrimitiveValue::UnitType& expect, int& value)
</ins><span class="cx"> {
</span><span class="cx"> const CharacterType* current = string;
</span><span class="cx"> double localValue = 0;
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> if (current == end)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (expect == CSSPrimitiveValue::UnitTypes::CSS_NUMBER && (*current == '.' || *current == '%'))
</del><ins>+ if (expect == CSSPrimitiveValue::UnitType::CSS_NUMBER && (*current == '.' || *current == '%'))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (*current == '.') {
</span><span class="lines">@@ -300,11 +300,11 @@
</span><span class="cx"> localValue += percentage;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (expect == CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE && *current != '%')
</del><ins>+ if (expect == CSSPrimitiveValue::UnitType::CSS_PERCENTAGE && *current != '%')
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (*current == '%') {
</span><del>- expect = CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE;
</del><ins>+ expect = CSSPrimitiveValue::UnitType::CSS_PERCENTAGE;
</ins><span class="cx"> localValue = localValue / 100.0 * 256.0;
</span><span class="cx"> // Clamp values at 255 for percentages over 100%
</span><span class="cx"> if (localValue > 255)
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> localValue = 255;
</span><span class="cx"> current++;
</span><span class="cx"> } else {
</span><del>- expect = CSSPrimitiveValue::UnitTypes::CSS_NUMBER;
</del><ins>+ expect = CSSPrimitiveValue::UnitType::CSS_NUMBER;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (current != end && isHTMLSpace<CharacterType>(*current))
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> template <typename CharacterType>
</span><span class="cx"> static Color fastParseColorInternal(const CharacterType* characters, unsigned length, bool quirksMode)
</span><span class="cx"> {
</span><del>- CSSPrimitiveValue::UnitTypes expect = CSSPrimitiveValue::UnitTypes::CSS_UNKNOWN;
</del><ins>+ CSSPrimitiveValue::UnitType expect = CSSPrimitiveValue::UnitType::CSS_UNKNOWN;
</ins><span class="cx">
</span><span class="cx"> if (length >= 4 && characters[0] == '#') {
</span><span class="cx"> RGBA32 rgb;
</span><span class="lines">@@ -1059,13 +1059,13 @@
</span><span class="cx"> if (delimiter == notFound)
</span><span class="cx"> return false;
</span><span class="cx"> unsigned argumentLength = static_cast<unsigned>(delimiter);
</span><del>- CSSPrimitiveValue::UnitTypes unit = CSSPrimitiveValue::UnitTypes::CSS_NUMBER;
</del><ins>+ CSSPrimitiveValue::UnitType unit = CSSPrimitiveValue::UnitType::CSS_NUMBER;
</ins><span class="cx"> double number;
</span><span class="cx"> if (!parseSimpleLength(pos, argumentLength, unit, number))
</span><span class="cx"> return false;
</span><del>- if (unit != CSSPrimitiveValue::UnitTypes::CSS_PX && (number || unit != CSSPrimitiveValue::UnitTypes::CSS_NUMBER))
</del><ins>+ if (unit != CSSPrimitiveValue::UnitType::CSS_PX && (number || unit != CSSPrimitiveValue::UnitType::CSS_NUMBER))
</ins><span class="cx"> return false;
</span><del>- transformValue->append(CSSPrimitiveValue::create(number, CSSPrimitiveValue::UnitTypes::CSS_PX));
</del><ins>+ transformValue->append(CSSPrimitiveValue::create(number, CSSPrimitiveValue::UnitType::CSS_PX));
</ins><span class="cx"> pos += argumentLength + 1;
</span><span class="cx"> --expectedCount;
</span><span class="cx"> }
</span><span class="lines">@@ -1084,7 +1084,7 @@
</span><span class="cx"> double number = charactersToDouble(pos, argumentLength, &ok);
</span><span class="cx"> if (!ok)
</span><span class="cx"> return false;
</span><del>- transformValue->append(CSSPrimitiveValue::create(number, CSSPrimitiveValue::UnitTypes::CSS_NUMBER));
</del><ins>+ transformValue->append(CSSPrimitiveValue::create(number, CSSPrimitiveValue::UnitType::CSS_NUMBER));
</ins><span class="cx"> pos += argumentLength + 1;
</span><span class="cx"> --expectedCount;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserTokencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserToken.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserToken.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/CSSParserToken.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> template<typename CharacterType>
</span><del>-CSSPrimitiveValue::UnitTypes cssPrimitiveValueUnitFromTrie(const CharacterType* data, unsigned length)
</del><ins>+CSSPrimitiveValue::UnitType cssPrimitiveValueUnitFromTrie(const CharacterType* data, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(data);
</span><span class="cx"> ASSERT(length);
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> case 1:
</span><span class="cx"> switch (toASCIILower(data[0])) {
</span><span class="cx"> case 's':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_S;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_S;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 2:
</span><span class="lines">@@ -56,55 +56,55 @@
</span><span class="cx"> case 'c':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'h':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_CHS;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_CHS;
</ins><span class="cx"> case 'm':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_CM;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_CM;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'e':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'm':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_EMS;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_EMS;
</ins><span class="cx"> case 'x':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_EXS;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_EXS;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'f':
</span><span class="cx"> if (toASCIILower(data[1]) == 'r')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_FR;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_FR;
</ins><span class="cx"> break;
</span><span class="cx"> case 'h':
</span><span class="cx"> if (toASCIILower(data[1]) == 'z')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_HZ;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_HZ;
</ins><span class="cx"> break;
</span><span class="cx"> case 'i':
</span><span class="cx"> if (toASCIILower(data[1]) == 'n')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_IN;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_IN;
</ins><span class="cx"> break;
</span><span class="cx"> case 'm':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'm':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_MM;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_MM;
</ins><span class="cx"> case 's':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_MS;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_MS;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'p':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'c':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_PC;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_PC;
</ins><span class="cx"> case 't':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_PT;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_PT;
</ins><span class="cx"> case 'x':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_PX;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_PX;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'v':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'h':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_VH;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_VH;
</ins><span class="cx"> case 'w':
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_VW;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_VW;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -115,27 +115,27 @@
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'e':
</span><span class="cx"> if (toASCIILower(data[2]) == 'g')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_DEG;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_DEG;
</ins><span class="cx"> break;
</span><span class="cx"> case 'p':
</span><span class="cx"> if (toASCIILower(data[2]) == 'i')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_DPI;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_DPI;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'k':
</span><span class="cx"> if (toASCIILower(data[1]) == 'h' && toASCIILower(data[2]) == 'z')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_KHZ;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_KHZ;
</ins><span class="cx"> break;
</span><span class="cx"> case 'r':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="cx"> case 'a':
</span><span class="cx"> if (toASCIILower(data[2]) == 'd')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_RAD;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_RAD;
</ins><span class="cx"> break;
</span><span class="cx"> case 'e':
</span><span class="cx"> if (toASCIILower(data[2]) == 'm')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_REMS;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_REMS;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -149,11 +149,11 @@
</span><span class="cx"> switch (toASCIILower(data[2])) {
</span><span class="cx"> case 'c':
</span><span class="cx"> if (toASCIILower(data[3]) == 'm')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_DPCM;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_DPCM;
</ins><span class="cx"> break;
</span><span class="cx"> case 'p':
</span><span class="cx"> if (toASCIILower(data[3]) == 'x')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_DPPX;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_DPPX;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -161,11 +161,11 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'g':
</span><span class="cx"> if (toASCIILower(data[1]) == 'r' && toASCIILower(data[2]) == 'a' && toASCIILower(data[3]) == 'd')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_GRAD;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_GRAD;
</ins><span class="cx"> break;
</span><span class="cx"> case 't':
</span><span class="cx"> if (toASCIILower(data[1]) == 'u' && toASCIILower(data[2]) == 'r' && toASCIILower(data[3]) == 'n')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_TURN;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_TURN;
</ins><span class="cx"> break;
</span><span class="cx"> case 'v':
</span><span class="cx"> switch (toASCIILower(data[1])) {
</span><span class="lines">@@ -173,11 +173,11 @@
</span><span class="cx"> switch (toASCIILower(data[2])) {
</span><span class="cx"> case 'a':
</span><span class="cx"> if (toASCIILower(data[3]) == 'x')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_VMAX;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_VMAX;
</ins><span class="cx"> break;
</span><span class="cx"> case 'i':
</span><span class="cx"> if (toASCIILower(data[3]) == 'n')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_VMIN;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_VMIN;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -189,15 +189,15 @@
</span><span class="cx"> switch (toASCIILower(data[0])) {
</span><span class="cx"> case '_':
</span><span class="cx"> if (toASCIILower(data[1]) == '_' && toASCIILower(data[2]) == 'q' && toASCIILower(data[3]) == 'e' && toASCIILower(data[4]) == 'm')
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_QUIRKY_EMS;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_QUIRKY_EMS;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- return CSSPrimitiveValue::UnitTypes::CSS_UNKNOWN;
</del><ins>+ return CSSPrimitiveValue::UnitType::CSS_UNKNOWN;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static CSSPrimitiveValue::UnitTypes stringToUnitType(StringView stringView)
</del><ins>+static CSSPrimitiveValue::UnitType stringToUnitType(StringView stringView)
</ins><span class="cx"> {
</span><span class="cx"> if (stringView.is8Bit())
</span><span class="cx"> return cssPrimitiveValueUnitFromTrie(stringView.characters8(), stringView.length());
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> , m_blockType(NotBlock)
</span><span class="cx"> , m_numericValueType(numericValueType)
</span><span class="cx"> , m_numericSign(sign)
</span><del>- , m_unit(static_cast<unsigned>(CSSPrimitiveValue::UnitTypes::CSS_NUMBER))
</del><ins>+ , m_unit(static_cast<unsigned>(CSSPrimitiveValue::UnitType::CSS_NUMBER))
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(type == NumberToken);
</span><span class="cx"> m_numericValue = numericValue;
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_type == NumberToken);
</span><span class="cx"> m_type = PercentageToken;
</span><del>- m_unit = static_cast<unsigned>(CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ m_unit = static_cast<unsigned>(CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UChar CSSParserToken::delimiter() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserTokenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserToken.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserToken.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/CSSParserToken.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> double numericValue() const;
</span><span class="cx"> HashTokenType getHashTokenType() const { ASSERT(m_type == HashToken); return m_hashTokenType; }
</span><span class="cx"> BlockType getBlockType() const { return static_cast<BlockType>(m_blockType); }
</span><del>- CSSPrimitiveValue::UnitTypes unitType() const { return static_cast<CSSPrimitiveValue::UnitTypes>(m_unit); }
</del><ins>+ CSSPrimitiveValue::UnitType unitType() const { return static_cast<CSSPrimitiveValue::UnitType>(m_unit); }
</ins><span class="cx"> UChar32 unicodeRangeStart() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.start; }
</span><span class="cx"> UChar32 unicodeRangeEnd() const { ASSERT(m_type == UnicodeRangeToken); return m_unicodeRange.end; }
</span><span class="cx"> CSSValueID id() const;
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> unsigned m_blockType : 2; // BlockType
</span><span class="cx"> unsigned m_numericValueType : 1; // NumericValueType
</span><span class="cx"> unsigned m_numericSign : 2; // NumericSign
</span><del>- unsigned m_unit : 7; // CSSPrimitiveValue::UnitTypes
</del><ins>+ unsigned m_unit : 7; // CSSPrimitiveValue::UnitType
</ins><span class="cx">
</span><span class="cx"> bool valueDataCharRawEqual(const CSSParserToken& other) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -386,7 +386,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> addProperty(CSSPropertyTransformOriginX, CSSPropertyTransformOrigin, resultX.releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyTransformOriginY, CSSPropertyTransformOrigin, resultY.releaseNonNull(), important);
</span><del>- addProperty(CSSPropertyTransformOriginZ, CSSPropertyTransformOrigin, resultZ ? resultZ.releaseNonNull() : CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_PX), important, !hasZ);
</del><ins>+ addProperty(CSSPropertyTransformOriginZ, CSSPropertyTransformOrigin, resultZ ? resultZ.releaseNonNull() : CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitType::CSS_PX), important, !hasZ);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1041,7 +1041,7 @@
</span><span class="cx"> int i = defaultValue;
</span><span class="cx"> if (RefPtr<CSSPrimitiveValue> counterValue = consumeInteger(range))
</span><span class="cx"> i = counterValue->intValue();
</span><del>- list->append(createPrimitiveValuePair(counterName.releaseNonNull(), CSSPrimitiveValue::create(i, CSSPrimitiveValue::UnitTypes::CSS_NUMBER), Pair::IdenticalValueEncoding::Coalesce));
</del><ins>+ list->append(createPrimitiveValuePair(counterName.releaseNonNull(), CSSPrimitiveValue::create(i, CSSPrimitiveValue::UnitType::CSS_NUMBER), Pair::IdenticalValueEncoding::Coalesce));
</ins><span class="cx"> } while (!range.atEnd());
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="lines">@@ -1293,7 +1293,7 @@
</span><span class="cx"> if (equalIgnoringASCIICase(token.value(), "none"))
</span><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(CSSValueNone);
</span><span class="cx"> // FIXME-NEWPARSER: Want to use a CSSCustomIdentValue here eventually.
</span><del>- return CSSValuePool::singleton().createValue(token.value().toString(), CSSPrimitiveValue::UnitTypes::CSS_STRING);
</del><ins>+ return CSSValuePool::singleton().createValue(token.value().toString(), CSSPrimitiveValue::UnitType::CSS_STRING);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return consumeCustomIdent(range);
</span><span class="lines">@@ -1751,7 +1751,7 @@
</span><span class="cx"> double perspective;
</span><span class="cx"> if (!consumeNumberRaw(args, perspective) || perspective < 0)
</span><span class="cx"> return false;
</span><del>- parsedValue = CSSPrimitiveValue::create(perspective, CSSPrimitiveValue::UnitTypes::CSS_PX);
</del><ins>+ parsedValue = CSSPrimitiveValue::create(perspective, CSSPrimitiveValue::UnitType::CSS_PX);
</ins><span class="cx"> }
</span><span class="cx"> if (!parsedValue)
</span><span class="cx"> return false;
</span><span class="lines">@@ -1937,7 +1937,7 @@
</span><span class="cx"> else
</span><span class="cx"> return nullptr;
</span><span class="cx"> range.consumeIncludingWhitespace();
</span><del>- return CSSPrimitiveValue::create(percent, CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSPrimitiveValue::create(percent, CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx"> }
</span><span class="cx"> return consumeLengthOrPercent(range, cssParserMode, ValueRangeAll);
</span><span class="cx"> }
</span><span class="lines">@@ -2160,11 +2160,11 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> separator;
</span><span class="cx"> if (!counters)
</span><del>- separator = CSSPrimitiveValue::create(String(), CSSPrimitiveValue::UnitTypes::CSS_STRING);
</del><ins>+ separator = CSSPrimitiveValue::create(String(), CSSPrimitiveValue::UnitType::CSS_STRING);
</ins><span class="cx"> else {
</span><span class="cx"> if (!consumeCommaIncludingWhitespace(args) || args.peek().type() != StringToken)
</span><span class="cx"> return nullptr;
</span><del>- separator = CSSPrimitiveValue::create(args.consumeIncludingWhitespace().value().toString(), CSSPrimitiveValue::UnitTypes::CSS_STRING);
</del><ins>+ separator = CSSPrimitiveValue::create(args.consumeIncludingWhitespace().value().toString(), CSSPrimitiveValue::UnitType::CSS_STRING);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> listStyle;
</span><span class="lines">@@ -2222,7 +2222,7 @@
</span><span class="cx"> double perspective;
</span><span class="cx"> if (!consumeNumberRaw(range, perspective))
</span><span class="cx"> return nullptr;
</span><del>- parsedValue = CSSPrimitiveValue::create(perspective, CSSPrimitiveValue::UnitTypes::CSS_PX);
</del><ins>+ parsedValue = CSSPrimitiveValue::create(perspective, CSSPrimitiveValue::UnitType::CSS_PX);
</ins><span class="cx"> }
</span><span class="cx"> if (parsedValue && (parsedValue->isCalculated() || parsedValue->doubleValue() > 0))
</span><span class="cx"> return parsedValue;
</span><span class="lines">@@ -2782,7 +2782,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> offset;
</span><span class="cx"> if (range.atEnd())
</span><del>- offset = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
</del><ins>+ offset = CSSValuePool::singleton().createValue(0, CSSPrimitiveValue::UnitType::CSS_PX);
</ins><span class="cx"> else {
</span><span class="cx"> offset = consumeLengthOrPercent(range, context.mode, ValueRangeAll, UnitlessQuirk::Forbid);
</span><span class="cx"> if (!offset)
</span><span class="lines">@@ -3203,10 +3203,10 @@
</span><span class="cx"> const CSSParserToken& token = range.peek();
</span><span class="cx"> if (identMatches<CSSValueWebkitMinContent, CSSValueWebkitMaxContent, CSSValueAuto>(token.id()))
</span><span class="cx"> return consumeIdent(range);
</span><del>- if (token.type() == DimensionToken && token.unitType() == CSSPrimitiveValue::UnitTypes::CSS_FR) {
</del><ins>+ if (token.type() == DimensionToken && token.unitType() == CSSPrimitiveValue::UnitType::CSS_FR) {
</ins><span class="cx"> if (range.peek().numericValue() < 0)
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_FR);
</del><ins>+ return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_FR);
</ins><span class="cx"> }
</span><span class="cx"> return consumeLengthOrPercent(range, cssParserMode, ValueRangeNonNegative, UnitlessQuirk::Allow);
</span><span class="cx"> }
</span><span class="lines">@@ -4676,7 +4676,7 @@
</span><span class="cx"> else if (flexShrink == unsetValue)
</span><span class="cx"> flexShrink = num;
</span><span class="cx"> else if (!num) // flex only allows a basis of 0 (sans units) if flex-grow and flex-shrink values have already been set.
</span><del>- flexBasis = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
</del><ins>+ flexBasis = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::CSS_PX);
</ins><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx"> } else if (!flexBasis) {
</span><span class="lines">@@ -4695,13 +4695,13 @@
</span><span class="cx"> if (flexShrink == unsetValue)
</span><span class="cx"> flexShrink = 1;
</span><span class="cx"> if (!flexBasis)
</span><del>- flexBasis = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitTypes::CSS_PX);
</del><ins>+ flexBasis = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::CSS_PX);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_range.atEnd())
</span><span class="cx"> return false;
</span><del>- addProperty(CSSPropertyFlexGrow, CSSPropertyFlex, CSSPrimitiveValue::create(clampTo<float>(flexGrow), CSSPrimitiveValue::UnitTypes::CSS_NUMBER), important);
- addProperty(CSSPropertyFlexShrink, CSSPropertyFlex, CSSPrimitiveValue::create(clampTo<float>(flexShrink), CSSPrimitiveValue::UnitTypes::CSS_NUMBER), important);
</del><ins>+ addProperty(CSSPropertyFlexGrow, CSSPropertyFlex, CSSPrimitiveValue::create(clampTo<float>(flexGrow), CSSPrimitiveValue::UnitType::CSS_NUMBER), important);
+ addProperty(CSSPropertyFlexShrink, CSSPropertyFlex, CSSPrimitiveValue::create(clampTo<float>(flexShrink), CSSPrimitiveValue::UnitType::CSS_NUMBER), important);
</ins><span class="cx"> addProperty(CSSPropertyFlexBasis, CSSPropertyFlex, flexBasis.releaseNonNull(), important);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (!m_calcValue)
</span><span class="cx"> return nullptr;
</span><span class="cx"> m_sourceRange = m_range;
</span><del>- return CSSValuePool::singleton().createValue(m_calcValue->doubleValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ return CSSValuePool::singleton().createValue(m_calcValue->doubleValue(), CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool consumeNumberRaw(double& result)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> if (token.type() == NumberToken) {
</span><span class="cx"> if (token.numericValueType() == NumberValueType || token.numericValue() < minimumValue)
</span><span class="cx"> return nullptr;
</span><del>- return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range);
</span><span class="cx"> if (const CSSCalcValue* calculation = calcParser.value()) {
</span><span class="lines">@@ -210,24 +210,24 @@
</span><span class="cx"> const CSSParserToken& token = range.peek();
</span><span class="cx"> if (token.type() == DimensionToken) {
</span><span class="cx"> switch (token.unitType()) {
</span><del>- case CSSPrimitiveValue::UnitTypes::CSS_QUIRKY_EMS:
</del><ins>+ case CSSPrimitiveValue::UnitType::CSS_QUIRKY_EMS:
</ins><span class="cx"> if (cssParserMode != UASheetMode)
</span><span class="cx"> return nullptr;
</span><span class="cx"> FALLTHROUGH;
</span><del>- case CSSPrimitiveValue::UnitTypes::CSS_EMS:
- case CSSPrimitiveValue::UnitTypes::CSS_REMS:
- case CSSPrimitiveValue::UnitTypes::CSS_CHS:
- case CSSPrimitiveValue::UnitTypes::CSS_EXS:
- case CSSPrimitiveValue::UnitTypes::CSS_PX:
- case CSSPrimitiveValue::UnitTypes::CSS_CM:
- case CSSPrimitiveValue::UnitTypes::CSS_MM:
- case CSSPrimitiveValue::UnitTypes::CSS_IN:
- case CSSPrimitiveValue::UnitTypes::CSS_PT:
- case CSSPrimitiveValue::UnitTypes::CSS_PC:
- case CSSPrimitiveValue::UnitTypes::CSS_VW:
- case CSSPrimitiveValue::UnitTypes::CSS_VH:
- case CSSPrimitiveValue::UnitTypes::CSS_VMIN:
- case CSSPrimitiveValue::UnitTypes::CSS_VMAX:
</del><ins>+ case CSSPrimitiveValue::UnitType::CSS_EMS:
+ case CSSPrimitiveValue::UnitType::CSS_REMS:
+ case CSSPrimitiveValue::UnitType::CSS_CHS:
+ case CSSPrimitiveValue::UnitType::CSS_EXS:
+ case CSSPrimitiveValue::UnitType::CSS_PX:
+ case CSSPrimitiveValue::UnitType::CSS_CM:
+ case CSSPrimitiveValue::UnitType::CSS_MM:
+ case CSSPrimitiveValue::UnitType::CSS_IN:
+ case CSSPrimitiveValue::UnitType::CSS_PT:
+ case CSSPrimitiveValue::UnitType::CSS_PC:
+ case CSSPrimitiveValue::UnitType::CSS_VW:
+ case CSSPrimitiveValue::UnitType::CSS_VH:
+ case CSSPrimitiveValue::UnitType::CSS_VMIN:
+ case CSSPrimitiveValue::UnitType::CSS_VMAX:
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (std::isinf(token.numericValue()))
</span><span class="cx"> return nullptr;
</span><del>- CSSPrimitiveValue::UnitTypes unitType = CSSPrimitiveValue::UnitTypes::CSS_PX;
</del><ins>+ CSSPrimitiveValue::UnitType unitType = CSSPrimitiveValue::UnitType::CSS_PX;
</ins><span class="cx"> return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), unitType);
</span><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range, valueRange);
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> if (token.type() == PercentageToken) {
</span><span class="cx"> if ((valueRange == ValueRangeNonNegative && token.numericValue() < 0) || std::isinf(token.numericValue()))
</span><span class="cx"> return nullptr;
</span><del>- return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range, valueRange);
</span><span class="cx"> if (const CSSCalcValue* calculation = calcParser.value()) {
</span><span class="lines">@@ -301,10 +301,10 @@
</span><span class="cx"> const CSSParserToken& token = range.peek();
</span><span class="cx"> if (token.type() == DimensionToken) {
</span><span class="cx"> switch (token.unitType()) {
</span><del>- case CSSPrimitiveValue::UnitTypes::CSS_DEG:
- case CSSPrimitiveValue::UnitTypes::CSS_RAD:
- case CSSPrimitiveValue::UnitTypes::CSS_GRAD:
- case CSSPrimitiveValue::UnitTypes::CSS_TURN:
</del><ins>+ case CSSPrimitiveValue::UnitType::CSS_DEG:
+ case CSSPrimitiveValue::UnitType::CSS_RAD:
+ case CSSPrimitiveValue::UnitType::CSS_GRAD:
+ case CSSPrimitiveValue::UnitType::CSS_TURN:
</ins><span class="cx"> return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
</span><span class="cx"> default:
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless)) {
</span><del>- return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_DEG);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_DEG);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CalcParser calcParser(range, ValueRangeAll);
</span><span class="lines">@@ -325,14 +325,14 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> consumeTime(CSSParserTokenRange& range, CSSParserMode cssParserMode, ValueRange valueRange, UnitlessQuirk unitless)
</span><span class="cx"> {
</span><span class="cx"> const CSSParserToken& token = range.peek();
</span><del>- CSSPrimitiveValue::UnitTypes unit = token.unitType();
</del><ins>+ CSSPrimitiveValue::UnitType unit = token.unitType();
</ins><span class="cx"> bool acceptUnitless = token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless);
</span><span class="cx"> if (acceptUnitless)
</span><del>- unit = CSSPrimitiveValue::UnitTypes::CSS_MS;
</del><ins>+ unit = CSSPrimitiveValue::UnitType::CSS_MS;
</ins><span class="cx"> if (token.type() == DimensionToken || acceptUnitless) {
</span><span class="cx"> if (valueRange == ValueRangeNonNegative && token.numericValue() < 0)
</span><span class="cx"> return nullptr;
</span><del>- if (unit == CSSPrimitiveValue::UnitTypes::CSS_MS || unit == CSSPrimitiveValue::UnitTypes::CSS_S)
</del><ins>+ if (unit == CSSPrimitiveValue::UnitType::CSS_MS || unit == CSSPrimitiveValue::UnitType::CSS_S)
</ins><span class="cx"> return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), unit);
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (range.peek().type() != IdentToken || isCSSWideKeyword(range.peek().id()))
</span><span class="cx"> return nullptr;
</span><del>- return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().value().toString(), CSSPrimitiveValue::UnitTypes::CSS_STRING);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().value().toString(), CSSPrimitiveValue::UnitType::CSS_STRING);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> consumeString(CSSParserTokenRange& range)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (range.peek().type() != StringToken)
</span><span class="cx"> return nullptr;
</span><del>- return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().value().toString(), CSSPrimitiveValue::UnitTypes::CSS_STRING);
</del><ins>+ return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().value().toString(), CSSPrimitiveValue::UnitType::CSS_STRING);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringView consumeUrlAsStringView(CSSParserTokenRange& range)
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> StringView url = consumeUrlAsStringView(range);
</span><span class="cx"> if (url.isNull())
</span><span class="cx"> return nullptr;
</span><del>- return CSSValuePool::singleton().createValue(url.toString(), CSSPrimitiveValue::UnitTypes::CSS_URI);
</del><ins>+ return CSSValuePool::singleton().createValue(url.toString(), CSSPrimitiveValue::UnitType::CSS_URI);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static int clampRGBComponent(const CSSPrimitiveValue& value)
</span><span class="lines">@@ -758,11 +758,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (args.peek().type() == IdentToken) {
</span><span class="cx"> if ((horizontal && consumeIdent<CSSValueLeft>(args)) || (!horizontal && consumeIdent<CSSValueTop>(args)))
</span><del>- return CSSValuePool::singleton().createValue(0., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(0., CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx"> if ((horizontal && consumeIdent<CSSValueRight>(args)) || (!horizontal && consumeIdent<CSSValueBottom>(args)))
</span><del>- return CSSValuePool::singleton().createValue(100., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(100., CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx"> if (consumeIdent<CSSValueCenter>(args))
</span><del>- return CSSValuePool::singleton().createValue(50., CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE);
</del><ins>+ return CSSValuePool::singleton().createValue(50., CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> RefPtr<CSSPrimitiveValue> result = consumePercent(args, ValueRangeAll);
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- stop.m_position = CSSValuePool::singleton().createValue(position, CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ stop.m_position = CSSValuePool::singleton().createValue(position, CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx"> stop.m_color = consumeDeprecatedGradientStopColor(args, cssParserMode);
</span><span class="cx"> return stop.m_color && args.atEnd();
</span><span class="cx"> }
</span><span class="lines">@@ -1081,9 +1081,9 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> percentage;
</span><span class="cx"> const CSSParserToken& percentageArg = args.consumeIncludingWhitespace();
</span><span class="cx"> if (percentageArg.type() == PercentageToken)
</span><del>- percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue() / 100, 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue() / 100, 0, 1), CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx"> else if (percentageArg.type() == NumberToken)
</span><del>- percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue(), 0, 1), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ percentage = CSSValuePool::singleton().createValue(clampTo<double>(percentageArg.numericValue(), 0, 1), CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx">
</span><span class="cx"> if (!percentage)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1183,11 +1183,11 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> if (token.value() != "x")
</span><span class="cx"> return nullptr;
</span><del>- ASSERT(token.unitType() == CSSPrimitiveValue::UnitTypes::CSS_UNKNOWN);
</del><ins>+ ASSERT(token.unitType() == CSSPrimitiveValue::UnitType::CSS_UNKNOWN);
</ins><span class="cx"> double imageScaleFactor = token.numericValue();
</span><span class="cx"> if (imageScaleFactor <= 0)
</span><span class="cx"> return nullptr;
</span><del>- imageSet->append(CSSValuePool::singleton().createValue(imageScaleFactor, CSSPrimitiveValue::UnitTypes::CSS_NUMBER));
</del><ins>+ imageSet->append(CSSValuePool::singleton().createValue(imageScaleFactor, CSSPrimitiveValue::UnitType::CSS_NUMBER));
</ins><span class="cx"> } while (consumeCommaIncludingWhitespace(args));
</span><span class="cx"> if (!args.atEnd())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1254,7 +1254,7 @@
</span><span class="cx"> bool isPercentage = downcast<CSSPrimitiveValue>(*parsedValue).isPercentage();
</span><span class="cx"> double maxAllowed = isPercentage ? 100.0 : 1.0;
</span><span class="cx"> if (downcast<CSSPrimitiveValue>(*parsedValue).doubleValue() > maxAllowed)
</span><del>- parsedValue = CSSPrimitiveValue::create(maxAllowed, isPercentage ? CSSPrimitiveValue::UnitTypes::CSS_PERCENTAGE : CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</del><ins>+ parsedValue = CSSPrimitiveValue::create(maxAllowed, isPercentage ? CSSPrimitiveValue::UnitType::CSS_PERCENTAGE : CSSPrimitiveValue::UnitType::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserMediaQueryParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/MediaQueryParser.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/MediaQueryParser.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> void MediaQueryParser::readFeatureValue(CSSParserTokenType type, const CSSParserToken& token)
</span><span class="cx"> {
</span><del>- if (type == DimensionToken && token.unitType() == CSSPrimitiveValue::UnitTypes::CSS_UNKNOWN)
</del><ins>+ if (type == DimensionToken && token.unitType() == CSSPrimitiveValue::UnitType::CSS_UNKNOWN)
</ins><span class="cx"> m_state = SkipUntilComma;
</span><span class="cx"> else {
</span><span class="cx"> if (m_mediaQueryData.tryAddParserToken(type, token))
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserSizesAttributeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/SizesAttributeParser.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-float SizesAttributeParser::computeLength(double value, CSSPrimitiveValue::UnitTypes type, const Document& document)
</del><ins>+float SizesAttributeParser::computeLength(double value, CSSPrimitiveValue::UnitType type, const Document& document)
</ins><span class="cx"> {
</span><span class="cx"> auto* renderer = document.renderView();
</span><span class="cx"> if (!renderer)
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserSizesAttributeParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/SizesAttributeParser.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/SizesAttributeParser.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/css/parser/SizesAttributeParser.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> float length();
</span><span class="cx">
</span><span class="cx"> static float defaultLength(const Document&);
</span><del>- static float computeLength(double value, CSSPrimitiveValue::UnitTypes, const Document&);
</del><ins>+ static float computeLength(double value, CSSPrimitiveValue::UnitType, const Document&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool parse(CSSParserTokenRange);
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/dom/StyledElement.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool StyledElement::setInlineStyleProperty(CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitTypes unit, bool important)
</del><ins>+bool StyledElement::setInlineStyleProperty(CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitType unit, bool important)
</ins><span class="cx"> {
</span><span class="cx"> ensureMutableInlineStyle().setProperty(propertyID, CSSValuePool::singleton().createValue(value, unit), important);
</span><span class="cx"> inlineStyleChanged();
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> style.setProperty(propertyID, CSSValuePool::singleton().createIdentifierValue(identifier));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitTypes unit)
</del><ins>+void StyledElement::addPropertyToPresentationAttributeStyle(MutableStyleProperties& style, CSSPropertyID propertyID, double value, CSSPrimitiveValue::UnitType unit)
</ins><span class="cx"> {
</span><span class="cx"> style.setProperty(propertyID, CSSValuePool::singleton().createValue(value, unit));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomStyledElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StyledElement.h (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StyledElement.h 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/dom/StyledElement.h 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> bool setInlineStyleProperty(CSSPropertyID, CSSValueID identifier, bool important = false);
</span><span class="cx"> bool setInlineStyleProperty(CSSPropertyID, CSSPropertyID identifier, bool important = false);
</span><del>- WEBCORE_EXPORT bool setInlineStyleProperty(CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes, bool important = false);
</del><ins>+ WEBCORE_EXPORT bool setInlineStyleProperty(CSSPropertyID, double value, CSSPrimitiveValue::UnitType, bool important = false);
</ins><span class="cx"> WEBCORE_EXPORT bool setInlineStyleProperty(CSSPropertyID, const String& value, bool important = false);
</span><span class="cx"> bool removeInlineStyleProperty(CSSPropertyID);
</span><span class="cx"> void removeAllInlineStyleProperties();
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> virtual bool isPresentationAttribute(const QualifiedName&) const { return false; }
</span><span class="cx">
</span><span class="cx"> void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, CSSValueID identifier);
</span><del>- void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, double value, CSSPrimitiveValue::UnitTypes);
</del><ins>+ void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, double value, CSSPrimitiveValue::UnitType);
</ins><span class="cx"> void addPropertyToPresentationAttributeStyle(MutableStyleProperties&, CSSPropertyID, const String& value);
</span><span class="cx">
</span><span class="cx"> void addSubresourceAttributeURLs(ListHashSet<URL>&) const override;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGLengthValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGLengthValue.cpp (209757 => 209758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGLengthValue.cpp 2016-12-13 16:59:55 UTC (rev 209757)
+++ trunk/Source/WebCore/svg/SVGLengthValue.cpp 2016-12-13 17:39:27 UTC (rev 209758)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx">
</span><span class="cx"> Ref<CSSPrimitiveValue> SVGLengthValue::toCSSPrimitiveValue(const SVGLengthValue& length)
</span><span class="cx"> {
</span><del>- CSSPrimitiveValue::UnitTypes cssType = CSSPrimitiveValue::CSS_UNKNOWN;
</del><ins>+ CSSPrimitiveValue::UnitType cssType = CSSPrimitiveValue::CSS_UNKNOWN;
</ins><span class="cx"> switch (length.unitType()) {
</span><span class="cx"> case LengthTypeUnknown:
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>