| Index: src/core/SkDevice.cpp
 | 
| ===================================================================
 | 
| --- src/core/SkDevice.cpp	(revision 10315)
 | 
| +++ src/core/SkDevice.cpp	(working copy)
 | 
| @@ -371,18 +371,8 @@
 | 
|  }
 | 
|  
 | 
|  void SkDevice::drawBitmap(const SkDraw& draw, const SkBitmap& bitmap,
 | 
| -                          const SkIRect* srcRect,
 | 
|                            const SkMatrix& matrix, const SkPaint& paint) {
 | 
| -    SkBitmap        tmp;    // storage if we need a subset of bitmap
 | 
| -    const SkBitmap* bitmapPtr = &bitmap;
 | 
| -
 | 
| -    if (srcRect) {
 | 
| -        if (!bitmap.extractSubset(&tmp, *srcRect)) {
 | 
| -            return;     // extraction failed
 | 
| -        }
 | 
| -        bitmapPtr = &tmp;
 | 
| -    }
 | 
| -    draw.drawBitmap(*bitmapPtr, matrix, paint);
 | 
| +    draw.drawBitmap(bitmap, matrix, paint);
 | 
|  }
 | 
|  
 | 
|  void SkDevice::drawBitmapRect(const SkDraw& draw, const SkBitmap& bitmap,
 | 
| @@ -449,7 +439,7 @@
 | 
|          // We can go faster by just calling drawBitmap, which will concat the
 | 
|          // matrix with the CTM, and try to call drawSprite if it can. If not,
 | 
|          // it will make a shader and call drawRect, as we do below.
 | 
| -        this->drawBitmap(draw, *bitmapPtr, NULL, matrix, paint);
 | 
| +        this->drawBitmap(draw, *bitmapPtr, matrix, paint);
 | 
|          return;
 | 
|      }
 | 
|  
 | 
| 
 |