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

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

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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/CSSMatrix.h ('k') | Source/core/css/CSSPrimitiveValue.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 25 matching lines...) Expand all
36 #include "wtf/MathExtras.h" 36 #include "wtf/MathExtras.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 CSSMatrix::CSSMatrix(const TransformationMatrix& m) 40 CSSMatrix::CSSMatrix(const TransformationMatrix& m)
41 : m_matrix(m) 41 : m_matrix(m)
42 { 42 {
43 ScriptWrappable::init(this); 43 ScriptWrappable::init(this);
44 } 44 }
45 45
46 CSSMatrix::CSSMatrix(const String& s, ExceptionState& es) 46 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState)
47 { 47 {
48 ScriptWrappable::init(this); 48 ScriptWrappable::init(this);
49 setMatrixValue(s, es); 49 setMatrixValue(s, exceptionState);
50 } 50 }
51 51
52 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& es) 52 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate)
53 { 53 {
54 if (string.isEmpty()) 54 if (string.isEmpty())
55 return; 55 return;
56 56
57 RefPtr<MutableStylePropertySet> styleDeclaration = MutableStylePropertySet:: create(); 57 RefPtr<MutableStylePropertySet> styleDeclaration = MutableStylePropertySet:: create();
58 if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform , string, true, HTMLStandardMode, 0)) { 58 if (CSSParser::parseValue(styleDeclaration.get(), CSSPropertyWebkitTransform , string, true, HTMLStandardMode, 0)) {
59 // Convert to TransformOperations. This can fail if a property 59 // Convert to TransformOperations. This can fail if a property
60 // requires style (i.e., param uses 'ems' or 'exs') 60 // requires style (i.e., param uses 'ems' or 'exs')
61 RefPtr<CSSValue> value = styleDeclaration->getPropertyCSSValue(CSSProper tyWebkitTransform); 61 RefPtr<CSSValue> value = styleDeclaration->getPropertyCSSValue(CSSProper tyWebkitTransform);
62 62
63 // Check for a "none" or empty transform. In these cases we can use the default identity matrix. 63 // Check for a "none" or empty transform. In these cases we can use the default identity matrix.
64 if (!value || (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.g et()))->getValueID() == CSSValueNone)) 64 if (!value || (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.g et()))->getValueID() == CSSValueNone))
65 return; 65 return;
66 66
67 TransformOperations operations; 67 TransformOperations operations;
68 if (!TransformBuilder::createTransformOperations(value.get(), 0, 0, oper ations)) { 68 if (!TransformBuilder::createTransformOperations(value.get(), 0, 0, oper ations)) {
69 es.throwUninformativeAndGenericDOMException(SyntaxError); 69 exceptionState.throwUninformativeAndGenericDOMException(SyntaxError) ;
70 return; 70 return;
71 } 71 }
72 72
73 // Convert transform operations to a TransformationMatrix. This can fail 73 // Convert transform operations to a TransformationMatrix. This can fail
74 // if a param has a percentage ('%') 74 // if a param has a percentage ('%')
75 TransformationMatrix t; 75 TransformationMatrix t;
76 for (unsigned i = 0; i < operations.operations().size(); ++i) { 76 for (unsigned i = 0; i < operations.operations().size(); ++i) {
77 if (operations.operations()[i].get()->apply(t, IntSize(0, 0))) { 77 if (operations.operations()[i].get()->apply(t, IntSize(0, 0))) {
78 es.throwUninformativeAndGenericDOMException(SyntaxError); 78 exceptionState.throwUninformativeAndGenericDOMException(SyntaxEr ror);
79 return; 79 return;
80 } 80 }
81 } 81 }
82 82
83 // set the matrix 83 // set the matrix
84 m_matrix = t; 84 m_matrix = t;
85 } else { // There is something there but parsing failed. 85 } else { // There is something there but parsing failed.
86 es.throwUninformativeAndGenericDOMException(SyntaxError); 86 exceptionState.throwUninformativeAndGenericDOMException(SyntaxError);
87 } 87 }
88 } 88 }
89 89
90 // Perform a concatenation of the matrices (this * secondMatrix) 90 // Perform a concatenation of the matrices (this * secondMatrix)
91 PassRefPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const 91 PassRefPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const
92 { 92 {
93 if (!secondMatrix) 93 if (!secondMatrix)
94 return 0; 94 return 0;
95 95
96 return CSSMatrix::create(TransformationMatrix(m_matrix).multiply(secondMatri x->m_matrix)); 96 return CSSMatrix::create(TransformationMatrix(m_matrix).multiply(secondMatri x->m_matrix));
97 } 97 }
98 98
99 PassRefPtr<CSSMatrix> CSSMatrix::inverse(ExceptionState& es) const 99 PassRefPtr<CSSMatrix> CSSMatrix::inverse(ExceptionState& exceptionState) const
100 { 100 {
101 if (!m_matrix.isInvertible()) { 101 if (!m_matrix.isInvertible()) {
102 es.throwUninformativeAndGenericDOMException(NotSupportedError); 102 exceptionState.throwUninformativeAndGenericDOMException(NotSupportedErro r);
103 return 0; 103 return 0;
104 } 104 }
105 105
106 return CSSMatrix::create(m_matrix.inverse()); 106 return CSSMatrix::create(m_matrix.inverse());
107 } 107 }
108 108
109 PassRefPtr<CSSMatrix> CSSMatrix::translate(double x, double y, double z) const 109 PassRefPtr<CSSMatrix> CSSMatrix::translate(double x, double y, double z) const
110 { 110 {
111 if (std::isnan(x)) 111 if (std::isnan(x))
112 x = 0; 112 x = 0;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 if (m_matrix.isAffine()) 181 if (m_matrix.isAffine())
182 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()); 182 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());
183 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)", 183 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)",
184 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(), 184 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(),
185 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(), 185 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(),
186 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(), 186 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(),
187 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44()); 187 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44());
188 } 188 }
189 189
190 } // namespace WebCore 190 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSMatrix.h ('k') | Source/core/css/CSSPrimitiveValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698