Index: tests/PixelRefTest.cpp |
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp |
index 470221c0fea0c44196751c9fcfc96e94fea81d44..e0ffd7a6017537fa78b1f3f03a4bd519f3b8c7ec 100644 |
--- a/tests/PixelRefTest.cpp |
+++ b/tests/PixelRefTest.cpp |
@@ -51,35 +51,37 @@ private: |
} // namespace |
DEF_TEST(PixelRef_GenIDChange, r) { |
- SkMallocPixelRef pixelRef(NULL, 0, NULL); // We don't really care about the pixels here. |
+ SkImageInfo info = { 10, 10, kPMColor_SkColorType, kPremul_SkAlphaType }; |
+ |
+ SkAutoTUnref<SkPixelRef> pixelRef(SkMallocPixelRef::NewAllocate(info, 0, NULL)); |
// Register a listener. |
int count = 0; |
- pixelRef.addGenIDChangeListener(SkNEW_ARGS(TestListener, (&count))); |
+ pixelRef->addGenIDChangeListener(SkNEW_ARGS(TestListener, (&count))); |
REPORTER_ASSERT(r, 0 == count); |
// No one has looked at our pixelRef's generation ID, so invalidating it doesn't make sense. |
// (An SkPixelRef tree falls in the forest but there's nobody around to hear it. Do we care?) |
- pixelRef.notifyPixelsChanged(); |
+ pixelRef->notifyPixelsChanged(); |
REPORTER_ASSERT(r, 0 == count); |
// Force the generation ID to be calculated. |
- REPORTER_ASSERT(r, 0 != pixelRef.getGenerationID()); |
+ REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID()); |
// Our listener was dropped in the first call to notifyPixelsChanged(). This is a no-op. |
- pixelRef.notifyPixelsChanged(); |
+ pixelRef->notifyPixelsChanged(); |
REPORTER_ASSERT(r, 0 == count); |
// Force the generation ID to be recalculated, then add a listener. |
- REPORTER_ASSERT(r, 0 != pixelRef.getGenerationID()); |
- pixelRef.addGenIDChangeListener(SkNEW_ARGS(TestListener, (&count))); |
- pixelRef.notifyPixelsChanged(); |
+ REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID()); |
+ pixelRef->addGenIDChangeListener(SkNEW_ARGS(TestListener, (&count))); |
+ pixelRef->notifyPixelsChanged(); |
REPORTER_ASSERT(r, 1 == count); |
// Quick check that NULL is safe. |
- REPORTER_ASSERT(r, 0 != pixelRef.getGenerationID()); |
- pixelRef.addGenIDChangeListener(NULL); |
- pixelRef.notifyPixelsChanged(); |
+ REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID()); |
+ pixelRef->addGenIDChangeListener(NULL); |
+ pixelRef->notifyPixelsChanged(); |
test_info(r); |
} |