Merge "Add a couple more tests around bitmap uploads" into nyc-dev

This commit is contained in:
Chris Craik
2016-03-28 17:47:51 +00:00
committed by Android (Google) Code Review
2 changed files with 16 additions and 0 deletions

View File

@@ -596,6 +596,15 @@ TEST(RecordingCanvas, refPaint) {
EXPECT_NE(&paint, ops[2]->paint);
}
TEST(RecordingCanvas, refBitmap) {
SkBitmap bitmap = TestUtils::createSkBitmap(100, 100);
auto dl = TestUtils::createDisplayList<RecordingCanvas>(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<RecordingCanvas>(100, 100, [&bitmap](RecordingCanvas& canvas) {

View File

@@ -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());
}