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

Side by Side Diff: Source/core/css/CSSMatrix.cpp

Issue 16415007: Cleanup usage of CSSPropertyID and CSSValueID inside Blink. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 if (string.isEmpty()) 57 if (string.isEmpty())
58 return; 58 return;
59 59
60 RefPtr<MutableStylePropertySet> styleDeclaration = MutableStylePropertySet:: create(); 60 RefPtr<MutableStylePropertySet> styleDeclaration = MutableStylePropertySet:: create();
61 if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform , string, true, CSSStrictMode, 0)) { 61 if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform , string, true, CSSStrictMode, 0)) {
62 // Convert to TransformOperations. This can fail if a property 62 // Convert to TransformOperations. This can fail if a property
63 // requires style (i.e., param uses 'ems' or 'exs') 63 // requires style (i.e., param uses 'ems' or 'exs')
64 RefPtr<CSSValue> value = styleDeclaration->getPropertyCSSValue(CSSProper tyWebkitTransform); 64 RefPtr<CSSValue> value = styleDeclaration->getPropertyCSSValue(CSSProper tyWebkitTransform);
65 65
66 // Check for a "none" or empty transform. In these cases we can use the default identity matrix. 66 // Check for a "none" or empty transform. In these cases we can use the default identity matrix.
67 if (!value || (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.g et()))->getIdent() == CSSValueNone)) 67 if (!value || (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.g et()))->getValueID() == CSSValueNone))
68 return; 68 return;
69 69
70 TransformOperations operations; 70 TransformOperations operations;
71 if (!TransformBuilder::createTransformOperations(value.get(), 0, 0, oper ations)) { 71 if (!TransformBuilder::createTransformOperations(value.get(), 0, 0, oper ations)) {
72 ec = SYNTAX_ERR; 72 ec = SYNTAX_ERR;
73 return; 73 return;
74 } 74 }
75 75
76 // Convert transform operations to a TransformationMatrix. This can fail 76 // Convert transform operations to a TransformationMatrix. This can fail
77 // if a param has a percentage ('%') 77 // if a param has a percentage ('%')
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 if (m_matrix.isAffine()) 183 if (m_matrix.isAffine())
184 return String::format("matrix(%f, %f, %f, %f, %f, %f)", m_matrix.a(), m_ matrix.b(), m_matrix.c(), m_matrix.d(), m_matrix.e(), m_matrix.f()); 184 return String::format("matrix(%f, %f, %f, %f, %f, %f)", m_matrix.a(), m_ matrix.b(), m_matrix.c(), m_matrix.d(), m_matrix.e(), m_matrix.f());
185 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)", 185 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)",
186 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(), 186 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(),
187 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(), 187 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(),
188 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(), 188 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(),
189 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44()); 189 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44());
190 } 190 }
191 191
192 } // namespace WebCore 192 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698