From bee6092dbef81ff724624c4dd630efa8657817f8 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Fri, 25 Mar 2016 10:27:03 -0700 Subject: [PATCH] Add a couple more tests around bitmap uploads Change-Id: I36138238b7e6cce8dab62fb56eaa1be15091a412 --- libs/hwui/tests/unit/RecordingCanvasTests.cpp | 9 +++++++++ libs/hwui/tests/unit/SkiaBehaviorTests.cpp | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp index ca726732f75f2..e4b43364d6c08 100644 --- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp +++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp @@ -602,6 +602,15 @@ TEST(RecordingCanvas, refPaint) { EXPECT_NE(&paint, ops[3]->paint); } +TEST(RecordingCanvas, refBitmap) { + SkBitmap bitmap = TestUtils::createSkBitmap(100, 100); + auto dl = TestUtils::createDisplayList(100, 100, [&bitmap](RecordingCanvas& canvas) { + canvas.drawBitmap(bitmap, 0, 0, nullptr); + }); + auto& bitmaps = dl->getBitmapResources(); + EXPECT_EQ(1u, bitmaps.size()); +} + TEST(RecordingCanvas, refBitmapInShader_bitmapShader) { SkBitmap bitmap = TestUtils::createSkBitmap(100, 100); auto dl = TestUtils::createDisplayList(100, 100, [&bitmap](RecordingCanvas& canvas) { diff --git a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp index 586625bf97cfe..875e260c84cf1 100644 --- a/libs/hwui/tests/unit/SkiaBehaviorTests.cpp +++ b/libs/hwui/tests/unit/SkiaBehaviorTests.cpp @@ -41,3 +41,10 @@ TEST(SkiaBehavior, CreateBitmapShader1x1) { EXPECT_EQ(SkShader::kRepeat_TileMode, xy[1]); EXPECT_EQ(origBitmap.pixelRef(), bitmap.pixelRef()); } + +TEST(SkiaBehavior, genIds) { + SkBitmap bitmap = TestUtils::createSkBitmap(100, 100); + uint32_t genId = bitmap.getGenerationID(); + bitmap.notifyPixelsChanged(); + EXPECT_NE(genId, bitmap.getGenerationID()); +}