Revert[6] of add asserts around results from requestLock

tests/PixelRefTest.cpp

+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "Test.h"
 
 #include "SkMallocPixelRef.h"
 #include "SkPixelRef.h"
 
+static void decrement_counter_proc(void* pixels, void* ctx) {
+    int* counter = (int*)ctx;
+    *counter -= 1;
+}
+
+static void test_dont_leak_install(skiatest::Reporter* reporter) {
+    bool success;
+    int release_counter;
+    SkImageInfo info;
+    SkBitmap bm;
+
+    info = SkImageInfo::MakeN32Premul(0, 0);
+    release_counter = 1;
+    success = bm.installPixels(info, NULL, 0, NULL, decrement_counter_proc, &release_counter);
+    REPORTER_ASSERT(reporter, true == success);
+    bm.reset();
+    REPORTER_ASSERT(reporter, 0 == release_counter);
+
+    info = SkImageInfo::MakeN32Premul(10, 10);
+    release_counter = 1;
+    success = bm.installPixels(info, NULL, 0, NULL, decrement_counter_proc, &release_counter);
+    REPORTER_ASSERT(reporter, true == success);
+    bm.reset();
+    REPORTER_ASSERT(reporter, 0 == release_counter);
+
+    info = SkImageInfo::MakeN32Premul(-10, -10);
+    release_counter = 1;
+    success = bm.installPixels(info, NULL, 0, NULL, decrement_counter_proc, &release_counter);
+    REPORTER_ASSERT(reporter, false == success);
+    bm.reset();
+    REPORTER_ASSERT(reporter, 0 == release_counter);
+}
+
+static void test_install(skiatest::Reporter* reporter) {
+    bool success;
+    SkImageInfo info = SkImageInfo::MakeN32Premul(0, 0);
+    SkBitmap bm;
+    // make sure we don't assert on an empty install
+    success = bm.installPixels(info, NULL, 0);
+    REPORTER_ASSERT(reporter, success);
+
+    // no pixels should be the same as setInfo()
+    info = SkImageInfo::MakeN32Premul(10, 10);
+    success = bm.installPixels(info, NULL, 0);
+    REPORTER_ASSERT(reporter, success);
+
+}
+
 class TestListener : public SkPixelRef::GenIDChangeListener {
 public:
     explicit TestListener(int* ptr) : fPtr(ptr) {}
     void onChange() override { (*fPtr)++; }
 private:
     int* fPtr;
 };
 
 DEF_TEST(PixelRef_GenIDChange, r) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
@@ skipping 20 matching lines @@
     // 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, 1 == count);
 
     // Quick check that NULL is safe.
     REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID());
     pixelRef->addGenIDChangeListener(NULL);
     pixelRef->notifyPixelsChanged();
+
+    test_install(r);
+    test_dont_leak_install(r);
 }