diff options
author | 2012-07-03 19:12:29 +0000 | |
---|---|---|
committer | 2012-07-03 19:12:29 +0000 | |
commit | 54823c227d383308fb1732e83b566df6272d4bfb (patch) | |
tree | dcf8e7de1bb4452ff1e5e683a5bee7375af1dd28 /include/gpu | |
parent | e38160c38c295a4d9cd2441727ebdc6e5f47e225 (diff) |
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
Diffstat (limited to 'include/gpu')
-rw-r--r-- | include/gpu/GrContext.h | 12 | ||||
-rw-r--r-- | include/gpu/SkGpuDevice.h | 9 |
2 files changed, 1 insertions, 20 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index f5b44bf628..d718637e04 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -683,18 +683,6 @@ public: void unlockStencilBuffer(GrResourceEntry* sbEntry); GrStencilBuffer* findStencilBuffer(int width, int height, int sampleCnt); - /* - * postClipPush acts as a hint to this and lower-level classes (e.g., - * GrGpu) that the clip stack has changed. - */ - virtual void postClipPush(); - - /* - * preClipPop acts as a hint that the clip stack has been restored to an - * earlier state. - */ - virtual void preClipPop(); - GrPathRenderer* getPathRenderer(const SkPath& path, GrPathFill fill, const GrDrawTarget* target, diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 124e7846fa..40444a975c 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -144,14 +144,7 @@ private: // used by createCompatibleDevice SkGpuDevice(GrContext*, GrTexture* texture, TexCache, bool needClear); - // overrides from SkDevice - virtual void postSave() SK_OVERRIDE { - fContext->postClipPush(); - } - virtual void preRestore() SK_OVERRIDE { - fContext->preClipPop(); - } - + // override from SkDevice virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config config, int width, int height, bool isOpaque, |