commit b9086a026844e4cfd08b219e49ce3f12294cba98
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 18:02:54 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Nov 01 18:02:54 2012 +0000
tree 1f97e490ba203d8717d70a5cae5571efef8a495b
parent db2e25a7d45d8a63ed87af96e5d1bf7577ff48fe

Replace GrMatrix with SkMatrix.
Review URL: https://codereview.appspot.com/6814067

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

src/gpu/effects/GrConfigConversionEffect.cpp

diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index 29ba405..7ccea74 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -221,7 +221,7 @@
 bool GrConfigConversionEffect::InstallEffect(GrTexture* texture,
                                              bool swapRedAndBlue,
                                              PMConversion pmConversion,
-                                             const GrMatrix& matrix,
+                                             const SkMatrix& matrix,
                                              GrEffectStage* stage) {
     if (!swapRedAndBlue && kNone_PMConversion == pmConversion) {
         // If we returned a GrConfigConversionEffect that was equivalent to a GrSingleTextureEffect

src/gpu/effects/GrConfigConversionEffect.h

diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index 5b531d4..6a10c25 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -37,7 +37,7 @@
     static bool InstallEffect(GrTexture*,
                               bool swapRedAndBlue,
                               PMConversion pmConversion,
-                              const GrMatrix& matrix,
+                              const SkMatrix& matrix,
                               GrEffectStage* stage);
 
     static const char* Name() { return "Config Conversion"; }

src/gpu/effects/GrSingleTextureEffect.cpp

diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp
index 0f3b614..0afa184 100644
--- a/src/gpu/effects/GrSingleTextureEffect.cpp
+++ b/src/gpu/effects/GrSingleTextureEffect.cpp
@@ -77,20 +77,20 @@
     fMatrix.reset();
 }
 
-GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const GrMatrix& m)
+GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const SkMatrix& m)
     : INHERITED(1)
     , fTextureAccess(texture)
     , fMatrix(m) {
 }
 
-GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const GrMatrix& m, bool bilerp)
+GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture, const SkMatrix& m, bool bilerp)
     : INHERITED(1)
     , fTextureAccess(texture, bilerp)
     , fMatrix(m) {
 }
 
 GrSingleTextureEffect::GrSingleTextureEffect(GrTexture* texture,
-                                             const GrMatrix& m,
+                                             const SkMatrix& m,
                                              const GrTextureParams& params)
     : INHERITED(1)
     , fTextureAccess(texture, params)

src/gpu/effects/GrSingleTextureEffect.h

diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h
index 23b416d..e598f2f 100644
--- a/src/gpu/effects/GrSingleTextureEffect.h
+++ b/src/gpu/effects/GrSingleTextureEffect.h
@@ -9,7 +9,7 @@
 #define GrSingleTextureEffect_DEFINED
 
 #include "GrEffect.h"
-#include "GrMatrix.h"
+#include "SkMatrix.h"
 
 class GrGLSingleTextureEffect;
 
@@ -25,9 +25,9 @@
     GrSingleTextureEffect(GrTexture* texture, const GrTextureParams&);
 
     /** These three constructors take an explicit matrix */
-    GrSingleTextureEffect(GrTexture*, const GrMatrix&); /* unfiltered, clamp mode */
-    GrSingleTextureEffect(GrTexture*, const GrMatrix&, bool bilerp); /* clamp mode */
-    GrSingleTextureEffect(GrTexture*, const GrMatrix&, const GrTextureParams&);
+    GrSingleTextureEffect(GrTexture*, const SkMatrix&); /* unfiltered, clamp mode */
+    GrSingleTextureEffect(GrTexture*, const SkMatrix&, bool bilerp); /* clamp mode */
+    GrSingleTextureEffect(GrTexture*, const SkMatrix&, const GrTextureParams&);
 
     virtual ~GrSingleTextureEffect();
 
@@ -35,7 +35,7 @@
 
     static const char* Name() { return "Single Texture"; }
 
-    const GrMatrix& getMatrix() const { return fMatrix; }
+    const SkMatrix& getMatrix() const { return fMatrix; }
 
     typedef GrGLSingleTextureEffect GLEffect;
 
@@ -49,7 +49,7 @@
     GR_DECLARE_EFFECT_TEST;
 
     GrTextureAccess fTextureAccess;
-    GrMatrix        fMatrix;
+    SkMatrix        fMatrix;
 
     typedef GrEffect INHERITED;
 };