| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 WebKitCSSMatrix::~WebKitCSSMatrix() | 51 WebKitCSSMatrix::~WebKitCSSMatrix() |
| 52 { | 52 { |
| 53 } | 53 } |
| 54 | 54 |
| 55 void WebKitCSSMatrix::setMatrixValue(const String& string, ExceptionCode& ec) | 55 void WebKitCSSMatrix::setMatrixValue(const String& string, ExceptionCode& ec) |
| 56 { | 56 { |
| 57 if (string.isEmpty()) | 57 if (string.isEmpty()) |
| 58 return; | 58 return; |
| 59 | 59 |
| 60 RefPtr<StylePropertySet> styleDeclaration = StylePropertySet::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()))->getIdent() == CSSValueNone)) |
| 68 return; | 68 return; |
| 69 | 69 |
| 70 TransformOperations operations; | 70 TransformOperations operations; |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 return String::format("matrix(%f, %f, %f, %f, %f, %f)", | 184 return String::format("matrix(%f, %f, %f, %f, %f, %f)", |
| 185 m_matrix.a(), m_matrix.b(), m_matrix.c(), m_matr
ix.d(), m_matrix.e(), m_matrix.f()); | 185 m_matrix.a(), m_matrix.b(), m_matrix.c(), m_matr
ix.d(), m_matrix.e(), m_matrix.f()); |
| 186 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)", |
| 187 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_ma
trix.m14(), | 187 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_ma
trix.m14(), |
| 188 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_ma
trix.m24(), | 188 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_ma
trix.m24(), |
| 189 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_ma
trix.m34(), | 189 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_ma
trix.m34(), |
| 190 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_ma
trix.m44()); | 190 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_ma
trix.m44()); |
| 191 } | 191 } |
| 192 | 192 |
| 193 } // namespace WebCore | 193 } // namespace WebCore |
| OLD | NEW |