From bd4569c2329a6f3c8643439648a61cbee2c8b45b Mon Sep 17 00:00:00 2001 From: bsalomon Date: Tue, 30 Aug 2016 12:52:49 -0700 Subject: [PATCH] Remove SkBitmap::getTexture() GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2289313002 Review-Url: https://codereview.chromium.org/2289313002 --- include/core/SkBitmap.h | 8 -------- public.bzl | 1 - 2 files changed, 9 deletions(-) diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 53547f9..ce1b56e 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 ddd8c6a..e3dcade 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", -- 2.7.4