From 473f0aa2bb218e50fce5e19063f8c8fdaf57fad4 Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Fri, 6 Dec 2013 20:31:45 +0000 Subject: Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is to refactor bitmap later to remove redundancy, and more interestingly, remove the chance for a disconnect between the actual (pixelref) rowbytes and config, and the one claimed by the bitmap."" This reverts commit 4174afb18a9746bbad2a06c0ec2d4ad35f72d790. BUG= Review URL: https://codereview.chromium.org/108723003 git-svn-id: http://skia.googlecode.com/svn/trunk@12547 2bbb7eff-a529-9590-31e7-b0007b416f81 --- tests/PixelRefTest.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'tests/PixelRefTest.cpp') diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp index ce2575e830..f3625bd64d 100644 --- a/tests/PixelRefTest.cpp +++ b/tests/PixelRefTest.cpp @@ -17,33 +17,35 @@ 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 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(); } -- cgit v1.2.3