commit 0e7bddfb340a558f1ef0f554e64b4339ca939aea
author reed <reed@google.com> Wed Aug 17 13:24:05 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 17 13:24:05 2016 -0700
tree 995932195da173b14033dbbdf488bb4f5ec28c78
parent bd4121ab24f16f0ddaef4701e3636eae94d2c301

fix no-gpu build

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

TBR=robertphilips
NOTREECHECKS=true

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

src/image/SkImage_Base.h

diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h
index 09971c1..a1da0fa 100644
--- a/src/image/SkImage_Base.h
+++ b/src/image/SkImage_Base.h
@@ -8,11 +8,14 @@
 #ifndef SkImage_Base_DEFINED
 #define SkImage_Base_DEFINED
 
-#include "GrTexture.h"
 #include "SkAtomics.h"
 #include "SkImage.h"
 #include "SkSurface.h"
 
+#if SK_SUPPORT_GPU
+    #include "GrTexture.h"
+#endif
+
 #include <new>
 
 class GrTextureParams;
@@ -41,7 +44,9 @@
                               int srcX, int srcY, CachingHint) const;
 
     virtual GrTexture* peekTexture() const { return nullptr; }
+#if SK_SUPPORT_GPU
     virtual sk_sp<GrTexture> refPinnedTexture(uint32_t* uniqueID) const { return nullptr; }
+#endif
     virtual SkImageCacherator* peekCacherator() const { return nullptr; }
 
     // return a read-only copy of the pixels. We promise to not modify them,

src/image/SkImage_Raster.cpp

diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index abdecb9..acfacea 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -17,6 +17,7 @@
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
+#include "GrImageIDTextureAdjuster.h"
 #include "SkGr.h"
 #include "SkGrPriv.h"
 #endif
@@ -194,8 +195,6 @@
     return true;
 }
 
-#include "GrImageIDTextureAdjuster.h"
-
 GrTexture* SkImage_Raster::asTextureRef(GrContext* ctx, const GrTextureParams& params,
                                         SkSourceGammaTreatment gammaTreatment) const {
 #if SK_SUPPORT_GPU