| Index: include/gpu/SkGpuDevice.h
|
| diff --git a/include/gpu/SkGpuDevice.h b/include/gpu/SkGpuDevice.h
|
| index 3ccab51831dca58f17df7bd4a114b49d1da7392e..64bd33f439e8f9cd496529efd05408eb85fdcc4f 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;
|
|
|