Revert "add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning"

This reverts commit 1d22c4aaf9d8f053f25194a1ed74b137bfb19497.

git-svn-id: http://skia.googlecode.com/svn/trunk@12056 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 11 insertions, 49 deletions

diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp
index 13169971c4..a4b36d8945 100644
--- a/bench/Matrix44Bench.cpp
+++ b/bench/Matrix44Bench.cpp
@@ -13,7 +13,7 @@
 class Matrix44Bench : public SkBenchmark {
     SkString    fName;
 public:
-    Matrix44Bench(const char name[]) {
+    Matrix44Bench(const char name[])  {
         fName.printf("matrix44_%s", name);
         fIsRendering = false;
     }
@@ -39,12 +39,7 @@ private:
 
 class EqualsMatrix44Bench : public Matrix44Bench {
 public:
-    EqualsMatrix44Bench()
-        : INHERITED("equals")
-        , fM0(SkMatrix44::kIdentity_Constructor)
-        , fM1(SkMatrix44::kIdentity_Constructor)
-        , fM2(SkMatrix44::kIdentity_Constructor)
-    {
+    EqualsMatrix44Bench() : INHERITED("equals") {
         fM1.set(0, 0, 0);
         fM2.set(3, 3, 0);
     }
@@ -63,10 +58,7 @@ private:
 
 class SetIdentityMatrix44Bench : public Matrix44Bench {
 public:
-    SetIdentityMatrix44Bench()
-        : INHERITED("setidentity")
-        , mat(SkMatrix44::kIdentity_Constructor)
-    {
+    SetIdentityMatrix44Bench() : INHERITED("setidentity") {
         double rowMajor[16] =
                 { 1, 2, 3, 4,
                   5, 6, 7, 8,
@@ -87,10 +79,7 @@ private:
 
 class PreScaleMatrix44Bench : public Matrix44Bench {
 public:
-    PreScaleMatrix44Bench()
-        : INHERITED("prescale")
-        , fM0(SkMatrix44::kUninitialized_Constructor)
-    {
+    PreScaleMatrix44Bench() : INHERITED("prescale") {
         fX = fY = fZ = SkDoubleToMScalar(1.5);
     }
 protected:
@@ -108,11 +97,7 @@ private:
 
 class InvertMatrix44Bench : public Matrix44Bench {
 public:
-    InvertMatrix44Bench()
-        : INHERITED("invert")
-        , fM0(SkMatrix44::kUninitialized_Constructor)
-        , fM1(SkMatrix44::kUninitialized_Constructor)
-    {
+    InvertMatrix44Bench() : INHERITED("invert") {
         fM0.set(0, 0, -1.1);
         fM0.set(0, 1, 2.1);
         fM0.set(0, 2, -3.1);
@@ -143,11 +128,7 @@ private:
 
 class InvertAffineMatrix44Bench : public Matrix44Bench {
 public:
-    InvertAffineMatrix44Bench()
-        : INHERITED("invertaffine")
-        , fM0(SkMatrix44::kIdentity_Constructor)
-        , fM1(SkMatrix44::kUninitialized_Constructor)
-    {
+    InvertAffineMatrix44Bench() : INHERITED("invertaffine") {
         fM0.set(0, 0, -1.1);
         fM0.set(0, 1, 2.1);
         fM0.set(0, 2, -3.1);
@@ -175,11 +156,7 @@ private:
 
 class InvertScaleTranslateMatrix44Bench : public Matrix44Bench {
 public:
-    InvertScaleTranslateMatrix44Bench()
-        : INHERITED("invertscaletranslate")
-        , fM0(SkMatrix44::kIdentity_Constructor)
-        , fM1(SkMatrix44::kUninitialized_Constructor)
-    {
+    InvertScaleTranslateMatrix44Bench() : INHERITED("invertscaletranslate") {
         fM0.set(0, 0, -1.1);
         fM0.set(0, 3, 4.1);
 
@@ -202,11 +179,7 @@ private:
 
 class InvertTranslateMatrix44Bench : public Matrix44Bench {
 public:
-    InvertTranslateMatrix44Bench()
-        : INHERITED("inverttranslate")
-        , fM0(SkMatrix44::kIdentity_Constructor)
-        , fM1(SkMatrix44::kUninitialized_Constructor)
-    {
+    InvertTranslateMatrix44Bench() : INHERITED("inverttranslate") {
         fM0.set(0, 3, 4.1);
         fM0.set(1, 3, 8.1);
         fM0.set(2, 3, -12.1);
@@ -224,10 +197,7 @@ private:
 
 class PostScaleMatrix44Bench : public Matrix44Bench {
 public:
-    PostScaleMatrix44Bench()
-        : INHERITED("postscale")
-        , fM0(SkMatrix44::kUninitialized_Constructor)
-    {
+    PostScaleMatrix44Bench() : INHERITED("postscale") {
         fX = fY = fZ = SkDoubleToMScalar(1.5);
     }
 protected:
@@ -245,12 +215,7 @@ private:
 
 class SetConcatMatrix44Bench : public Matrix44Bench {
 public:
-    SetConcatMatrix44Bench()
-        : INHERITED("setconcat")
-        , fM0(SkMatrix44::kUninitialized_Constructor)
-        , fM1(SkMatrix44::kUninitialized_Constructor)
-        , fM2(SkMatrix44::kUninitialized_Constructor)
-{
+    SetConcatMatrix44Bench() : INHERITED("setconcat") {
         fX = fY = fZ = SkDoubleToMScalar(1.5);
         fM1.setScale(fX, fY, fZ);
         fM2.setTranslate(fX, fY, fZ);
@@ -270,10 +235,7 @@ private:
 
 class GetTypeMatrix44Bench : public Matrix44Bench {
 public:
-    GetTypeMatrix44Bench()
-        : INHERITED("gettype")
-        , fMatrix(SkMatrix44::kIdentity_Constructor)
-    {}
+    GetTypeMatrix44Bench() : INHERITED("gettype") {}
 protected:
     // Putting random generation of the matrix inside performTest()
     // would help us avoid anomalous runs, but takes up 25% or