Remove GrWrapTextureInBitmap from public API

BUG=skia:5531
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2147053002

Review-Url: https://codereview.chromium.org/2147053002

gm/drawbitmaprect.cpp

@@ -17,7 +17,7 @@
 #include "SkSurface.h"
 
 #if SK_SUPPORT_GPU
-#include "SkGr.h"
+#include "SkGrPriv.h"
 #endif
 
 static SkBitmap make_chessbm(int w, int h) {

include/gpu/SkGr.h

@@ -88,8 +88,4 @@ GrTextureParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality pain
 
 SkImageInfo GrMakeInfoFromTexture(GrTexture* tex, int w, int h, bool isOpaque);
 
-// Using the dreaded SkGrPixelRef ...
-SK_API void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque,
-                                  SkBitmap* dst);
-
 #endif

src/core/SkCanvas.cpp

@@ -41,7 +41,7 @@
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrRenderTarget.h"
-#include "SkGr.h"
+#include "SkGrPriv.h"
 #endif
 
 #define RETURN_ON_NULL(ptr)     do { if (nullptr == (ptr)) return; } while (0)

src/gpu/SkGrPriv.h

@@ -100,6 +100,13 @@ bool SkPaintToGrPaintWithTexture(GrContext* context,
 
 //////////////////////////////////////////////////////////////////////////////
 
+// Using the dreaded SkGrPixelRef ...
+void GrWrapTextureInBitmap(GrTexture* src, int w, int h, bool isOpaque,
+                           SkBitmap* dst);
+
+
+//////////////////////////////////////////////////////////////////////////////
+
 GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&, const GrCaps&);
 
 bool GrPixelConfigToColorAndColorSpace(GrPixelConfig, SkColorType*, sk_sp<SkColorSpace>*);

tests/BitmapCopyTest.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "SkBitmap.h"
+#include "SkGrPriv.h"
 #include "SkRect.h"
 #include "SkTemplates.h"
 #include "Test.h"

tests/GrTextureMipMapInvalidationTest.cpp

@@ -13,7 +13,7 @@
 #include "GrTexture.h"
 #include "GrTexturePriv.h"
 #include "SkCanvas.h"
-#include "SkGr.h"
+#include "SkGrPriv.h"
 #include "SkSurface.h"
 #include "Test.h"
 

tests/ReadPixelsTest.cpp

@@ -15,6 +15,7 @@
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "SkGr.h"
+#include "SkGrPriv.h"
 #endif
 
 #include <initializer_list>