From 135e16cd8ebb2ba30458b284d4a17e1eea81ad35 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Thu, 13 Dec 2012 21:53:41 +0000 Subject: revert 6798 (assert in GM) git-svn-id: http://skia.googlecode.com/svn/trunk@6802 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkShader.h | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) (limited to 'include/core/SkShader.h') diff --git a/include/core/SkShader.h b/include/core/SkShader.h index 7edbe6fd4b..1286177271 100644 --- a/include/core/SkShader.h +++ b/include/core/SkShader.h @@ -139,28 +139,11 @@ public: /** * Called once before drawing, with the current paint and device matrix. * Return true if your shader supports these parameters, or false if not. - * If false is returned, nothing will be drawn. If true is returned, then - * a balancing call to endContext() will be made before the next call to - * setContext. - * - * Subclasses should be sure to call their INHERITED::setContext() if they - * override this method. + * If false is returned, nothing will be drawn. */ virtual bool setContext(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix); - /** - * Assuming setContext returned true, endContext() will be called when - * the draw using the shader has completed. It is an error for setContext - * to be called twice w/o an intervening call to endContext(). - * - * Subclasses should be sure to call their INHERITED::endContext() if they - * override this method. - */ - virtual void endContext(); - - SkDEBUGCODE(bool setContextHasBeenCalled() const { return fInSetContext; }) - /** * Called for each span of the object being drawn. Your subclass should * set the appropriate colors (with premultiplied alpha) that correspond @@ -199,6 +182,14 @@ public: return (flags & kHasSpan16_Flag) != 0; } + /** + * Called before a session using the shader begins. Some shaders override + * this to defer some of their work (like calling bitmap.lockPixels()). + * Must be balanced by a call to endSession. + */ + virtual void beginSession(); + virtual void endSession(); + /** Gives method bitmap should be read to implement a shader. Also determines number and interpretation of "extra" parameters returned @@ -364,7 +355,7 @@ private: uint8_t fPaintAlpha; uint8_t fDeviceConfig; uint8_t fTotalInverseClass; - SkDEBUGCODE(SkBool8 fInSetContext;) + SkDEBUGCODE(SkBool8 fInSession;) static SkShader* CreateBitmapShader(const SkBitmap& src, TileMode, TileMode, -- cgit v1.2.3