diff options
| author |  Mike Reed <reed@google.com> | 2016-12-08 13:41:10 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-08 19:25:49 +0000 |
| commit | df8599ac246515b4e7ea8ed0285e4b416b8bc570 (patch) | |
| tree | b4a837719319cf9a2606ccd60207b830cadb8941 /src/ports | |
| parent | fc6d9e95407293fbbabb0388ebbe311403a896bc (diff) | |
remove SK_SUPPORT_LEGACY_REFENCODEDDATA_NOCTX flag
BUG=skia:
Change-Id: I51b7778db8b596b2633b6be9488af984cee2af70
Reviewed-on: https://skia-review.googlesource.com/5713
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkImageGeneratorCG.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkImageGeneratorCG.h | 2 | ||||
| -rw-r--r-- | src/ports/SkImageGeneratorWIC.cpp | 2 | ||||
| -rw-r--r-- | src/ports/SkImageGeneratorWIC.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/ports/SkImageGeneratorCG.cpp b/src/ports/SkImageGeneratorCG.cpp index c54eebf9c7..700a7b9a34 100644 --- a/src/ports/SkImageGeneratorCG.cpp +++ b/src/ports/SkImageGeneratorCG.cpp @@ -75,7 +75,7 @@ SkImageGeneratorCG::SkImageGeneratorCG(const SkImageInfo& info, const void* imag , fData(SkRef(data)) {} -SkData* SkImageGeneratorCG::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) { +SkData* SkImageGeneratorCG::onRefEncodedData(GrContext* ctx) { return SkRef(fData.get()); } diff --git a/src/ports/SkImageGeneratorCG.h b/src/ports/SkImageGeneratorCG.h index baf3669ffc..9ecfe1b1fe 100644 --- a/src/ports/SkImageGeneratorCG.h +++ b/src/ports/SkImageGeneratorCG.h @@ -22,7 +22,7 @@ public: static SkImageGenerator* NewFromEncodedCG(SkData* data); protected: - SkData* onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) override; + SkData* onRefEncodedData(GrContext* ctx) override; bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override; diff --git a/src/ports/SkImageGeneratorWIC.cpp b/src/ports/SkImageGeneratorWIC.cpp index 52d1377f20..1232f35bd8 100644 --- a/src/ports/SkImageGeneratorWIC.cpp +++ b/src/ports/SkImageGeneratorWIC.cpp @@ -132,7 +132,7 @@ SkImageGeneratorWIC::SkImageGeneratorWIC(const SkImageInfo& info, , fData(SkRef(data)) {} -SkData* SkImageGeneratorWIC::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) { +SkData* SkImageGeneratorWIC::onRefEncodedData(GrContext* ctx) { return SkRef(fData.get()); } diff --git a/src/ports/SkImageGeneratorWIC.h b/src/ports/SkImageGeneratorWIC.h index 76cb6df1a3..eb65e0b678 100644 --- a/src/ports/SkImageGeneratorWIC.h +++ b/src/ports/SkImageGeneratorWIC.h @@ -39,7 +39,7 @@ public: static SkImageGenerator* NewFromEncodedWIC(SkData* data); protected: - SkData* onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) override; + SkData* onRefEncodedData(GrContext* ctx) override; bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) override; |