Remove image usage type enum. Use GrTextureParams instead.

src/utils/SkImageGeneratorUtils.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 "SkImageGeneratorUtils.h"
 #include "SkBitmap.h"
 
@@ skipping 38 matching lines @@
 #include "GrTexture.h"
 #include "SkGrPriv.h"
 
 class GeneratorFromTexture : public SkImageGenerator {
 public:
     GeneratorFromTexture(GrContext* ctx, GrTexture* tex, const SkImageInfo& info)
         : SkImageGenerator(info), fCtx(ctx), fTexture(tex)
     {}
 
 protected:
-    GrTexture* onGenerateTexture(GrContext* ctx, SkImageUsageType, const SkIRect* subset) override {
+    GrTexture* onGenerateTexture(GrContext* ctx, const GrTextureParams&,
+                                 const SkIRect* subset) override {
         if (ctx) {
             SkASSERT(ctx == fCtx.get());
         }
 
         if (!subset) {
             return SkRef(fTexture.get());
         }
         // need to copy the subset into a new texture
         GrSurfaceDesc desc = fTexture->desc();
         desc.fWidth = subset->width();
@@ skipping 35 matching lines @@
 public:
     GeneratorFromImage(const SkImage* image, const SkImageInfo& info)
         : SkImageGenerator(info), fImage(image) {}
 
 protected:
     bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
                      SkPMColor*, int*) override {
         return fImage->readPixels(info, pixels, rowBytes, 0, 0);
     }
 
-    GrTexture* onGenerateTexture(GrContext* ctx, SkImageUsageType, const SkIRect* subset) override {
+    GrTexture* onGenerateTexture(GrContext* ctx, const GrTextureParams&,
+                                 const SkIRect* subset) override {
         // waiting on https://code.google.com/p/skia/issues/detail?id=4233
         return nullptr;
     }
 
 private:
     SkAutoTUnref<const SkImage> fImage;
 };
 
 SkImageGenerator* SkImageGeneratorUtils::NewFromImage(const SkImage* image) {
     if (image) {
         const SkColorType ct = kN32_SkColorType;
         const SkAlphaType at = image->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
         const SkImageInfo info = SkImageInfo::Make(image->width(), image->height(), ct, at);
         return new GeneratorFromImage(image, info);
     }
     return nullptr;
 }