remove dead SkPersp macros

include/core/SkMatrix.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMatrix_DEFINED
 #define SkMatrix_DEFINED
 
 #include "SkRect.h"
 
 class SkString;
 
-// TODO: can we remove these 3 (need to check chrome/android)
-typedef SkScalar SkPersp;
-#define SkScalarToPersp(x) (x)
-#define SkPerspToScalar(x) (x)
-
 /** \class SkMatrix
 
     The SkMatrix class holds a 3x3 matrix for transforming coordinates.
     SkMatrix does not have a constructor, so it must be explicitly initialized
     using either reset() - to construct an identity matrix, or one of the set
     functions (e.g. setTranslate, setRotate, etc.).
 */
 class SK_API SkMatrix {
 public:
     /** Enum of bit fields for the mask return by getType().
@@ skipping 96 matching lines @@
         SkASSERT((unsigned)index < 9);
         return fMat[index];
     }
 
     SkScalar getScaleX() const { return fMat[kMScaleX]; }
     SkScalar getScaleY() const { return fMat[kMScaleY]; }
     SkScalar getSkewY() const { return fMat[kMSkewY]; }
     SkScalar getSkewX() const { return fMat[kMSkewX]; }
     SkScalar getTranslateX() const { return fMat[kMTransX]; }
     SkScalar getTranslateY() const { return fMat[kMTransY]; }
-    SkPersp getPerspX() const { return fMat[kMPersp0]; }
-    SkPersp getPerspY() const { return fMat[kMPersp1]; }
+    SkScalar getPerspX() const { return fMat[kMPersp0]; }
+    SkScalar getPerspY() const { return fMat[kMPersp1]; }
 
     SkScalar& operator[](int index) {
         SkASSERT((unsigned)index < 9);
         this->setTypeMask(kUnknown_Mask);
         return fMat[index];
     }
 
     void set(int index, SkScalar value) {
         SkASSERT((unsigned)index < 9);
         fMat[index] = value;
         this->setTypeMask(kUnknown_Mask);
     }
 
     void setScaleX(SkScalar v) { this->set(kMScaleX, v); }
     void setScaleY(SkScalar v) { this->set(kMScaleY, v); }
     void setSkewY(SkScalar v) { this->set(kMSkewY, v); }
     void setSkewX(SkScalar v) { this->set(kMSkewX, v); }
     void setTranslateX(SkScalar v) { this->set(kMTransX, v); }
     void setTranslateY(SkScalar v) { this->set(kMTransY, v); }
-    void setPerspX(SkPersp v) { this->set(kMPersp0, v); }
-    void setPerspY(SkPersp v) { this->set(kMPersp1, v); }
+    void setPerspX(SkScalar v) { this->set(kMPersp0, v); }
+    void setPerspY(SkScalar v) { this->set(kMPersp1, v); }
 
-    void setAll(SkScalar scaleX, SkScalar skewX, SkScalar transX,
-                SkScalar skewY, SkScalar scaleY, SkScalar transY,
-                SkPersp persp0, SkPersp persp1, SkPersp persp2) {
+    void setAll(SkScalar scaleX, SkScalar skewX,  SkScalar transX,
+                SkScalar skewY,  SkScalar scaleY, SkScalar transY,
+                SkScalar persp0, SkScalar persp1, SkScalar persp2) {
         fMat[kMScaleX] = scaleX;
         fMat[kMSkewX]  = skewX;
         fMat[kMTransX] = transX;
         fMat[kMSkewY]  = skewY;
         fMat[kMScaleY] = scaleY;
         fMat[kMTransY] = transY;
         fMat[kMPersp0] = persp0;
         fMat[kMPersp1] = persp1;
         fMat[kMPersp2] = persp2;
         this->setTypeMask(kUnknown_Mask);
@@ skipping 584 matching lines @@
     static void RotTrans_pts(const SkMatrix&, SkPoint dst[], const SkPoint[],
                              int count);
     static void Persp_pts(const SkMatrix&, SkPoint dst[], const SkPoint[], int);
 
     static const MapPtsProc gMapPtsProcs[];
 
     friend class SkPerspIter;
 };
 
 #endif