Index: tests/PictureTest.cpp |
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp |
index ce10f56fd66a81116ba483ebeffd6b3e155b043b..50e9977b2a7426efaaeaeeb7ea31851e2ac9c2b5 100644 |
--- a/tests/PictureTest.cpp |
+++ b/tests/PictureTest.cpp |
@@ -1733,7 +1733,8 @@ static void test_bytes_used(skiatest::Reporter* reporter) { |
sizeof(SkPicture) + sizeof(SkRecord)); |
// Protect against any unintentional bloat. |
- REPORTER_ASSERT(reporter, SkPictureUtils::ApproximateBytesUsed(empty.get()) <= 144); |
+ size_t approxUsed = SkPictureUtils::ApproximateBytesUsed(empty.get()); |
+ REPORTER_ASSERT(reporter, approxUsed <= 152); |
// Sanity check of nested SkPictures. |
SkPictureRecorder r2; |
@@ -1905,11 +1906,14 @@ DEF_TEST(Picture_BitmapLeak, r) { |
REPORTER_ASSERT(r, mut.pixelRef()->unique()); |
REPORTER_ASSERT(r, immut.pixelRef()->unique()); |
- SkPictureRecorder rec; |
- SkCanvas* canvas = rec.beginRecording(1920, 1200); |
- canvas->drawBitmap(mut, 0, 0); |
- canvas->drawBitmap(immut, 800, 600); |
- SkAutoTDelete<const SkPicture> pic(rec.endRecording()); |
+ SkAutoTDelete<const SkPicture> pic; |
+ { |
+ SkPictureRecorder rec; |
+ SkCanvas* canvas = rec.beginRecording(1920, 1200); |
+ canvas->drawBitmap(mut, 0, 0); |
+ canvas->drawBitmap(immut, 800, 600); |
+ pic.reset(rec.endRecording()); |
+ } |
// The picture shares the immutable pixels but copies the mutable ones. |
REPORTER_ASSERT(r, mut.pixelRef()->unique()); |