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/effects/imagefilters/SkAlphaThresholdFilter.cpp

diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index 6011002..1367fba 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -23,7 +23,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrTextureProxy.h"
-#include "src/gpu/effects/GrSimpleTextureEffect.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/effects/generated/GrAlphaThresholdFragmentProcessor.h"
 #endif
 
@@ -166,7 +166,7 @@
             return nullptr;
         }
 
-        auto textureFP = GrSimpleTextureEffect::Make(
+        auto textureFP = GrTextureEffect::Make(
                 std::move(inputProxy), input->alphaType(),
                 SkMatrix::MakeTrans(input->subset().x(), input->subset().y()));
         textureFP = GrColorSpaceXformEffect::Make(std::move(textureFP), input->getColorSpace(),

src/effects/imagefilters/SkArithmeticImageFilter.cpp

diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 6a32c5e..8b5e2d2 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -354,8 +354,8 @@
         SkMatrix backgroundMatrix = SkMatrix::MakeTrans(
                 SkIntToScalar(bgSubset.left() - backgroundOffset.fX),
                 SkIntToScalar(bgSubset.top()  - backgroundOffset.fY));
-        bgFP = GrSimpleTextureEffect::Make(std::move(backgroundProxy), background->alphaType(),
-                                           backgroundMatrix, GrSamplerState::Filter::kNearest);
+        bgFP = GrTextureEffect::Make(std::move(backgroundProxy), background->alphaType(),
+                                     backgroundMatrix, GrSamplerState::Filter::kNearest);
         bgFP = GrDomainEffect::Make(
                 std::move(bgFP),
                 GrTextureDomain::MakeTexelDomain(bgSubset, GrTextureDomain::kDecal_Mode),
@@ -374,8 +374,8 @@
                 SkIntToScalar(fgSubset.left() - foregroundOffset.fX),
                 SkIntToScalar(fgSubset.top()  - foregroundOffset.fY));
         auto foregroundFP =
-                GrSimpleTextureEffect::Make(std::move(foregroundProxy), foreground->alphaType(),
-                                            foregroundMatrix, GrSamplerState::Filter::kNearest);
+                GrTextureEffect::Make(std::move(foregroundProxy), foreground->alphaType(),
+                                      foregroundMatrix, GrSamplerState::Filter::kNearest);
         foregroundFP = GrDomainEffect::Make(
                 std::move(foregroundFP),
                 GrTextureDomain::MakeTexelDomain(fgSubset, GrTextureDomain::kDecal_Mode),

src/effects/imagefilters/SkXfermodeImageFilter.cpp

diff --git a/src/effects/imagefilters/SkXfermodeImageFilter.cpp b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
index 1a1e2a1..c36d226 100644
--- a/src/effects/imagefilters/SkXfermodeImageFilter.cpp
+++ b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
@@ -24,8 +24,8 @@
 #include "src/gpu/GrTextureProxy.h"
 
 #include "src/gpu/SkGr.h"
-#include "src/gpu/effects/GrSimpleTextureEffect.h"
 #include "src/gpu/effects/GrTextureDomain.h"
+#include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/effects/generated/GrConstColorProcessor.h"
 #endif
 #include "src/core/SkClipOpPriv.h"
@@ -266,8 +266,8 @@
         SkMatrix bgMatrix = SkMatrix::MakeTrans(
                 SkIntToScalar(bgSubset.left() - backgroundOffset.fX),
                 SkIntToScalar(bgSubset.top()  - backgroundOffset.fY));
-        bgFP = GrSimpleTextureEffect::Make(std::move(backgroundProxy), background->alphaType(),
-                                           bgMatrix, GrSamplerState::Filter::kNearest);
+        bgFP = GrTextureEffect::Make(std::move(backgroundProxy), background->alphaType(), bgMatrix,
+                                     GrSamplerState::Filter::kNearest);
         bgFP = GrDomainEffect::Make(
                 std::move(bgFP),
                 GrTextureDomain::MakeTexelDomain(bgSubset, GrTextureDomain::kDecal_Mode),
@@ -286,8 +286,8 @@
                 SkIntToScalar(fgSubset.left() - foregroundOffset.fX),
                 SkIntToScalar(fgSubset.top()  - foregroundOffset.fY));
         auto foregroundFP =
-                GrSimpleTextureEffect::Make(std::move(foregroundProxy), foreground->alphaType(),
-                                            fgMatrix, GrSamplerState::Filter::kNearest);
+                GrTextureEffect::Make(std::move(foregroundProxy), foreground->alphaType(), fgMatrix,
+                                      GrSamplerState::Filter::kNearest);
         foregroundFP = GrDomainEffect::Make(
                 std::move(foregroundFP),
                 GrTextureDomain::MakeTexelDomain(fgSubset, GrTextureDomain::kDecal_Mode),