From 627778d5ba4fd6f4a4a1238bbf7a1b561469fe21 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 28 Sep 2016 17:13:38 -0400 Subject: isABitmap is deprecated, use isAImage BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2748 Change-Id: I7006a3231ff0e9e39b187deae550364bc97f49d6 Reviewed-on: https://skia-review.googlesource.com/2748 Commit-Queue: Mike Reed Reviewed-by: Florin Malita --- tests/ShaderTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/ShaderTest.cpp') 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); -- cgit v1.2.3