diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-07 09:37:13 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-09 15:44:53 +0000 |
| commit | a8f80de2bc17672b4b6f26d3cf6b38123ac850c9 (patch) | |
| tree | ae254be1a14e5ccaf0e0d8deffc43eff2983b923 /gm | |
| parent | c083e4f586831459ef7b8e197a5bee3b189b8511 (diff) | |
Removing ref counting from GrXPFactory.
All GrXPFactory instances are static constexpr.
Change-Id: If1086b08534166201e53b3fd9379104e361eb5e6
Reviewed-on: https://skia-review.googlesource.com/6701
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/beziereffects.cpp | 6 | ||||
| -rw-r--r-- | gm/bigrrectaaeffect.cpp | 2 | ||||
| -rw-r--r-- | gm/convexpolyeffect.cpp | 4 | ||||
| -rw-r--r-- | gm/rrects.cpp | 2 | ||||
| -rw-r--r-- | gm/texturedomaineffect.cpp | 2 | ||||
| -rw-r--r-- | gm/yuvtorgbeffect.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index 07fc977882..bcce9dbafb 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -193,7 +193,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); std::unique_ptr<GrDrawOp> op = BezierCubicOrConicTestOp::Make(gp, bounds, color, klmEqs, klmSigns[c]); @@ -326,7 +326,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); std::unique_ptr<GrDrawOp> op = BezierCubicOrConicTestOp::Make(gp, bounds, color, klmEqs, 1.f); @@ -540,7 +540,7 @@ protected: canvas->drawRect(bounds, boundsPaint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); GrPathUtils::QuadUVMatrix DevToUV(pts); diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index 21e49ebbc9..d8034a4384 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -75,7 +75,7 @@ protected: canvas->drawRect(testBounds, paint); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); SkRRect rrect = fRRect; rrect.offset(SkIntToScalar(x + kGap), SkIntToScalar(y + kGap)); diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index db0b02e6b3..5927d5d0c7 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -180,7 +180,7 @@ protected: } GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); grPaint.addCoverageFragmentProcessor(std::move(fp)); std::unique_ptr<GrDrawOp> op = PolyBoundsOp::Make(p.getBounds(), 0xff000000); @@ -220,7 +220,7 @@ protected: } GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); grPaint.addCoverageFragmentProcessor(std::move(fp)); std::unique_ptr<GrDrawOp> op = PolyBoundsOp::Make(rect, 0xff000000); diff --git a/gm/rrects.cpp b/gm/rrects.cpp index a0518018e7..33de77f11d 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -103,7 +103,7 @@ protected: if (kEffect_Type == fType) { #if SK_SUPPORT_GPU GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); SkRRect rrect = fRRects[curRRect]; rrect.offset(SkIntToScalar(x), SkIntToScalar(y)); diff --git a/gm/texturedomaineffect.cpp b/gm/texturedomaineffect.cpp index 9ff694d281..f2c5fd4652 100644 --- a/gm/texturedomaineffect.cpp +++ b/gm/texturedomaineffect.cpp @@ -113,7 +113,7 @@ protected: for (int m = 0; m < GrTextureDomain::kModeCount; ++m) { GrTextureDomain::Mode mode = (GrTextureDomain::Mode) m; GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrTextureDomainEffect::Make(texture.get(), nullptr, textureMatrices[tm], GrTextureDomain::MakeTexelDomain(texture.get(), diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index ab04a9d87b..103c2e41ff 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -111,7 +111,7 @@ protected: for (int i = 0; i < 6; ++i) { GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrYUVEffect::MakeYUVToRGB(texture[indices[i][0]].get(), texture[indices[i][1]].get(), @@ -228,7 +228,7 @@ protected: SkScalar x = kDrawPad + kTestPad; GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrYUVEffect::MakeYUVToRGB(texture[0].get(), texture[1].get(), texture[2].get(), sizes, static_cast<SkYUVColorSpace>(space), true)); |