Rolling back r4034 (Proposed plumbing to propagate save & restore)

http://codereview.appspot.com/6346066/



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

4 files changed, 0 insertions, 29 deletions

diff --git a/src/gpu/GrClipMaskManager.h b/src/gpu/GrClipMaskManager.h
index 00ca642262..bb597ba63f 100644
--- a/src/gpu/GrClipMaskManager.h
+++ b/src/gpu/GrClipMaskManager.h
@@ -297,17 +297,6 @@ public:
         }
     }
 
-    void postClipPush() {
-        // TODO: make sure that, if the clip stack is unaltered, the 
-        // prior clip mask is reused (i.e., a push w/ no change to the 
-        // clip stack)
-        fAACache.push();
-    }
-
-    void preClipPop() {
-        fAACache.pop();
-    }
-
     void setContext(GrContext* context) {
         fAACache.setContext(context);
     }
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 076079928b..6326f4d24e 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1973,12 +1973,4 @@ GrTexture* GrContext::applyMorphology(GrTexture* srcTexture,
     return srcTexture;
 }
 
-void GrContext::postClipPush() {
-    fGpu->postClipPush();
-}
-
-void GrContext::preClipPop() {
-    fGpu->preClipPop();
-};
-
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 9b9be64832..66256cf877 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -191,9 +191,6 @@ public:
 
     static bool StageUsesTexCoords(GrVertexLayout layout, int stage);
 
-    virtual void postClipPush() {};
-    virtual void preClipPop() {};
-
 private:
     static const int TEX_COORD_BIT_CNT = GrDrawState::kNumStages *
                                          GrDrawState::kMaxTexCoords;
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h
index 5c21b55edf..f502dba23d 100644
--- a/src/gpu/GrGpu.h
+++ b/src/gpu/GrGpu.h
@@ -362,13 +362,6 @@ public:
                                                  // clipping.
     };
 
-    virtual void postClipPush() SK_OVERRIDE {
-        fClipMaskManager.postClipPush();
-    }
-    virtual void preClipPop() SK_OVERRIDE {
-        fClipMaskManager.preClipPop();
-    }
-
 protected:
     enum DrawType {
         kDrawPoints_DrawType,