| Index: src/image/SkSurface_Raster.cpp
|
| diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp
|
| index 167f7733db9fc269a32938467cba32dddb6e855d..13f215589f190f9aa0cbb2d45ac5a1ff841c83e6 100644
|
| --- a/src/image/SkSurface_Raster.cpp
|
| +++ b/src/image/SkSurface_Raster.cpp
|
| @@ -118,7 +118,7 @@ SkImage* SkSurface_Raster::onNewImageSnapshot() {
|
|
|
| void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) {
|
| // are we sharing pixelrefs with the image?
|
| - SkASSERT(NULL != this->getCachedImage());
|
| + SkASSERT(this->getCachedImage());
|
| if (SkBitmapImageGetPixelRef(this->getCachedImage()) == fBitmap.pixelRef()) {
|
| SkASSERT(fWeOwnThePixels);
|
| if (kDiscard_ContentChangeMode == mode) {
|
| @@ -131,7 +131,7 @@ void SkSurface_Raster::onCopyOnWrite(ContentChangeMode mode) {
|
| // Now fBitmap is a deep copy of itself (and therefore different from
|
| // what is being used by the image. Next we update the canvas to use
|
| // this as its backend, so we can't modify the image's pixels anymore.
|
| - SkASSERT(NULL != this->getCachedCanvas());
|
| + SkASSERT(this->getCachedCanvas());
|
| this->getCachedCanvas()->getDevice()->replaceBitmapBackendForRasterSurface(fBitmap);
|
| }
|
| }
|
|
|