diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-13 21:53:41 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-13 21:53:41 +0000 |
| commit | 135e16cd8ebb2ba30458b284d4a17e1eea81ad35 (patch) | |
| tree | 1738da6c7015a4828d782ba31cbf170587a01643 /include/core/SkComposeShader.h | |
| parent | 2a3f08b0a71d044ba48694ed04b3dc1ce846e9d9 (diff) | |
revert 6798 (assert in GM)
git-svn-id: http://skia.googlecode.com/svn/trunk@6802 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkComposeShader.h')
| -rw-r--r-- | include/core/SkComposeShader.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h index b0790bf393..a8a8e0bb60 100644 --- a/include/core/SkComposeShader.h +++ b/include/core/SkComposeShader.h @@ -34,10 +34,11 @@ public: SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL); virtual ~SkComposeShader(); - virtual bool setContext(const SkBitmap&, const SkPaint&, - const SkMatrix&) SK_OVERRIDE; - virtual void endContext() SK_OVERRIDE; - virtual void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; + // override + virtual bool setContext(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix); + virtual void shadeSpan(int x, int y, SkPMColor result[], int count); + virtual void beginSession(); + virtual void endSession(); SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) |