Remove Android-specific SK_SUPPORT_LEGACY_IMG_SNAPSHOT flag

Android has been updated to use the new signature so this should no longer be needed

Change-Id: Id745191e815381d032aba6a49bf4baf9c53b2385
Reviewed-on: https://skia-review.googlesource.com/9985
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni
index 76c8339a9c514401c2f636a2febab914b7cfb2d1..f84c275294a905e56ff6d2ae27a84d41af073e87 100644 (file)
--- a/gn/android_framework_defines.gni
+++ b/gn/android_framework_defines.gni
@@ -16,5 +16,4 @@ android_framework_defines = [
   "SK_SUPPORT_LEGACY_SHADER_ISABITMAP",
   "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER",
   "SK_SUPPORT_LEGACY_CANVAS_HELPERS",
-  "SK_SUPPORT_LEGACY_IMG_SNAPSHOT",
 ]

diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h
index e0005647e6b511f27e413228028ce951bb3989a2..1b0f9ff975243c2b6fd6efc69433fc6a125b04f1 100644 (file)
--- a/src/image/SkSurface_Base.h
+++ b/src/image/SkSurface_Base.h
@@ -43,16 +43,7 @@ public:
      *  must faithfully represent the current contents, even if the surface
      *  is changed after this called (e.g. it is drawn to via its canvas).
      */
-#ifdef SK_SUPPORT_LEGACY_IMG_SNAPSHOT
-    // This entry point is never called but is just here so Android unit tests will compile
-    virtual sk_sp<SkImage> onNewImageSnapshot(SkBudgeted) { return nullptr; }
-
-    // This entry point should be pure virtual. It has a default implementation so Android
-    // unit tests will compile.
-    virtual sk_sp<SkImage> onNewImageSnapshot() { return nullptr; }
-#else
     virtual sk_sp<SkImage> onNewImageSnapshot() = 0;
-#endif
 
     /**
      *  Default implementation: