remove/deprecate SkBitmap::getTexture, as it now always returns false

src/gpu/GrImageIDTextureAdjuster.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 "GrImageIDTextureAdjuster.h"
 
 #include "GrContext.h"
 #include "GrGpuResourcePriv.h"
 #include "SkBitmap.h"
 #include "SkGrPriv.h"
 #include "SkImage_Base.h"
 #include "SkImageCacherator.h"
 #include "SkPixelRef.h"
 
 static bool bmp_is_alpha_only(const SkBitmap& bm) { return kAlpha_8_SkColorType == bm.colorType(); }
 
-GrBitmapTextureAdjuster::GrBitmapTextureAdjuster(const SkBitmap* bmp)
-    : INHERITED(bmp->getTexture(),
-                SkIRect::MakeWH(bmp->width(), bmp->height()),
-                bmp_is_alpha_only(*bmp))
-    , fBmp(bmp) {}
-
-void GrBitmapTextureAdjuster::makeCopyKey(const CopyParams& params, GrUniqueKey* copyKey) {
-    if (fBmp->isVolatile()) {
-        return;
-    }
-    // The content area must represent the whole bitmap. Texture-backed bitmaps don't support
-    // extractSubset(). Therefore, either the bitmap and the texture are the same size or the
-    // content's dimensions are the bitmap's dimensions which is pinned to the upper left
-    // of the texture.
-    GrUniqueKey baseKey;
-    GrMakeKeyFromImageID(&baseKey, fBmp->getGenerationID(),
-                         SkIRect::MakeWH(fBmp->width(), fBmp->height()));
-    MakeCopyKeyFromOrigKey(baseKey, params, copyKey);
-}
-
-void GrBitmapTextureAdjuster::didCacheCopy(const GrUniqueKey& copyKey) {
-    GrInstallBitmapUniqueKeyInvalidator(copyKey, fBmp->pixelRef());
-}
-
-SkColorSpace* GrBitmapTextureAdjuster::getColorSpace() {
-    return fBmp->colorSpace();
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
 // SkImage's don't have a way of communicating whether they're alpha-only. So we fallback to
 // inspecting the texture.
 static bool tex_image_is_alpha_only(const SkImage_Base& img) {
     return GrPixelConfigIsAlphaOnly(img.peekTexture()->config());
 }
 
 GrImageTextureAdjuster::GrImageTextureAdjuster(const SkImage_Base* img)
     : INHERITED(img->peekTexture(), SkIRect::MakeWH(img->width(), img->height()),
                 tex_image_is_alpha_only(*img))
     , fImageBase(img) {}
@@ skipping 12 matching lines @@
 }
 
 SkColorSpace* GrImageTextureAdjuster::getColorSpace() {
     return fImageBase->onImageInfo().colorSpace();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 GrBitmapTextureMaker::GrBitmapTextureMaker(GrContext* context, const SkBitmap& bitmap)
     : INHERITED(context, bitmap.width(), bitmap.height(), bmp_is_alpha_only(bitmap))
-    , fBitmap(bitmap) {
-    SkASSERT(!bitmap.getTexture());
+    , fBitmap(bitmap)
+{
     if (!bitmap.isVolatile()) {
         SkIPoint origin = bitmap.pixelRefOrigin();
         SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY, bitmap.width(),
                                            bitmap.height());
         GrMakeKeyFromImageID(&fOriginalKey, bitmap.pixelRef()->getGenerationID(), subset);
     }
 }
 
 GrTexture* GrBitmapTextureMaker::refOriginalTexture(bool willBeMipped,
                                                     SkSourceGammaTreatment gammaTreatment) {
@@ skipping 63 matching lines @@
 
 void GrImageTextureMaker::didCacheCopy(const GrUniqueKey& copyKey) {
     if (fClient) {
         as_IB(fClient)->notifyAddedToCache();
     }
 }
 
 SkColorSpace* GrImageTextureMaker::getColorSpace() {
     return fCacher->info().colorSpace();
 }