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

Unified Diff: sky/engine/core/css/CSSMatrix.cpp

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/css/CSSMatrix.h ('k') | sky/engine/core/css/CSSPrimitiveValue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/css/CSSMatrix.cpp
diff --git a/sky/engine/core/css/CSSMatrix.cpp b/sky/engine/core/css/CSSMatrix.cpp
index 23216210bcc6d21c75a7301fa5841288f725fd9d..64769b3eeb8ed9e796d0233f5f51bb46414e7298 100644
--- a/sky/engine/core/css/CSSMatrix.cpp
+++ b/sky/engine/core/css/CSSMatrix.cpp
@@ -28,7 +28,7 @@
#include "gen/sky/core/CSSPropertyNames.h"
#include "gen/sky/core/CSSValueKeywords.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
#include "sky/engine/core/css/CSSToLengthConversionData.h"
#include "sky/engine/core/css/StylePropertySet.h"
#include "sky/engine/core/css/parser/BisonCSSParser.h"
@@ -69,21 +69,21 @@ void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt
DEFINE_STATIC_REF(RenderStyle, defaultStyle, RenderStyle::createDefaultStyle());
TransformOperations operations;
if (!TransformBuilder::createTransformOperations(value.get(), CSSToLengthConversionData(defaultStyle, 0), operations)) {
- exceptionState.throwDOMException(SyntaxError, "Failed to interpret '" + string + "' as a transformation operation.");
+ exceptionState.ThrowDOMException(SyntaxError, "Failed to interpret '" + string + "' as a transformation operation.");
return;
}
// Convert transform operations to a TransformationMatrix. This can fail
// if a param has a percentage ('%')
if (operations.dependsOnBoxSize())
- exceptionState.throwDOMException(SyntaxError, "The transformation depends on the box size, which is not supported.");
+ exceptionState.ThrowDOMException(SyntaxError, "The transformation depends on the box size, which is not supported.");
TransformationMatrix t;
operations.apply(FloatSize(0, 0), t);
// set the matrix
m_matrix = t;
} else { // There is something there but parsing failed.
- exceptionState.throwDOMException(SyntaxError, "Failed to parse '" + string + "'.");
+ exceptionState.ThrowDOMException(SyntaxError, "Failed to parse '" + string + "'.");
}
}
@@ -99,7 +99,7 @@ PassRefPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const
PassRefPtr<CSSMatrix> CSSMatrix::inverse(ExceptionState& exceptionState) const
{
if (!m_matrix.isInvertible()) {
- exceptionState.throwDOMException(NotSupportedError, "The matrix is not invertable.");
+ exceptionState.ThrowDOMException(NotSupportedError, "The matrix is not invertable.");
return nullptr;
}
« no previous file with comments | « sky/engine/core/css/CSSMatrix.h ('k') | sky/engine/core/css/CSSPrimitiveValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698