split SkPictureRecorder out of SkPicture

debugger/SkDebugger.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 "SkDebugger.h"
 #include "SkString.h"
@@ skipping 23 matching lines @@
     fDebugCanvas->setPicture(picture);
     picture->draw(fDebugCanvas);
     fDebugCanvas->setPicture(NULL);
     fIndex = fDebugCanvas->getSize() - 1;
     SkRefCnt_SafeAssign(fPicture, picture);
 }
 
 SkPicture* SkDebugger::copyPicture() {
     // We can't just call clone here since we want to removed the "deleted"
     // commands. Playing back will strip those out.
-    SkPicture* newPicture = new SkPicture;
-    SkCanvas* canvas = newPicture->beginRecording(fPictureWidth, fPictureHeight);
+    SkPictureRecorder recorder;
+    SkCanvas* canvas = recorder.beginRecording(fPictureWidth, fPictureHeight);
 
     bool vizMode = fDebugCanvas->getMegaVizMode();
     fDebugCanvas->setMegaVizMode(false);
     bool overDraw = fDebugCanvas->getOverdrawViz();
     fDebugCanvas->setOverdrawViz(false);
     int saveCount = fDebugCanvas->getOutstandingSaveCount();
     fDebugCanvas->setOutstandingSaveCount(0);
 
     fDebugCanvas->draw(canvas);
 
     int temp = fDebugCanvas->getOutstandingSaveCount();
     for (int i = 0; i < temp; ++i) {
         canvas->restore();
     }
 
     fDebugCanvas->setMegaVizMode(vizMode);
     fDebugCanvas->setOverdrawViz(overDraw);
     fDebugCanvas->setOutstandingSaveCount(saveCount);
 
-    newPicture->endRecording();
-    return newPicture;
+    return recorder.endRecording();
 }
 
 void SkDebugger::getOverviewText(const SkTDArray<double>* typeTimes,
                                  double totTime,
                                  SkString* overview,
                                  int numRuns) {
     const SkTDArray<SkDrawCommand*>& commands = this->getDrawCommands();
 
     SkTDArray<int> counts;
     counts.setCount(LAST_DRAWTYPE_ENUM+1);
@@ skipping 64 matching lines @@
     overview->insert(0, totalStr);
 
     overview->append("<br/>");
     overview->append("SkPicture Width: ");
     overview->appendS32(pictureWidth());
     overview->append("px<br/>");
     overview->append("SkPicture Height: ");
     overview->appendS32(pictureHeight());
     overview->append("px");
 }