Alter SkCanvas::drawPicture (devirtualize, take const SkPicture, take pointer)

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 262 matching lines @@
                                 const uint16_t indices[], int indexCount,
                                 const SkPaint& paint) {
     SkRect bbox;
     bbox.set(vertices, vertexCount);
     if (this->transformBounds(bbox, &paint)) {
         INHERITED::drawVertices(mode, vertexCount, vertices, texs,
                                 colors, xfer, indices, indexCount, paint);
     }
 }
 
-void SkBBoxRecord::drawPicture(SkPicture& picture) {
-    if (picture.width() > 0 && picture.height() > 0 &&
-        this->transformBounds(SkRect::MakeWH(picture.width(), picture.height()), NULL)) {
-        INHERITED::drawPicture(picture);
+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);
     }
 }
 
 bool SkBBoxRecord::transformBounds(const SkRect& bounds, const SkPaint* paint) {
     SkRect outBounds = bounds;
     outBounds.sort();
 
     if (paint) {
         // account for stroking, path effects, shadows, etc
         if (paint->canComputeFastBounds()) {
             SkRect temp;
             outBounds = paint->computeFastBounds(outBounds, &temp);
         } else {
             // set bounds to current clip
             if (!this->getClipBounds(&outBounds)) {
                 // current clip is empty
                 return false;
             }
         }
     }
 
     if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
         this->getTotalMatrix().mapRect(&outBounds);
         this->handleBBox(outBounds);
         return true;
     }
 
     return false;
 }