aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar joshualitt <joshualitt@google.com>2015-03-05 12:18:38 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-05 12:18:38 -0800
commita0865b4620cc614586a5c02f258da2436ed3ab2b (patch)
treecbba8cff17a70b6ba29cbb8b028ba26f2ba8b9fb /tests
parentc1e97b372e21edf9c7e45cfea0eca7f1a52fe9e5 (diff)
Revert of Update SkPicture cull rects with RTree information (patchset #6 id:140001 of https://codereview.chromium.org/971803002/)
Reason for revert: Might be breaking deps roll Original issue's description: > Update SkPicture cull rects with RTree information > > When computed, the RTree for an SkPicture will have a root > bounds that reflects the best bounding information available, > rather than the best estimate at the time the picture recorder > is created. Given that creators frequently don't know ahead of > time what will be drawn, the RTree bound is often tighter. > > Perf testing on Chrome indicates a small raster performance > advantage. For upcoming painting changes in Chrome the > performance advantage is much larger. > > BUG= > > Committed: https://skia.googlesource.com/skia/+/2dd3b6647dc726f36fd8774b3d0d2e83b493aeac TBR=mtklein@google.com,schenney@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/977413003
Diffstat (limited to 'tests')
-rw-r--r--tests/PictureTest.cpp9
-rw-r--r--tests/RecordDrawTest.cpp1
2 files changed, 3 insertions, 7 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index ac750e9a85..33e058cc2e 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1248,9 +1248,8 @@ DEF_TEST(DontOptimizeSaveLayerDrawDrawRestore, reporter) {
struct CountingBBH : public SkBBoxHierarchy {
mutable int searchCalls;
- SkRect rootBound;
- CountingBBH(const SkRect& bound) : searchCalls(0), rootBound(bound) {}
+ CountingBBH() : searchCalls(0) {}
void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {
this->searchCalls++;
@@ -1258,7 +1257,6 @@ struct CountingBBH : public SkBBoxHierarchy {
void insert(const SkRect[], int) SK_OVERRIDE {}
virtual size_t bytesUsed() const SK_OVERRIDE { return 0; }
- SkRect getRootBound() const SK_OVERRIDE { return rootBound; }
};
class SpoonFedBBHFactory : public SkBBHFactory {
@@ -1273,12 +1271,11 @@ private:
// When the canvas clip covers the full picture, we don't need to call the BBH.
DEF_TEST(Picture_SkipBBH, r) {
- SkRect bound = SkRect::MakeWH(320, 240);
- CountingBBH bbh(bound);
+ CountingBBH bbh;
SpoonFedBBHFactory factory(&bbh);
SkPictureRecorder recorder;
- recorder.beginRecording(bound, &factory);
+ recorder.beginRecording(320, 240, &factory);
SkAutoTUnref<const SkPicture> picture(recorder.endRecording());
SkCanvas big(640, 480), small(300, 200);
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index baee712b37..cf138b8d4e 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -133,7 +133,6 @@ struct TestBBH : public SkBBoxHierarchy {
void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE {}
size_t bytesUsed() const SK_OVERRIDE { return 0; }
- SkRect getRootBound() const SK_OVERRIDE { return SkRect::MakeEmpty(); }
struct Entry {
unsigned opIndex;