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

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

Issue 2382653006: Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue (Closed)
Patch Set: Make check-webkit-style happy Created 4 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 unified diff | Download patch
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 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/css/CSSMatrix.h" 26 #include "core/css/CSSMatrix.h"
27 27
28 #include "bindings/core/v8/ExceptionState.h" 28 #include "bindings/core/v8/ExceptionState.h"
29 #include "core/CSSPropertyNames.h" 29 #include "core/CSSPropertyNames.h"
30 #include "core/CSSValueKeywords.h" 30 #include "core/CSSValueKeywords.h"
31 #include "core/css/CSSIdentifierValue.h"
31 #include "core/css/CSSToLengthConversionData.h" 32 #include "core/css/CSSToLengthConversionData.h"
32 #include "core/css/StylePropertySet.h" 33 #include "core/css/StylePropertySet.h"
33 #include "core/css/parser/CSSParser.h" 34 #include "core/css/parser/CSSParser.h"
34 #include "core/css/resolver/TransformBuilder.h" 35 #include "core/css/resolver/TransformBuilder.h"
35 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
36 #include "core/frame/UseCounter.h" 37 #include "core/frame/UseCounter.h"
37 #include "core/layout/api/LayoutViewItem.h" 38 #include "core/layout/api/LayoutViewItem.h"
38 #include "core/style/ComputedStyle.h" 39 #include "core/style/ComputedStyle.h"
39 #include "core/style/StyleInheritedData.h" 40 #include "core/style/StyleInheritedData.h"
40 #include "wtf/MathExtras.h" 41 #include "wtf/MathExtras.h"
(...skipping 22 matching lines...) Expand all
63 } 64 }
64 65
65 void CSSMatrix::setMatrixValue(const String& string, 66 void CSSMatrix::setMatrixValue(const String& string,
66 ExceptionState& exceptionState) { 67 ExceptionState& exceptionState) {
67 if (string.isEmpty()) 68 if (string.isEmpty())
68 return; 69 return;
69 70
70 if (const CSSValue* value = 71 if (const CSSValue* value =
71 CSSParser::parseSingleValue(CSSPropertyTransform, string)) { 72 CSSParser::parseSingleValue(CSSPropertyTransform, string)) {
72 // Check for a "none" transform. In these cases we can use the default ident ity matrix. 73 // Check for a "none" transform. In these cases we can use the default ident ity matrix.
73 if (value->isPrimitiveValue() && 74 if (value->isIdentifierValue() &&
74 (toCSSPrimitiveValue(value))->getValueID() == CSSValueNone) 75 (toCSSIdentifierValue(value))->getValueID() == CSSValueNone)
75 return; 76 return;
76 77
77 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle()); 78 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle());
78 TransformOperations operations; 79 TransformOperations operations;
79 TransformBuilder::createTransformOperations( 80 TransformBuilder::createTransformOperations(
80 *value, CSSToLengthConversionData(initialStyle, initialStyle, 81 *value, CSSToLengthConversionData(initialStyle, initialStyle,
81 LayoutViewItem(nullptr), 1.0f), 82 LayoutViewItem(nullptr), 1.0f),
82 operations); 83 operations);
83 84
84 // Convert transform operations to a TransformationMatrix. This can fail 85 // Convert transform operations to a TransformationMatrix. This can fail
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 return String::format( 194 return String::format(
194 "matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, " 195 "matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, "
195 "%f)", 196 "%f)",
196 m_matrix->m11(), m_matrix->m12(), m_matrix->m13(), m_matrix->m14(), 197 m_matrix->m11(), m_matrix->m12(), m_matrix->m13(), m_matrix->m14(),
197 m_matrix->m21(), m_matrix->m22(), m_matrix->m23(), m_matrix->m24(), 198 m_matrix->m21(), m_matrix->m22(), m_matrix->m23(), m_matrix->m24(),
198 m_matrix->m31(), m_matrix->m32(), m_matrix->m33(), m_matrix->m34(), 199 m_matrix->m31(), m_matrix->m32(), m_matrix->m33(), m_matrix->m34(),
199 m_matrix->m41(), m_matrix->m42(), m_matrix->m43(), m_matrix->m44()); 200 m_matrix->m41(), m_matrix->m42(), m_matrix->m43(), m_matrix->m44());
200 } 201 }
201 202
202 } // namespace blink 203 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSIdentifierValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSPrimitiveValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698