Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Unified Diff: third_party/WebKit/Source/core/dom/DOMMatrix.cpp

Issue 2516973002: [GeometryInferface] add Constructor(DOMString transformList). (Closed)
Patch Set: [GeometryInferface] add Constructor(DOMString transformList). Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/dom/DOMMatrix.h ('k') | third_party/WebKit/Source/core/dom/DOMMatrix.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5ec28a8ebd8505fecf4ab0fb7190ff5026c69ff2..59c6ae4412f04aa6c0f8c2c0e4fb043a1bee1217 100644
--- a/third_party/WebKit/Source/core/dom/DOMMatrix.cpp
+++ b/third_party/WebKit/Source/core/dom/DOMMatrix.cpp
@@ -4,14 +4,6 @@
#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) {
@@ -29,6 +21,13 @@ DOMMatrix* DOMMatrix::create(const SkMatrix44& matrix,
return new DOMMatrix(transformationMatrix, transformationMatrix.isAffine());
}
+DOMMatrix* DOMMatrix::create(const String& transformList,
+ ExceptionState& exceptionState) {
+ DOMMatrix* matrix = new DOMMatrix(TransformationMatrix());
+ matrix->setMatrixValueFromString(transformList, exceptionState);
+ return matrix;
+}
+
DOMMatrix* DOMMatrix::create(Vector<double> sequence,
ExceptionState& exceptionState) {
if (sequence.size() != 6 && sequence.size() != 16) {
@@ -261,50 +260,7 @@ DOMMatrix* DOMMatrix::invertSelf() {
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 || value->isCSSWideKeyword()) {
- exceptionState.throwDOMException(SyntaxError,
- "Failed to parse '" + inputString + "'.");
- return nullptr;
- }
-
- if (value->isIdentifierValue()) {
- DCHECK(toCSSIdentifierValue(value)->getValueID() == CSSValueNone);
- m_matrix->makeIdentity();
- m_is2D = true;
- return this;
- }
-
- if (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();
-
+ setMatrixValueFromString(inputString, exceptionState);
return this;
}
« no previous file with comments | « third_party/WebKit/Source/core/dom/DOMMatrix.h ('k') | third_party/WebKit/Source/core/dom/DOMMatrix.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698