AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Revert "Remove Android-specific SK_SUPPORT_LEGACY_IMG_SNAPSHOT flag""

Browse Source 
This reverts commit fde9bff19c.

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 c3efe67856.
> 
> 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>
This commit is contained in:
Robert Phillips 2017-03-24 11:59:47 +00:00 committed by Skia Commit-Bot
parent 3e7cddaf32
commit a3bdd44aff
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/android_framework_defines.gni
View File

@ -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",
]

9
src/image/SkSurface_Base.h
View File

@ -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: