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

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

Issue 2380713004: [GeometryInterface] Add setMatrixValue(transfromList) function. (Closed)
Patch Set: [GeometryInterface] Add setMatrixValue(transfromList) function. Created 4 years, 2 months 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
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 0e77259c9af33e0ffc0c6bc1bd47d0ce23edab1a..63d9226b4c95c33c1c3abd6993cf61a9485fe0b9 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) {
@@ -215,4 +223,62 @@ 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) {
+ return this;
+ }
+ } else {
+ if (!value->isValueList()) {
+ exceptionState.throwDOMException(
+ SyntaxError, "Failed to parse '" + inputString + "'.");
+ return nullptr;
+ }
+ }
+
+ DEFINE_STATIC_REF(ComputedStyle, initialStyle,
+ ComputedStyle::clone(ComputedStyle::initialStyle()));
Timothy Loh 2016/10/25 04:48:01 We don't need to clone this at all, just use Compu
Hwanseung Lee 2016/10/27 16:24:48 Done.
+ if (value->isValueList() &&
+ TransformBuilder::hasRelativeLengths(toCSSValueList(*value))) {
+ exceptionState.throwDOMException(SyntaxError,
+ "Relative lengths not supported.");
+ return nullptr;
+ }
+
+ TransformOperations operations;
+ TransformBuilder::createTransformOperations(
+ *value, CSSToLengthConversionData(initialStyle, initialStyle,
+ LayoutViewItem(nullptr), 1.0f),
+ operations);
+
+ if (operations.dependsOnBoxSize()) {
+ exceptionState.throwDOMException(SyntaxError,
+ "The transformation depends on the box "
+ "size, which is not supported.");
+ return nullptr;
+ }
+
+ m_is2D = !operations.has3DOperation();
+
+ m_matrix = TransformationMatrix::create();
Timothy Loh 2016/10/25 04:48:01 It's probably better to just call makeIdentity() i
Hwanseung Lee 2016/10/26 14:51:43 Done.
+ operations.apply(FloatSize(0, 0), *m_matrix);
+
+ return this;
+}
+
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698