commit 296b1ccf9b8e9c8b945645efcbaa9c71c7135f58
author Robert Phillips <robertphillips@google.com> Wed Mar 15 10:42:12 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 15 15:20:40 2017 +0000
tree e8085e48ed8cd2a3b66316e95215f5b06f39bf50
parent e0d4fbac00f240603e725b50d58d89048fd8b21f

Retract GrContext from src/gpu/effects

Change-Id: Iceb7263098286bafb2605ef17d1fe6bb25d71e97
Reviewed-on: https://skia-review.googlesource.com/9693
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/effects/GrTextureDomain.cpp

diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp
index 7bd41a7..d7c74aa 100644
--- a/src/gpu/effects/GrTextureDomain.cpp
+++ b/src/gpu/effects/GrTextureDomain.cpp
@@ -7,7 +7,6 @@
 
 #include "GrTextureDomain.h"
 
-#include "GrContext.h"
 #include "GrResourceProvider.h"
 #include "GrShaderCaps.h"
 #include "GrSimpleTextureEffect.h"
@@ -273,7 +272,7 @@
     this->initClassID<GrTextureDomainEffect>();
 }
 
-sk_sp<GrFragmentProcessor> GrTextureDomainEffect::Make(GrContext* context,
+sk_sp<GrFragmentProcessor> GrTextureDomainEffect::Make(GrResourceProvider* resourceProvider,
                                                        sk_sp<GrTextureProxy> proxy,
                                                        sk_sp<GrColorSpaceXform> colorSpaceXform,
                                                        const SkMatrix& matrix,
@@ -282,23 +281,24 @@
                                                        GrSamplerParams::FilterMode filterMode) {
     if (GrTextureDomain::kIgnore_Mode == mode ||
         (GrTextureDomain::kClamp_Mode == mode && can_ignore_rect(proxy.get(), domain))) {
-        return GrSimpleTextureEffect::Make(context, std::move(proxy), std::move(colorSpaceXform),
-                                           matrix, filterMode);
+        return GrSimpleTextureEffect::Make(resourceProvider, std::move(proxy),
+                                           std::move(colorSpaceXform), matrix, filterMode);
     } else {
         return sk_sp<GrFragmentProcessor>(
-            new GrTextureDomainEffect(context, std::move(proxy), std::move(colorSpaceXform),
+            new GrTextureDomainEffect(resourceProvider, std::move(proxy),
+                                      std::move(colorSpaceXform),
                                       matrix, domain, mode, filterMode));
     }
 }
 
-GrTextureDomainEffect::GrTextureDomainEffect(GrContext* context,
+GrTextureDomainEffect::GrTextureDomainEffect(GrResourceProvider* resourceProvider,
                                              sk_sp<GrTextureProxy> proxy,
                                              sk_sp<GrColorSpaceXform> colorSpaceXform,
                                              const SkMatrix& matrix,
                                              const SkRect& domain,
                                              GrTextureDomain::Mode mode,
                                              GrSamplerParams::FilterMode filterMode)
-    : GrSingleTextureEffect(context, OptFlags(proxy->config(), mode), proxy,
+    : GrSingleTextureEffect(resourceProvider, OptFlags(proxy->config(), mode), proxy,
                             std::move(colorSpaceXform), matrix, filterMode)
     , fTextureDomain(proxy.get(), domain, mode) {
     SkASSERT(mode != GrTextureDomain::kRepeat_Mode ||
@@ -376,7 +376,7 @@
     const SkMatrix& matrix = GrTest::TestMatrix(d->fRandom);
     bool bilerp = mode != GrTextureDomain::kRepeat_Mode ? d->fRandom->nextBool() : false;
     sk_sp<GrColorSpaceXform> colorSpaceXform = GrTest::TestColorXform(d->fRandom);
-    return GrTextureDomainEffect::Make(d->context(),
+    return GrTextureDomainEffect::Make(d->resourceProvider(),
                                        std::move(proxy),
                                        std::move(colorSpaceXform),
                                        matrix,
@@ -408,21 +408,21 @@
 }
 
 sk_sp<GrFragmentProcessor> GrDeviceSpaceTextureDecalFragmentProcessor::Make(
-        GrContext* context,
+        GrResourceProvider* resourceProvider,
         sk_sp<GrTextureProxy> proxy,
         const SkIRect& subset,
         const SkIPoint& deviceSpaceOffset) {
     return sk_sp<GrFragmentProcessor>(new GrDeviceSpaceTextureDecalFragmentProcessor(
-            context, std::move(proxy), subset, deviceSpaceOffset));
+            resourceProvider, std::move(proxy), subset, deviceSpaceOffset));
 }
 
 GrDeviceSpaceTextureDecalFragmentProcessor::GrDeviceSpaceTextureDecalFragmentProcessor(
-        GrContext* context,
+        GrResourceProvider* resourceProvider,
         sk_sp<GrTextureProxy> proxy,
         const SkIRect& subset,
         const SkIPoint& deviceSpaceOffset)
         : INHERITED(kCompatibleWithCoverageAsAlpha_OptimizationFlag)
-        , fTextureSampler(context->resourceProvider(), proxy, GrSamplerParams::ClampNoFilter())
+        , fTextureSampler(resourceProvider, proxy, GrSamplerParams::ClampNoFilter())
         , fTextureDomain(proxy.get(), GrTextureDomain::MakeTexelDomain(subset),
                          GrTextureDomain::kDecal_Mode) {
     this->addTextureSampler(&fTextureSampler);
@@ -508,7 +508,7 @@
     SkIPoint pt;
     pt.fX = d->fRandom->nextULessThan(2048);
     pt.fY = d->fRandom->nextULessThan(2048);
-    return GrDeviceSpaceTextureDecalFragmentProcessor::Make(d->context(),
+    return GrDeviceSpaceTextureDecalFragmentProcessor::Make(d->resourceProvider(),
                                                             std::move(proxy), subset, pt);
 }
 #endif