| Index: include/gpu/GrTypes.h | 
| diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h | 
| index b38608e66696f5caaa6661e7662941fb9101974d..fc233ea0cdf60646c49261f3c326b58e2d40d7aa 100644 | 
| --- a/include/gpu/GrTypes.h | 
| +++ b/include/gpu/GrTypes.h | 
| @@ -616,22 +616,4 @@ static inline size_t GrCompressedFormatDataSize(GrPixelConfig config, | 
| */ | 
| static const uint32_t kAll_GrBackendState = 0xffffffff; | 
|  | 
| -/////////////////////////////////////////////////////////////////////////////// | 
| - | 
| -#if GR_ALWAYS_ALLOCATE_ON_HEAP | 
| -    #define GrAutoMallocBaseType SkAutoMalloc | 
| -#else | 
| -    #define GrAutoMallocBaseType SkAutoSMalloc<S> | 
| -#endif | 
| - | 
| -template <size_t S> class GrAutoMalloc : public GrAutoMallocBaseType { | 
| -public: | 
| -    GrAutoMalloc() : INHERITED() {} | 
| -    explicit GrAutoMalloc(size_t size) : INHERITED(size) {} | 
| -    virtual ~GrAutoMalloc() {} | 
| -private: | 
| -    typedef GrAutoMallocBaseType INHERITED; | 
| -}; | 
| - | 
| -#undef GrAutoMallocBaseType | 
| #endif | 
|  |