diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-21 16:50:16 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 13:13:14 +0000 |
| commit | c3efe6785666cdd13848e63f36fdadca26c48649 (patch) | |
| tree | 5a8f4a3f8469e3433af6e2cea4df48f590a5964a | |
| parent | 0ae6faa34d73ffc7ebec3d13f0473703bade821b (diff) | |
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>
| -rw-r--r-- | gn/android_framework_defines.gni | 1 | ||||
| -rw-r--r-- | src/image/SkSurface_Base.h | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index 76c8339a9c..f84c275294 100644 --- 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 e0005647e6..1b0f9ff975 100644 --- 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: |