Make a separate path renderer object. Move enum types to GrTypes.h

Review URL http://codereview.appspot.com/4167067/



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

1 files changed, 5 insertions, 5 deletions

diff --git a/gpu/include/GrPaint.h b/gpu/include/GrPaint.h
index 770647adc4..a34cbaf445 100644
--- a/gpu/include/GrPaint.h
+++ b/gpu/include/GrPaint.h
@@ -18,8 +18,8 @@
 #define GrPaint_DEFINED

 

 #include "GrTexture.h"

+#include "GrColor.h"

 #include "GrSamplerState.h"

-#include "GrDrawTarget.h"

 

 /**

  * The paint describes how pixels are colored when the context draws to

@@ -29,8 +29,8 @@ class GrPaint {
 public:

 

     // All the paint fields are public except texture (it's ref-counted)

-    GrDrawTarget::BlendCoeff    fSrcBlendCoeff;

-    GrDrawTarget::BlendCoeff    fDstBlendCoeff;

+    GrBlendCoeff                fSrcBlendCoeff;

+    GrBlendCoeff                fDstBlendCoeff;

     bool                        fAntiAlias;

     bool                        fDither;

 

@@ -80,8 +80,8 @@ private:
     GrTexture*      fTexture;

 

     void resetBlend() {

-        fSrcBlendCoeff = GrDrawTarget::kOne_BlendCoeff;

-        fDstBlendCoeff = GrDrawTarget::kZero_BlendCoeff;

+        fSrcBlendCoeff = kOne_BlendCoeff;

+        fDstBlendCoeff = kZero_BlendCoeff;

     }

 

     void resetOptions() {