add drawPicture variant that takes a matrix and paint

src/core/SkBBoxRecord.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxRecord.h"
 
@@ skipping 275 matching lines @@
 
 void SkBBoxRecord::drawPatch(const SkPatch& patch, const SkPaint& paint) {
     const SkPoint* points = patch.getControlPoints();
     SkRect bbox;
     bbox.set(points, SkPatch::kNumCtrlPts);
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawPatch(patch, paint);
     }
 }
 
-void SkBBoxRecord::onDrawPicture(const SkPicture* picture) {
-    if (picture->width() > 0 && picture->height() > 0 &&
-        this->transformBounds(SkRect::MakeWH(picture->width(), picture->height()), NULL)) {
-        this->INHERITED::onDrawPicture(picture);
+void SkBBoxRecord::onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                                 const SkPaint* paint) {
+    SkRect bounds = SkRect::MakeWH(SkIntToScalar(picture->width()),
+                                   SkIntToScalar(picture->height()));
+    // todo: wonder if we should allow passing an optional matrix to transformBounds so we don't
+    // end up transforming the rect twice.
+    if (matrix) {
+        matrix->mapRect(&bounds);
+    }
+    if (this->transformBounds(bounds, paint)) {
+        this->INHERITED::onDrawPicture(picture, matrix, paint);
     }
 }
 
 void SkBBoxRecord::willSave() {
     fSaveStack.push(NULL);
     this->INHERITED::willSave();
 }
 
 SkCanvas::SaveLayerStrategy SkBBoxRecord::willSaveLayer(const SkRect* bounds,
                                                         const SkPaint* paint,
@@ skipping 37 matching lines @@
     }
 
     if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
         this->getTotalMatrix().mapRect(&outBounds);
         this->handleBBox(outBounds);
         return true;
     }
 
     return false;
 }