From 4cd9e2169e35cd67ee7358acea6541245e1d1744 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 7 Mar 2014 03:25:16 +0000 Subject: Add SkCanvas::writePixels that takes info+pixels directly add corresponding methods to device (w/ diff name to avoid colliding with exising virtuals) BUG=skia: R=bsalomon@google.com, robertphillips@google.com, junov@google.com, junov@chromium.org Author: reed@google.com Review URL: https://codereview.chromium.org/180113010 git-svn-id: http://skia.googlecode.com/svn/trunk@13697 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/gpu/SkGpuDevice.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include/gpu') diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h index 3ccab51831..64bd33f439 100644 --- a/include/gpu/SkGpuDevice.h +++ b/include/gpu/SkGpuDevice.h @@ -90,9 +90,10 @@ public: virtual SkBitmap::Config config() const SK_OVERRIDE; virtual void clear(SkColor color) SK_OVERRIDE; +#ifdef SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG virtual void writePixels(const SkBitmap& bitmap, int x, int y, SkCanvas::Config8888 config8888) SK_OVERRIDE; - +#endif virtual void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE; virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count, const SkPoint[], const SkPaint& paint) SK_OVERRIDE; @@ -148,10 +149,8 @@ public: class SkAutoCachedTexture; // used internally protected: - // overrides from SkBaseDevice - virtual bool onReadPixels(const SkBitmap& bitmap, - int x, int y, - SkCanvas::Config8888 config8888) SK_OVERRIDE; + virtual bool onReadPixels(const SkBitmap&, int x, int y, SkCanvas::Config8888) SK_OVERRIDE; + virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) SK_OVERRIDE; private: GrContext* fContext; -- cgit v1.2.3