Index: third_party/WebKit/Source/platform/transforms/TransformationMatrix.h |
diff --git a/third_party/WebKit/Source/platform/transforms/TransformationMatrix.h b/third_party/WebKit/Source/platform/transforms/TransformationMatrix.h |
index 64f47ad19f10260f110e144e6fb2a017e8605efa..14fdd36aa4b08541aabbf9513061c2fdc70f57d4 100644 |
--- a/third_party/WebKit/Source/platform/transforms/TransformationMatrix.h |
+++ b/third_party/WebKit/Source/platform/transforms/TransformationMatrix.h |
@@ -32,7 +32,8 @@ |
#include "wtf/Alignment.h" |
#include "wtf/Allocator.h" |
#include "wtf/CPU.h" |
-#include "wtf/PassOwnPtr.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
#include <string.h> // for memcpy |
namespace blink { |
@@ -61,24 +62,24 @@ public: |
typedef double Matrix4[4][4]; |
#endif |
- static PassOwnPtr<TransformationMatrix> create() |
+ static std::unique_ptr<TransformationMatrix> create() |
{ |
- return adoptPtr(new TransformationMatrix()); |
+ return wrapUnique(new TransformationMatrix()); |
} |
- static PassOwnPtr<TransformationMatrix> create(const TransformationMatrix& t) |
+ static std::unique_ptr<TransformationMatrix> create(const TransformationMatrix& t) |
{ |
- return adoptPtr(new TransformationMatrix(t)); |
+ return wrapUnique(new TransformationMatrix(t)); |
} |
- static PassOwnPtr<TransformationMatrix> create(double a, double b, double c, double d, double e, double f) |
+ static std::unique_ptr<TransformationMatrix> create(double a, double b, double c, double d, double e, double f) |
{ |
- return adoptPtr(new TransformationMatrix(a, b, c, d, e, f)); |
+ return wrapUnique(new TransformationMatrix(a, b, c, d, e, f)); |
} |
- static PassOwnPtr<TransformationMatrix> create(double m11, double m12, double m13, double m14, |
+ static std::unique_ptr<TransformationMatrix> create(double m11, double m12, double m13, double m14, |
double m21, double m22, double m23, double m24, |
double m31, double m32, double m33, double m34, |
double m41, double m42, double m43, double m44) |
{ |
- return adoptPtr(new TransformationMatrix(m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44)); |
+ return wrapUnique(new TransformationMatrix(m11, m12, m13, m14, m21, m22, m23, m24, m31, m32, m33, m34, m41, m42, m43, m44)); |
} |
TransformationMatrix() |