Chromium Code Reviews| Index: third_party/WebKit/Source/core/dom/DOMMatrix.cpp |
| diff --git a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp b/third_party/WebKit/Source/core/dom/DOMMatrix.cpp |
| index 966810654a5eed9950886b24b46a341f051a327b..d1b78b3410ba8ef084c8c8bb20b0975fb7a2b4c9 100644 |
| --- a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp |
| +++ b/third_party/WebKit/Source/core/dom/DOMMatrix.cpp |
| @@ -4,6 +4,14 @@ |
| #include "core/dom/DOMMatrix.h" |
| +#include "core/css/CSSIdentifierValue.h" |
| +#include "core/css/CSSToLengthConversionData.h" |
| +#include "core/css/CSSValueList.h" |
| +#include "core/css/parser/CSSParser.h" |
| +#include "core/css/resolver/TransformBuilder.h" |
| +#include "core/layout/api/LayoutViewItem.h" |
| +#include "core/style/ComputedStyle.h" |
| + |
| namespace blink { |
| DOMMatrix* DOMMatrix::create(ExceptionState& exceptionState) { |
| @@ -245,4 +253,61 @@ DOMMatrix* DOMMatrix::invertSelf() { |
| return this; |
| } |
| +DOMMatrix* DOMMatrix::setMatrixValue(const String& inputString, |
| + ExceptionState& exceptionState) { |
| + DEFINE_STATIC_LOCAL(String, identityMatrix2D, ("matrix(1, 0, 0, 1, 0, 0)")); |
| + String string = inputString; |
| + if (string.isEmpty()) |
| + string = identityMatrix2D; |
| + |
| + const CSSValue* value = |
| + CSSParser::parseSingleValue(CSSPropertyTransform, string); |
| + |
| + if (!value) { |
| + exceptionState.throwDOMException(SyntaxError, |
| + "Failed to parse '" + inputString + "'."); |
| + return nullptr; |
| + } |
| + |
| + if (value->isIdentifierValue()) { |
| + if ((toCSSIdentifierValue(value))->getValueID() == CSSValueNone) { |
| + m_matrix->makeIdentity(); |
| + m_is2D = true; |
| + return this; |
| + } |
| + } else { |
| + if (!value->isValueList()) { |
| + exceptionState.throwDOMException( |
|
Timothy Loh
2016/10/27 02:38:42
Does this exception ever get thrown? From what I c
Hwanseung Lee
2016/10/27 16:24:48
when we don't check value->isValueList(), it will
Timothy Loh
2016/10/28 02:50:04
My point here is that in the code we should make i
Hwanseung Lee
2016/10/28 12:17:58
Done.
|
| + SyntaxError, "Failed to parse '" + inputString + "'."); |
| + return nullptr; |
| + } |
| + } |
| + |
| + if (value->isValueList() && |
| + TransformBuilder::hasRelativeLengths(toCSSValueList(*value))) { |
| + exceptionState.throwDOMException(SyntaxError, |
| + "Relative lengths not supported."); |
| + return nullptr; |
| + } |
| + |
| + const ComputedStyle& initialStyle = ComputedStyle::initialStyle(); |
| + TransformOperations operations = TransformBuilder::createTransformOperations( |
| + *value, CSSToLengthConversionData(&initialStyle, &initialStyle, |
| + LayoutViewItem(nullptr), 1.0f)); |
| + |
| + if (operations.dependsOnBoxSize()) { |
| + exceptionState.throwDOMException(SyntaxError, |
| + "The transformation depends on the box " |
| + "size, which is not supported."); |
| + return nullptr; |
| + } |
| + |
| + m_matrix->makeIdentity(); |
| + operations.apply(FloatSize(0, 0), *m_matrix); |
| + |
| + m_is2D = !operations.has3DOperation(); |
| + |
| + return this; |
| +} |
| + |
| } // namespace blink |