Towards removing getTexture() from SkImage

src/image/SkImage.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkImageGenerator.h"
 #include "SkImagePriv.h"
 #include "SkImage_Base.h"
 #include "SkReadPixelsRec.h"
 #include "SkString.h"
 #include "SkSurface.h"
+#if SK_SUPPORT_GPU
+#include "GrTexture.h"
+#include "GrContext.h"
+#endif
 
 uint32_t SkImage::NextUniqueID() {
     static int32_t gUniqueID;
 
     // never return 0;
     uint32_t id;
     do {
         id = sk_atomic_inc(&gUniqueID) + 1;
     } while (0 == id);
     return id;
@@ skipping 13 matching lines @@
 
 bool SkImage::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
                            int srcX, int srcY) const {
     SkReadPixelsRec rec(dstInfo, dstPixels, dstRowBytes, srcX, srcY);
     if (!rec.trim(this->width(), this->height())) {
         return false;
     }
     return as_IB(this)->onReadPixels(rec.fInfo, rec.fPixels, rec.fRowBytes, rec.fX, rec.fY);
 }
 
-GrTexture* SkImage::getTexture() const {
-    return as_IB(this)->onGetTexture();
-}
-
 SkShader* SkImage::newShader(SkShader::TileMode tileX,
                              SkShader::TileMode tileY,
                              const SkMatrix* localMatrix) const {
     return as_IB(this)->onNewShader(tileX, tileY, localMatrix);
 }
 
 SkData* SkImage::encode(SkImageEncoder::Type type, int quality) const {
     SkBitmap bm;
     if (as_IB(this)->getROPixels(&bm)) {
         return SkImageEncoder::EncodeData(bm, type, quality);
@@ skipping 39 matching lines @@
         }
     }
 
     if (NULL == subset && this->width() == newWidth && this->height() == newHeight) {
         return SkRef(const_cast<SkImage*>(this));
     }
 
     return as_IB(this)->onNewImage(newWidth, newHeight, subset, quality);
 }
 
+#if SK_SUPPORT_GPU
+
+GrTexture* SkImage::getTexture() const {
+    return as_IB(this)->getTexture();
+}
+
+bool SkImage::isTextureBacked() const { return SkToBool(as_IB(this)->getTexture()); }
+
+GrBackendObject SkImage::getTextureHandle(bool flushPendingGrContextReads) const {
+    GrTexture* texture = as_IB(this)->getTexture();
+    if (texture) {
+        GrContext* context = texture->getContext();
+        if (context) {            
+            if (flushPendingGrContextReads) {
+                context->prepareSurfaceForExternalRead(texture);
+            }
+        }
+        return texture->getTextureHandle();
+    }
+    return 0;
+}
+
+#else
+
+GrTexture* SkImage::getTexture() const { return NULL; }
+
+bool SkImage::isTextureBacked() const { return false; }
+
+GrBackendObject SkImage::getTextureHandle(bool flushPendingGrContextReads) const { return 0; }
+
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 static bool raster_canvas_supports(const SkImageInfo& info) {
     switch (info.colorType()) {
         case kN32_SkColorType:
             return kUnpremul_SkAlphaType != info.alphaType();
         case kRGB_565_SkColorType:
             return true;
         case kAlpha_8_SkColorType:
             return true;
@@ skipping 53 matching lines @@
 
 SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
     return NULL;
 }
 
 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, SkAlphaType) {
     return NULL;
 }
 
 #endif