diff options
author | reed <reed@google.com> | 2016-03-13 13:01:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-13 13:01:57 -0700 |
commit | 9283d20afc27571f7a871d1bd1100dd5df584941 (patch) | |
tree | 3688fa1847d47e1f2493b040bbe91594f6274cf0 /tests/ShaderOpacityTest.cpp | |
parent | ce563cdd48ec7ce4e0420dd88760df9be9dba50c (diff) |
Revert of more shader-->sp conversions (patchset #5 id:80001 of https://codereview.chromium.org/1789633002/ )
Reason for revert:
seems to have changed pictureshadertile
Original issue's description:
> more shader-->sp conversions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789633002
>
> Committed: https://skia.googlesource.com/skia/+/ce563cdd48ec7ce4e0420dd88760df9be9dba50c
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1790353002
Diffstat (limited to 'tests/ShaderOpacityTest.cpp')
-rw-r--r-- | tests/ShaderOpacityTest.cpp | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp index 698d5442d8..90d25d731a 100644 --- a/tests/ShaderOpacityTest.cpp +++ b/tests/ShaderOpacityTest.cpp @@ -17,36 +17,42 @@ static void test_bitmap(skiatest::Reporter* reporter) { bmp.setInfo(info); // test 1: bitmap without pixel data - auto shader = SkShader::MakeBitmapShader(bmp, + SkShader* shader = SkShader::CreateBitmapShader(bmp, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); REPORTER_ASSERT(reporter, shader); REPORTER_ASSERT(reporter, !shader->isOpaque()); + shader->unref(); // From this point on, we have pixels bmp.allocPixels(info); // test 2: not opaque by default - shader = SkShader::MakeBitmapShader(bmp, + shader = SkShader::CreateBitmapShader(bmp, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); REPORTER_ASSERT(reporter, shader); REPORTER_ASSERT(reporter, !shader->isOpaque()); + shader->unref(); // test 3: explicitly opaque bmp.setAlphaType(kOpaque_SkAlphaType); - shader = SkShader::MakeBitmapShader(bmp, + shader = SkShader::CreateBitmapShader(bmp, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); REPORTER_ASSERT(reporter, shader); REPORTER_ASSERT(reporter, shader->isOpaque()); + shader->unref(); // test 4: explicitly not opaque bmp.setAlphaType(kPremul_SkAlphaType); - shader = SkShader::MakeBitmapShader(bmp, + shader = SkShader::CreateBitmapShader(bmp, SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); REPORTER_ASSERT(reporter, shader); REPORTER_ASSERT(reporter, !shader->isOpaque()); + shader->unref(); + } -static void test_gradient(skiatest::Reporter* reporter) { +static void test_gradient(skiatest::Reporter* reporter) +{ SkPoint pts[2]; pts[0].iset(0, 0); pts[1].iset(1, 0); @@ -58,33 +64,39 @@ static void test_gradient(skiatest::Reporter* reporter) { // test 1: all opaque colors[0] = SkColorSetARGB(0xFF, 0, 0, 0); colors[1] = SkColorSetARGB(0xFF, 0, 0, 0); - auto grad = SkGradientShader::MakeLinear(pts, colors, pos, count, mode); + SkShader* grad = SkGradientShader::CreateLinear(pts, colors, pos, count, + mode); REPORTER_ASSERT(reporter, grad); REPORTER_ASSERT(reporter, grad->isOpaque()); + grad->unref(); // test 2: all 0 alpha colors[0] = SkColorSetARGB(0, 0, 0, 0); colors[1] = SkColorSetARGB(0, 0, 0, 0); - grad = SkGradientShader::MakeLinear(pts, colors, pos, count, mode); + grad = SkGradientShader::CreateLinear(pts, colors, pos, count, mode); REPORTER_ASSERT(reporter, grad); REPORTER_ASSERT(reporter, !grad->isOpaque()); + grad->unref(); // test 3: one opaque, one transparent colors[0] = SkColorSetARGB(0xFF, 0, 0, 0); colors[1] = SkColorSetARGB(0x40, 0, 0, 0); - grad = SkGradientShader::MakeLinear(pts, colors, pos, count, mode); + grad = SkGradientShader::CreateLinear(pts, colors, pos, count, mode); REPORTER_ASSERT(reporter, grad); REPORTER_ASSERT(reporter, !grad->isOpaque()); + grad->unref(); // test 4: test 3, swapped colors[0] = SkColorSetARGB(0x40, 0, 0, 0); colors[1] = SkColorSetARGB(0xFF, 0, 0, 0); - grad = SkGradientShader::MakeLinear(pts, colors, pos, count, mode); + grad = SkGradientShader::CreateLinear(pts, colors, pos, count, mode); REPORTER_ASSERT(reporter, grad); REPORTER_ASSERT(reporter, !grad->isOpaque()); + grad->unref(); } -static void test_color(skiatest::Reporter* reporter) { +static void test_color(skiatest::Reporter* reporter) +{ SkColorShader colorShader1(SkColorSetARGB(0,0,0,0)); REPORTER_ASSERT(reporter, !colorShader1.isOpaque()); SkColorShader colorShader2(SkColorSetARGB(0xFF,0,0,0)); |