| Index: tests/GrPorterDuffTest.cpp
|
| diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
|
| index d0c91cb265c77feb63d6769829a32a8639c55dd0..d984f92142d3dddec9e1475e12b99e509e1ff9dd 100644
|
| --- a/tests/GrPorterDuffTest.cpp
|
| +++ b/tests/GrPorterDuffTest.cpp
|
| @@ -77,7 +77,7 @@
|
| struct XPInfo {
|
| XPInfo(skiatest::Reporter* reporter, SkXfermode::Mode xfermode, const GrCaps& caps,
|
| const GrProcOptInfo& colorPOI, const GrProcOptInfo& covPOI) {
|
| - SkAutoTUnref<const GrXPFactory> xpf(GrPorterDuffXPFactory::Create(xfermode));
|
| + SkAutoTUnref<GrXPFactory> xpf(GrPorterDuffXPFactory::Create(xfermode));
|
| SkAutoTUnref<GrXferProcessor> xp(
|
| xpf->createXferProcessor(colorPOI, covPOI, false, nullptr, caps));
|
| TEST_ASSERT(!xpf->willNeedDstTexture(caps, colorPOI, covPOI, false));
|
| @@ -97,7 +97,7 @@
|
| };
|
|
|
| static void GetXPOutputTypes(const GrXferProcessor* xp, int* outPrimary, int* outSecondary) {
|
| - GrPDXPFactory::TestGetXPOutputTypes(xp, outPrimary, outSecondary);
|
| + GrPorterDuffXPFactory::TestGetXPOutputTypes(xp, outPrimary, outSecondary);
|
| }
|
| };
|
|
|
| @@ -1124,7 +1124,7 @@
|
| SkASSERT(kRGBA_GrColorComponentFlags == colorPOI.validFlags());
|
| SkASSERT(covPOI.isFourChannelOutput());
|
|
|
| - SkAutoTUnref<const GrXPFactory> xpf(GrPorterDuffXPFactory::Create(SkXfermode::kSrcOver_Mode));
|
| + SkAutoTUnref<GrXPFactory> xpf(GrPorterDuffXPFactory::Create(SkXfermode::kSrcOver_Mode));
|
| TEST_ASSERT(!xpf->willNeedDstTexture(caps, colorPOI, covPOI, false));
|
|
|
| SkAutoTUnref<GrXferProcessor> xp(
|
| @@ -1200,7 +1200,7 @@
|
| }
|
| for (int m = 0; m <= SkXfermode::kLastCoeffMode; m++) {
|
| SkXfermode::Mode xfermode = static_cast<SkXfermode::Mode>(m);
|
| - SkAutoTUnref<const GrXPFactory> xpf(GrPorterDuffXPFactory::Create(xfermode));
|
| + SkAutoTUnref<GrXPFactory> xpf(GrPorterDuffXPFactory::Create(xfermode));
|
| GrXferProcessor::DstTexture* dstTexture =
|
| xpf->willNeedDstTexture(caps, colorPOI, covPOI, false) ? &fakeDstTexture : 0;
|
| SkAutoTUnref<GrXferProcessor> xp(
|
|
|