diff options
| -rw-r--r-- | include/core/SkBitmap.h | 8 | ||||
| -rw-r--r-- | public.bzl | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 53547f9123..ce1b56e7bf 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -24,10 +24,6 @@ class SkPixelRefFactory; class SkRegion; class SkString; -#ifdef SK_SUPPORT_LEGACY_BITMAP_GETTEXTURE -class GrTexture; -#endif - /** \class SkBitmap The SkBitmap class specifies a raster bitmap. A bitmap has an integer width @@ -472,10 +468,6 @@ public: (this->colorType() != kIndex_8_SkColorType || fColorTable); } -#ifdef SK_SUPPORT_LEGACY_BITMAP_GETTEXTURE - GrTexture* getTexture() const { return nullptr; } -#endif - /** Return the bitmap's colortable, if it uses one (i.e. colorType is Index_8) and the pixels are locked. Otherwise returns NULL. Does not affect the colortable's diff --git a/public.bzl b/public.bzl index ddd8c6aa36..e3dcadee7d 100644 --- a/public.bzl +++ b/public.bzl @@ -599,7 +599,6 @@ DEFINES_ALL = [ "GOOGLE3", # Staging flags for API changes "SK_SUPPORT_LEGACY_ACCESSBITMAP", - "SK_SUPPORT_LEGACY_BITMAP_GETTEXTURE", "SK_SUPPORT_LEGACY_COLORFILTER_PTR", "SK_SUPPORT_LEGACY_CREATESHADER_PTR", "SK_SUPPORT_LEGACY_IMAGEFACTORY", |