commit 84a4e5a8d683bf17d6c3058b977b9dfb000428af
author bsalomon <bsalomon@google.com> Mon Feb 29 11:41:52 2016 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 29 11:41:52 2016 -0800
tree 2d1a39c9baee537c1457f03ea1c51d5a911c2432
parent 3a9be690772f0417df2abe318c71e9b2fec0f8c5

Remove internal calls to SkImage::getTexture

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1744243002

Review URL: https://codereview.chromium.org/1744243002

src/core/SkSpecialImage.cpp

diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index 50117b2..88d90b8 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkCanvas.h"
+#include "SkImage_Base.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
 
@@ -33,24 +34,24 @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-static inline const SkSpecialImage_Base* as_IB(const SkSpecialImage* image) {
+static inline const SkSpecialImage_Base* as_SIB(const SkSpecialImage* image) {
     return static_cast<const SkSpecialImage_Base*>(image);
 }
 
 void SkSpecialImage::draw(SkCanvas* canvas, SkScalar x, SkScalar y, const SkPaint* paint) const {
-    return as_IB(this)->onDraw(canvas, x, y, paint);
+    return as_SIB(this)->onDraw(canvas, x, y, paint);
 }
 
 bool SkSpecialImage::peekPixels(SkPixmap* pixmap) const {
-    return as_IB(this)->onPeekPixels(pixmap);
+    return as_SIB(this)->onPeekPixels(pixmap);
 }
 
 GrTexture* SkSpecialImage::peekTexture() const {
-    return as_IB(this)->onPeekTexture();
+    return as_SIB(this)->onPeekTexture();
 }
 
 SkSpecialSurface* SkSpecialImage::newSurface(const SkImageInfo& info) const {
-    return as_IB(this)->onNewSurface(info);
+    return as_SIB(this)->onNewSurface(info);
 }
 
 #if SK_SUPPORT_GPU
@@ -72,7 +73,7 @@
 }
 
 bool SkSpecialImage::internal_getBM(SkBitmap* result) {
-    const SkSpecialImage_Base* ib = as_IB(this);
+    const SkSpecialImage_Base* ib = as_SIB(this);
 
     // TODO: need to test offset case! (see skbug.com/4967)
     return ib->getBitmap(result);
@@ -102,8 +103,8 @@
 
     size_t getSize() const override {
 #if SK_SUPPORT_GPU
-        if (fImage->getTexture()) {
-            return fImage->getTexture()->gpuMemorySize();
+        if (GrTexture* texture = as_IB(fImage.get())->peekTexture()) {
+            return texture->gpuMemorySize();
         } else
 #endif
         {
@@ -128,7 +129,7 @@
         return fImage->peekPixels(pixmap);
     }
 
-    GrTexture* onPeekTexture() const override { return fImage->getTexture(); }
+    GrTexture* onPeekTexture() const override { return as_IB(fImage.get())->peekTexture(); }
 
     bool getBitmap(SkBitmap* result) const override {
         return false;
@@ -136,7 +137,7 @@
 
     SkSpecialSurface* onNewSurface(const SkImageInfo& info) const override {
 #if SK_SUPPORT_GPU
-        GrTexture* texture = fImage->getTexture();
+        GrTexture* texture = as_IB(fImage.get())->peekTexture();
         if (texture) {
             GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(info);
             desc.fFlags = kRenderTarget_GrSurfaceFlag;