diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-24 11:59:47 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-24 12:37:27 +0000 |
| commit | a3bdd44aff94974e720ed04b860fbfe24f8f431e (patch) | |
| tree | b98add772ba05b2ae191f06763560dcd02fc7dc6 /src | |
| parent | 3e7cddaf32e280fe9f32eec5bfdd8168ca4941b6 (diff) | |
Revert "Revert "Remove Android-specific SK_SUPPORT_LEGACY_IMG_SNAPSHOT flag""
This reverts commit fde9bff19c2a2d84041983e20e443cca2f95ebb6.
Reason for revert: RenderNodeDrawableTests.cpp fix has landed in Android
Original change's description:
> 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>
>
TBR=djsollen@google.com,robertphillips@google.com,reviews@skia.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: Ia517aafc7c9c589d18c0e94699cad3f5acc0e941
Reviewed-on: https://skia-review.googlesource.com/10103
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/image/SkSurface_Base.h | 9 |
1 files changed, 0 insertions, 9 deletions
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: |