Index: tests/PictureTest.cpp |
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp |
index 33e058cc2e483fd5f185b501308f984172174990..ac750e9a85210c77a5935ba198ee3f3a10fb991c 100644 |
--- a/tests/PictureTest.cpp |
+++ b/tests/PictureTest.cpp |
@@ -1248,8 +1248,9 @@ DEF_TEST(DontOptimizeSaveLayerDrawDrawRestore, reporter) { |
struct CountingBBH : public SkBBoxHierarchy { |
mutable int searchCalls; |
+ SkRect rootBound; |
- CountingBBH() : searchCalls(0) {} |
+ CountingBBH(const SkRect& bound) : searchCalls(0), rootBound(bound) {} |
void search(const SkRect& query, SkTDArray<unsigned>* results) const SK_OVERRIDE { |
this->searchCalls++; |
@@ -1257,6 +1258,7 @@ 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 { |
@@ -1271,11 +1273,12 @@ private: |
// When the canvas clip covers the full picture, we don't need to call the BBH. |
DEF_TEST(Picture_SkipBBH, r) { |
- CountingBBH bbh; |
+ SkRect bound = SkRect::MakeWH(320, 240); |
+ CountingBBH bbh(bound); |
SpoonFedBBHFactory factory(&bbh); |
SkPictureRecorder recorder; |
- recorder.beginRecording(320, 240, &factory); |
+ recorder.beginRecording(bound, &factory); |
SkAutoTUnref<const SkPicture> picture(recorder.endRecording()); |
SkCanvas big(640, 480), small(300, 200); |