diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-22 14:18:02 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-22 14:18:15 +0000 |
| commit | fde9bff19c2a2d84041983e20e443cca2f95ebb6 (patch) | |
| tree | 108ee8ffe51bc6ad45de104afab42a91feee079f /src/image | |
| parent | e3b95ce468c73af8247ba9582a7b84548b19f06a (diff) | |
Revert "Remove Android-specific SK_SUPPORT_LEGACY_IMG_SNAPSHOT flag"
This reverts commit c3efe6785666cdd13848e63f36fdadca26c48649.
Reason for revert: RenderNodeDrawableTests.cpp
Original change's description:
> 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>
>
TBR=djsollen@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I0211342b237373fe40d205bb18bbef5efce56bf3
Reviewed-on: https://skia-review.googlesource.com/9946
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/image')
| -rw-r--r-- | src/image/SkSurface_Base.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/image/SkSurface_Base.h b/src/image/SkSurface_Base.h index 1b0f9ff975..e0005647e6 100644 --- a/src/image/SkSurface_Base.h +++ b/src/image/SkSurface_Base.h @@ -43,7 +43,16 @@ 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: |