diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-13 22:16:30 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-12-13 22:16:30 +0000 |
| commit | a641f3f18e5319773989812a888f3fad49e4f2ad (patch) | |
| tree | d090e4695e6f7970db27bdac351b3dfcccb02ec2 /include/core/SkComposeShader.h | |
| parent | cbcef708914f3b5e9bb63ad3d87261378026e29b (diff) | |
reland 6798 w/ fix for bitmap-as-mask pixel-locking
git-svn-id: http://skia.googlecode.com/svn/trunk@6806 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkComposeShader.h')
| -rw-r--r-- | include/core/SkComposeShader.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/core/SkComposeShader.h b/include/core/SkComposeShader.h index a8a8e0bb60..b0790bf393 100644 --- a/include/core/SkComposeShader.h +++ b/include/core/SkComposeShader.h @@ -34,11 +34,10 @@ public: SkComposeShader(SkShader* sA, SkShader* sB, SkXfermode* mode = NULL); virtual ~SkComposeShader(); - // 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(); + 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; SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeShader) |