diff options
author | 2017-03-04 08:12:46 -0500 | |
---|---|---|
committer | 2017-03-04 13:49:47 +0000 | |
commit | 32342f032e1dfd133040324f851f0365f9d4cb51 (patch) | |
tree | 56cc2ae886ef068ff0ebb13a22c9357b40cdc6dd /src/effects/GrAlphaThresholdFragmentProcessor.cpp | |
parent | ae9718f1d40556ed5a49e616dbe54087f4d0d546 (diff) |
Rebase and fix chromium
Combine texture provider and resource provider
Largely mechanical. Only three places that were calling createApprox
via texture provider (ie without flags), so that was simple.
BUG=skia:
Change-Id: I876367bcdc6a8db736deedab1028de1972015509
Reviewed-on: https://skia-review.googlesource.com/9176
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/effects/GrAlphaThresholdFragmentProcessor.cpp')
-rw-r--r-- | src/effects/GrAlphaThresholdFragmentProcessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/effects/GrAlphaThresholdFragmentProcessor.cpp index 464dc5e242..897d44768f 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.cpp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.cpp @@ -39,14 +39,14 @@ GrAlphaThresholdFragmentProcessor::GrAlphaThresholdFragmentProcessor( , fOuterThreshold(outerThreshold) , fImageCoordTransform(context, SkMatrix::I(), proxy.get(), GrSamplerParams::kNone_FilterMode) - , fImageTextureSampler(context->textureProvider(), std::move(proxy)) + , fImageTextureSampler(context->resourceProvider(), std::move(proxy)) , fColorSpaceXform(std::move(colorSpaceXform)) , fMaskCoordTransform( context, SkMatrix::MakeTrans(SkIntToScalar(-bounds.x()), SkIntToScalar(-bounds.y())), maskProxy.get(), GrSamplerParams::kNone_FilterMode) - , fMaskTextureSampler(context->textureProvider(), maskProxy) { + , fMaskTextureSampler(context->resourceProvider(), maskProxy) { this->initClassID<GrAlphaThresholdFragmentProcessor>(); this->addCoordTransform(&fImageCoordTransform); this->addTextureSampler(&fImageTextureSampler); |