Fix reversion to bilerp on clipped mipmap draws

src/gpu/GrTextureParamsAdjuster.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextureParamsAdjuster.h"
 
 #include "GrCaps.h"
@@ skipping 334 matching lines @@
 
         // We only expect MIP maps to require a tight copy.
         SkASSERT(filterOrNullForBicubic &&
                  GrTextureParams::kMipMap_FilterMode == *filterOrNullForBicubic);
         static const GrTextureParams::FilterMode kBilerp = GrTextureParams::kBilerp_FilterMode;
         domainMode =
             determine_domain_mode(constraintRect, filterConstraint, coordsLimitedToConstraintRect,
                                   texture->width(), texture->height(),
                                   contentArea, &kBilerp, &domain);
         SkASSERT(kTightCopy_DomainMode != domainMode);
-        filterOrNullForBicubic = &kBilerp;
     }
     SkASSERT(kNoDomain_DomainMode == domainMode ||
              (domain.fLeft <= domain.fRight && domain.fTop <= domain.fBottom));
     if (filterOrNullForBicubic) {
         if (kDomain_DomainMode == domainMode) {
-            SkASSERT(*filterOrNullForBicubic != GrTextureParams::kMipMap_FilterMode);
             return GrTextureDomainEffect::Create(texture, textureMatrix, domain,
                                                  GrTextureDomain::kClamp_Mode,
                                                  *filterOrNullForBicubic);
         } else {
             GrTextureParams params(SkShader::kClamp_TileMode, *filterOrNullForBicubic);
             return GrSimpleTextureEffect::Create(texture, textureMatrix, params);
         }
     } else {
         if (kDomain_DomainMode == domainMode) {
             return GrBicubicEffect::Create(texture, textureMatrix, domain);
@@ skipping 34 matching lines @@
     return result;
 }
 
 GrTexture* GrTextureMaker::generateTextureForParams(GrContext* ctx, const CopyParams& copyParams) {
     SkAutoTUnref<GrTexture> original(this->refOriginalTexture(ctx));
     if (!original) {
         return nullptr;
     }
     return copy_on_gpu(original, nullptr, copyParams);
 }