Index: third_party/WebKit/Source/core/css/CSSMatrix.cpp |
diff --git a/third_party/WebKit/Source/core/css/CSSMatrix.cpp b/third_party/WebKit/Source/core/css/CSSMatrix.cpp |
index ea9fac2995731c74f07fdcfa1be23d36573280a2..e1011aed50e631924b2e7b6eb8f59c7349c53183 100644 |
--- a/third_party/WebKit/Source/core/css/CSSMatrix.cpp |
+++ b/third_party/WebKit/Source/core/css/CSSMatrix.cpp |
@@ -40,7 +40,7 @@ |
namespace blink { |
-RawPtr<CSSMatrix> CSSMatrix::create(ExecutionContext* executionContext, const String& s, ExceptionState& exceptionState) |
+CSSMatrix* CSSMatrix::create(ExecutionContext* executionContext, const String& s, ExceptionState& exceptionState) |
{ |
UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix); |
return new CSSMatrix(s, exceptionState); |
@@ -69,9 +69,9 @@ void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt |
if (string.isEmpty()) |
return; |
- if (RawPtr<CSSValue> value = CSSParser::parseSingleValue(CSSPropertyTransform, string)) { |
+ if (CSSValue* value = CSSParser::parseSingleValue(CSSPropertyTransform, string)) { |
// Check for a "none" transform. In these cases we can use the default identity matrix. |
- if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.get()))->getValueID() == CSSValueNone) |
+ if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value))->getValueID() == CSSValueNone) |
return; |
DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle()); |
@@ -90,7 +90,7 @@ void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt |
} |
// Perform a concatenation of the matrices (this * secondMatrix) |
-RawPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const |
+CSSMatrix* CSSMatrix::multiply(CSSMatrix* secondMatrix) const |
{ |
if (!secondMatrix) |
return nullptr; |
@@ -98,7 +98,7 @@ RawPtr<CSSMatrix> CSSMatrix::multiply(CSSMatrix* secondMatrix) const |
return CSSMatrix::create(TransformationMatrix(*m_matrix).multiply(*secondMatrix->m_matrix)); |
} |
-RawPtr<CSSMatrix> CSSMatrix::inverse(ExceptionState& exceptionState) const |
+CSSMatrix* CSSMatrix::inverse(ExceptionState& exceptionState) const |
{ |
if (!m_matrix->isInvertible()) { |
exceptionState.throwDOMException(NotSupportedError, "The matrix is not invertable."); |
@@ -108,7 +108,7 @@ RawPtr<CSSMatrix> CSSMatrix::inverse(ExceptionState& exceptionState) const |
return CSSMatrix::create(m_matrix->inverse()); |
} |
-RawPtr<CSSMatrix> CSSMatrix::translate(double x, double y, double z) const |
+CSSMatrix* CSSMatrix::translate(double x, double y, double z) const |
{ |
if (std::isnan(x)) |
x = 0; |
@@ -119,7 +119,7 @@ RawPtr<CSSMatrix> CSSMatrix::translate(double x, double y, double z) const |
return CSSMatrix::create(TransformationMatrix(*m_matrix).translate3d(x, y, z)); |
} |
-RawPtr<CSSMatrix> CSSMatrix::scale(double scaleX, double scaleY, double scaleZ) const |
+CSSMatrix* CSSMatrix::scale(double scaleX, double scaleY, double scaleZ) const |
{ |
if (std::isnan(scaleX)) |
scaleX = 1; |
@@ -130,7 +130,7 @@ RawPtr<CSSMatrix> CSSMatrix::scale(double scaleX, double scaleY, double scaleZ) |
return CSSMatrix::create(TransformationMatrix(*m_matrix).scale3d(scaleX, scaleY, scaleZ)); |
} |
-RawPtr<CSSMatrix> CSSMatrix::rotate(double rotX, double rotY, double rotZ) const |
+CSSMatrix* CSSMatrix::rotate(double rotX, double rotY, double rotZ) const |
{ |
if (std::isnan(rotX)) |
rotX = 0; |
@@ -148,7 +148,7 @@ RawPtr<CSSMatrix> CSSMatrix::rotate(double rotX, double rotY, double rotZ) const |
return CSSMatrix::create(TransformationMatrix(*m_matrix).rotate3d(rotX, rotY, rotZ)); |
} |
-RawPtr<CSSMatrix> CSSMatrix::rotateAxisAngle(double x, double y, double z, double angle) const |
+CSSMatrix* CSSMatrix::rotateAxisAngle(double x, double y, double z, double angle) const |
{ |
if (std::isnan(x)) |
x = 0; |
@@ -163,14 +163,14 @@ RawPtr<CSSMatrix> CSSMatrix::rotateAxisAngle(double x, double y, double z, doubl |
return CSSMatrix::create(TransformationMatrix(*m_matrix).rotate3d(x, y, z, angle)); |
} |
-RawPtr<CSSMatrix> CSSMatrix::skewX(double angle) const |
+CSSMatrix* CSSMatrix::skewX(double angle) const |
{ |
if (std::isnan(angle)) |
angle = 0; |
return CSSMatrix::create(TransformationMatrix(*m_matrix).skewX(angle)); |
} |
-RawPtr<CSSMatrix> CSSMatrix::skewY(double angle) const |
+CSSMatrix* CSSMatrix::skewY(double angle) const |
{ |
if (std::isnan(angle)) |
angle = 0; |