Index: src/utils/SkDeferredCanvas.cpp |
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp |
index 2e3f5bb6a5bea72b2dcbf37dd0bfc6c9a9656478..0339d6d5f1e2d580ae8b68e978f6bb66fba17e22 100644 |
--- a/src/utils/SkDeferredCanvas.cpp |
+++ b/src/utils/SkDeferredCanvas.cpp |
@@ -171,11 +171,6 @@ public: |
protected: |
virtual const SkBitmap& onAccessBitmap() SK_OVERRIDE; |
-#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG |
- virtual bool onReadPixels(const SkBitmap& bitmap, |
- int x, int y, |
- SkCanvas::Config8888 config8888) SK_OVERRIDE; |
-#endif |
virtual bool onReadPixels(const SkImageInfo&, void*, size_t, int x, int y) SK_OVERRIDE; |
virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y) SK_OVERRIDE; |
@@ -509,15 +504,6 @@ SkSurface* SkDeferredDevice::newSurface(const SkImageInfo& info) { |
return this->immediateDevice()->newSurface(info); |
} |
-#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG |
-bool SkDeferredDevice::onReadPixels( |
- const SkBitmap& bitmap, int x, int y, SkCanvas::Config8888 config8888) { |
- this->flushPendingCommands(kNormal_PlaybackMode); |
- return fImmediateCanvas->readPixels(const_cast<SkBitmap*>(&bitmap), |
- x, y, config8888); |
-} |
-#endif |
- |
bool SkDeferredDevice::onReadPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, |
int x, int y) { |
this->flushPendingCommands(kNormal_PlaybackMode); |