diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/PictureTest.cpp | 2 | ||||
| -rw-r--r-- | tests/ShaderTest.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index 425d14f193..5076f5d828 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -82,7 +82,7 @@ static void test_analysis(skiatest::Reporter* reporter) { *(bitmap.getAddr32(0, 0)) = SK_ColorGREEN; paint.setShader(SkShader::MakeBitmapShader(bitmap, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)); - REPORTER_ASSERT(reporter, paint.getShader()->isABitmap()); + REPORTER_ASSERT(reporter, paint.getShader()->isAImage()); canvas->drawRect(SkRect::MakeWH(10, 10), paint); } diff --git a/tests/ShaderTest.cpp b/tests/ShaderTest.cpp index 83240478ad..e3d87a2886 100644 --- a/tests/ShaderTest.cpp +++ b/tests/ShaderTest.cpp @@ -16,15 +16,18 @@ static void check_isabitmap(skiatest::Reporter* reporter, SkShader* shader, int expectedW, int expectedH, SkShader::TileMode expectedX, SkShader::TileMode expectedY, const SkMatrix& expectedM) { - SkBitmap bm; SkShader::TileMode tileModes[2]; SkMatrix localM; + +#ifdef SK_SUPPORT_LEGACY_SHADER_ISABITMAP + SkBitmap bm; REPORTER_ASSERT(reporter, shader->isABitmap(&bm, &localM, tileModes)); REPORTER_ASSERT(reporter, bm.width() == expectedW); REPORTER_ASSERT(reporter, bm.height() == expectedH); REPORTER_ASSERT(reporter, localM == expectedM); REPORTER_ASSERT(reporter, tileModes[0] == expectedX); REPORTER_ASSERT(reporter, tileModes[1] == expectedY); +#endif // wack these so we don't get a false positive localM.setScale(9999, -9999); |