commit 9b14f26d0f3a974f3dd626c8354e1db1cfcd322f
author robertphillips <robertphillips@google.com> Wed Jun 04 05:40:44 2014 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jun 04 05:40:44 2014 -0700
tree 542d5f1d7a1266454675745139e956b4424fde4b
parent 232f7259a939c70ce447a729a5094fcc272b679d

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

R=reed@google.com, bsalomon@google.com, mtklein@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/313613004

tools/CopyTilesRenderer.cpp

diff --git a/tools/CopyTilesRenderer.cpp b/tools/CopyTilesRenderer.cpp
index 8022092..2456855 100644
--- a/tools/CopyTilesRenderer.cpp
+++ b/tools/CopyTilesRenderer.cpp
@@ -55,7 +55,7 @@
                 mat.postTranslate(SkIntToScalar(-x), SkIntToScalar(-y));
                 fCanvas->setMatrix(mat);
                 // Draw the picture
-                fCanvas->drawPicture(*fPicture);
+                fCanvas->drawPicture(fPicture);
                 // Now extract the picture into tiles
                 const SkBitmap& baseBitmap = fCanvas->getDevice()->accessBitmap(false);
                 SkIRect subset;

tools/PdfRenderer.cpp

diff --git a/tools/PdfRenderer.cpp b/tools/PdfRenderer.cpp
index 890abde..bcecf57 100644
--- a/tools/PdfRenderer.cpp
+++ b/tools/PdfRenderer.cpp
@@ -51,7 +51,7 @@
         return false;
     }
 
-    fCanvas->drawPicture(*fPicture);
+    fCanvas->drawPicture(fPicture);
     fCanvas->flush();
 
     return fPdfDoc->close();

tools/PictureRenderer.cpp

diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 5128782..0343460 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -390,7 +390,7 @@
     PipeController pipeController(fCanvas.get());
     SkGPipeWriter writer;
     SkCanvas* pipeCanvas = writer.startRecording(&pipeController);
-    pipeCanvas->drawPicture(*fPicture);
+    pipeCanvas->drawPicture(fPicture);
     writer.endRecording();
     fCanvas->flush();
     if (NULL != out) {
@@ -426,7 +426,7 @@
         return false;
     }
 
-    fCanvas->drawPicture(*fPicture);
+    fCanvas->drawPicture(fPicture);
     fCanvas->flush();
     if (NULL != out) {
         *out = SkNEW(SkBitmap);
@@ -592,7 +592,7 @@
     SkMatrix mat(canvas->getTotalMatrix());
     mat.postTranslate(-tileRect.fLeft, -tileRect.fTop);
     canvas->setMatrix(mat);
-    canvas->drawPicture(*picture);
+    canvas->drawPicture(picture);
     canvas->restoreToCount(saveCount);
     canvas->flush();
 }
@@ -893,7 +893,7 @@
                                                  factory.get(),
                                                  this->recordFlags());
     this->scaleToScaleFactor(canvas);
-    canvas->drawPicture(*fPicture);
+    canvas->drawPicture(fPicture);
 }
 
 bool PlaybackCreationRenderer::render(SkBitmap** out) {

tools/lua/lua_pictures.cpp

diff --git a/tools/lua/lua_pictures.cpp b/tools/lua/lua_pictures.cpp
index c8b205d..f1c5ce9 100644
--- a/tools/lua/lua_pictures.cpp
+++ b/tools/lua/lua_pictures.cpp
@@ -158,7 +158,7 @@
                                                     L.get(), gAccumulateFunc));
 
                 call_canvas(L.get(), canvas.get(), path, gStartCanvasFunc);
-                canvas->drawPicture(*pic);
+                canvas->drawPicture(pic);
                 call_canvas(L.get(), canvas.get(), path, gEndCanvasFunc);
 
             } else {

tools/pinspect.cpp

diff --git a/tools/pinspect.cpp b/tools/pinspect.cpp
index 306bf6f..368d6fe 100644
--- a/tools/pinspect.cpp
+++ b/tools/pinspect.cpp
@@ -48,7 +48,7 @@
 #ifdef SK_DEVELOPER
     SkDebugfDumper dumper;
     SkDumpCanvas canvas(&dumper);
-    canvas.drawPicture(*pic);
+    canvas.drawPicture(pic);
 #else
     printf("SK_DEVELOPER mode not enabled\n");
 #endif