Index: include/core/SkDevice.h |
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h |
index 899c5d37540c5f6cf059229f8bbffcb8ec7aa384..67b76b56a122638d587b993375660f3f9462b9f6 100644 |
--- a/include/core/SkDevice.h |
+++ b/include/core/SkDevice.h |
@@ -116,6 +116,7 @@ public: |
*/ |
const SkBitmap& accessBitmap(bool changePixels); |
+#ifdef SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG |
/** |
* DEPRECATED: This will be made protected once WebKit stops using it. |
* Instead use Canvas' writePixels method. |
@@ -132,7 +133,10 @@ public: |
* not kARGB_8888_Config then this parameter is ignored. |
*/ |
virtual void writePixels(const SkBitmap& bitmap, int x, int y, |
- SkCanvas::Config8888 config8888 = SkCanvas::kNative_Premul_Config8888) = 0; |
+ SkCanvas::Config8888 config8888 = SkCanvas::kNative_Premul_Config8888); |
+#endif |
+ |
+ bool writePixelsDirect(const SkImageInfo&, const void*, size_t rowBytes, int x, int y); |
/** |
* Return the device's associated gpu render target, or NULL. |
@@ -387,6 +391,8 @@ protected: |
// default impl returns NULL |
virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes); |
+ virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y); |
+ |
/** |
* Leaky properties are those which the device should be applying but it isn't. |
* These properties will be applied by the draw, when and as it can. |