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

include/utils/SkProxyCanvas.h

Index: include/utils/SkProxyCanvas.h
diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h
index a418ec0850a111ca1328b741f1a4c35ac0a721b6..09bf37578b950877db760b85685c0ca32f21db7c 100644
--- a/include/utils/SkProxyCanvas.h
+++ b/include/utils/SkProxyCanvas.h
@@ -42,7 +42,6 @@ public:
                                   const SkPaint* paint = NULL) SK_OVERRIDE;
     virtual void drawSprite(const SkBitmap& bitmap, int left, int top,
                             const SkPaint* paint = NULL) SK_OVERRIDE;
-    virtual void drawPicture(SkPicture&) SK_OVERRIDE;
     virtual void drawVertices(VertexMode vmode, int vertexCount,
                               const SkPoint vertices[], const SkPoint texs[],
                               const SkColor colors[], SkXfermode* xmode,
@@ -79,6 +78,8 @@ protected:
     virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
     virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE;
 
+    virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE;
+
 private:
     SkCanvas*   fProxy;