Index: include/core/SkDevice.h |
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h |
index 3c677744895b2ce3b27e84b87c29f1ac05f1d6fc..7bb257935ab5e4e09b465e9f78c5e3f5773d729d 100644 |
--- a/include/core/SkDevice.h |
+++ b/include/core/SkDevice.h |
@@ -124,27 +124,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. |
- * |
- * Similar to draw sprite, this method will copy the pixels in bitmap onto |
- * the device, with the top/left corner specified by (x, y). The pixel |
- * values in the device are completely replaced: there is no blending. |
- * |
- * Currently if bitmap is backed by a texture this is a no-op. This may be |
- * relaxed in the future. |
- * |
- * If the bitmap has config kARGB_8888_Config then the config8888 param |
- * will determines how the pixel valuess are intepreted. If the bitmap is |
- * 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); |
-#endif |
- |
- bool writePixelsDirect(const SkImageInfo&, const void*, size_t rowBytes, int x, int y); |
+ bool writePixels(const SkImageInfo&, const void*, size_t rowBytes, int x, int y); |
void* accessPixels(SkImageInfo* info, size_t* rowBytes); |