| Index: src/image/SkSurface_Gpu.cpp
|
| diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
|
| index fab130cdde19130cbc8efca7dcc1e46fd8a76198..f94dc5bd7002dc88a18b65b811702f2f5a992b20 100644
|
| --- a/src/image/SkSurface_Gpu.cpp
|
| +++ b/src/image/SkSurface_Gpu.cpp
|
| @@ -77,7 +77,7 @@ void SkSurface_Gpu::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y,
|
| void SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) {
|
| GrRenderTarget* rt = fDevice->accessRenderTarget();
|
| // are we sharing our render target with the image?
|
| - SkASSERT(NULL != this->getCachedImage());
|
| + SkASSERT(this->getCachedImage());
|
| if (rt->asTexture() == SkTextureImageGetTexture(this->getCachedImage())) {
|
| // We call createCompatibleDevice because it uses the texture cache. This isn't
|
| // necessarily correct (http://skbug.com/2252), but never using the cache causes
|
| @@ -88,7 +88,7 @@ void SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) {
|
| if (kRetain_ContentChangeMode == mode) {
|
| fDevice->context()->copyTexture(rt->asTexture(), newDevice->accessRenderTarget());
|
| }
|
| - SkASSERT(NULL != this->getCachedCanvas());
|
| + SkASSERT(this->getCachedCanvas());
|
| SkASSERT(this->getCachedCanvas()->getDevice() == fDevice);
|
|
|
| this->getCachedCanvas()->setRootDevice(newDevice);
|
|
|