diff options
author | 2014-06-09 06:25:34 -0700 | |
---|---|---|
committer | 2014-06-09 06:25:34 -0700 | |
commit | 9f1c241e0d8a756fca1ec2dacb565eec83166d5f (patch) | |
tree | 77a588bd485fb27de5d4dc81a78624968361f65e /tools | |
parent | 5713352a64936428d37a721382d021f4a9002172 (diff) |
Remove SkPicture::kUsePathBoundsForClip_RecordingFlag
The real question is whether we ever want to record a picture without using the path bounds for a conservative (but faster) clip answer?
R=reed@google.com, mtklein@google.com, djsollen@google.com, scroggo@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/316143003
Diffstat (limited to 'tools')
-rw-r--r-- | tools/PictureRenderer.cpp | 6 | ||||
-rw-r--r-- | tools/PictureRenderer.h | 2 | ||||
-rw-r--r-- | tools/bench_playback.cpp | 3 | ||||
-rw-r--r-- | tools/bench_record.cpp | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 0343460e32..d337a5ebb7 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -256,12 +256,6 @@ void PictureRenderer::purgeTextures() { #endif } -uint32_t PictureRenderer::recordFlags() { - return (kNone_BBoxHierarchyType == fBBoxHierarchyType) - ? 0 - : SkPicture::kUsePathBoundsForClip_RecordingFlag; -} - /** * Write the canvas to an image file and/or JSON summary. * diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index 57d73cf334..efe118ff08 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -413,7 +413,7 @@ protected: void scaleToScaleFactor(SkCanvas*); SkBBHFactory* getFactory(); - uint32_t recordFlags(); + uint32_t recordFlags() const { return 0; } SkCanvas* setupCanvas(); virtual SkCanvas* setupCanvas(int width, int height); diff --git a/tools/bench_playback.cpp b/tools/bench_playback.cpp index 435dd77fb9..ffe9e23e55 100644 --- a/tools/bench_playback.cpp +++ b/tools/bench_playback.cpp @@ -39,8 +39,7 @@ static SkPicture* rerecord_with_tilegrid(SkPicture& src) { SkTileGridFactory factory(info); SkPictureRecorder recorder; - src.draw(recorder.beginRecording(src.width(), src.height(), &factory, - SkPicture::kUsePathBoundsForClip_RecordingFlag)); + src.draw(recorder.beginRecording(src.width(), src.height(), &factory)); return recorder.endRecording(); } diff --git a/tools/bench_record.cpp b/tools/bench_record.cpp index c7941eda98..271597f52a 100644 --- a/tools/bench_record.cpp +++ b/tools/bench_record.cpp @@ -25,7 +25,7 @@ __SK_FORCE_IMAGE_DECODER_LINKING; DEFINE_string2(skps, r, "skps", "Directory containing SKPs to read and re-record."); DEFINE_int32(loops, 900, "Number of times to re-record each SKP."); -DEFINE_int32(flags, SkPicture::kUsePathBoundsForClip_RecordingFlag, "RecordingFlags to use."); +DEFINE_int32(flags, 0, "RecordingFlags to use."); DEFINE_bool(endRecording, true, "If false, don't time SkPicture::endRecording()"); DEFINE_int32(nullSize, 1000, "Pretend dimension of null source picture."); DEFINE_int32(tileGridSize, 512, "Set the tile grid size. Has no effect if bbh is not set to tilegrid."); |