From 71c4477bee8297189e12a666bbb178f461ad2859 Mon Sep 17 00:00:00 2001 From: sergeyv Date: Tue, 29 Nov 2016 20:27:25 -0800 Subject: [PATCH] Add hwui test for correct refcounting of SkColorTable in Bitmap Test: BitmapTests.colorTableRefCounting bug:32561595 Change-Id: I505c735feffbac18d406b6b2f9dff51d81700cd8 --- libs/hwui/Android.mk | 1 + libs/hwui/tests/unit/BitmapTests.cpp | 44 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 libs/hwui/tests/unit/BitmapTests.cpp diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index eff24990a438c..361e9018ccbdf 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -278,6 +278,7 @@ LOCAL_SRC_FILES += \ tests/unit/BakedOpDispatcherTests.cpp \ tests/unit/BakedOpRendererTests.cpp \ tests/unit/BakedOpStateTests.cpp \ + tests/unit/BitmapTests.cpp \ tests/unit/CanvasContextTests.cpp \ tests/unit/CanvasStateTests.cpp \ tests/unit/ClipAreaTests.cpp \ diff --git a/libs/hwui/tests/unit/BitmapTests.cpp b/libs/hwui/tests/unit/BitmapTests.cpp new file mode 100644 index 0000000000000..8c7e08183a1ec --- /dev/null +++ b/libs/hwui/tests/unit/BitmapTests.cpp @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#include "hwui/Bitmap.h" + +#include +#include +#include + +#include + +using namespace android; +using namespace android::uirenderer; + +TEST(Bitmap, colorTableRefCounting) { + const SkPMColor c[] = { SkPackARGB32(0x80, 0x80, 0, 0) }; + SkColorTable* ctable = new SkColorTable(c, SK_ARRAY_COUNT(c)); + + SkBitmap* bm = new SkBitmap(); + bm->allocPixels(SkImageInfo::Make(1, 1, kIndex_8_SkColorType, kPremul_SkAlphaType), + nullptr, ctable); + sk_sp bitmap = Bitmap::allocateHeapBitmap(bm, ctable); + EXPECT_FALSE(ctable->unique()); + delete bm; + bitmap.reset(); + EXPECT_TRUE(ctable->unique()); + ctable->unref(); +} +