| Index: src/core/SkDevice.cpp
|
| diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
|
| index 3cfe89cfeca9143b7b12acafdc53a16d241261fc..5b6ecc07f875e7c3d5a87454bfd3df30d36cd943 100644
|
| --- a/src/core/SkDevice.cpp
|
| +++ b/src/core/SkDevice.cpp
|
| @@ -171,8 +171,8 @@ void SkBaseDevice::drawDRRect(const SkDraw& draw, const SkRRect& outer,
|
| this->drawPath(draw, path, paint, preMatrix, pathIsMutable);
|
| }
|
|
|
| -bool SkBaseDevice::writePixelsDirect(const SkImageInfo& info, const void* pixels, size_t rowBytes,
|
| - int x, int y) {
|
| +bool SkBaseDevice::writePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes,
|
| + int x, int y) {
|
| #ifdef SK_DEBUG
|
| SkASSERT(info.width() > 0 && info.height() > 0);
|
| SkASSERT(pixels);
|
| @@ -210,10 +210,6 @@ void* SkBaseDevice::onAccessPixels(SkImageInfo* info, size_t* rowBytes) {
|
| return NULL;
|
| }
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG
|
| -void SkBaseDevice::writePixels(const SkBitmap&, int x, int y, SkCanvas::Config8888) {}
|
| -#endif
|
| -
|
| void SkBaseDevice::EXPERIMENTAL_optimize(SkPicture* picture) {
|
| // The base class doesn't perform any analysis but derived classes may
|
| }
|
|
|