remove android legacy flags

relies on https://googleplex-android-review.git.corp.google.com/#/c/2060523/ landing first

Bug: skia:
Change-Id: I603c8e0835235e9d81bd0a5a559cb5ab5b5cfd56
Reviewed-on: https://skia-review.googlesource.com/11350
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni
index dd03c9e..3447efe 100644 (file)
--- a/gn/android_framework_defines.gni
+++ b/gn/android_framework_defines.gni
@@ -12,9 +12,6 @@ android_framework_defines = [
   "SK_SUPPORT_LEGACY_GRADIENT_DITHERING",
   "SK_SUPPORT_LEGACY_DRAWFILTER",
   "SK_IGNORE_GPU_DITHER",
-  "SK_SUPPORT_LEGACY_BITMAP_SETPIXELREF",
   "SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
   "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
-  "SK_SUPPORT_LEGACY_CANVAS_VERTICES",
-  "SK_SUPPORT_LEGACY_PIXELREFFACTORY",
 ]

diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index d14ccda..8487d41 100644 (file)
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -255,11 +255,6 @@ public:
         }
     }
 
-    // TEMPORARY -- remove after updating Android BitmapTests.cpp:35
-    void allocPixels(const SkImageInfo& info, std::nullptr_t, SkColorTable* ctable) {
-        this->allocPixels(info, sk_ref_sp(ctable));
-    }
-
     /**
      *  Allocate the bitmap's pixels to match the requested image info and
      *  rowBytes. If the request cannot be met (e.g. the info is invalid or