| Index: src/core/SkCanvas.cpp
|
| diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
|
| index 2cfe8ae2da8b92e65a12b177eb7ef27dea7268fc..42d0382397d55c4b26b0d14558b13898e0bbb068 100644
|
| --- a/src/core/SkCanvas.cpp
|
| +++ b/src/core/SkCanvas.cpp
|
| @@ -856,7 +856,7 @@ SkBaseDevice* SkCanvas::getTopDevice(bool updateMatrixClip) const {
|
| }
|
|
|
| bool SkCanvas::readPixels(SkBitmap* bitmap, int x, int y) {
|
| - if (kUnknown_SkColorType == bitmap->colorType() || bitmap->getTexture()) {
|
| + if (kUnknown_SkColorType == bitmap->colorType()) {
|
| return false;
|
| }
|
|
|
| @@ -918,10 +918,6 @@ bool SkCanvas::readPixels(const SkImageInfo& dstInfo, void* dstP, size_t rowByte
|
| }
|
|
|
| bool SkCanvas::writePixels(const SkBitmap& bitmap, int x, int y) {
|
| - if (bitmap.getTexture()) {
|
| - return false;
|
| - }
|
| -
|
| SkAutoPixmapUnlock unlocker;
|
| if (bitmap.requestLock(&unlocker)) {
|
| const SkPixmap& pm = unlocker.pixmap();
|
|
|