Remove texture/mask setters on GrPaint

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



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

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index e14456a966..8e3fb09a46 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1551,9 +1551,8 @@ void GrContext::setPaint(const GrPaint& paint) {
 
     for (int i = 0; i < GrPaint::kMaxTextures; ++i) {
         int s = i + GrPaint::kFirstTextureStage;
-        ASSERT_OWNED_RESOURCE(paint.getTexture(i));
         if (paint.isTextureStageEnabled(i)) {
-            fDrawState->setTexture(s, paint.getTexture(i));
+            fDrawState->setTexture(s, NULL);
             *fDrawState->sampler(s) = paint.getTextureSampler(i);
         }
     }
@@ -1562,9 +1561,8 @@ void GrContext::setPaint(const GrPaint& paint) {
 
     for (int i = 0; i < GrPaint::kMaxMasks; ++i) {
         int s = i + GrPaint::kFirstMaskStage;
-        ASSERT_OWNED_RESOURCE(paint.getMask(i));
         if (paint.isMaskStageEnabled(i)) {
-            fDrawState->setTexture(s, paint.getMask(i));
+            fDrawState->setTexture(s, NULL);
             *fDrawState->sampler(s) = paint.getMaskSampler(i);
         }
     }