commit 05c8f461d02bd9bdc809b0345c53ef66502ada43
author Brian Osman <brianosman@google.com> Mon Oct 22 17:13:36 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 23 17:51:25 2018 +0000
tree 884c6358a2b0772af4a7cd2e77fb3078e3d4b242
parent c77cd1a843f48c7e8f4756dc3786813d5724a5c6

Hoist color space xform creation out of GrTextureProducer

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

src/gpu/GrTextureMaker.cpp

diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp
index b373306..9f4651f 100644
--- a/src/gpu/GrTextureMaker.cpp
+++ b/src/gpu/GrTextureMaker.cpp
@@ -107,8 +107,7 @@
         const SkRect& constraintRect,
         FilterConstraint filterConstraint,
         bool coordsLimitedToConstraintRect,
-        const GrSamplerState::Filter* filterOrNullForBicubic,
-        SkColorSpace* dstColorSpace) {
+        const GrSamplerState::Filter* filterOrNullForBicubic) {
     const GrSamplerState::Filter* fmForDetermineDomain = filterOrNullForBicubic;
     if (filterOrNullForBicubic && GrSamplerState::Filter::kMipMap == *filterOrNullForBicubic &&
         kYes_FilterConstraint == filterConstraint) {
@@ -140,8 +139,6 @@
         DetermineDomainMode(constraintRect, filterConstraint, coordsLimitedToConstraintRect,
                             proxy.get(), fmForDetermineDomain, &domain);
     SkASSERT(kTightCopy_DomainMode != domainMode);
-    auto fp = CreateFragmentProcessorForDomainAndFilter(std::move(proxy), adjustedMatrix,
-                                                        domainMode, domain, filterOrNullForBicubic);
-    return GrColorSpaceXformEffect::Make(std::move(fp), this->colorSpace(), this->alphaType(),
-                                         dstColorSpace);
+    return CreateFragmentProcessorForDomainAndFilter(std::move(proxy), adjustedMatrix, domainMode,
+                                                     domain, filterOrNullForBicubic);
 }