From df91b73a34e3a306c93a5e320704736255c3d9f0 Mon Sep 17 00:00:00 2001 From: reed Date: Sat, 30 May 2015 06:32:55 -0700 Subject: Revert[4] of add asserts around results from requestLock This reverts commit 19663e54c017499406036746e7689193aa6417e6. BUG=skia: TBR= Review URL: https://codereview.chromium.org/1159733006 --- tests/PixelRefTest.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'tests/PixelRefTest.cpp') diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp index e13d0e07e5..ed9ea87092 100644 --- a/tests/PixelRefTest.cpp +++ b/tests/PixelRefTest.cpp @@ -1,8 +1,29 @@ +/* + * 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 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) {} @@ -43,4 +64,6 @@ DEF_TEST(PixelRef_GenIDChange, r) { REPORTER_ASSERT(r, 0 != pixelRef->getGenerationID()); pixelRef->addGenIDChangeListener(NULL); pixelRef->notifyPixelsChanged(); + + test_install(r); } -- cgit v1.2.3