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

Unified Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 649153002: Align -webkit-transform-origin behaviour with transform-origin behaviour (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: git cl try Created 6 years, 2 months 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 | « Source/core/css/parser/CSSPropertyParser.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index c4d902a23587fd251209c5e9a399b7b307f8aa57..f51ee026fba0fb744abe25c9df85712dc8d5710e 100644
--- a/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/Source/core/css/parser/CSSPropertyParser.cpp
@@ -1111,7 +1111,8 @@ bool CSSPropertyParser::parseValue(CSSPropertyID propId, bool important)
return false;
}
break;
- case CSSPropertyTransformOrigin: {
+ case CSSPropertyTransformOrigin:
+ case CSSPropertyWebkitTransformOrigin: {
RefPtrWillBeRawPtr<CSSValueList> list = parseTransformOrigin();
if (!list)
return false;
@@ -1138,8 +1139,6 @@ bool CSSPropertyParser::parseValue(CSSPropertyID propId, bool important)
case CSSPropertyWebkitTransformOriginZ:
validPrimitive = validUnit(value, FLength);
break;
- case CSSPropertyWebkitTransformOrigin:
- return parseWebkitTransformOriginShorthand(important);
case CSSPropertyPerspective:
if (id == CSSValueNone) {
validPrimitive = true;
@@ -2964,30 +2963,6 @@ PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseAnimationProperty()
return createPrimitiveStringValue(value);
}
-bool CSSPropertyParser::parseWebkitTransformOriginShorthand(bool important)
-{
- RefPtrWillBeRawPtr<CSSValue> originX = nullptr;
- RefPtrWillBeRawPtr<CSSValue> originY = nullptr;
- RefPtrWillBeRawPtr<CSSValue> originZ = nullptr;
-
- parse2ValuesFillPosition(m_valueList, originX, originY);
-
- if (m_valueList->current()) {
- if (!validUnit(m_valueList->current(), FLength))
- return false;
- originZ = createPrimitiveNumericValue(m_valueList->current());
- m_valueList->next();
- } else {
- originZ = cssValuePool().createImplicitInitialValue();
- }
-
- addProperty(CSSPropertyWebkitTransformOriginX, originX.release(), important);
- addProperty(CSSPropertyWebkitTransformOriginY, originY.release(), important);
- addProperty(CSSPropertyWebkitTransformOriginZ, originZ.release(), important);
-
- return true;
-}
-
bool CSSPropertyParser::parseCubicBezierTimingFunctionValue(CSSParserValueList*& args, double& result)
{
CSSParserValue* v = args->current();
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698