Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp

Issue 1490883002: Move remaining independent transform properties into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
index c9696bbf685f2afeac617853ba89e96cfacc7576..ca793d08bf798be0265f1b345a14923d61cc9892 100644
--- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
@@ -695,52 +695,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
return true;
}
- case CSSPropertyTranslate: {
- // translate : [ <length> | <percentage> ] [[ <length> | <percentage> ] <length>? ]?
- // defaults to 0 on all axis, note that the last value CANNOT be a percentage
- ASSERT(RuntimeEnabledFeatures::cssIndependentTransformPropertiesEnabled());
- RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
- if (!validUnit(value, FLength | FPercent))
- return false;
-
- list->append(createPrimitiveNumericValue(value));
- value = m_valueList->next();
-
- if (value) {
- if (!validUnit(value, FLength | FPercent))
- return false;
-
- list->append(createPrimitiveNumericValue(value));
- value = m_valueList->next();
-
- if (value) {
- if (!validUnit(value, FLength))
- return false;
-
- list->append(createPrimitiveNumericValue(value));
- value = m_valueList->next();
- }
- }
-
- parsedValue = list.release();
- break;
- }
-
- case CSSPropertyScale: { // scale: <number>{1,3}, default scale for all axis is 1
- ASSERT(RuntimeEnabledFeatures::cssIndependentTransformPropertiesEnabled());
- RefPtrWillBeRawPtr<CSSValueList> scaleList = CSSValueList::createSpaceSeparated();
-
- for (unsigned i = 0; value && i < 3; i++) { // up to 3 dimensions of scale
- if (!validUnit(value, FNumber))
- return false;
- scaleList->append(createPrimitiveNumericValue(value));
- value = m_valueList->next();
- }
-
- parsedValue = scaleList.release();
- break;
- }
-
case CSSPropertyWebkitPerspectiveOriginX:
case CSSPropertyWebkitTransformOriginX:
parsedValue = parseFillPositionX(m_valueList);
@@ -1108,6 +1062,8 @@ bool CSSPropertyParser::parseValue(CSSPropertyID unresolvedProperty, bool import
case CSSPropertyR:
case CSSPropertyRx:
case CSSPropertyRy:
+ case CSSPropertyScale:
+ case CSSPropertyTranslate:
validPrimitive = false;
break;
« no previous file with comments | « third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698