Fixed bug with SkImage leaving canvas backing store in an immutable state after destroy.

tests/SurfaceTest.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkCanvas.h"
 #include "SkRRect.h"
 #include "SkSurface.h"
@@ skipping 115 matching lines @@
     EXPECT_COPY_ON_WRITE(drawBitmapMatrix(testBitmap, testMatrix, NULL))
     EXPECT_COPY_ON_WRITE(drawBitmapNine(testBitmap, testIRect, testRect, NULL))
     EXPECT_COPY_ON_WRITE(drawSprite(testBitmap, 0, 0, NULL))
     EXPECT_COPY_ON_WRITE(drawText(testText.c_str(), testText.size(), 0, 1, testPaint))
     EXPECT_COPY_ON_WRITE(drawPosText(testText.c_str(), testText.size(), testPoints2, \
         testPaint))
     EXPECT_COPY_ON_WRITE(drawTextOnPath(testText.c_str(), testText.size(), testPath, NULL, \
         testPaint))
 }
 
+static void TestSurfaceWritableAfterSnapshotRelease(skiatest::Reporter* reporter,
+                                                    SurfaceType surfaceType,
+                                                    GrContext* context) {
+    // This test succeeds by not triggering an assertion.
+    // The test verifies that the surface remains writable (usable) after
+    // acquiring and releasing a snapshot without triggering a copy on write.
+    SkSurface* surface = createSurface(surfaceType, context);
+    SkAutoTUnref<SkSurface> aur_surface(surface);
+    SkCanvas* canvas = surface->getCanvas();
+    canvas->clear(1);
+    surface->newImageShapshot()->unref();  // Create and destroy SkImage
+    canvas->clear(2);
+}
+
 static void TestSurface(skiatest::Reporter* reporter) {

[bsalomon, 2013/04/03 14:13:43]

Just noting that TestSurface and TestSurfaceGpu could be combined as:

GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
TestSurfaceCopyOnWrite(reporter, kRaster_SurfaceType, NULL);
TestSurfaceCopyOnWrite(reporter, kPicture_SurfaceType, NULL);
TestSurfaceCopyOnWrite(reporter, kPicture_SurfaceType, NULL);
TestSurfaceCopyOnWrite(reporter, kGpu_SurfaceType, context);
TestSurfaceWritableAfterSnapshotRelease(reporter, kRaster_SurfaceType, NULL);
TestSurfaceWritableAfterSnapshotRelease(reporter, kPicture_SurfaceType, NULL);
TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, context);

     TestSurfaceCopyOnWrite(reporter, kRaster_SurfaceType, NULL);
     TestSurfaceCopyOnWrite(reporter, kPicture_SurfaceType, NULL);
+    TestSurfaceWritableAfterSnapshotRelease(reporter, kRaster_SurfaceType, NULL);
+    TestSurfaceWritableAfterSnapshotRelease(reporter, kPicture_SurfaceType, NULL);
 }
 
 static void TestSurfaceGpu(skiatest::Reporter* reporter, GrContextFactory* factory) {
 #if SK_SUPPORT_GPU
     GrContext* context = factory->get(GrContextFactory::kNative_GLContextType);
     TestSurfaceCopyOnWrite(reporter, kGpu_SurfaceType, context);
+    TestSurfaceWritableAfterSnapshotRelease(reporter, kGpu_SurfaceType, context);
 #endif
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("Surface", SurfaceTestClass, TestSurface)
 DEFINE_GPUTESTCLASS("SurfaceGpu", SurfaceGpuTestClass, TestSurfaceGpu)