commit b8f098d3721cbd2eb22d00d6f82357000b359318
author Brian Salomon <bsalomon@google.com> Tue Jan 07 11:15:44 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 07 18:44:42 2020 +0000
tree 6e5993ed7ce74b3cc670f855602a931bff9d026e
parent 3f83bfd21c757956d89063e4b0b2f9cb654ce4c6

Reland "Rename GrSimpleTextureEffect->GrTextureEffect"

This reverts commit d7436a37ff3fca9d0f6923f30a7b67da94b5ac1a.

Restores old file order in gpu.gni until Mac/Metal issue can be
debugged.

Change-Id: I6e2ee3bdc3b39270aeaaf28b9613e4ac49d38e1e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262801
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 26ba0da..ba75657 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -163,7 +163,7 @@
     SkMatrix maskMatrix = SkMatrix::MakeTrans(SkIntToScalar(-textureOriginInDeviceSpace.fX),
                                               SkIntToScalar(-textureOriginInDeviceSpace.fY));
     maskMatrix.preConcat(viewMatrix);
-    paint.addCoverageFragmentProcessor(GrSimpleTextureEffect::Make(
+    paint.addCoverageFragmentProcessor(GrTextureEffect::Make(
             std::move(proxy), kPremul_SkAlphaType, maskMatrix, GrSamplerState::Filter::kNearest));
     DrawNonAARect(renderTargetContext, std::move(paint), userStencilSettings, clip, SkMatrix::I(),
                   dstRect, invert);