Reland "Don't require mips in GrTextureProducer if texture is 1x1."

This reverts commit c861eee3a6f1f93ad3df27b8be94f44b245bd128.

Reason for revert: Relanding with fix for gray8 not copyable

Original change's description:
> Revert "Don't require mips in GrTextureProducer if texture is 1x1."
>
> This reverts commit 5191fd7555d34225ef771ad4cac65bcbbb50a89c.
>
> Reason for revert: breaking angle
>
> Original change's description:
> > Don't require mips in GrTextureProducer if texture is 1x1.
> >
> > Bug: chromium:862921
> > Change-Id: I5f3584ad36e160a5a09d0a37e31e147155076b4d
> > Reviewed-on: https://skia-review.googlesource.com/142586
> > Reviewed-by: Brian Osman <brianosman@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
>
> TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com
>
> Change-Id: Iaef7a56b061cb41f4c75ec20d8df77d3e52b194d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: chromium:862921
> Reviewed-on: https://skia-review.googlesource.com/142600
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com

Change-Id: I52378fa43efe2fdf583335f5fa8aa5b04a68ae2f
Bug: chromium:862921
Reviewed-on: https://skia-review.googlesource.com/142760
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/gpu/GrTextureMaker.h b/src/gpu/GrTextureMaker.h
index a365b50444..e2dd3c852a 100644
--- a/src/gpu/GrTextureMaker.h
+++ b/src/gpu/GrTextureMaker.h
@@ -28,8 +28,7 @@ public:
 
 protected:
     GrTextureMaker(GrContext* context, int width, int height, bool isAlphaOnly)
-        : INHERITED(width, height, isAlphaOnly)
-        , fContext(context) {}
+        : INHERITED(context, width, height, isAlphaOnly) {}
 
     /**
      *  Return the maker's "original" texture. It is the responsibility of the maker to handle any
@@ -54,10 +53,9 @@ private:
     sk_sp<GrTextureProxy> onRefTextureProxyForParams(const GrSamplerState&,
                                                      SkColorSpace* dstColorSpace,
                                                      sk_sp<SkColorSpace>* proxyColorSpace,
+                                                     bool willBeMipped,
                                                      SkScalar scaleAdjust[2]) override;
 
-    GrContext*  fContext;
-
     typedef GrTextureProducer INHERITED;
 };