| Index: tests/PictureTest.cpp
|
| diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
|
| index ac750e9a85210c77a5935ba198ee3f3a10fb991c..33e058cc2e483fd5f185b501308f984172174990 100644
|
| --- a/tests/PictureTest.cpp
|
| +++ b/tests/PictureTest.cpp
|
| @@ -1248,9 +1248,8 @@
|
|
|
| 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 @@
|
|
|
| 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 @@
|
|
|
| // 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);
|
|
|