| 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 16 matching lines...) Expand all Loading... |
| 27 #include "core/css/CSSMatrix.h" | 27 #include "core/css/CSSMatrix.h" |
| 28 | 28 |
| 29 #include "bindings/core/v8/ExceptionState.h" | 29 #include "bindings/core/v8/ExceptionState.h" |
| 30 #include "core/CSSPropertyNames.h" | 30 #include "core/CSSPropertyNames.h" |
| 31 #include "core/CSSValueKeywords.h" | 31 #include "core/CSSValueKeywords.h" |
| 32 #include "core/css/CSSToLengthConversionData.h" | 32 #include "core/css/CSSToLengthConversionData.h" |
| 33 #include "core/css/StylePropertySet.h" | 33 #include "core/css/StylePropertySet.h" |
| 34 #include "core/css/parser/CSSParser.h" | 34 #include "core/css/parser/CSSParser.h" |
| 35 #include "core/css/resolver/TransformBuilder.h" | 35 #include "core/css/resolver/TransformBuilder.h" |
| 36 #include "core/dom/ExceptionCode.h" | 36 #include "core/dom/ExceptionCode.h" |
| 37 #include "core/frame/UseCounter.h" |
| 37 #include "core/rendering/style/RenderStyle.h" | 38 #include "core/rendering/style/RenderStyle.h" |
| 38 #include "core/rendering/style/StyleInheritedData.h" | 39 #include "core/rendering/style/StyleInheritedData.h" |
| 39 #include "wtf/MathExtras.h" | 40 #include "wtf/MathExtras.h" |
| 40 | 41 |
| 41 namespace blink { | 42 namespace blink { |
| 42 | 43 |
| 44 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::create(ExecutionContext* executionC
ontext, const String& s, ExceptionState& exceptionState) |
| 45 { |
| 46 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix); |
| 47 return adoptRefWillBeNoop(new CSSMatrix(s, exceptionState)); |
| 48 } |
| 49 |
| 43 CSSMatrix::CSSMatrix(const TransformationMatrix& m) | 50 CSSMatrix::CSSMatrix(const TransformationMatrix& m) |
| 44 : m_matrix(m) | 51 : m_matrix(m) |
| 45 { | 52 { |
| 46 } | 53 } |
| 47 | 54 |
| 48 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState) | 55 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState) |
| 49 { | 56 { |
| 50 setMatrixValue(s, exceptionState); | 57 setMatrixValue(s, exceptionState); |
| 51 } | 58 } |
| 52 | 59 |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 if (m_matrix.isAffine()) | 184 if (m_matrix.isAffine()) |
| 178 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()); |
| 179 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)", |
| 180 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(), |
| 181 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(), |
| 182 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(), |
| 183 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()); |
| 184 } | 191 } |
| 185 | 192 |
| 186 } // namespace blink | 193 } // namespace blink |
| OLD | NEW |