drawBitmap* cleanup

src/device/xps/SkXPSDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef UNICODE
 #define UNICODE
 #endif
@@ skipping 1931 matching lines @@
 
     HRM(clipGeometry->SetFillRule(fillRule),
         "Could not set fill rule.");
     HRM(xpsVisual->SetClipGeometryLocal(clipGeometry.get()),
         "Could not set clip geometry.");
 
     return S_OK;
 }
 
 void SkXPSDevice::drawBitmap(const SkDraw& d, const SkBitmap& bitmap,
-                             const SkIRect* srcRectOrNull,
                              const SkMatrix& matrix, const SkPaint& paint) {
     if (d.fClip->isEmpty()) {
         return;
     }
 
     SkIRect srcRect;
-    SkBitmap tmp;
-    const SkBitmap* bitmapPtr = &bitmap;
-    if (NULL == srcRectOrNull) {
-        srcRect.set(0, 0, bitmap.width(), bitmap.height());
-        bitmapPtr = &bitmap;
-    } else {
-        srcRect = *srcRectOrNull;
-        if (!bitmap.extractSubset(&tmp, srcRect)) {
-            return; // extraction failed
-        }
-        bitmapPtr = &tmp;
-    }
+    srcRect.set(0, 0, bitmap.width(), bitmap.height());
 
     //Create the new shaded path.
     SkTScopedComPtr<IXpsOMPath> shadedPath;
     HRVM(this->fXpsFactory->CreatePath(&shadedPath),
          "Could not create path for bitmap.");
 
     //Create the shaded geometry.
     SkTScopedComPtr<IXpsOMGeometry> shadedGeometry;
     HRVM(this->fXpsFactory->CreateGeometry(&shadedGeometry),
          "Could not create geometry for bitmap.");
@@ skipping 19 matching lines @@
         //TODO: perspective that bitmap!
     }
 
     SkTScopedComPtr<IXpsOMGeometryFigure> rectFigure;
     if (NULL != xpsTransform.get()) {
         const SkShader::TileMode xy[2] = {
             SkShader::kClamp_TileMode,
             SkShader::kClamp_TileMode,
         };
         SkTScopedComPtr<IXpsOMTileBrush> xpsImageBrush;
-        HRV(this->createXpsImageBrush(*bitmapPtr,
+        HRV(this->createXpsImageBrush(bitmap,
                                       transform,
                                       xy,
                                       paint.getAlpha(),
                                       &xpsImageBrush));
         HRVM(shadedPath->SetFillBrushLocal(xpsImageBrush.get()),
              "Could not set bitmap brush.");
 
         const SkRect bitmapRect = SkRect::MakeLTRB(0, 0,
             SkIntToScalar(srcRect.width()), SkIntToScalar(srcRect.height()));
         HRV(this->createXpsRect(bitmapRect, FALSE, TRUE, &rectFigure));
@@ skipping 426 matching lines @@
              IID_PPV_ARGS(&this->fXpsFactory)),
          "Could not create factory for layer.");
 
     HRVM(this->fXpsFactory->CreateCanvas(&this->fCurrentXpsCanvas),
          "Could not create canvas for layer.");
 }
 
 bool SkXPSDevice::allowImageFilter(SkImageFilter*) {
     return false;
 }