| OLD | NEW |
| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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()))->getValueID() == 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 = SyntaxError; |
| 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 ('%') |
| 78 TransformationMatrix t; | 78 TransformationMatrix t; |
| 79 for (unsigned i = 0; i < operations.operations().size(); ++i) { | 79 for (unsigned i = 0; i < operations.operations().size(); ++i) { |
| 80 if (operations.operations()[i].get()->apply(t, IntSize(0, 0))) { | 80 if (operations.operations()[i].get()->apply(t, IntSize(0, 0))) { |
| 81 ec = SYNTAX_ERR; | 81 ec = SyntaxError; |
| 82 return; | 82 return; |
| 83 } | 83 } |
| 84 } | 84 } |
| 85 | 85 |
| 86 // set the matrix | 86 // set the matrix |
| 87 m_matrix = t; | 87 m_matrix = t; |
| 88 } else // There is something there but parsing failed. | 88 } else { // There is something there but parsing failed. |
| 89 ec = SYNTAX_ERR; | 89 ec = SyntaxError; |
| 90 } |
| 90 } | 91 } |
| 91 | 92 |
| 92 // Perform a concatenation of the matrices (this * secondMatrix) | 93 // Perform a concatenation of the matrices (this * secondMatrix) |
| 93 PassRefPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const | 94 PassRefPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const |
| 94 { | 95 { |
| 95 if (!secondMatrix) | 96 if (!secondMatrix) |
| 96 return 0; | 97 return 0; |
| 97 | 98 |
| 98 return CSSMatrix::create(TransformationMatrix(m_matrix).multiply(secondMatri
x->m_matrix)); | 99 return CSSMatrix::create(TransformationMatrix(m_matrix).multiply(secondMatri
x->m_matrix)); |
| 99 } | 100 } |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 if (m_matrix.isAffine()) | 184 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()); | 185 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)", | 186 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(), | 187 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(), | 188 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(), | 189 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()); | 190 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44()); |
| 190 } | 191 } |
| 191 | 192 |
| 192 } // namespace WebCore | 193 } // namespace WebCore |
| OLD | NEW |