diff options
| author |  Mike Reed <reed@google.com> | 2016-09-28 17:13:38 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-09-28 21:42:04 +0000 |
| commit | 627778d5ba4fd6f4a4a1238bbf7a1b561469fe21 (patch) | |
| tree | 25438c2d6f388c4b93c03100c44b20e8fa22f36e /tests/ShaderTest.cpp | |
| parent | e95ea08cf4134eff0fa1f7afe624b4a49e3c5ba4 (diff) | |
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 <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'tests/ShaderTest.cpp')
| -rw-r--r-- | tests/ShaderTest.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |