| 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 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 namespace blink { | 41 namespace blink { |
| 42 | 42 |
| 43 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::create(ExecutionContext* executionC
ontext, const String& s, ExceptionState& exceptionState) | 43 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::create(ExecutionContext* executionC
ontext, const String& s, ExceptionState& exceptionState) |
| 44 { | 44 { |
| 45 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix); | 45 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix); |
| 46 return adoptRefWillBeNoop(new CSSMatrix(s, exceptionState)); | 46 return adoptRefWillBeNoop(new CSSMatrix(s, exceptionState)); |
| 47 } | 47 } |
| 48 | 48 |
| 49 CSSMatrix::CSSMatrix(const TransformationMatrix& m) | 49 CSSMatrix::CSSMatrix(const TransformationMatrix& m) |
| 50 : m_matrix(adoptPtr(new TransformationMatrix(m))) | 50 : m_matrix(TransformationMatrix::create(m)) |
| 51 { | 51 { |
| 52 } | 52 } |
| 53 | 53 |
| 54 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState) | 54 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState) |
| 55 : m_matrix(adoptPtr(new TransformationMatrix)) | 55 : m_matrix(TransformationMatrix::create()) |
| 56 { | 56 { |
| 57 setMatrixValue(s, exceptionState); | 57 setMatrixValue(s, exceptionState); |
| 58 } | 58 } |
| 59 | 59 |
| 60 static inline PassRefPtr<ComputedStyle> createInitialStyle() | 60 static inline PassRefPtr<ComputedStyle> createInitialStyle() |
| 61 { | 61 { |
| 62 RefPtr<ComputedStyle> initialStyle = ComputedStyle::create(); | 62 RefPtr<ComputedStyle> initialStyle = ComputedStyle::create(); |
| 63 initialStyle->font().update(nullptr); | 63 initialStyle->font().update(nullptr); |
| 64 return initialStyle; | 64 return initialStyle; |
| 65 } | 65 } |
| 66 | 66 |
| 67 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt
ate) | 67 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt
ate) |
| 68 { | 68 { |
| 69 if (string.isEmpty()) | 69 if (string.isEmpty()) |
| 70 return; | 70 return; |
| 71 | 71 |
| 72 if (RefPtrWillBeRawPtr<CSSValue> value = CSSParser::parseSingleValue(CSSProp
ertyTransform, string)) { | 72 if (RefPtrWillBeRawPtr<CSSValue> value = CSSParser::parseSingleValue(CSSProp
ertyTransform, string)) { |
| 73 // Check for a "none" transform. In these cases we can use the default i
dentity matrix. | 73 // Check for a "none" transform. In these cases we can use the default i
dentity matrix. |
| 74 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.get()))->get
ValueID() == CSSValueNone) | 74 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.get()))->get
ValueID() == CSSValueNone) |
| 75 return; | 75 return; |
| 76 | 76 |
| 77 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle()); | 77 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle()); |
| 78 TransformOperations operations; | 78 TransformOperations operations; |
| 79 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio
nData(initialStyle, initialStyle, nullptr, 1.0f), operations); | 79 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio
nData(initialStyle, initialStyle, nullptr, 1.0f), operations); |
| 80 | 80 |
| 81 // Convert transform operations to a TransformationMatrix. This can fail | 81 // Convert transform operations to a TransformationMatrix. This can fail |
| 82 // if a param has a percentage ('%') | 82 // if a param has a percentage ('%') |
| 83 if (operations.dependsOnBoxSize()) | 83 if (operations.dependsOnBoxSize()) |
| 84 exceptionState.throwDOMException(SyntaxError, "The transformation de
pends on the box size, which is not supported."); | 84 exceptionState.throwDOMException(SyntaxError, "The transformation de
pends on the box size, which is not supported."); |
| 85 m_matrix = adoptPtr(new TransformationMatrix); | 85 m_matrix = TransformationMatrix::create(); |
| 86 operations.apply(FloatSize(0, 0), *m_matrix); | 86 operations.apply(FloatSize(0, 0), *m_matrix); |
| 87 } else { // There is something there but parsing failed. | 87 } else { // There is something there but parsing failed. |
| 88 exceptionState.throwDOMException(SyntaxError, "Failed to parse '" + stri
ng + "'."); | 88 exceptionState.throwDOMException(SyntaxError, "Failed to parse '" + stri
ng + "'."); |
| 89 } | 89 } |
| 90 } | 90 } |
| 91 | 91 |
| 92 // Perform a concatenation of the matrices (this * secondMatrix) | 92 // Perform a concatenation of the matrices (this * secondMatrix) |
| 93 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) c
onst | 93 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) c
onst |
| 94 { | 94 { |
| 95 if (!secondMatrix) | 95 if (!secondMatrix) |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 blink | 192 } // namespace blink |
| OLD | NEW |