summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhendrikw <hendrikw@chromium.org>2015-03-09 18:47:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-10 01:48:16 +0000
commit535b4f0be7b7edde9874e8b6ac1519afe44f6db5 (patch)
tree12a20a7528c6d2862a63be29e237134e5bfc0327
parenteaa3896066e3b3c5e742a2dea4f87fe5e8e5dda4 (diff)
downloadchromium_src-535b4f0be7b7edde9874e8b6ac1519afe44f6db5.zip
chromium_src-535b4f0be7b7edde9874e8b6ac1519afe44f6db5.tar.gz
chromium_src-535b4f0be7b7edde9874e8b6ac1519afe44f6db5.tar.bz2
drawPicture calls OnDrawPicture calls drawPicture
Ran into infinite recursion while looking at skia benchmarked skpictures in trace viewer. BenchmarkingCanvas::onDrawPicture was calling SkCanvas::drawPicture, which would call BenchmarkingCanvas::onDrawPicture. BenchmarkingCanvas::onDrawPicture now calls SkCanvas::onDrawPicture, which should break up pictures into multiple commands. Review URL: https://codereview.chromium.org/990373002 Cr-Commit-Position: refs/heads/master@{#319811}
-rw-r--r--skia/ext/benchmarking_canvas.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index 0dd6949..2af0d1a 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc
@@ -624,7 +624,7 @@ void BenchmarkingCanvas::onDrawPicture(const SkPicture* picture,
if (matrix)
op.addParam("matrix", AsValue(*matrix));
- INHERITED::drawPicture(picture, matrix, paint);
+ INHERITED::onDrawPicture(picture, matrix, paint);
}
void BenchmarkingCanvas::onDrawBitmap(const SkBitmap& bitmap,