From fd9720cfec6bc50fa77d40ffdf2f6cb4b5150d4e Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Tue, 6 Nov 2012 16:54:40 +0000 Subject: Fix the PictureRecord step of BenchPictures. Review URL: https://codereview.appspot.com/6820100 git-svn-id: http://skia.googlecode.com/svn/trunk@6311 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tools/PictureRenderer.cpp | 5 +++++ tools/PictureRenderer.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index d407b0eea8..23223da516 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -164,6 +164,11 @@ static bool writeAppendNumber(SkCanvas* canvas, const SkString* path, int number /////////////////////////////////////////////////////////////////////////////////////////////// +SkCanvas* RecordPictureRenderer::setupCanvas(int width, int height) { + // defer the canvas setup until the render step + return NULL; +} + bool RecordPictureRenderer::render(const SkString*) { SkAutoTUnref replayer(this->createPicture()); SkCanvas* recorder = replayer->beginRecording(fPicture->width(), fPicture->height(), diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index a3c879a2ab..3858f8145f 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -169,6 +169,9 @@ class RecordPictureRenderer : public PictureRenderer { virtual SkString getNormalTimeFormat() SK_OVERRIDE { return SkString("%6.4f"); } +protected: + virtual SkCanvas* setupCanvas(int width, int height) SK_OVERRIDE; + private: virtual SkString getConfigNameInternal() SK_OVERRIDE; }; -- cgit v1.2.3