Move functions from SkGr to SkGrPriv.h

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 29 matching lines @@
 SkImageGenerator* SkImageGeneratorUtils::NewFromBitmap(const SkBitmap& bm) {
     return new GeneratorFromBitmap(bm);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
 #include "GrTexture.h"
-#include "SkGr.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 {
         if (ctx) {
@@ skipping 64 matching lines @@
     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;
 }