add drawPicture variant that takes a matrix and paint

src/gpu/GrPictureUtils.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrPictureUtils.h"
 #include "SkDevice.h"
 #include "SkDraw.h"
@@ skipping 216 matching lines @@
     // for speed, just respect the bounds, and disable AA. May give us a few
     // false positives and negatives.
     virtual void onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
         this->updateClipConservativelyUsingBounds(path.getBounds(), op,
                                                   path.isInverseFillType());
     }
     virtual void onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle) SK_OVERRIDE {
         this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false);
     }
 
-    virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE {
+    virtual void onDrawPicture(const SkPicture* picture, const SkMatrix* matrix,
+                               const SkPaint* paint) SK_OVERRIDE {
         if (NULL != picture->fData.get()) {
             // Disable the BBH for the old path so all the draw calls
             // will be seen. The stock SkPicture::draw method can't be
             // invoked since it just uses a vanilla SkPicturePlayback.
             SkPicturePlayback playback(picture);
             playback.setUseBBH(false);
             playback.draw(this, NULL);

[mtklein, 2014/08/07 21:25:20]

Seems like we should pass matrix and paint through here...

[reed1, 2014/08/08 13:57:29]

Done.

         } else {
             // Since we know this is the SkRecord path we can just call
             // SkPicture::draw.
             picture->draw(this);

[mtklein, 2014/08/07 21:25:20]

... and here?

[reed1, 2014/08/08 13:57:29]

Done.

         }
     }
 
 private:
     typedef SkCanvas INHERITED;
 };
 
 // GatherGPUInfo is only intended to be called within the context of SkGpuDevice's
 // EXPERIMENTAL_optimize method.
 void GatherGPUInfo(const SkPicture* pict, GPUAccelData* accelData) {
     if (NULL == pict || 0 == pict->width() || 0 == pict->height()) {
         return ;
     }
 
     // BBH-based rendering doesn't re-issue many of the operations the gather
     // process cares about (e.g., saves and restores) so it must be disabled.
     SkPicturePlayback playback(pict);
     playback.setUseBBH(false);
 
     GrGatherDevice device(pict->width(), pict->height(), &playback, accelData, 0);
     GrGatherCanvas canvas(&device);
 
     canvas.clipRect(SkRect::MakeWH(SkIntToScalar(pict->width()),
                                    SkIntToScalar(pict->height())),
                     SkRegion::kIntersect_Op, false);
     playback.draw(&canvas, NULL);
 }